tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 13:48:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix AssetAdmin icon reference

Browse Source 
Needs to use namespaced class name (see LeftAndMain->Menu()).
Not replacing the old .icon-assetadmin rule since we want the old and new UI to co-exist for a short while.
Ideally we'd move these styles to the asset-admin module, but the whole way of referencing image sprites
is outdated anyway - so I'd prefer to merge this quick fix and think about SVG icons for menu entries instead.
This commit is contained in:
Ingo Schommer 2016-04-21 20:59:29 +12:00
parent 9331b4095a
commit 8c63ae3d68
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/client/dist/styles/bundle.css vendored
View File

File diff suppressed because one or more lines are too long

3
admin/client/src/styles/legacy/_retina.scss
View File

@ -19,7 +19,8 @@
&.icon-campaignadmin {
background-position: 0 round(nth(sprite-position($sprite, "collection"), 2) / 2);
}
&.icon-assetadmin {
&.icon-assetadmin,
&.icon-silverstripe-assetadmin-controller-assetadmin {
background-position: 0 round(nth(sprite-position($sprite, "picture"), 2) / 2);
}
&.icon-cmsmain {

6
admin/client/src/styles/legacy/_sprites.scss
View File

@ -71,7 +71,8 @@
&.icon-campaignadmin {
@include sprite($menu-icons-24x24-collection, inline-block);
}
&.icon-assetadmin {
&.icon-assetadmin,
&.icon-silverstripe-assetadmin-controller-assetadmin {
@include sprite($menu-icons-24x24-picture, inline-block);
}
&.icon-cmsmain {
@ -105,7 +106,8 @@
&.icon-campaignadmin {
@include sprite($menu-icons-16x16-collection, inline-block);
}
&.icon-assetadmin {
&.icon-assetadmin,
&.icon-silverstripe-assetadmin-controller-assetadmin {
@include sprite($menu-icons-16x16-picture, inline-block);
}
&.icon-cmsmain {