cleaned up some CSS in admin theme

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 61b61c27a476c4e58d0e7f0a721d16429e4f8df0..fde34873d322f17127a5ff54a6f680e22dfe20c0 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -141,24 +141,6 @@ p {
        font-size: xx-large;
        content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
 }
-.hidden {
-       display: none;
-}
-.centered {
-       margin: 0 auto;
-}
-.center {
-       text-align: center;
-}
-.float {
-       float: left;
-}
-.float-alt {
-       float: right;
-}
-.elgg-toggle {
-       cursor: pointer;
-}
 
 /* ***************************************
        PAGE WRAPPER
@@ -412,9 +394,17 @@ p {
 .elgg-item {
        margin: 3px;
 }
-.elgg-simple-list li {
+.elgg-list-simple li {
        margin-bottom: 5px;
 }
+.elgg-list-distinct {
+       border-top: 1px dotted #CCCCCC;
+       margin: 5px 0;
+       clear: both;
+}
+.elgg-list-distinct > li {
+       border-bottom: 1px dotted #CCCCCC;
+}
 
 /* ***************************************
        FORMS AND INPUT
@@ -736,6 +726,20 @@ a.elgg-button {
        content: "";
 }
 
+/* ***************************************
+       GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+       display: inline-block;
+       color: #999;
+}
+
+.elgg-menu-general > li:after {
+       content: "\007C";
+       padding: 0 4px;
+}
+
 /* ***************************************
        HOVER MENU
 *************************************** */
@@ -819,6 +823,9 @@ a.elgg-button {
 .elgg-menu-hz .elgg-body:after {
        content: '.';
 }
+.elgg-menu > li:last-child::after {
+       display: none;
+}
 .elgg-menu-admin-footer a {
        color: #eee;
 }
@@ -1001,149 +1008,6 @@ a.elgg-widget-collapsed:before {
        width: 83.33%;
 }
 
-/* ***************************************
-       HELPERS
-*************************************** */
-
-.clearfloat { 
-       clear: both;
-}
-
-.hidden {
-       display: none;
-}
-
-.centered {
-       margin: 0 auto;
-}
-
-.center {
-       text-align: center;
-}
-
-.float {
-       float: left;
-}
-
-.float-alt {
-       float: right;
-}
-
-.right {
-       float: right;
-}
-
-.left {
-       float: left;
-}
-
-.link {
-       cursor: pointer;
-}
-
-.large {
-       font-size: 120%;
-}
-
-.small {
-       font-size: 80%;
-}
-
-.elgg-discover .elgg-discoverable {
-       display: none;
-}
-
-.elgg-discover:hover .elgg-discoverable {
-       display: block;
-}
-
-.elgg-transition:hover {
-       opacity: .7;
-}
-
-/* ***************************************
-       BORDERS AND SEPARATORS
-*************************************** */
-.elgg-border-plain {
-       border: 1px solid #eeeeee;
-}
-.elgg-border-transition {
-       border: 1px solid #eeeeee;
-}
-.elgg-divide-top {
-       border-top: 1px solid #CCCCCC;
-}
-.elgg-divide-bottom {
-       border-bottom: 1px solid #CCCCCC;
-}
-.elgg-divide-left {
-       border-left: 1px solid #CCCCCC;
-}
-.elgg-divide-right {
-       border-right: 1px solid #CCCCCC;
-}
-
-
-/* ***************************************
-       SPACING (from OOCSS)
-*************************************** */
-.pan{padding:0}
-.pas{padding:5px}
-.pam{padding:10px}
-.pal{padding:20px}
-.ptn{padding-top:0}
-.pts{padding-top:5px}
-.ptm{padding-top:10px}
-.ptl{padding-top:20px}
-.prn{padding-right:0}
-.prs{padding-right:5px}
-.prm{padding-right:10px}
-.prl{padding-right:20px}
-.pbn{padding-bottom:0}
-.pbs{padding-bottom:5px}
-.pbm{padding-bottom:10px}
-.pbl{padding-bottom:20px}
-.pln{padding-left:0}
-.pls{padding-left:5px}
-.plm{padding-left:10px}
-.pll{padding-left:20px}
-.phn{padding-left:0;padding-right:0}
-.phs{padding-left:5px;padding-right:5px}
-.phm{padding-left:10px;padding-right:10px}
-.phl{padding-left:20px;padding-right:20px}
-.pvn{padding-top:0;padding-bottom:0}
-.pvs{padding-top:5px;padding-bottom:5px}
-.pvm{padding-top:10px;padding-bottom:10px}
-.pvl{padding-top:20px;padding-bottom:20px}
-.man{margin:0}
-.mas{margin:5px}
-.mam{margin:10px}
-.mal{margin:20px}
-.mtn{margin-top:0}
-.mts{margin-top:5px}
-.mtm{margin-top:10px}
-.mtl{margin-top:20px}
-.mrn{margin-right:0}
-.mrs{margin-right:5px}
-.mrm{margin-right:10px}
-.mrl{margin-right:20px}
-.mbn{margin-bottom:0}
-.mbs{margin-bottom:5px}
-.mbm{margin-bottom:10px}
-.mbl{margin-bottom:20px}
-.mln{margin-left:0}
-.mls{margin-left:5px}
-.mlm{margin-left:10px}
-.mll{margin-left:20px}
-.mhn{margin-left:0;margin-right:0}
-.mhs{margin-left:5px;margin-right:5px}
-.mhm{margin-left:10px;margin-right:10px}
-.mhl{margin-left:20px;margin-right:20px}
-.mvn{margin-top:0;margin-bottom:0}
-.mvs{margin-top:5px;margin-bottom:5px}
-.mvm{margin-top:10px;margin-bottom:10px}
-.mvl{margin-top:20px;margin-bottom:20px}
-
 /* ***************************************
        ICONS
 *************************************** */
@@ -1434,3 +1298,116 @@ table.mceLayout {
 .elgg-output dd {
        margin: 0 0 1em 2em;
 }
+
+/* ***************************************
+       HELPERS
+*************************************** */
+.hidden {
+       display: none;
+}
+.centered {
+       margin: 0 auto;
+}
+.center {
+       text-align: center;
+}
+.float {
+       float: left;
+}
+.float-alt {
+       float: right;
+}
+.elgg-toggle {
+       cursor: pointer;
+}
+.elgg-discover .elgg-discoverable {
+       display: none;
+}
+.elgg-discover:hover .elgg-discoverable {
+       display: block;
+}
+.elgg-transition:hover {
+       opacity: .7;
+}
+
+/* ***************************************
+       BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+       border: 1px solid #eeeeee;
+}
+.elgg-border-transition {
+       border: 1px solid #eeeeee;
+}
+.elgg-divide-top {
+       border-top: 1px solid #CCCCCC;
+}
+.elgg-divide-bottom {
+       border-bottom: 1px solid #CCCCCC;
+}
+.elgg-divide-left {
+       border-left: 1px solid #CCCCCC;
+}
+.elgg-divide-right {
+       border-right: 1px solid #CCCCCC;
+}
+
+/* ***************************************
+       SPACING (from OOCSS)
+*************************************** */
+.pan{padding:0}
+.pas{padding:5px}
+.pam{padding:10px}
+.pal{padding:20px}
+.ptn{padding-top:0}
+.pts{padding-top:5px}
+.ptm{padding-top:10px}
+.ptl{padding-top:20px}
+.prn{padding-right:0}
+.prs{padding-right:5px}
+.prm{padding-right:10px}
+.prl{padding-right:20px}
+.pbn{padding-bottom:0}
+.pbs{padding-bottom:5px}
+.pbm{padding-bottom:10px}
+.pbl{padding-bottom:20px}
+.pln{padding-left:0}
+.pls{padding-left:5px}
+.plm{padding-left:10px}
+.pll{padding-left:20px}
+.phn{padding-left:0;padding-right:0}
+.phs{padding-left:5px;padding-right:5px}
+.phm{padding-left:10px;padding-right:10px}
+.phl{padding-left:20px;padding-right:20px}
+.pvn{padding-top:0;padding-bottom:0}
+.pvs{padding-top:5px;padding-bottom:5px}
+.pvm{padding-top:10px;padding-bottom:10px}
+.pvl{padding-top:20px;padding-bottom:20px}
+.man{margin:0}
+.mas{margin:5px}
+.mam{margin:10px}
+.mal{margin:20px}
+.mtn{margin-top:0}
+.mts{margin-top:5px}
+.mtm{margin-top:10px}
+.mtl{margin-top:20px}
+.mrn{margin-right:0}
+.mrs{margin-right:5px}
+.mrm{margin-right:10px}
+.mrl{margin-right:20px}
+.mbn{margin-bottom:0}
+.mbs{margin-bottom:5px}
+.mbm{margin-bottom:10px}
+.mbl{margin-bottom:20px}
+.mln{margin-left:0}
+.mls{margin-left:5px}
+.mlm{margin-left:10px}
+.mll{margin-left:20px}
+.mhn{margin-left:0;margin-right:0}
+.mhs{margin-left:5px;margin-right:5px}
+.mhm{margin-left:10px;margin-right:10px}
+.mhl{margin-left:20px;margin-right:20px}
+.mvn{margin-top:0;margin-bottom:0}
+.mvs{margin-top:5px;margin-bottom:5px}
+.mvm{margin-top:10px;margin-bottom:10px}
+.mvl{margin-top:20px;margin-bottom:20px}

diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 627cae55cc2e2d97e7d3d937458c1aa4a5ffb429..ace6048bb6d98b77ffef983e7f40e4568a22ebb9 100644 (file)
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -68,8 +68,9 @@
 /* Enabled nesting of dropdown/flyout menus */
 .elgg-menu > li { position: relative; }
 
-/* Separators should only come between list items */
-.elgg-menu > li:last-child:after { display: none } 
+.elgg-menu > li:last-child::after {
+       display: none;
+}
 
 /* Maximize click target */
 .elgg-menu > li > a { display: block }

diff --git a/views/default/css/elements/helpers.php b/views/default/css/elements/helpers.php
index e6f59260d05dea43e2d91887b9da0a356f897b8a..e9a9e0a30e201e907fbe4bd64dee322ad27c64c6 100644 (file)
--- a/views/default/css/elements/helpers.php
+++ b/views/default/css/elements/helpers.php
@@ -33,27 +33,10 @@
        float: right;
 }
 
-.right {
-       float: right;
-}
-
-.left {
-       float: left;
-}
-
 .link {
        cursor: pointer;
 }
 
-<?php @todo // do we need something like large and small? ?>
-.large {
-       font-size: 120%;
-}
-
-.small {
-       font-size: 80%;
-}
-
 .elgg-discover .elgg-discoverable {
        display: none;
 }

diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php
index 92a0784df4de28fa74ef5b5c95ff634667b8bc52..1a67ffcc453fa1c4f9e566e69b2691e37cff9245 100644 (file)
--- a/views/default/forms/admin/menu/save.php
+++ b/views/default/forms/admin/menu/save.php
@@ -64,7 +64,7 @@ $custom_items = elgg_get_config('site_custom_menu_items');
 $name_str = elgg_echo('name');
 $url_str = elgg_echo('admin:plugins:label:website');
 
-echo '<ul class="elgg-simple-list">';
+echo '<ul class="elgg-list elgg-list-simple">';
 
 if (is_array($custom_items)) {
        foreach ($custom_items as $title => $url) {