From 0cb6ced20d3e54d1884ee5ab38c24e57246987dc Mon Sep 17 00:00:00 2001 From: ewinslow Date: Mon, 14 Mar 2011 22:26:51 +0000 Subject: Refs #3109: More CSS cleanup. Fixes bugs introduced by last cleanup where background-color: was being used instead of background: git-svn-id: http://code.elgg.org/elgg/trunk@8707 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/theme_preview/navigation.php | 2 +- mod/embed/views/default/embed/css.php | 4 +- mod/search/views/default/search/css.php | 4 +- mod/thewire/views/default/thewire/css.php | 8 ++-- views/default/css/admin.php | 21 +++------ views/default/css/elements/buttons.php | 51 ++++++++-------------- views/default/css/elements/components.php | 20 ++++----- views/default/css/elements/forms.php | 18 ++++---- views/default/css/elements/icons.php | 5 +-- views/default/css/elements/layout.php | 17 +++----- views/default/css/elements/misc.php | 6 +-- views/default/css/elements/modules.php | 16 +++---- views/default/css/elements/navigation.php | 2 +- 13 files changed, 70 insertions(+), 104 deletions(-) diff --git a/mod/developers/views/default/theme_preview/navigation.php b/mod/developers/views/default/theme_preview/navigation.php index 4e6f4d3d6..10cffd230 100644 --- a/mod/developers/views/default/theme_preview/navigation.php +++ b/mod/developers/views/default/theme_preview/navigation.php @@ -54,7 +54,7 @@ elgg_push_breadcrumb('Third');

Page Menu

-
+
setParent($params['menu']['default'][1]); diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php index e695eab9f..736c6ae44 100644 --- a/mod/embed/views/default/embed/css.php +++ b/mod/embed/views/default/embed/css.php @@ -57,7 +57,7 @@ z-index:-100; } .facebox_overlayBG { - background-color: #000000; + background-color: #000; z-index: 9999; } * html #facebox_overlay { /* ie6 hack */ @@ -90,7 +90,7 @@ border-bottom:none; } .embed_data:last-child { - border-bottom:1px dotted #CCCCCC; + border-bottom:1px dotted #CCC; } .embed_modal_videolist .elgg-image img { width:75px; diff --git a/mod/search/views/default/search/css.php b/mod/search/views/default/search/css.php index e53ef99bf..366782396 100644 --- a/mod/search/views/default/search/css.php +++ b/mod/search/views/default/search/css.php @@ -30,7 +30,7 @@ Search plugin font-size: 12px; font-weight: bold; padding: 2px 4px 2px 26px; - background-color: transparent url(_graphics/elgg_sprites.png) no-repeat 2px -220px; + background: transparent url(_graphics/elgg_sprites.png) no-repeat 2px -220px; } .elgg-search input[type=text]:focus, .elgg-search input[type=text]:active { background-color: white; @@ -60,7 +60,7 @@ Search plugin background-color: #FDFFC3; } .search-highlight-color4 { - background-color: #cccccc; + background-color: #ccc; } .search-highlight-color5 { background-color: #4690d6; diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php index 4f5a12874..afc3a16aa 100644 --- a/mod/thewire/views/default/thewire/css.php +++ b/mod/thewire/views/default/thewire/css.php @@ -5,7 +5,7 @@ ?> /******************************** - The Wire +The Wire *********************************/ #thewire-textarea { height: 40px; @@ -80,7 +80,7 @@ return true; margin-top:4px; } .wire_post_contents { - background-color: #eeeeee; + background-color: #eee; margin:0; padding:5px; line-height: 1.2em; @@ -88,8 +88,8 @@ return true; position: relative; } .wire_post_icon { - float:left; - margin-right:8px; + float:left; + margin-right:8px; } .wire_post_info { margin-top:-3px; diff --git a/views/default/css/admin.php b/views/default/css/admin.php index c948201e6..c90f1167e 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -819,10 +819,7 @@ a.elgg-longtext-control { text-shadow:1px 1px 0px black; text-decoration:none; border: 1px solid #0054A7; - background-color:#0054A7; - background-image: url(_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; + background-color: #0054A7 url(_graphics/button_graduation.png) repeat-x left 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -841,15 +838,12 @@ a.elgg-longtext-control { color: white; border-color: #333; text-decoration:none; - background-color:#333; - background-image: url(_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; + background-color: #333 url(_graphics/button_graduation.png) repeat-x left 10px; } .admin_area input[type="password"]:focus { border: solid 1px #666; background-color: #f5f5f5; - color:#333; + color: #333; } .admin_area input[type="submit"] { font-size: 14px; @@ -858,10 +852,7 @@ a.elgg-longtext-control { text-shadow:1px 1px 0px black; text-decoration:none; border: 1px solid #0054A7; - background-color:#0054A7; - background-image: url(_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; + background: #0054A7 url(_graphics/button_graduation.png) repeat-x left 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -880,14 +871,14 @@ a.elgg-longtext-control { .admin_area input[type="submit"]:hover { border-color: #333; text-decoration:none; - background-color: #333 url(_graphics/button_graduation.png) repeat-x left 10px; + background: #333 url(_graphics/button_graduation.png) repeat-x left 10px; } .admin_area .elgg-button-cancel { font-size: 14px; font-weight: bold; text-decoration:none; color: #333; - background-color:#ddd url(_graphics/button_graduation.png) repeat-x left 10px; + background: #ddd url(_graphics/button_graduation.png) repeat-x left 10px; border: 1px solid #999; -webkit-border-radius: 5px; diff --git a/views/default/css/elements/buttons.php b/views/default/css/elements/buttons.php index bfab6d5e7..b8bf6e212 100644 --- a/views/default/css/elements/buttons.php +++ b/views/default/css/elements/buttons.php @@ -38,47 +38,35 @@ a.elgg-button { text-shadow: 1px 1px 0px black; text-decoration: none; border: 1px solid #4690d6; - background-color: #4690d6; - background-image: url(_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; + background: #4690d6 url(_graphics/button_graduation.png) repeat-x left 10px; } .elgg-button-submit:hover { border-color: #0054a7; text-decoration: none; color: white; - background-color: #0054a7; - background-image: url(_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; + background: #0054a7 url(_graphics/button_graduation.png) repeat-x left 10px; } /* Cancel: This button should convey a negative but easily reversible action (e.g., turning off a plugin) */ .elgg-button-cancel { - color: #333333; - background-color: #dddddd; - background-image: url(_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; - border: 1px solid #999999; + color: #333; + background: #ddd url(_graphics/button_graduation.png) repeat-x left 10px; + border: 1px solid #999; } .elgg-button-cancel:hover { - color: #444444; - background-color: #999999; + color: #444; + background-color: #999; background-position: left 10px; text-decoration: none; } /* Action: This button should convey a normal, inconsequential action, such as clicking a link */ .elgg-button-action { - background-color:#cccccc; - background-image: url(_graphics/button_background.gif); - background-repeat: repeat-x; - background-position: 0 0; - border:1px solid #999999; - color: #333333; - padding: 2px 15px 2px 15px; + background: #ccc url(_graphics/button_background.gif) repeat-x 0 0; + border:1px solid #999; + color: #333; + padding: 2px 15px; text-align: center; font-weight: bold; text-decoration: none; @@ -96,7 +84,7 @@ a.elgg-button { .elgg-button-action:hover, .elgg-button-action:focus { - background-color: #ccc url(_graphics/button_background.gif) repeat-x 0 -15px; + background: #ccc url(_graphics/button_background.gif) repeat-x 0 -15px; color: #111; text-decoration: none; border: 1px solid #999; @@ -104,18 +92,15 @@ a.elgg-button { /* Delete: This button should convey "be careful before you click me" */ .elgg-button-delete { - color: #bbbbbb; + color: #bbb; text-decoration: none; - border: 1px solid #333333; - background-color: #555555; - background-image: url(_graphics/button_graduation.png); - background-repeat: repeat-x; - background-position: left 10px; + border: 1px solid #333; + background: #555 url(_graphics/button_graduation.png) repeat-x left 10px; text-shadow: 1px 1px 0px black; } .elgg-button-delete:hover { - color: #999999; - background-color: #333333; + color: #999; + background-color: #333; background-position: left 10px; text-decoration: none; } @@ -156,7 +141,7 @@ a.elgg-button { .elgg-button-dropdown.elgg-state-active { background: #ccc; outline: none; - color: #333333; + color: #333; border:1px solid #ccc; -webkit-border-radius:4px 4px 0 0; diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index 1d0fbf366..df1632db4 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -91,28 +91,28 @@ *************************************** */ .elgg-table { width: 100%; - border-top: 1px solid #cccccc; + border-top: 1px solid #ccc; } .elgg-table td, .elgg-table th { padding: 4px 8px; - border: 1px solid #cccccc; + border: 1px solid #ccc; } .elgg-table th { - background-color: #dddddd; + background-color: #ddd; } .elgg-table tr:nth-child(odd), .elgg-table tr.odd { - background-color: #ffffff; + background-color: #fff; } .elgg-table tr:nth-child(even), .elgg-table tr.even { background-color: #f0f0f0; } .elgg-table-alt { width: 100%; - border-top: 1px solid #cccccc; + border-top: 1px solid #ccc; } .elgg-table-alt td { padding: 2px 4px 2px 4px; - border-bottom: 1px solid #cccccc; + border-bottom: 1px solid #ccc; } .elgg-table-alt td:first-child { width: 200px; @@ -161,10 +161,10 @@ River *************************************** */ .elgg-river { - border-top: 1px solid #CCCCCC; + border-top: 1px solid #CCC; } .elgg-river > li { - border-bottom: 1px solid #CCCCCC; + border-bottom: 1px solid #CCC; } .elgg-river-item { padding: 7px 0; @@ -173,13 +173,13 @@ margin-right: 20px; } .elgg-river-timestamp { - color: #666666; + color: #666; font-size: 85%; font-style: italic; line-height: 1.2em; } .elgg-river-content { - border-left: 1px solid #CCCCCC; + border-left: 1px solid #CCC; font-size: 85%; line-height: 1.5em; margin: 8px 0 5px 0; diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index 9a379e742..d783b5123 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -19,13 +19,13 @@ fieldset > div:last-child { label { font-weight: bold; - color: #333333; + color: #333; font-size: 110%; } input, textarea { - border: 1px solid #cccccc; - color: #666666; + border: 1px solid #ccc; + color: #666; font: 120% Arial, Helvetica, sans-serif; padding: 5px; width: 100%; @@ -81,8 +81,8 @@ input[type="radio"] { .friends-picker-container h3 { font-size:4em !important; text-align: left; - margin:10px 0 20px 0 !important; - color:#999999 !important; + margin:10px 0 20px !important; + color:#999 !important; background: none !important; padding:0 !important; } @@ -140,9 +140,9 @@ input[type="radio"] { min-height: 230px; } .friends-picker-navigation { - margin: 0 0 10px 0; - padding:0 0 10px 0; - border-bottom:1px solid #cccccc; + margin: 0 0 10px; + padding:0 0 10px; + border-bottom:1px solid #ccc; } .friends-picker-navigation ul { list-style: none; @@ -172,7 +172,7 @@ input[type="radio"] { color:#333 !important; } .friends-picker-navigation li a:hover { - background: #333333; + background: #333; color:white !important; } .friends-picker-navigation li a.current { diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php index 343da430e..ad289e793 100644 --- a/views/default/css/elements/icons.php +++ b/views/default/css/elements/icons.php @@ -89,10 +89,7 @@ } .elgg-ajax-loader { - background-color: white; - background-image: url(_graphics/ajax_loader_bw.gif); - background-repeat: no-repeat; - background-position: center center; + background: white url(_graphics/ajax_loader_bw.gif) no-repeat center center; min-height: 33px; min-width: 33px; } diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php index 6ac9999f2..ea01b8c45 100644 --- a/views/default/css/elements/layout.php +++ b/views/default/css/elements/layout.php @@ -62,10 +62,7 @@ /***** PAGE HEADER ******/ .elgg-page-header { position: relative; - background-color: #4690D6; - background-image: url(_graphics/header_shadow.png); - background-repeat: repeat-x; - background-position: bottom left; + background-color: #4690D6 url(_graphics/header_shadow.png) repeat-x bottom left; } .elgg-page-header > .elgg-inner { position: relative; @@ -79,14 +76,10 @@ padding: 10px 0; } .elgg-layout-one-sidebar { - background-image: url(_graphics/sidebar_background.gif); - background-repeat: repeat-y; - background-position: right top; + background: transparent url(_graphics/sidebar_background.gif) repeat-y right top; } .elgg-layout-two-sidebar { - background-image: url(_graphics/two_sidebar_background.gif); - background-repeat: repeat-y; - background-position: right top; + background: transparent url(_graphics/two_sidebar_background.gif) repeat-y right top; } .elgg-sidebar { position: relative; @@ -118,8 +111,8 @@ position: relative; } .elgg-page-footer { - color: #999999; + color: #999; } .elgg-page-footer a:hover { - color: #666666; + color: #666; } \ No newline at end of file diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php index 6be695618..c8ba4f735 100644 --- a/views/default/css/elements/misc.php +++ b/views/default/css/elements/misc.php @@ -17,10 +17,10 @@ *************************************** */ #current-user-avatar { - border-right:1px solid #cccccc; + border-right:1px solid #ccc; } #avatar-croppingtool { - border-top: 1px solid #cccccc; + border-top: 1px solid #ccc; } #user-avatar { float: left; @@ -38,7 +38,7 @@ *************************************** */ #friends_collections_accordian li { - color: #666666; + color: #666; } #friends_collections_accordian li h2 { -webkit-border-radius: 8px; diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php index 31d53bd33..1a5c7e593 100644 --- a/views/default/css/elements/modules.php +++ b/views/default/css/elements/modules.php @@ -53,7 +53,7 @@ /* Dropdown */ .elgg-module-dropdown { background-color:white; - border:5px solid #CCCCCC; + border:5px solid #CCC; -webkit-border-radius: 5px 0 5px 5px; -moz-border-radius: 5px 0 5px 5px; @@ -109,7 +109,7 @@ padding: 10px; margin: 0 5px 15px; background: #dedede; - border: 2px solid #cccccc; + border: 2px solid #ccc; } .elgg-widgets-add-panel li { @@ -117,7 +117,7 @@ margin: 2px 10px; width: 200px; padding: 4px; - background-color: #cccccc; + background-color: #ccc; border: 2px solid #b0b0b0; font-weight: bold; } @@ -125,14 +125,14 @@ display: block; } .elgg-widgets-add-panel .elgg-state-available { - color: #333333; + color: #333; cursor: pointer; } .elgg-widgets-add-panel .elgg-state-available:hover { background-color: #bcbcbc; } .elgg-widgets-add-panel .elgg-state-unavailable { - color: #888888; + color: #888; } .elgg-module-widget { @@ -142,7 +142,7 @@ position: relative; } .elgg-module-widget:hover { - background-color: #cccccc; + background-color: #ccc; } .elgg-module-widget > .elgg-head { background-color: #dedede; @@ -153,7 +153,7 @@ .elgg-module-widget > .elgg-head h3 { float: left; padding: 0 45px 0 20px; - color: #333333; + color: #333; } .elgg-module-widget.elgg-state-draggable > .elgg-head { cursor: move; @@ -182,7 +182,7 @@ background:transparent url(_graphics/elgg_sprites.png) no-repeat -300px -1px; } .elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { - border: 1px solid #cccccc; + border: 1px solid #ccc; } .elgg-module-widget > .elgg-body { background-color: white; diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index 613c6f7f2..a098759a5 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -395,7 +395,7 @@ li:hover > .elgg-menu-site-more { width: 165px; border: solid 1px; border-color: #E5E5E5 #999 #999 #E5E5E5; - background-color: #FFFFFF; + background-color: #FFF; -webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50); -moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50); -- cgit v1.2.3