From fd439f67ba6446bccfff5452791e0a94215e7a94 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 17 Feb 2012 17:56:44 +0100 Subject: [PATCH] More CSS fixes --- main/css/base.css | 31 +++++++++------- main/css/base_chamilo.css | 37 ++++--------------- main/inc/lib/course.lib.php | 7 +--- .../bxslider/bx_styles/bx_styles.css | 4 +- main/template/default/layout/layout_1_col.tpl | 8 ++-- main/template/default/layout/layout_2_col.tpl | 12 ++++-- main/template/default/layout/main.tpl | 8 ++-- main/template/default/layout/main_footer.tpl | 7 ++-- main/template/default/layout/main_header.tpl | 34 ++++++++++++----- .../default/layout/{header.tpl => topbar.tpl} | 19 +--------- .../experimental/layout/layout_2_col.tpl | 7 ++-- 11 files changed, 79 insertions(+), 95 deletions(-) rename main/template/default/layout/{header.tpl => topbar.tpl} (94%) diff --git a/main/css/base.css b/main/css/base.css index fae637af2b..9ca34700b1 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -37,12 +37,16 @@ legend { width:165px; } +#header1 { + height: 50px; +} #header2 .nav{ margin-bottom:0px; } #header2 { width:100%; + height: 35px; } #header2 .nav { @@ -291,7 +295,7 @@ footer { } #topbar_push { - height:40px; + height: 55px; } .actions { background:#efefef; @@ -338,20 +342,22 @@ footer { margin-top:0px; } - /* Begin of proper */ -#header3 { - float:none; - position:relative; -} - #header4 { height: 26px !important; /* breadcrumb fix */ + margin-top:5px; } -#submain { - padding:5px 10px 10px 10px; +.show-grid [class*="span"] { + background-color: #EEEEEE; + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + line-height: 30px; + min-height: 30px; + text-align: center; } a.tag { @@ -1327,11 +1333,10 @@ button.next.disabled, .a_button.disabled { box-shadow: 0 -1px 10px 2px #CCCCCC; border:1px solid #CCCCCC; float:left; - margin:10px; + margin:10px 0px 10px 0px; padding:12px; - width:95%; - /* min-height:294px; */ - color: #BBBBBB; + width:90%; + color: #bbb; } .categories-content-course { diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index 35f48d146d..2c80704f15 100755 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -42,8 +42,7 @@ body { } #submain { - border: 1px solid #ccc; - position: relative; /* to avoid the IE peekabo bug*/ + border: 1px solid #ccc; margin: 0px auto; min-height: 320px; -moz-border-radius:0px 0px 10px 10px; @@ -283,8 +282,7 @@ input.link_alike:hover { #header1 { padding:0px; font-size:12px; - color:#666666; - height:53px; + color:#666666; background-repeat:repeat-x; } #header1 a { @@ -333,18 +331,6 @@ input.link_alike:hover { margin-right: 2px; } -#header3 .banner_links { - margin: 0; -} -#header3 input:hover { - color: #999; - -moz-border-radius-bottomleft:5px; - -moz-border-radius-bottomright:5px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - border:1px solid #E1E1E0; -} - /* HEADER 4: */ #header4 { @@ -392,18 +378,14 @@ input.link_alike:hover { NAVIGATION MENU */ #menu-wrapper { - display: block; - float: right; - width: 220px; - + display: block; background-color: #F3F4F5; border-bottom: 1px solid #CCCCCC; border-bottom-left-radius: 5px; border-left: 1px solid #CCCCCC; box-shadow: -3px 3px 32px 0 #E8E8E8; color: #595959; - margin-bottom: 1em; - margin-left: 15px; + margin-bottom: 1em; min-height: 20px; padding-bottom: 20px; } @@ -966,8 +948,7 @@ div.system_announcement { } .system_announcements { padding-top: 10px; - padding-bottom: 10px; - margin-left:8px; + padding-bottom: 10px; } .system_announcements h3 { padding-left:70px; @@ -2317,12 +2298,8 @@ span.form_required { #header3 { font-size: 14px; font-weight: bold; - margin-bottom: 5px; - margin-left: auto; - margin-right: auto; - margin-top: 0; - padding-bottom: 0; - position: relative; + margin:0px; + } /* Scroll effect */ diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 38da3dc992..51ac0bdb6b 100644 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -2887,9 +2887,7 @@ class CourseManager { //$number_of_courses = Database::num_rows($result); $key = 0; $status_icon = ''; - - echo '
'; - + // Browse through all courses. while ($course = Database::fetch_array($result)) { // Get notifications. @@ -2984,8 +2982,7 @@ class CourseManager { echo $show_notification; echo '
'; $key++; - } - echo ''; + } } /** diff --git a/main/inc/lib/javascript/bxslider/bx_styles/bx_styles.css b/main/inc/lib/javascript/bxslider/bx_styles/bx_styles.css index 978a7da124..3fb1752aba 100755 --- a/main/inc/lib/javascript/bxslider/bx_styles/bx_styles.css +++ b/main/inc/lib/javascript/bxslider/bx_styles/bx_styles.css @@ -29,9 +29,9 @@ #container-slider { margin: 15px auto; - min-height: 310px; + min-height: 200px; padding: 0 0 0 6%; - width: 560px; + width: 500px; z-index: 0; } .bx-next { diff --git a/main/template/default/layout/layout_1_col.tpl b/main/template/default/layout/layout_1_col.tpl index 47153c5b8b..27ca70b80e 100644 --- a/main/template/default/layout/layout_1_col.tpl +++ b/main/template/default/layout/layout_1_col.tpl @@ -1,9 +1,9 @@ {extends file="default/layout/main.tpl"} {* Header *} -{block name=header} +{block name="main_header"} {if $show_header == 1} - {include file="default/layout/header.tpl"} + {include file="default/layout/main_header.tpl"} {/if} {/block} @@ -27,7 +27,7 @@ {* Footer *} {block name=footer} - {if $show_header == 1} - {include file="default/layout/footer.tpl"} + {if $show_footer == 1} + {include file="default/layout/main_footer.tpl"} {/if} {/block} \ No newline at end of file diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl index 4ab55da592..012db4ce57 100644 --- a/main/template/default/layout/layout_2_col.tpl +++ b/main/template/default/layout/layout_2_col.tpl @@ -1,7 +1,9 @@ {extends file="default/layout/main.tpl"} {block name=header} - {include file="default/layout/header.tpl"} + {if $show_header == 1 } + {include file="default/layout/main_header.tpl"} + {/if} {/block} {block name=body} @@ -49,7 +51,7 @@ {* Right column *} -
-{block name="footer"}{/block} +{include file="default/layout/footer.tpl"} - + \ No newline at end of file diff --git a/main/template/default/layout/main_header.tpl b/main/template/default/layout/main_header.tpl index 4ed673b8df..33420004dc 100644 --- a/main/template/default/layout/main_header.tpl +++ b/main/template/default/layout/main_header.tpl @@ -1,5 +1,5 @@ - + {include file="default/layout/head.tpl"} @@ -11,25 +11,41 @@
  • {"WCAGGoContent"|get_lang}
    • +
    {* Bug and help notifications *} - {include file="default/layout/header.tpl"} - + + {*topbar*} + {include file="default/layout/topbar.tpl"} +
    - {* menu *} +
    + {* header1 - logo *} +
    + {$header1} +
    + + {$plugin_header} + + {* header 2 - right menu (notifications) *} +
    +
      + {$header2} +
    +
    +
    + {* header 3 - menu *} {if $header3} -
    -
    + -
    +
    {/if} {* breadcrumb *} {$header4} -
    \ No newline at end of file +
    \ No newline at end of file diff --git a/main/template/default/layout/header.tpl b/main/template/default/layout/topbar.tpl similarity index 94% rename from main/template/default/layout/header.tpl rename to main/template/default/layout/topbar.tpl index 64ba2a68a5..a52d3dba8f 100644 --- a/main/template/default/layout/header.tpl +++ b/main/template/default/layout/topbar.tpl @@ -93,21 +93,4 @@ top:-2px; } -{/if} - - \ No newline at end of file +{/if} \ No newline at end of file diff --git a/main/template/experimental/layout/layout_2_col.tpl b/main/template/experimental/layout/layout_2_col.tpl index b85f2931ee..51040ee45b 100644 --- a/main/template/experimental/layout/layout_2_col.tpl +++ b/main/template/experimental/layout/layout_2_col.tpl @@ -1,7 +1,8 @@ {extends file="default/layout/main.tpl"} -{block name=header} - {include file="default/layout/header.tpl"} + +{block name="header"} + {include file="default/layout/main_header.tpl"} {/block} {block name=body} @@ -12,7 +13,7 @@ {$announcements_block}
    -