diff --git a/assets/css/scss/_base.scss b/assets/css/scss/_base.scss index 2ae777a421..726fc75884 100644 --- a/assets/css/scss/_base.scss +++ b/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; diff --git a/assets/css/scss/_sidebar.scss b/assets/css/scss/_sidebar.scss index 0ec6d3370a..93e0b43bed 100644 --- a/assets/css/scss/_sidebar.scss +++ b/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 */ diff --git a/assets/css/scss/_variables.scss b/assets/css/scss/_variables.scss index 1d37d34e0c..d1c4a8bdbc 100644 --- a/assets/css/scss/_variables.scss +++ b/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; diff --git a/src/CoreBundle/Menu/NavBuilder.php b/src/CoreBundle/Menu/NavBuilder.php index c6c045bffe..7188da3b48 100644 --- a/src/CoreBundle/Menu/NavBuilder.php +++ b/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'); diff --git a/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig b/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig index b125132537..54e5e00111 100644 --- a/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig +++ b/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig @@ -31,9 +31,11 @@ {% autoescape false %} - {% if actions != '' %} - {{ actions }} - {% endif %} +
+ {% if actions != '' %} + {{ actions }} + {% endif %} +
{% block chamilo_messages %} {% include '@ChamiloTheme/FlashMessage/render.html.twig' %}