Merge branch 'master' of github.com:chamilo/chamilo-lms

assets/css/scss/_base.scss

@@ -77,7 +77,9 @@ a {
 hr {
   border-top: 1px solid $border-color;
 }
-
+.container-fluid{
+  width: 95%;
+}
 /*** TABS ***/
 .nav-tabs{
   margin-bottom: 10px;
@@ -337,6 +339,20 @@ hr {
     }*/
   }
 }
+/*** GRID CATALOG ***/
+.list-course{
+  display: grid;
+  grid-gap: 1rem;
+  grid-row-gap: 16px;
+  grid-template-columns: repeat(5, 1fr);
+  @include portrait($breakpoint-sm, $breakpoint-md){
+    grid-template-columns: repeat(3, 1fr);
+  }
+  @include landscape($breakpoint-sm) {
+    grid-template-columns: repeat(1, 1fr);
+  }
+}
+
 /* CATEGORY CLASSIC */
 .category-list{
   display: grid;
@@ -424,6 +440,7 @@ hr {
     }
   }
 }
+
 /** GRID SESSION **/
 
 .grid-session{

assets/css/scss/_sidebar.scss

@@ -4,6 +4,59 @@
 
 .sidebar {
   background-color: $sidebar-background;
+  border-right: 1px solid #cdcdcd;
+  .nav-dropdown-items{
+    background: #ffffff;
+    .nav-item{
+      border-right: 1px solid #cdcdcd;
+      .nav-link{
+        i{
+          color: #2d3b48 !important;
+        }
+        color: #2d3b48 !important;
+      }
+    }
+  }
+  .nav-dropdown{
+    &.open{
+      .nav-link{
+        color: #2d3b48;
+      }
+    }
+  }
+  .nav-item{
+    i{
+      color: $sidebar-icon;
+      display: inline-block;
+      font-size: 18px;
+      line-height: 17px;
+      margin-left: 3px;
+      margin-right: 10px;
+      text-align: center;
+      vertical-align: middle;
+      width: 20px;
+    }
+    &.current{
+      i{
+        color: $sidebar-link-hover;
+      }
+      .nav-link{
+        color: $sidebar-link-hover;
+      }
+      background-color: $sidebar-current;
+    }
+  }
+  .nav-link{
+    color: $sidebar-link;
+    padding: 16px 25px;
+    &:hover{
+      color: $sidebar-link-hover;
+      background: transparent;
+      i{
+        color: $sidebar-link-hover;
+      }
+    }
+  }
 }
 .section-slider{
   background: #9d7bd7; /* Old browsers */ /* FF3.6-15 */ /* Chrome10-25,Safari5.1-6 */

assets/css/scss/_variables.scss

@@ -52,7 +52,11 @@ $menu-background      : #FFFFFF;
 $menu-secondary       : #ff3c7e;
 
 // SIDEBAR
-$sidebar-background   : #0BADFE;
+$sidebar-background   : #5b6be8;
+$sidebar-link         : #FFFFFF;
+$sidebar-icon         : #84b7ff;
+$sidebar-link-hover   : #ffef5f;
+$sidebar-current      : rgba(0, 0, 0, 0.15);
 
 $header-link          : #54667a;
 $header-hover         : #ff3c7e;

main/template/default/auth/course_catalog.html.twig

@@ -14,9 +14,9 @@
             </div>
         </div>
     </div>
-    <div class="row">
+    <div class="list-course">
         {% for item in courses %}
-            <div class="col-md-3">
+            <div class="item-course">
                 {% set image %}
                     {% if item.category != '' %}
                         <div class="category">

main/template/default/auth/session_catalog.html.twig

@@ -43,9 +43,9 @@
                 </form>
             </div>
         </div>
-        <div class="row">
+        <div class="list-course">
             {% for item in sessions %}
-            <div class="col-md-3">
+            <div class="item-course">
                 {% set image %}
                     {% if item.category != '' %}
                         <div class="category">

src/CoreBundle/Menu/NavBuilder.php

@@ -121,13 +121,13 @@ class NavBuilder implements ContainerAwareInterface
                 }
             }
 
-            $menu['courses']->addChild(
+            /*$menu['courses']->addChild(
                 $translator->trans('Course history'),
                 [
                     'route' => 'legacy_main',
                     'routeParameters' => ['name' => '../user_portal.php'],
                 ]
-            );
+            );*/
 
             if (api_is_allowed_to_create_course()) {
                 $lang = $translator->trans('Create course');

src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig

@@ -31,9 +31,11 @@
 
         {% autoescape false %}
 
-        {% if actions != '' %}
-            {{ actions }}
-        {% endif %}
+        <section class="container-fluid">
+            {% if actions != '' %}
+                {{ actions }}
+            {% endif %}
+        </section>
 
         {% block chamilo_messages %}
         {% include '@ChamiloTheme/FlashMessage/render.html.twig' %}