Merge branch 'dev' of http://git.dcv.vn/doanpv/academy-lms into dev

application/views/frontend/default/includes_top.php

@@ -14,4 +14,7 @@
 <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700" rel="stylesheet">
 <link rel="stylesheet" href="<?php echo base_url().'assets/global/toastr/toastr.css' ?>">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/nestable2/1.6.0/jquery.nestable.min.css" />
+
+<link rel="stylesheet" href="<?php echo base_url().'assets/frontend/default/css/override-fe.css'; ?>">
+
 <script src="<?php echo base_url('assets/backend/js/jquery-3.3.1.min.js'); ?>"></script>

assets/frontend/default/css/main.css

@@ -4138,8 +4138,3 @@ background-color: #ffffff;
 border-color: #992337;
 color: #2a303b;
 }
-
-.container-xl, nav.navbar {
-    background-color: #4d91ea !important;
-    color: white;
-}

assets/frontend/default/css/override-fe.css

+.container-xl, nav.navbar {
+    background-color: #4d91ea !important;
+    color: white;
+}
\ No newline at end of file