diff --git a/app/assets/stylesheets/icons.css.erb b/app/assets/stylesheets/icons.css.erb index 6335a8b9..a645546d 100644 --- a/app/assets/stylesheets/icons.css.erb +++ b/app/assets/stylesheets/icons.css.erb @@ -56,15 +56,20 @@ a [class*=" icon"] { vertical-align: -10%; font-size: 1.3333333333333333em; } -.btn [class^="icon"], + .nav [class^="icon"], -.btn [class*=" icon"], .nav [class*=" icon"] { display: inline; /* keeps button heights with and without icons the same */ - line-height: 1.4em; - font-size: 1.5em; + line-height: 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, .nav [class^="icon"].icon-spin, diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb index 7fc9cb80..906db029 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb @@ -2,21 +2,21 @@ -
+
<%= render 'filter_status' %>