Permalink
Browse files

BUGFIX: Consistently style custom defined page icons.

* Apply page icon styling to .page-icon, rather than specific elements.
  • Loading branch information...
1 parent ce3d48e commit 160d516699d348d4f92b5dacb580cb817954271c @ajshort ajshort committed Jun 13, 2012
Showing with 40 additions and 39 deletions.
  1. +11 −7 admin/css/screen.css
  2. +28 −25 admin/scss/_style.scss
  3. +1 −7 admin/scss/_tree.scss
View
Oops, something went wrong.
View
@@ -424,6 +424,32 @@ body.cms {
}
/** --------------------------------------------
+ * Page icons
+ * -------------------------------------------- */
+
+.page-icon, a .jstree-pageicon {
+ display: block;
+ width: 16px;
+ height: 16px;
+ background: transparent url(../images/sitetree_ss_pageclass_icons_default.png) no-repeat;
+}
+
+.page-icon {
+ &.class-HomePage {
+ background-position: 0 -48px;
+ }
+ &.class-RedirectorPage {
+ background-position: 0 -16px;
+ }
+ &.class-VirtualPage {
+ background-position: 0 -32px;
+ }
+ &.class-ErrorPage {
+ background-position: 0 -112px;
+ }
+}
+
+/** --------------------------------------------
* "Add page" dialog
* -------------------------------------------- */
@@ -487,38 +513,15 @@ body.cms {
padding-bottom: 0;
}
- input, label, .icon, .title {
+ input, label, .page-icon, .title {
float: left;
line-height: 1.3em;
}
- .icon {
- width: 20px;
- display: block;
- width: 16px;
- height: 16px;
+ .page-icon {
margin: 0 4px;
- background-color: transparent;
- background-image: url(../images/sitetree_ss_pageclass_icons_default.png);
- background-repeat: no-repeat;
- }
-
- .class-HomePage {
- background-position: 0 -48px;
}
- .class-RedirectorPage {
- background-position: 0 -16px;
- }
-
- .class-VirtualPage {
- background-position: 0 -32px;
- }
-
- .class-ErrorPage {
- background-position: 0 -112px;
- }
-
.title {
width: 120px;
font-weight: bold;
View
@@ -587,14 +587,8 @@
}
a .jstree-pageicon {
- display: block;
- float: left;
- width: 16px;
- height: 16px;
+ float: left;
margin-right: 4px;
- background-color: transparent;
- background-image: url(../images/sitetree_ss_pageclass_icons_default.png);
- background-repeat: no-repeat;
}
li.class-HomePage > a .jstree-pageicon {

0 comments on commit 160d516

Please sign in to comment.