pulled master at 4

2017-06-04 18:29:58 +06:30
parent 8d4086d5e9 eb74eb2a2d
commit 9b90e3bd7e
71 changed files with 590 additions and 161 deletions
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,6 +9,29 @@
 //   padding-top: 4.5rem;
 // }

+.setting_nav{
+	background-color: #2f5663;
+}
+
+ul.navbar-nav li a{
+	text-decoration :none;
+	color :#e6e6e6;
+}
+
+ul.dropdown-menu li a{
+	text-decoration :none;
+	color :#525252;
+}
+
+.setting_breadcrumb{
+	background-color: transparent !important;
+	margin-bottom: 0px !important;
+}
+.page-header{
+	border-bottom :0px solid #000 !important;
+	margin :0px !important;
+}
+
 /*----- Order Processing Items -----*/
 .opi_ul {
  display:block;
@@ -33,4 +56,4 @@

 /*----- Header Bar -----*/

-/*----- Header Bar -----*/
+/*----- Header Bar -----*/