Merge changes for responsive design by @aragonc

main/css/responsive.css

@@ -128,6 +128,14 @@ The more frequent ones have been marked with *
     .navbar {
       margin-top: 0em;
     }
+    header{
+        margin-top: 15px;
+    }
+    .subnav .dropdown-menu li a {
+    color: #FFFFFF;
+    font-weight: normal;
+    }
+
     .subnav .navbar-inner .in{
         margin-top: 45px;
     }
@@ -281,7 +289,21 @@ The more frequent ones have been marked with *
     #topbar {
         display:none;
     }
-
+    .subnav .dropdown-menu li a {
+    color: #FFFFFF;
+    font-weight: normal;
+    }
+    header{
+        margin-top: 15px;
+    }
+    #top_main_content .menu-column {
+        float: left;
+        width: 100%;
+    }
+    .menu-column .group-one{
+        width: 100%;
+    }
+    
     /* only for the course tools */
     #course_tools .row > [class*="span"], #course_tools  .row-fluid > [class*="span"] {
         float: left;
@@ -391,10 +413,11 @@ The more frequent ones have been marked with *
     /* Some fixes for w~720px */
     .section-mycampus #top_main_content .content-column {
         float: none;
+        width: 720px;
     }
     .section-mycampus #homepage {
         float: left;
-        width: 450px;
+        width: 720px;
     }
     .section-mycampus #hot_courses {
         float: left;
@@ -409,7 +432,10 @@ The more frequent ones have been marked with *
     .section-mycampus .hot-course-box, .section-mycourses .course-box {
         width: 660px;
     }
-
+     #top_main_content .span9 {
+        float: left;
+        width: 720px;
+    }
     /* Footer fixes */
 
     footer {
@@ -437,6 +463,17 @@ The more frequent ones have been marked with *
     #topbar {
         display:none;
     }
+    header{
+        margin-top: 15px;
+    }
+    
+    #homepage .row .span9{
+         width: 610px;
+    }
+    .subnav .dropdown-menu li a {
+    color: #FFFFFF;
+    font-weight: normal;
+    }
 
     /* fixes tabs */
     .subnav .nav-tabs > li > a, .subnav .nav-pills > li > a {

main/inc/lib/template.lib.php

@@ -432,7 +432,7 @@ class Template
 
         //Default CSS responsive design
         $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'bootstrap-responsive.css');
-        $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'responsive.css');
+        
 
         //Extra CSS files
         $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/thickbox.css';
@@ -445,6 +445,7 @@ class Template
         $css[] = api_get_path(WEB_CSS_PATH).'font_awesome/css/font-awesome.css';
         $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/mediaelement/mediaelementplayer.css';
         //THEME CSS STYLE
+        $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'responsive.css');
         $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->theme.'/default.css');
 
         if ($this->show_learnpath) {

main/template/default/layout/layout_2_col.tpl

@@ -22,7 +22,7 @@
 		{% if _u.logged  == 0 %}
 			{% include "default/layout/login_form.tpl" %}
 		{% endif %}
-
+        
 		{# User picture #}
         {{ user_image_block }}