diff options
Diffstat (limited to 'views/default/css/elements')
| -rw-r--r-- | views/default/css/elements/chrome.php | 9 | ||||
| -rw-r--r-- | views/default/css/elements/grid.php | 2 | ||||
| -rw-r--r-- | views/default/css/elements/layout_objects.php | 47 | ||||
| -rw-r--r-- | views/default/css/elements/page_layout.php | 66 | ||||
| -rw-r--r-- | views/default/css/elements/reset.php | 3 |
5 files changed, 52 insertions, 75 deletions
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php index 6ff7279ee..dd2896ecf 100644 --- a/views/default/css/elements/chrome.php +++ b/views/default/css/elements/chrome.php @@ -120,4 +120,11 @@ h2 { } .elgg-text ol { list-style-type: decimal; -}
\ No newline at end of file +} + +.elgg-subtext { + color: #666666; + font-size: 85%; + line-height: 1.2em; + font-style: italic; +} diff --git a/views/default/css/elements/grid.php b/views/default/css/elements/grid.php index 04c9a46b5..a800a2842 100644 --- a/views/default/css/elements/grid.php +++ b/views/default/css/elements/grid.php @@ -67,4 +67,4 @@ line-height: 0; 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 "; -}
\ No newline at end of file +} diff --git a/views/default/css/elements/layout_objects.php b/views/default/css/elements/layout_objects.php index ebb45bbf3..efb3d29b3 100644 --- a/views/default/css/elements/layout_objects.php +++ b/views/default/css/elements/layout_objects.php @@ -5,8 +5,6 @@ * @package Elgg.Core * @subpackage UI */ -?> - /** * elgg-body fills the space available to it. * It uses hidden text to expand itself. The combination of auto width, overflow @@ -17,6 +15,7 @@ * * @todo check what happens with long <pre> tags or large images */ +?> .elgg-body { width: auto; word-wrap: break-word; @@ -72,12 +71,6 @@ .elgg-list-item .elgg-subtext { margin-bottom: 5px; } -.elgg-subtext { - color: #666666; - font-size: 85%; - line-height: 1.2em; - font-style: italic; -} .elgg-tags { margin-bottom: 5px; } @@ -110,49 +103,33 @@ table.styled td.column-one { table.styled tr:hover { background: #E4E4E4; } + /* *************************************** Modules *************************************** */ - -.elgg-aside-module { +.elgg-module-aside { margin-bottom: 20px; } -.elgg-aside-module .elgg-head { +.elgg-module-aside .elgg-head { border-bottom: 1px solid #CCCCCC; margin-bottom: 5px; padding-bottom: 5px; } - -.elgg-group-module { - margin-bottom: 20px; -} -.elgg-group-module > .elgg-head { - padding: 5px 5px 3px; - background-color: #e4e4e4; - border-bottom: 1px solid #cccccc; - -moz-border-radius: 4px 4px 0 0; -} -.elgg-group-module > .elgg-head h3 { - color: #333333; -} - -.elgg-info-module { +.elgg-module-info { margin-bottom: 20px; } -.elgg-info-module .elgg-head { +.elgg-module-info > .elgg-head { background: #e4e4e4; padding: 5px; margin-bottom: 10px; -webkit-border-radius: 3px; -moz-border-radius: 3px; } - <?php //@todo should not assume h3 ?> -.elgg-info-module .elgg-head h3 { +.elgg-module-info > .elgg-head h3 { color: #333333; } - -.elgg-popup-module { +.elgg-module-popup { background-color: white; border: 1px solid #cccccc; z-index: 9999; @@ -162,6 +139,7 @@ table.styled tr:hover { -webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5); -moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5); } + /* *************************************** OWNER BLOCK *************************************** */ @@ -176,7 +154,6 @@ table.styled tr:hover { /* *************************************** WIDGETS *************************************** */ - .elgg-widgets { float: right; min-height: 30px; @@ -307,10 +284,10 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { .elgg-state-error { background-color:red; } - .elgg-system-message p { margin:0; } + /* *************************************** RIVER *************************************** */ @@ -341,7 +318,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { } <?php //@todo location-dependent styles ?> -.elgg-river-content .elgg-user-icon { +.elgg-river-content .elgg-avatar { float: left; } .elgg-river-layout .elgg-input-dropdown { @@ -449,4 +426,4 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { } .elgg-tagcloud { text-align: justify; -}
\ No newline at end of file +} diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php index ebb201225..13c6ce1d1 100644 --- a/views/default/css/elements/page_layout.php +++ b/views/default/css/elements/page_layout.php @@ -1,15 +1,31 @@ <?php /** + * Page Layout * + * Contains CSS for the page shell and page layout + * + * Classic layout: 990 wide centered. Used in default page shell */ ?> /* *************************************** PAGE LAYOUT *************************************** */ -<?php //@todo should be in base/reset ?> -body { - background-color: white; +/***** CLASSIC LAYOUT ******/ +.elgg-classic .elgg-page-header > .elgg-inner { + width: 990px; + margin: 0 auto; + height: 90px; +} +.elgg-classic .elgg-page-body > .elgg-inner { + width: 990px; + margin: 0 auto; +} +.elgg-classic .elgg-page-footer > .elgg-inner { + width: 990px; + margin: 0 auto; + padding: 5px 0; + border-top: 1px solid #DEDEDE; } /***** TOPBAR ******/ @@ -25,7 +41,6 @@ body { .elgg-page-topbar > .elgg-inner { padding: 2px 10px 2px 8px; } - <?php //@todo location-dependent styles ?> .elgg-page-topbar a { color: #eeeeee; @@ -41,7 +56,7 @@ body { color: #71cbff; text-decoration: none; } -/* elgg logo and user avatar need to be adjusted slightly */ +<?php // elgg logo and user avatar need to be adjusted slightly ?> .elgg-page-topbar img { margin-top: -1px; } @@ -56,7 +71,6 @@ body { } /***** PAGE HEADER ******/ - .elgg-page-header { x-overflow: hidden; position: relative; @@ -65,15 +79,9 @@ body { background-repeat: repeat-x; background-position: bottom left; } - -<?php //@todo Put all elgg-classic styles together ?> -.elgg-classic .elgg-page-header > .elgg-inner { - width: 990px; - margin: 0 auto; - height: 90px; +.elgg-page-header > .elgg-inner { position: relative; } - .elgg-site-title, .elgg-site-title:hover { font-size: 2em; line-height: 1.4em; @@ -85,14 +93,9 @@ body { } /***** PAGE BODY ******/ - .elgg-page-body > .elgg-inner { min-height: 360px; } -.elgg-classic .elgg-page-body > .elgg-inner { - width: 990px; - margin: 0 auto; -} #elgg-layout-one-column { padding: 10px 0; } @@ -106,11 +109,6 @@ body { background-repeat: repeat-y; background-position: right top; } -.elgg-main { - position: relative; - min-height: 360px; - padding: 10px; -} .elgg-aside { padding: 20px 10px; position: relative; @@ -126,37 +124,31 @@ body { width: 160px; margin: 0 10px 0 0; } - +.elgg-main { + position: relative; + min-height: 360px; + padding: 10px; +} .elgg-main .elgg-header { padding-bottom: 3px; border-bottom: 1px solid #CCCCCC; margin-bottom: 10px; } - <?php //@todo location-dependent styles ?> .elgg-main .elgg-header h2 { float: left; max-width: 530px; margin-right: 10px; } - .elgg-main > .elgg-header a { float: right; } /***** PAGE FOOTER ******/ - .elgg-page-footer { position: relative; z-index: 999; } -.elgg-classic .elgg-page-footer > .elgg-inner { - width: 990px; - margin: 0 auto; - padding: 5px 0; - border-top: 1px solid #DEDEDE; -} - <?php //@todo location-dependent styles ?> .elgg-page-footer a { float: left; @@ -168,11 +160,9 @@ body { float: left; width: 100%; } -.elgg-page-footer .elgg-inner, -.elgg-page-footer .elgg-inner a, -.elgg-page-footer .elgg-inner p { +.elgg-page-footer, .elgg-page-footer a { color: #999999; } -.elgg-page-footer .elgg-inner a:hover { +.elgg-page-footer a:hover { color: #666666; } diff --git a/views/default/css/elements/reset.php b/views/default/css/elements/reset.php index b5f77675e..5a88180af 100644 --- a/views/default/css/elements/reset.php +++ b/views/default/css/elements/reset.php @@ -28,6 +28,9 @@ table, caption, tbody, tfoot, thead, tr, th, td { font-family: inherit; vertical-align: baseline; } +body { + background-color: white; +} img { border-width:0; border-color:transparent; |