瀏覽代碼

add link login - refs ##2681

Alex Aragón 6 年之前
父節點
當前提交
94ff140330

+ 1 - 1
assets/css/scss/_base.scss

@@ -131,7 +131,7 @@ hr {
   padding: 85px 20px 20px;
   min-height: calc(100vh - 61px);
   &.bg-content{
-    background-color: $default-background;
+    background-color: $page-background;
   }
   .box-body{
     background-color: $default-white;

+ 7 - 7
assets/css/scss/_sidebar.scss

@@ -170,7 +170,7 @@
   overflow: auto;
   padding: 0;
   position: relative;
-  background: $default-sidebar;
+  background: $sidebar-bg;
 
   .nav-header {
     margin-top: 10px;
@@ -183,10 +183,10 @@
 
   .sidebar-divider {
     height: 0;
-    margin: .5rem 0;
+    margin: 0;
     overflow: hidden;
-    border-top: 1px solid #217aa4;
-    border-bottom: 1px solid #16b1fd;
+    border-top: 1px solid #DEE2E6;
+    border-bottom: 1px solid #FFFFFF;
   }
 
   .dropdown-toggle::after {
@@ -254,7 +254,7 @@
     }
 
     a {
-      color: $default-white;
+      color: $sidebar-link;
       transition: all 0.3s ease;
       display: block;
       font-size: 14px;
@@ -283,9 +283,9 @@
 
       &:hover,
       &:focus {
-        color: $default-info;
+        color: $sidebar-link;
         text-decoration: none;
-        background: $default-link;
+        background: $sidebar-focus;
 
         .icon-holder {
           color: $default-info;

+ 1 - 1
assets/css/scss/_topbar.scss

@@ -3,7 +3,7 @@
 // ---------------------------------------------------------
 
 .header {
-  background-color: $default-white;
+  background: $menu-background;
   border-bottom: 1px solid $border-color;
   display: block;
   margin-bottom: 0;

+ 12 - 3
assets/css/scss/_variables.scss

@@ -28,7 +28,7 @@ $grey-900             : #313435;
 // ---------------------------------------------------------
 
 $default-danger       : #ff3c7e;
-$default-dark         : #313435;
+$default-dark         : #54667a;
 $default-grey         : #565a5c;
 $default-info         : #4abaff;
 $default-primary      : #7774e7;
@@ -38,8 +38,17 @@ $default-yellow       : #FFCC00;
 $default-white        : #FFFFFF;
 $default-black        : #000000;
 $default-link         : rgb(0, 153, 255);
-$default-background   : #FFFFFF;
-$default-sidebar      : #0181bf;
+
+
+// ---------------------------------------------------------
+// COLORS PAGE
+// ---------------------------------------------------------
+
+$page-background      : #f2f8f9;
+$menu-background      :linear-gradient(120deg, #00e4d0, #5983e8);
+$sidebar-link         : #54667A;
+$sidebar-bg           : #FFFFFF;
+$sidebar-focus        : rgba(0, 0, 0, 0.07);
 
 // ---------------------------------------------------------
 // OTHERS

+ 1 - 0
src/ThemeBundle/Resources/views/Layout/sidebar.html.twig

@@ -1,5 +1,6 @@
 {% autoescape false %}
 <ul class="sidebar-menu scrollable pos-r">
+
     {{ mopa_bootstrap_menu('ChamiloCoreBundle:NavBuilder:leftMenu', {'automenu': 'navbar', 'stacked' : true}) }}
 
     <li class="sidebar-divider"></li>

+ 18 - 13
src/ThemeBundle/Resources/views/Layout/topbar.html.twig

@@ -104,21 +104,11 @@
             </ul>
             <!-- END NAVBAR LEFT -->
             <!-- NAVBAR RIGHT -->
+
+
+
             {% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
             <ul class="nav-right">
-                <li class="btn-padding">
-                    <a class="btn btn-light btn-create-two btn-sm" href="{{ url('legacy_main', { 'name' : 'create_course/add_course.php' }) }}">
-                        <i class="fa fa-plus fa-lg" aria-hidden="true"></i>
-                        {{ "AddCourse"|trans }}
-                    </a>
-                </li>
-                <li class="btn-padding">
-
-                    <a class="btn btn-light btn-create-one btn-sm" href="{{ url('legacy_main', { 'name' : 'session/session_add.php' }) }}">
-                        <i class="fa fa-plus fa-lg" aria-hidden="true"></i>
-                        {{ "AddSession"|trans }}
-                    </a>
-                </li>
                 <li class="btn-padding">
                     <a class="btn btn-light btn-create-three btn-sm" href="{{ path('legacy_main', { 'name' : '../user_portal.php'}) }}">
                         <i class="fa fa-graduation-cap fa-lg" aria-hidden="true"></i>
@@ -186,6 +176,21 @@
                     </ul>
                 </li>
             </ul>
+            {% else %}
+                <ul class="nav-right">
+                    <li class="btn-padding">
+                        <a class="btn btn-light btn-create-two btn-sm" href="{{ url('legacy_main', { 'name' : 'auth/inscription.php' }) }}">
+                            <i class="fas fa-pencil-alt"></i>
+                            {{ "Register"|trans }}
+                        </a>
+                    </li>
+                    <li class="btn-padding">
+                        <a class="btn btn-light btn-create-one btn-sm" href="{{ url('legacy_main', { 'name' : '../public/login' }) }}">
+                            <i class="fas fa-sign-in-alt"></i>
+                            {{ "Sign in"|trans }}
+                        </a>
+                    </li>
+                </ul>
             {% endif %}
             <!-- END NAVBAR RIGHT -->
         </div>