saurabh/orbit-basic
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2012-04-24 15:21:12 +08:00
2 parents 51ee9a4bfa 45c194e870
commit c0abaa643c
3 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/stylesheets/bootstrap.css.erb
+1
View File
@@ -66,6 +66,7 @@ textarea {
margin: 0;
font-size: 100%;
vertical-align: middle;
margin-bottom: 10px;
}
button, input {
*overflow: visible;
app/assets/stylesheets/widgets.css
+1 -1
View File
@@ -84,7 +84,7 @@
border-radius: 0 3px 3px 0;
text-align: left;
margin: 0;
width: 180px;
width: 193px;
}
.file-upload .upload {
margin:0;
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
Vendored
+2 -2
View File
@@ -19,7 +19,7 @@
<div class="control-group">
<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
<div class="controls">
<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %>
<%= f.text_field locale, :id => "link-#{locale}" %>
</div>
</div>
<% end %>
@@ -43,7 +43,7 @@
<div class="control-group">
<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
<div class="controls">
<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %>
<%= f.text_field locale, :id => "link-#{locale}" %>
</div>
</div>
<% end %>