developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 

Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
This commit is contained in:
Christophe Vilayphiou 2012-04-24 16:32:00 +08:00
parent 9f6c9156c6 291d5e3a03
commit c7d8e0b27b
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/list.css
View File

@ -161,6 +161,6 @@ legend {
top: 10px; top: 10px;
left: 5px; left: 5px;
} }
.list-remove { #sort_headers .list-remove {
padding: 8px 0 8px 16px !important; padding: 8px 0 8px 16px !important;
} }

4
app/assets/stylesheets/style.css.erb
View File

@ -110,6 +110,7 @@
padding:6px; padding:6px;
} }
#orbit-bar .nav > li.search { #orbit-bar .nav > li.search {
background-image: none;
overflow: hidden; overflow: hidden;
width: 28px; width: 28px;
position: relative; position: relative;
@ -323,6 +324,9 @@
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
.form-actions .btn {
margin-bottom: 0;
}
#sub-wiget { #sub-wiget {
clear: right; clear: right;
float: right; float: right;

5
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb vendored
View File

@ -2,9 +2,14 @@
<%= stylesheet_link_tag "inc/permission-checkbox" %> <%= stylesheet_link_tag "inc/permission-checkbox" %>
<% end %> <% end %>
<% content_for :page_specific_javascript do %> <% content_for :page_specific_javascript do %>
<<<<<<< HEAD
<%= javascript_include_tag "bootstrap" %> <%= javascript_include_tag "bootstrap" %>
<%#= javascript_include_tag "inc/permission-checkbox" %> <%#= javascript_include_tag "inc/permission-checkbox" %>
<%#= javascript_include_tag "inc/search" %> <%#= javascript_include_tag "inc/search" %>
=======
<%= javascript_include_tag "inc/permission-checkbox" %>
<%= javascript_include_tag "inc/search" %>
>>>>>>> 291d5e3a03ba7da62ceb5e3b18012f0c9198dfba
<% end %> <% end %>
<%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> <%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
<%= form_tag('', :remote => true) %> <%= form_tag('', :remote => true) %>