diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-02-19 14:17:44 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-02-25 16:26:52 +1100 |
| commit | c65713944011bcc4b1e7335a17e14a3023b67377 (patch) | |
| tree | 23c2fc5c658526bf11a9a8384172f6479811a6e7 | |
| parent | e31d002858e9dd6b790285ce21f35ca1ae8fa72c (diff) | |
No need to set the admin icon paths
| -rw-r--r-- | app/sass/admin.scss | 4 | ||||
| -rw-r--r-- | public/adminbootstraptheme/stylesheets/admin.css | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/sass/admin.scss b/app/sass/admin.scss index 48c55c88d..584b0d00d 100644 --- a/app/sass/admin.scss +++ b/app/sass/admin.scss @@ -1,7 +1,3 @@ -$iconSpritePath: image-url('glyphicons-halflings.png'); -$iconWhiteSpritePath: image-url('glyphicons-halflings-white.png'); - - /* As we're namespacing bootstrap to class admin, which is applied to the body element in the admin interface (no id or class allowed on the HTML element in HTML 4.01) and to the navbar also, so it can be styled with bootstrap diff --git a/public/adminbootstraptheme/stylesheets/admin.css b/public/adminbootstraptheme/stylesheets/admin.css index 82a17efb8..9c98ac432 100644 --- a/public/adminbootstraptheme/stylesheets/admin.css +++ b/public/adminbootstraptheme/stylesheets/admin.css @@ -1,3 +1,5 @@ +/* $iconSpritePath: image-url('glyphicons-halflings.png'); +$iconWhiteSpritePath: image-url('glyphicons-halflings-white.png'); */ /* As we're namespacing bootstrap to class admin, which is applied to the body element in the admin interface (no id or class allowed on the HTML element in HTML 4.01) and to the navbar also, so it can be styled with bootstrap when showing for admin users on the front end, re-apply the bootstrap html and body styles here. */ html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } @@ -380,8 +382,8 @@ body.admin { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-se .admin .table-hover tbody tr.error:hover td { background-color: #ebcccc; } .admin .table-hover tbody tr.warning:hover td { background-color: #faf2cc; } .admin .table-hover tbody tr.info:hover td { background-color: #c4e3f3; } -.admin [class^="icon-"], .admin [class*=" icon-"] { display: inline-block; width: 14px; height: 14px; *margin-right: .3em; line-height: 14px; vertical-align: text-top; background-image: url(url('../images/glyphicons-halflings.png?1349911855')); background-position: 14px 14px; background-repeat: no-repeat; margin-top: 1px; } -.admin .icon-white, .admin .nav-pills > .active > a > [class^="icon-"], .admin .nav-pills > .active > a > [class*=" icon-"], .admin .nav-list > .active > a > [class^="icon-"], .admin .nav-list > .active > a > [class*=" icon-"], .admin .navbar-inverse .nav > .active > a > [class^="icon-"], .admin .navbar-inverse .nav > .active > a > [class*=" icon-"], .admin .dropdown-menu > li > a:hover > [class^="icon-"], .admin .dropdown-menu > li > a:hover > [class*=" icon-"], .admin .dropdown-menu > .active > a > [class^="icon-"], .admin .dropdown-menu > .active > a > [class*=" icon-"], .admin .dropdown-submenu:hover > a > [class^="icon-"], .admin .dropdown-submenu:hover > a > [class*=" icon-"] { background-image: url(url('../images/glyphicons-halflings-white.png?1349911855')); } +.admin [class^="icon-"], .admin [class*=" icon-"] { display: inline-block; width: 14px; height: 14px; *margin-right: .3em; line-height: 14px; vertical-align: text-top; background-image: url(../images/glyphicons-halflings.png?1361243119); background-position: 14px 14px; background-repeat: no-repeat; margin-top: 1px; } +.admin .icon-white, .admin .nav-pills > .active > a > [class^="icon-"], .admin .nav-pills > .active > a > [class*=" icon-"], .admin .nav-list > .active > a > [class^="icon-"], .admin .nav-list > .active > a > [class*=" icon-"], .admin .navbar-inverse .nav > .active > a > [class^="icon-"], .admin .navbar-inverse .nav > .active > a > [class*=" icon-"], .admin .dropdown-menu > li > a:hover > [class^="icon-"], .admin .dropdown-menu > li > a:hover > [class*=" icon-"], .admin .dropdown-menu > .active > a > [class^="icon-"], .admin .dropdown-menu > .active > a > [class*=" icon-"], .admin .dropdown-submenu:hover > a > [class^="icon-"], .admin .dropdown-submenu:hover > a > [class*=" icon-"] { background-image: url(../images/glyphicons-halflings-white.png?1361243119); } .admin .icon-glass { background-position: 0 0; } .admin .icon-music { background-position: -24px 0; } .admin .icon-search { background-position: -48px 0; } |