developers
/
Orbit
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

This commit is contained in:
Christophe Vilayphiou 2012-04-24 15:21:12 +08:00
parent 51ee9a4bfa 45c194e870
commit c0abaa643c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/bootstrap.css.erb
View File

@ -66,6 +66,7 @@ textarea {
margin: 0; margin: 0;
font-size: 100%; font-size: 100%;
vertical-align: middle; vertical-align: middle;
margin-bottom: 10px;
} }
button, input { button, input {
*overflow: visible; *overflow: visible;

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

@ -84,7 +84,7 @@
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
text-align: left; text-align: left;
margin: 0; margin: 0;
width: 180px; width: 193px;
} }
.file-upload .upload { .file-upload .upload {
margin:0; margin:0;

4
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb vendored
View File

@ -19,7 +19,7 @@
<div class="control-group"> <div class="control-group">
<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label> <label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
<div class="controls"> <div class="controls">
<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> <%= f.text_field locale, :id => "link-#{locale}" %>
</div> </div>
</div> </div>
<% end %> <% end %>
@ -43,7 +43,7 @@
<div class="control-group"> <div class="control-group">
<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label> <label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
<div class="controls"> <div class="controls">
<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> <%= f.text_field locale, :id => "link-#{locale}" %>
</div> </div>
</div> </div>
<% end %> <% end %>