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

# Conflicts:
#	application/language/english.json
#	application/language/vietnamese.json

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

@@ -3,4 +3,24 @@
     color: white;
 }
 
-ul.footer-menu li a.nav-link { color: white !important; font-weight: bold }
\ No newline at end of file
+ul.footer-menu li a.nav-link { color: white !important; font-weight: bold ;}
+.course-box .course-image .img-fluid {min-height: 214px;}
+/* .mobile-main-nav a:not(.btn){
+    color: #ffffff;
+} */
+/* .mobile-main-nav{
+    background: #505763;
+} */
+/* .main-nav-wrap>ul>li{
+    min-width: 100px;
+}
+.main-nav-wrap>ul>li>ul{
+    background: #505763;
+}
+.main-nav-wrap>ul>li>ul>li ul{
+    background: #505763;
+}
+.mobile-main-nav .go-back-menu a,
+    .mobile-main-nav .category > .go-back a{
+        background-color: #414a5a;
+    } */
\ No newline at end of file