diff options
Diffstat (limited to 'views/default/css')
-rw-r--r-- | views/default/css/admin.php | 6 | ||||
-rw-r--r-- | views/default/css/elements/components.php | 12 | ||||
-rw-r--r-- | views/default/css/elements/core.php | 6 | ||||
-rw-r--r-- | views/default/css/elements/layout.php | 3 | ||||
-rw-r--r-- | views/default/css/elements/navigation.php | 31 | ||||
-rw-r--r-- | views/default/css/elgg.php | 7 |
6 files changed, 47 insertions, 18 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php index a4d413781..d7c154438 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -383,7 +383,7 @@ table.mceLayout { margin-left: 5px; } -.elgg-list-item { +.elgg-item { margin: 3px; } .elgg-menu-metadata { @@ -1102,6 +1102,10 @@ a.elgg-widget-collapsed:before { ADMIN MISC *************************************** */ +.elgg-instructs { + max-width: 600px; +} + .manifest_file { background-color:#eee; diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php index 0fcbe3619..3f30a6422 100644 --- a/views/default/css/elements/components.php +++ b/views/default/css/elements/components.php @@ -47,10 +47,10 @@ border-bottom: 1px dotted #CCCCCC; } -.elgg-list-item .elgg-subtext { +.elgg-item .elgg-subtext { margin-bottom: 5px; } -.elgg-list-content { +.elgg-item .elgg-content { margin: 10px 5px; } @@ -65,9 +65,12 @@ .elgg-gallery td { padding: 5px; } -.elgg-gallery-fluid li { +.elgg-gallery-fluid > li { float: left; } +.elgg-gallery-users > li { + margin: 0 2px; +} /* *************************************** Tables @@ -161,6 +164,9 @@ font-style: italic; line-height: 1.2em; } + +.elgg-river-attachments, +.elgg-river-message, .elgg-river-content { border-left: 1px solid #CCC; font-size: 85%; diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php index 61dcdb1fe..af4a1882a 100644 --- a/views/default/css/elements/core.php +++ b/views/default/css/elements/core.php @@ -96,9 +96,6 @@ .elgg-menu-hz > li > span { /* Google says do this, but why? */ position: relative; - - /* FF2 */ - display: -moz-inline-box; display: inline-block; @@ -106,6 +103,3 @@ zoom: 1; *display: inline; } - -/* Looks much better when middle-aligned with surrounding text */ -.elgg-icon {vertical-align:middle}
\ No newline at end of file diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php index 4d87b8824..42d898439 100644 --- a/views/default/css/elements/layout.php +++ b/views/default/css/elements/layout.php @@ -75,9 +75,6 @@ .elgg-layout { min-height: 360px; } -.elgg-layout-one-column { - padding: 10px 0; -} .elgg-layout-one-sidebar { background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top; } diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index 99de0867b..64b7c47b4 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -144,6 +144,11 @@ float: right; } +.elgg-menu-topbar .elgg-icon { + vertical-align: middle; + margin-top: -1px; +} + .elgg-menu-topbar > li > a.elgg-topbar-logo { margin-top: 0; padding-left: 5px; @@ -421,20 +426,27 @@ li:hover > .elgg-menu-site-more { /* *************************************** ENTITY *************************************** */ +<?php // height depends on line height/font size ?> .elgg-menu-entity { float: right; margin-left: 15px; font-size: 90%; color: #aaa; + line-height: 16px; + height: 16px; } .elgg-menu-entity > li { - display: inline-block; margin-left: 15px; } -<?php // height depends on line height/font size ?> .elgg-menu-entity > li > a { color: #aaa; - height: 18px; +} +<?php // need to override .elgg-menu-hz ?> +.elgg-menu-entity > li > a { + display: block; +} +.elgg-menu-entity > li > span { + vertical-align: baseline; } /* *************************************** @@ -476,11 +488,24 @@ li:hover > .elgg-menu-site-more { margin-left: 15px; font-size: 90%; color: #aaa; + line-height: 16px; + height: 16px; } .elgg-menu-river > li { display: inline-block; margin-left: 5px; } +.elgg-menu-river > li > a { + color: #aaa; + height: 16px; +} +<?php // need to override .elgg-menu-hz ?> +.elgg-menu-river > li > a { + display: block; +} +.elgg-menu-river > li > span { + vertical-align: baseline; +} /* *************************************** SIDEBAR EXTRAS (rss, bookmark, etc) diff --git a/views/default/css/elgg.php b/views/default/css/elgg.php index 675af860d..4960e6ade 100644 --- a/views/default/css/elgg.php +++ b/views/default/css/elgg.php @@ -26,13 +26,12 @@ if ($old_css_view != elgg_get_config('viewpath')) { Base CSS * CSS reset * core - * helpers + * helpers (moved to end to have a higher priority) * grid *******************************************************************************/ echo elgg_view('css/elements/reset', $vars); echo elgg_view('css/elements/core', $vars); -echo elgg_view('css/elements/helpers', $vars); echo elgg_view('css/elements/grid', $vars); @@ -61,5 +60,9 @@ echo elgg_view('css/elements/layout', $vars); echo elgg_view('css/elements/misc', $vars); +// included last to have higher priority +echo elgg_view('css/elements/helpers', $vars); + + // in case plugins are still extending the old 'css' view, display it echo elgg_view('css', $vars); |