From bfeee992e484fca7b2dcaaa6f3c84e17217a7f49 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Fri, 25 Feb 2011 22:13:58 +0000 Subject: Converted css/elements/page_layout to layout. Now we have a bunch of nice, terse, 1-word names :) git-svn-id: http://code.elgg.org/elgg/trunk@8477 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css/elements/layout.php | 141 +++++++++++++++++++++++++++++ views/default/css/elements/page_layout.php | 141 ----------------------------- views/default/css/elgg.php | 4 +- 3 files changed, 143 insertions(+), 143 deletions(-) create mode 100644 views/default/css/elements/layout.php delete mode 100644 views/default/css/elements/page_layout.php (limited to 'views') diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php new file mode 100644 index 000000000..d2be769fa --- /dev/null +++ b/views/default/css/elements/layout.php @@ -0,0 +1,141 @@ + + +/* *************************************** + PAGE LAYOUT +*************************************** */ +/***** DEFAULT LAYOUT ******/ +.elgg-page-default .elgg-page-header > .elgg-inner { + width: 990px; + margin: 0 auto; + height: 90px; +} +.elgg-page-default .elgg-page-body > .elgg-inner { + width: 990px; + margin: 0 auto; +} +.elgg-page-default .elgg-page-footer > .elgg-inner { + width: 990px; + margin: 0 auto; + padding: 5px 0; + border-top: 1px solid #DEDEDE; +} + +/***** TOPBAR ******/ +.elgg-page-topbar { + background: #333333 url(_graphics/toptoolbar_background.gif) repeat-x top left; + border-bottom: 1px solid #000000; + min-width: 998px; + position: relative; + height: 24px; + z-index: 9000; +} +.elgg-page-topbar > .elgg-inner { + padding: 0 10px; +} + + +.elgg-page-topbar img { + margin-top: -1px; +} + +/***** PAGE MESSAGES ******/ +.elgg-system-messages { + position: fixed; + top: 24px; + right: 20px; + max-width: 500px; + z-index: 1000; +} +.elgg-system-messages li { + margin-top: 10px; +} +.elgg-system-messages li p { + margin: 0; +} + +/***** 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; +} +.elgg-page-header > .elgg-inner { + position: relative; +} + +/***** PAGE BODY ******/ +.elgg-layout { + min-height: 360px; +} +.elgg-layout-one-column { + padding: 10px 0; +} +.elgg-layout-one-sidebar { + background-image: url(_graphics/sidebar_background.gif); + background-repeat: repeat-y; + background-position: right top; +} +.elgg-layout-two-sidebar { + background-image: url(_graphics/two_sidebar_background.gif); + background-repeat: repeat-y; + background-position: right top; +} +.elgg-sidebar { + position: relative; + padding: 20px 10px; + float: right; + width: 210px; + margin: 0 0 0 10px; +} +.elgg-sidebar-alt { + position: relative; + padding: 20px 10px; + float: left; + width: 160px; + margin: 0 10px 0 0; +} +.elgg-main { + position: relative; + min-height: 360px; + padding: 10px; +} +.elgg-main > .elgg-head { + padding-bottom: 3px; + border-bottom: 1px solid #CCCCCC; + margin-bottom: 10px; +} + +.elgg-main > .elgg-head a { + float: right; +} + +/***** PAGE FOOTER ******/ +.elgg-page-footer { + position: relative; +} +.elgg-page-footer .elgg-menu { + float: left; + width: 100%; +} +.elgg-page-footer * { + color: #999999; +} +.elgg-page-footer a:hover { + color: #666666; +} +.elgg-page-footer a.elgg-alt { + float: right; +} \ No newline at end of file diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php deleted file mode 100644 index d2be769fa..000000000 --- a/views/default/css/elements/page_layout.php +++ /dev/null @@ -1,141 +0,0 @@ - - -/* *************************************** - PAGE LAYOUT -*************************************** */ -/***** DEFAULT LAYOUT ******/ -.elgg-page-default .elgg-page-header > .elgg-inner { - width: 990px; - margin: 0 auto; - height: 90px; -} -.elgg-page-default .elgg-page-body > .elgg-inner { - width: 990px; - margin: 0 auto; -} -.elgg-page-default .elgg-page-footer > .elgg-inner { - width: 990px; - margin: 0 auto; - padding: 5px 0; - border-top: 1px solid #DEDEDE; -} - -/***** TOPBAR ******/ -.elgg-page-topbar { - background: #333333 url(_graphics/toptoolbar_background.gif) repeat-x top left; - border-bottom: 1px solid #000000; - min-width: 998px; - position: relative; - height: 24px; - z-index: 9000; -} -.elgg-page-topbar > .elgg-inner { - padding: 0 10px; -} - - -.elgg-page-topbar img { - margin-top: -1px; -} - -/***** PAGE MESSAGES ******/ -.elgg-system-messages { - position: fixed; - top: 24px; - right: 20px; - max-width: 500px; - z-index: 1000; -} -.elgg-system-messages li { - margin-top: 10px; -} -.elgg-system-messages li p { - margin: 0; -} - -/***** 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; -} -.elgg-page-header > .elgg-inner { - position: relative; -} - -/***** PAGE BODY ******/ -.elgg-layout { - min-height: 360px; -} -.elgg-layout-one-column { - padding: 10px 0; -} -.elgg-layout-one-sidebar { - background-image: url(_graphics/sidebar_background.gif); - background-repeat: repeat-y; - background-position: right top; -} -.elgg-layout-two-sidebar { - background-image: url(_graphics/two_sidebar_background.gif); - background-repeat: repeat-y; - background-position: right top; -} -.elgg-sidebar { - position: relative; - padding: 20px 10px; - float: right; - width: 210px; - margin: 0 0 0 10px; -} -.elgg-sidebar-alt { - position: relative; - padding: 20px 10px; - float: left; - width: 160px; - margin: 0 10px 0 0; -} -.elgg-main { - position: relative; - min-height: 360px; - padding: 10px; -} -.elgg-main > .elgg-head { - padding-bottom: 3px; - border-bottom: 1px solid #CCCCCC; - margin-bottom: 10px; -} - -.elgg-main > .elgg-head a { - float: right; -} - -/***** PAGE FOOTER ******/ -.elgg-page-footer { - position: relative; -} -.elgg-page-footer .elgg-menu { - float: left; - width: 100%; -} -.elgg-page-footer * { - color: #999999; -} -.elgg-page-footer a:hover { - color: #666666; -} -.elgg-page-footer a.elgg-alt { - float: right; -} \ No newline at end of file diff --git a/views/default/css/elgg.php b/views/default/css/elgg.php index 7d5d14ce9..96ef4587b 100644 --- a/views/default/css/elgg.php +++ b/views/default/css/elgg.php @@ -38,7 +38,7 @@ Skin CSS * icons - icons, sprites, graphics * modules - modules, widgets * layout_objects - lists, content blocks, notifications, avatars - * page_layout - page layout + * layout - page layout * misc - to be removed/redone *******************************************************************************/ @@ -50,7 +50,7 @@ echo elgg_view('css/elements/icons', $vars); echo elgg_view('css/elements/navigation', $vars); echo elgg_view('css/elements/modules', $vars); echo elgg_view('css/elements/components', $vars); -echo elgg_view('css/elements/page_layout', $vars); +echo elgg_view('css/elements/layout', $vars); echo elgg_view('css/elements/misc', $vars); -- cgit v1.2.3