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

Fix filter not collapsing 

Fix icon size for button
This commit is contained in:
chris 2013-01-11 11:37:11 +08:00
parent a7d1cdbb75
commit b90e8efb1f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/stylesheets/icons.css.erb
View File

@ -56,15 +56,20 @@ a [class*=" icon"] {
vertical-align: -10%; vertical-align: -10%;
font-size: 1.3333333333333333em; font-size: 1.3333333333333333em;
} }
.btn [class^="icon"],
.nav [class^="icon"], .nav [class^="icon"],
.btn [class*=" icon"],
.nav [class*=" icon"] { .nav [class*=" icon"] {
display: inline; display: inline;
/* keeps button heights with and without icons the same */ /* keeps button heights with and without icons the same */
line-height: 1.4em; line-height: 1.5em;
font-size: 1.5em; }
.btn [class^="icon"],
.btn [class*=" icon"] {
display: inline;
/* keeps button heights with and without icons the same */
line-height: .9em;
} }
.btn [class^="icon"].icon-spin, .btn [class^="icon"].icon-spin,
.nav [class^="icon"].icon-spin, .nav [class^="icon"].icon-spin,

8
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendored
View File

@ -2,21 +2,21 @@
<ul class="nav nav-pills filter"> <ul class="nav nav-pills filter">
<li class="accordion-group"> <li class="accordion-group">
<div class="accordion-heading"> <div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:status) %> <b class="web-symbol"></b></a> <a href="#collapse-status" data-toggle="collapse" data-parent="#filter" class="accordion-toggle"><%= t(:status) %> <b class="web-symbol"></b></a>
</div> </div>
</li> </li>
<li class="accordion-group"> <li class="accordion-group">
<div class="accordion-heading"> <div class="accordion-heading">
<a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:categories) %> <b class="web-symbol"></b></a> <a href="#collapse-category" data-toggle="collapse" data-parent="#filter" class="accordion-toggle"><%= t(:categories) %> <b class="web-symbol"></b></a>
</div> </div>
</li> </li>
<li class="accordion-group"> <li class="accordion-group">
<div class="accordion-heading"> <div class="accordion-heading">
<a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:tags) %> <b class="web-symbol"></b></a> <a href="#collapse-tags" data-toggle="collapse" data-parent="#filter" class="accordion-toggle"><%= t(:tags) %> <b class="web-symbol"></b></a>
</div> </div>
</li> </li>
</ul> </ul>
<div class="filters"> <div class="filters accordion-group">
<div class="accordion-body collapse" id="collapse-status"> <div class="accordion-body collapse" id="collapse-status">
<%= render 'filter_status' %> <%= render 'filter_status' %>
</div> </div>