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

Merge pull request #5366 from open-sausages/pulls/4.0/fix-asset-admin-icon

Browse Source 
Fix AssetAdmin icon reference
This commit is contained in:
Damian Mooyman 2016-04-22 15:50:14 +12:00
commit 098f199d67
3 changed files with 226 additions and 123 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 {

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

@ -6,56 +6,156 @@
[class*="btn-icon-"] {
@extend .icon-btn-icon;
}
.btn-icon-accept_disable {@include sprite($btn-icon-accept_disabled);}
.btn-icon-accept {@include sprite($btn-icon-accept);}
.btn-icon-add_disabled {@include sprite($btn-icon-add_disabled);}
.btn-icon-add {@include sprite($btn-icon-add);}
.btn-icon-addMedia {@include sprite($btn-icon-addMedia);}
.btn-icon-addpage_disabled {@include sprite($btn-icon-addpage_disabled);}
.btn-icon-addpage {@include sprite($btn-icon-addpage);}
.btn-icon-arrow-circle-135-left {@include sprite($btn-icon-arrow-circle-135-left);}
.btn-icon-arrow-circle-double {@include sprite($btn-icon-arrow-circle-double);}
.btn-icon-back_disabled {@include sprite($btn-icon-back_disabled);}
.btn-icon-back {@include sprite($btn-icon-back);}
.btn-icon-chain--arrow {@include sprite($btn-icon-chain--arrow);}
.btn-icon-chain--exclamation {@include sprite($btn-icon-chain--exclamation);}
.btn-icon-chain--minus {@include sprite($btn-icon-chain--minus);}
.btn-icon-chain--pencil {@include sprite($btn-icon-chain--pencil);}
.btn-icon-chain--plus {@include sprite($btn-icon-chain--plus);}
.btn-icon-chain-small {@include sprite($btn-icon-chain-small);}
.btn-icon-chain-unchain {@include sprite($btn-icon-chain-unchain);}
.btn-icon-chain {@include sprite($btn-icon-chain);}
.btn-icon-cross-circle_disabled {@include sprite($btn-icon-cross-circle_disabled);}
.btn-icon-cross-circle {@include sprite($btn-icon-cross-circle);}
.btn-icon-cross {@include sprite($btn-icon-cross);}
.btn-icon-decline_disabled {@include sprite($btn-icon-decline_disabled);}
.btn-icon-decline {@include sprite($btn-icon-decline);}
.btn-icon-delete {@include sprite($btn-icon-delete);}
.btn-icon-deleteLight {@include sprite($btn-icon-deleteLight);}
.btn-icon-disk {@include sprite($btn-icon-disk);}
.btn-icon-document--pencil {@include sprite($btn-icon-document--pencil);}
.btn-icon-download-csv {@include sprite($btn-icon-download-csv);}
.btn-icon-drive-upload_disabled {@include sprite($btn-icon-drive-upload_disabled);}
.btn-icon-drive-upload {@include sprite($btn-icon-drive-upload);}
.btn-icon-grid_print {@include sprite($btn-icon-grid_print);}
.btn-icon-information {@include sprite($btn-icon-information);}
.btn-icon-magnifier {@include sprite($btn-icon-magnifier);}
.btn-icon-minus-circle_disabled {@include sprite($btn-icon-minus-circle_disabled);}
.btn-icon-minus-circle {@include sprite($btn-icon-minus-circle);}
.btn-icon-navigation_disabled {@include sprite($btn-icon-navigation_disabled);}
.btn-icon-navigation {@include sprite($btn-icon-navigation);}
.btn-icon-network-cloud_disabled {@include sprite($btn-icon-network-cloud_disabled);}
.btn-icon-network-cloud {@include sprite($btn-icon-network-cloud);}
.btn-icon-pencil_disabled {@include sprite($btn-icon-pencil_disabled);}
.btn-icon-pencil {@include sprite($btn-icon-pencil);}
.btn-icon-plug-disconnect-prohibition_disabled {@include sprite($btn-icon-plug-disconnect-prohibition_disabled);}
.btn-icon-plug-disconnect-prohibition {@include sprite($btn-icon-plug-disconnect-prohibition);}
.btn-icon-preview_disabled {@include sprite($btn-icon-preview_disabled);}
.btn-icon-preview {@include sprite($btn-icon-preview);}
.btn-icon-settings_disabled {@include sprite($btn-icon-settings_disabled);}
.btn-icon-settings {@include sprite($btn-icon-settings);}
.btn-icon-unpublish_disabled {@include sprite($btn-icon-unpublish_disabled);}
.btn-icon-unpublish {@include sprite($btn-icon-unpublish_disabled);}
.btn-icon-accept_disable {
@include sprite($btn-icon-accept_disabled);
}
.btn-icon-accept {
@include sprite($btn-icon-accept);
}
.btn-icon-add_disabled {
@include sprite($btn-icon-add_disabled);
}
.btn-icon-add {
@include sprite($btn-icon-add);
}
.btn-icon-addMedia {
@include sprite($btn-icon-addMedia);
}
.btn-icon-addpage_disabled {
@include sprite($btn-icon-addpage_disabled);
}
.btn-icon-addpage {
@include sprite($btn-icon-addpage);
}
.btn-icon-arrow-circle-135-left {
@include sprite($btn-icon-arrow-circle-135-left);
}
.btn-icon-arrow-circle-double {
@include sprite($btn-icon-arrow-circle-double);
}
.btn-icon-back_disabled {
@include sprite($btn-icon-back_disabled);
}
.btn-icon-back {
@include sprite($btn-icon-back);
}
.btn-icon-chain--arrow {
@include sprite($btn-icon-chain--arrow);
}
.btn-icon-chain--exclamation {
@include sprite($btn-icon-chain--exclamation);
}
.btn-icon-chain--minus {
@include sprite($btn-icon-chain--minus);
}
.btn-icon-chain--pencil {
@include sprite($btn-icon-chain--pencil);
}
.btn-icon-chain--plus {
@include sprite($btn-icon-chain--plus);
}
.btn-icon-chain-small {
@include sprite($btn-icon-chain-small);
}
.btn-icon-chain-unchain {
@include sprite($btn-icon-chain-unchain);
}
.btn-icon-chain {
@include sprite($btn-icon-chain);
}
.btn-icon-cross-circle_disabled {
@include sprite($btn-icon-cross-circle_disabled);
}
.btn-icon-cross-circle {
@include sprite($btn-icon-cross-circle);
}
.btn-icon-cross {
@include sprite($btn-icon-cross);
}
.btn-icon-decline_disabled {
@include sprite($btn-icon-decline_disabled);
}
.btn-icon-decline {
@include sprite($btn-icon-decline);
}
.btn-icon-delete {
@include sprite($btn-icon-delete);
}
.btn-icon-deleteLight {
@include sprite($btn-icon-deleteLight);
}
.btn-icon-disk {
@include sprite($btn-icon-disk);
}
.btn-icon-document--pencil {
@include sprite($btn-icon-document--pencil);
}
.btn-icon-download-csv {
@include sprite($btn-icon-download-csv);
}
.btn-icon-drive-upload_disabled {
@include sprite($btn-icon-drive-upload_disabled);
}
.btn-icon-drive-upload {
@include sprite($btn-icon-drive-upload);
}
.btn-icon-grid_print {
@include sprite($btn-icon-grid_print);
}
.btn-icon-information {
@include sprite($btn-icon-information);
}
.btn-icon-magnifier {
@include sprite($btn-icon-magnifier);
}
.btn-icon-minus-circle_disabled {
@include sprite($btn-icon-minus-circle_disabled);
}
.btn-icon-minus-circle {
@include sprite($btn-icon-minus-circle);
}
.btn-icon-navigation_disabled {
@include sprite($btn-icon-navigation_disabled);
}
.btn-icon-navigation {
@include sprite($btn-icon-navigation);
}
.btn-icon-network-cloud_disabled {
@include sprite($btn-icon-network-cloud_disabled);
}
.btn-icon-network-cloud {
@include sprite($btn-icon-network-cloud);
}
.btn-icon-pencil_disabled {
@include sprite($btn-icon-pencil_disabled);
}
.btn-icon-pencil {
@include sprite($btn-icon-pencil);
}
.btn-icon-plug-disconnect-prohibition_disabled {
@include sprite($btn-icon-plug-disconnect-prohibition_disabled);
}
.btn-icon-plug-disconnect-prohibition {
@include sprite($btn-icon-plug-disconnect-prohibition);
}
.btn-icon-preview_disabled {
@include sprite($btn-icon-preview_disabled);
}
.btn-icon-preview {
@include sprite($btn-icon-preview);
}
.btn-icon-settings_disabled {
@include sprite($btn-icon-settings_disabled);
}
.btn-icon-settings {
@include sprite($btn-icon-settings);
}
.btn-icon-unpublish_disabled {
@include sprite($btn-icon-unpublish_disabled);
}
.btn-icon-unpublish {
@include sprite($btn-icon-unpublish_disabled);
}
}
.icon {
@ -71,7 +171,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 +206,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 {