origin pull master

2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions
--- a/app/assets/stylesheets/settings.scss
+++ b/app/assets/stylesheets/settings.scss
@@ -0,0 +1,32 @@
+@import "bootstrap";
+@import "font-awesome";
+@import "theme";
+
+/* Show it is fixed to the top */
+// body {
+//   min-height: 75rem;
+//   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;
+}