harry
/
calendar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix scrollbar

This commit is contained in:
Ray 2014-12-29 19:44:42 +08:00
parent 9cdf957071
commit 9fab70b91d
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/calendar.scss
View File

@ -1,6 +1,5 @@
/* orbit calendar */ /* orbit calendar */
#orbit_calendar { #orbit_calendar {
padding: 10px 8px;
transition: all 0.3s ease; transition: all 0.3s ease;
-webkit-transition: all 0.3s ease; -webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease; -moz-transition: all 0.3s ease;
@ -602,4 +601,13 @@
color: #989898; color: #989898;
} }
} }
}
.calendar-form-actions {
margin-top: 0;
margin-bottom: 0;
padding-top: 10px;
padding-right: 0;
padding-bottom: 0;
padding-left: 0;
} }

10
app/views/admin/calendars/index.html.erb
View File

@ -53,14 +53,8 @@
</div> </div>
<div id="event_create_space"></div> <div id="event_create_space"></div>
<div id="calendar-loading"></div> <div id="calendar-loading"></div>
<div class="form-actions form-fixed"> <div class="calendar-form-actions form-actions">
<div class="row-fluid"> <%= link_to "Add", new_admin_calendar_path, :class => "btn btn-primary", :id=>"create_event_btn", :ref=>"add-btn" %>
<div class="span8">
</div>
<div class="span4">
<%= link_to "Add", new_admin_calendar_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn" %>
</div>
</div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">