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 #6158 from open-sausages/pulls/4.0/missing-leftmain-icons

Browse Source 
Fixed classes that weren't matching icon
This commit is contained in:
Damian Mooyman 2016-10-07 10:52:17 +13:00 committed by GitHub
commit ef03408a31
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8386,11 +8386,8 @@ h1{
height:24px; height:24px;
} }
.icon.icon-24.icon-siteconfigleftandmain{ .icon.icon-24.icon-silverstripe-reports-reportadmin{
background-position:0 -120px; background-position:0 -120px;
}
.icon.icon-24.icon-silverstripe-admin-securityadmin,.icon.icon-24.icon-siteconfigleftandmain{
background-repeat:no-repeat; background-repeat:no-repeat;
overflow:hidden; overflow:hidden;
display:inline-block; display:inline-block;
@ -8400,13 +8397,18 @@ h1{
.icon.icon-24.icon-silverstripe-admin-securityadmin{ .icon.icon-24.icon-silverstripe-admin-securityadmin{
background-position:0 -48px; background-position:0 -48px;
background-repeat:no-repeat;
overflow:hidden;
display:inline-block;
width:24px;
height:24px;
} }
.icon.icon-24.icon-reportadmin{ .icon.icon-24.icon-silverstripe-reports-reportadmin{
background-position:0 -264px; background-position:0 -264px;
} }
.icon.icon-24.icon-commentadmin,.icon.icon-24.icon-reportadmin{ .icon.icon-24.icon-commentadmin,.icon.icon-24.icon-silverstripe-reports-reportadmin{
background-repeat:no-repeat; background-repeat:no-repeat;
overflow:hidden; overflow:hidden;
display:inline-block; display:inline-block;
@ -8468,11 +8470,8 @@ h1{
height:16px; height:16px;
} }
.icon.icon-16.icon-siteconfigleftandmain{ .icon.icon-16.icon-silverstripe-siteconfig-siteconfigleftandmain{
background-position:0 -80px; background-position:0 -80px;
}
.icon.icon-16.icon-silverstripe-admin-securityadmin,.icon.icon-16.icon-siteconfigleftandmain{
background-repeat:no-repeat; background-repeat:no-repeat;
overflow:hidden; overflow:hidden;
display:inline-block; display:inline-block;
@ -8482,13 +8481,18 @@ h1{
.icon.icon-16.icon-silverstripe-admin-securityadmin{ .icon.icon-16.icon-silverstripe-admin-securityadmin{
background-position:0 -32px; background-position:0 -32px;
background-repeat:no-repeat;
overflow:hidden;
display:inline-block;
width:16px;
height:16px;
} }
.icon.icon-16.icon-reportadmin{ .icon.icon-16.icon-silverstripe-reports-reportadmin{
background-position:0 -176px; background-position:0 -176px;
} }
.icon.icon-16.icon-commentadmin,.icon.icon-16.icon-reportadmin{ .icon.icon-16.icon-commentadmin,.icon.icon-16.icon-silverstripe-reports-reportadmin{
background-repeat:no-repeat; background-repeat:no-repeat;
overflow:hidden; overflow:hidden;
display:inline-block; display:inline-block;

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

@ -181,13 +181,13 @@
&.icon-silverstripe-cms-controllers-cmspagescontroller { &.icon-silverstripe-cms-controllers-cmspagescontroller {
@include sprite($menu-icons-24x24-network, inline-block); @include sprite($menu-icons-24x24-network, inline-block);
} }
&.icon-siteconfigleftandmain { &.icon-silverstripe-reports-reportadmin {
@include sprite($menu-icons-24x24-gears, inline-block); @include sprite($menu-icons-24x24-gears, inline-block);
} }
&.icon-silverstripe-admin-securityadmin { &.icon-silverstripe-admin-securityadmin {
@include sprite($menu-icons-24x24-community, inline-block); @include sprite($menu-icons-24x24-community, inline-block);
} }
&.icon-reportadmin { &.icon-silverstripe-reports-reportadmin {
@include sprite($menu-icons-24x24-pie-chart, inline-block); @include sprite($menu-icons-24x24-pie-chart, inline-block);
} }
&.icon-commentadmin { &.icon-commentadmin {
@ -216,13 +216,13 @@
&.icon-silverstripe-cms-controllers-cmspagescontroller { &.icon-silverstripe-cms-controllers-cmspagescontroller {
@include sprite($menu-icons-16x16-network, inline-block); @include sprite($menu-icons-16x16-network, inline-block);
} }
&.icon-siteconfigleftandmain { &.icon-silverstripe-siteconfig-siteconfigleftandmain {
@include sprite($menu-icons-16x16-gears, inline-block); @include sprite($menu-icons-16x16-gears, inline-block);
} }
&.icon-silverstripe-admin-securityadmin { &.icon-silverstripe-admin-securityadmin {
@include sprite($menu-icons-16x16-community, inline-block); @include sprite($menu-icons-16x16-community, inline-block);
} }
&.icon-reportadmin { &.icon-silverstripe-reports-reportadmin {
@include sprite($menu-icons-16x16-pie-chart, inline-block); @include sprite($menu-icons-16x16-pie-chart, inline-block);
} }
&.icon-commentadmin { &.icon-commentadmin {