diff --git a/build/css/style-extra-bs4.css b/build/css/style-extra-bs4.css index 1bba36b2..0b4bc032 100644 --- a/build/css/style-extra-bs4.css +++ b/build/css/style-extra-bs4.css @@ -1,6 +1,7 @@ -/* -@media (min-width: 1200px) { - .container { max-width:100% !important; } - } -} -*/ \ No newline at end of file + + +.container.test .col.one { background:gold; } +.container.test .col.two { background:red; } + +.container.body .col-md-3 { background:orange; } + diff --git a/production/index.html b/production/index.html index f9754b5e..aafd7167 100755 --- a/production/index.html +++ b/production/index.html @@ -32,7 +32,7 @@ -
+
diff --git a/production/tester.html b/production/tester.html index 7517961f..bc4eefe9 100644 --- a/production/tester.html +++ b/production/tester.html @@ -26,8 +26,157 @@ -
+
+ + +
+
+
+ Gentelella Alela! +
+ +
+ +
+
+ ... +
+
+ Welcome, +

John Doe

+
+
+
+ + +
+ + + + + + +
+ + + + + + + + + + + + +
+ +
+
+ + +
A
@@ -368,6 +517,8 @@ + + diff --git a/src/scss/custom.scss b/src/scss/custom.scss index f095363d..c67054aa 100644 --- a/src/scss/custom.scss +++ b/src/scss/custom.scss @@ -2,25 +2,25 @@ .left_col { background: #2A3F54; } -.nav-sm .container.body .col-md-3.left_col { +.nav-sm container-fluid.body .col-md-3.left_col { min-height: 100%; width: 70px; padding: 0; z-index: 9999; position: absolute; } -.nav-sm .container.body .col-md-3.left_col.menu_fixed { +.nav-sm container-fluid.body .col-md-3.left_col.menu_fixed { position: fixed; height: 100%; } -.nav-sm .container.body .col-md-3.left_col .mCSB_container, -.nav-sm .container.body .col-md-3.left_col .mCustomScrollBox { +.nav-sm container-fluid.body .col-md-3.left_col .mCSB_container, +.nav-sm container-fluid.body .col-md-3.left_col .mCustomScrollBox { overflow: visible; } .nav-sm .hidden-small { visibility: hidden; } -.nav-sm .container.body .right_col { +.nav-sm container-fluid.body .right_col { padding: 10px 20px; margin-left: 70px; z-index: 2; @@ -190,7 +190,7 @@ position: static; } } -.nav-md .container-fluid.body .left_col { +.nav-md container-fluid-fluid.body .left_col { min-height: 100%; width: 230px; padding: 0; @@ -198,14 +198,14 @@ display: flex; z-index: 1; } -.nav-md .container.body .col-md-3.left_col.menu_fixed { +.nav-md container-fluid.body .col-md-3.left_col.menu_fixed { height: 100%; position: fixed; } -body .container.body .right_col { +body container-fluid.body .right_col { background: #F7F7F7; } -.nav-md .container.body .right_col { +.nav-md container-fluid.body .right_col { padding: 10px 20px 0; margin-left: 230px; } @@ -217,14 +217,14 @@ body .container.body .right_col { height: 57px; } @media (max-width: 991px) { - .nav-md .container.body .right_col, .nav-md .container.body .top_nav { + .nav-md container-fluid.body .right_col, .nav-md container-fluid.body .top_nav { width: 100%; margin: 0; } - .nav-md .container.body .col-md-3.left_col { + .nav-md container-fluid.body .col-md-3.left_col { display: none; } - .nav-md .container.body .right_col { + .nav-md container-fluid.body .right_col { width: 100%; padding-right: 0 } @@ -326,7 +326,7 @@ body .container.body .right_col { border: 1px solid #50C1CF !important; color: #fff; } -.container { +container-fluid { width: 100%; padding: 0 }