diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/css/admin.php | 1 | ||||
| -rw-r--r-- | views/default/css/elements/core.php | 65 | ||||
| -rw-r--r-- | views/default/css/elements/layout.php | 69 | ||||
| -rw-r--r-- | views/default/css/screen.php | 1 | ||||
| -rw-r--r-- | views/default/layout/objects/image_block.php | 16 |
5 files changed, 73 insertions, 79 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php index ff8bfa4a4..c9f4c2f88 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -10,7 +10,6 @@ echo elgg_view('css/elements/reset', $vars); echo elgg_view('css/elements/core', $vars); echo elgg_view('css/elements/typography', $vars); -echo elgg_view('css/elements/layout', $vars); echo elgg_view('css/elements/spacing', $vars); echo elgg_view('css/elements/navigation', $vars); echo elgg_view('css/elements/grid', $vars); diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php index f46ec11d9..29fdd598b 100644 --- a/views/default/css/elements/core.php +++ b/views/default/css/elements/core.php @@ -157,3 +157,68 @@ h2 { .elgg_hrb { border-bottom: 1px solid #CCCCCC; } + +/* *************************************** + CSS LAYOUT OBJECTS +*************************************** */ + +/** + * elgg-body fills the space available to it. + * It uses hidden text to expand itself. The combination of auto width, overflow + * hidden, and the hidden text creates this effect. + * + * This allows us to float fixed width divs to either side of an .elgg-body div + * without having to specify the body div's width. + * + * @todo check what happens with long <pre> tags or large images + */ +.elgg-body { + width: auto; + word-wrap: break-word; + overflow: hidden; +} +.elgg-body:after { + display: block; + visibility: hidden; + height: 0 !important; + 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 "; +} + +.elgg_inner { +} + +.elgg-footer { +} + +.elgg-image-block { + padding: 3px 0; +} + +.elgg-image-block .elgg-image { + float: left; + margin-right: 5px; +} +.elgg-image-block .elgg-image.elgg-alt { + float: right; + margin-left: 5px; +} + +.elgg-list { + border-top: 1px dotted #CCCCCC; + margin: 5px 0; + clear: both; +} + +.elgg-list li { + border-bottom: 1px dotted #CCCCCC; +} + +.elgg-center { + margin: 0 auto; +} + +.elgg-width-classic { + width: 990px; +} diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php deleted file mode 100644 index fce5eaed9..000000000 --- a/views/default/css/elements/layout.php +++ /dev/null @@ -1,69 +0,0 @@ -<?php -/** - * Reusable layout objects and elements - * - * @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 - * hidden, and the hidden text creates this effect. - * - * This allows us to float fixed width divs to either side of an .elgg-body div - * without having to specify the body div's width. - * - * @todo check what happens with long <pre> tags or large images - */ -.elgg-body { - width: auto; - word-wrap: break-word; - overflow: hidden; -} -.elgg-body:after { - display: block; - visibility: hidden; - height: 0 !important; - 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 "; -} - -.elgg_inner { -} - -.elgg-footer { -} - -.elgg-media { - padding: 3px 0; -} - -.elgg-media .elgg-image { - float: left; - margin-right: 5px; -} -.elgg-media .elgg-image.elgg-alt { - float: right; - margin-left: 5px; -} - -.elgg-list { - border-top: 1px dotted #CCCCCC; - margin: 5px 0; - clear: both; -} - -.elgg-list li { - border-bottom: 1px dotted #CCCCCC; -} - -.elgg-center { - margin: 0 auto; -} - -.elgg-width-classic { - width: 990px; -} diff --git a/views/default/css/screen.php b/views/default/css/screen.php index cbf4e2b2d..ea17acf9c 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -17,7 +17,6 @@ if ($old_css_view != "{$CONFIG->viewpath}") { echo elgg_view('css/elements/reset', $vars); echo elgg_view('css/elements/core', $vars); echo elgg_view('css/elements/typography', $vars); -echo elgg_view('css/elements/layout', $vars); echo elgg_view('css/elements/spacing', $vars); echo elgg_view('css/elements/navigation', $vars); echo elgg_view('css/elements/grid', $vars); diff --git a/views/default/layout/objects/image_block.php b/views/default/layout/objects/image_block.php index 79f8db138..46c58f864 100644 --- a/views/default/layout/objects/image_block.php +++ b/views/default/layout/objects/image_block.php @@ -20,10 +20,10 @@ */ $body = elgg_get_array_value('body', $vars, ''); -$image_block = elgg_get_array_value('image', $vars, ''); -$alt_image_block = elgg_get_array_value('image_alt', $vars, ''); +$image = elgg_get_array_value('image', $vars, ''); +$alt_image = elgg_get_array_value('image_alt', $vars, ''); -$class = 'elgg-media'; +$class = 'elgg-image-block'; $additional_class = elgg_get_array_value('class', $vars, ''); if ($additional_class) { $class = "$class $additional_class"; @@ -37,16 +37,16 @@ if (isset($vars['id'])) { $body = "<div class=\"elgg-body\">$body</div>"; -if ($image_block) { - $image_block = "<div class=\"elgg-image\">$image_block</div>"; +if ($image) { + $image = "<div class=\"elgg-image\">$image</div>"; } -if ($alt_image_block) { - $alt_image_block = "<div class=\"elgg-image elgg-alt\">$alt_image_block</div>"; +if ($alt_image) { + $alt_image = "<div class=\"elgg-image elgg-alt\">$alt_image</div>"; } echo <<<HTML <div class="$class clearfix" $id> - $image_block$alt_image_block$body + $image$alt_image$body </div> HTML; |