chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

More CSS fixes

Browse Source
skala
Julio Montoya 13 years ago
parent 06b67b1c24
commit fd439f67ba
11 changed files with 79 additions and 95 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 31
      main/css/base.css
  2. 37
      main/css/base_chamilo.css
  3. 7
      main/inc/lib/course.lib.php
  4. 4
      main/inc/lib/javascript/bxslider/bx_styles/bx_styles.css
  5. 8
      main/template/default/layout/layout_1_col.tpl
  6. 12
      main/template/default/layout/layout_2_col.tpl
  7. 8
      main/template/default/layout/main.tpl
  8. 7
      main/template/default/layout/main_footer.tpl
  9. 34
      main/template/default/layout/main_header.tpl
  10. 19
      main/template/default/layout/topbar.tpl
  11. 7
      main/template/experimental/layout/layout_2_col.tpl

31
main/css/base.css
Unescape View File

@ -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 {

37
main/css/base_chamilo.css
Unescape View File

@ -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 */

7
main/inc/lib/course.lib.php
Unescape View File

@ -2887,9 +2887,7 @@ class CourseManager {
//$number_of_courses = Database::num_rows($result);
$key = 0;
$status_icon = '';
echo '<div class="row">';
// Browse through all courses.
while ($course = Database::fetch_array($result)) {
// Get notifications.
@ -2984,8 +2982,7 @@ class CourseManager {
echo $show_notification;
echo '</div>';
$key++;
}
echo '</div>';
}
}
/**

4
main/inc/lib/javascript/bxslider/bx_styles/bx_styles.css
Unescape View File

@ -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 {

8
main/template/default/layout/layout_1_col.tpl
Unescape View File

@ -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}

12
main/template/default/layout/layout_2_col.tpl
Unescape View File

@ -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 @@
</div>
{* Right column *}
<div id="menu-wrapper" class="span3">
<div class="span3">
{*if user is not login show the login form*}
{if $_u.logged == 0}
@ -85,6 +87,8 @@
{/block}
{* Footer *}
{block name=footer}
{include file="default/layout/footer.tpl"}
{block name=footer}
{if $show_footer == 1 }
{include file="default/layout/main_footer.tpl"}
{/if}
{/block}

8
main/template/default/layout/main.tpl
Unescape View File

@ -1,7 +1,9 @@
{* html -> skip *}
{include file="default/layout/main_header.tpl"}
{* header *}
{block name="header"}{/block}
{* body *}
{block name="body"}{/block}
{* footer *}
{include file="default/layout/main_footer.tpl"}
{block name="footer"}{/block}

7
main/template/default/layout/main_footer.tpl
Unescape View File

@ -1,9 +1,8 @@
<div class="clear">&nbsp;</div> <!-- 'clearing' div to make sure that footer stays below the main and right column sections -->
<div class="clear">&nbsp;</div> <!-- 'clearing' div to make sure that footer stays below the main and right column sections -->
</div> <!-- end of #main" started at the end of banner.inc.php -->
</div> <!-- end of #main" started at the end of banner.inc.php -->
<div class="push"></div>
</div> <!-- end of #wrapper section -->
{block name="footer"}{/block}
{include file="default/layout/footer.tpl"}
</body>
</html>
</html>

34
main/template/default/layout/main_header.tpl
Unescape View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html>
<head>
{include file="default/layout/head.tpl"}
</head>
@ -11,25 +11,41 @@
<li><a href="#content" accesskey="2">{"WCAGGoContent"|get_lang}</a></li>
</ul>
</div>
<div id="wrapper">
{* Bug and help notifications *}
<ul id="navigation">
{$help_content}
{$bug_notification_link}
</ul>
{include file="default/layout/header.tpl"}
{*topbar*}
{include file="default/layout/topbar.tpl"}
<div id="main" class="container">
{* menu *}
<header>
{* header1 - logo *}
<div id="header1">
{$header1}
</div>
{$plugin_header}
{* header 2 - right menu (notifications) *}
<div id="header2">
<ul class="nav nav-pills">
{$header2}
</ul>
</div>
</header>
{* header 3 - menu *}
{if $header3}
<div id="header3">
<div class="subnav">
<div id="header3" class="subnav">
{$header3}
</div>
</div>
</div>
{/if}
{* breadcrumb *}
{$header4}
<div id="submain">
<div id="submain-content" class="row">

19
main/template/default/layout/header.tpl → main/template/default/layout/topbar.tpl
Unescape View File

@ -93,21 +93,4 @@
top:-2px;
}
</style>
{/if}
<div id="header" class="container">
{* header *}
<div id="header1">
{$header1}
</div>
{$plugin_header}
{* header 2 *}
<div id="header2">
<ul class="nav nav-pills">
{$header2}
</ul>
</div>
</div>
{/if}

7
main/template/experimental/layout/layout_2_col.tpl
Unescape View File

@ -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}
</div>
<div id="menu-wrapper">
<div>
{$login_block}
{$profile_block}
{$account_block}

Write Preview
Loading…
Cancel
Save