Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

[bookstack] / resources / assets / sass / _grid.scss

diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss
index 4532cca6f975de1cb2fa958f0acd56f3fb9bef69..de1ee83fb1caa914cc758ab12623584729286021 100644 (file)
--- a/resources/assets/sass/_grid.scss
+++ b/resources/assets/sass/_grid.scss
@@ -11,17 +11,29 @@ body.flexbox {
   #content {
     flex: 1;
     display: flex;
+    min-height: 0;
   }
 }
 
 .flex-fill {
   display: flex;
   align-items: stretch;
+  min-height: 0;
+  position: relative;
   .flex, &.flex {
+    min-height: 0;
     flex: 1;
   }
 }
 
+.flex-child > div {
+  flex: 1;
+}
+
+//body.ie .flex-child > div {
+//  flex: 1 0 0px;
+//}
+
 /** Rules for all columns */
 div[class^="col-"] img {
   max-width: 100%;
@@ -36,25 +48,14 @@ div[class^="col-"] img {
   &.fluid {
     max-width: 100%;
   }
+  &.medium {
+    max-width: 992px;
+  }
   &.small {
     max-width: 840px;
   }
 }
 
-.center-box {
-  margin: $-xl auto 0 auto;
-  padding: $-m $-xxl $-xl*2 $-xxl;
-  max-width: 346px;
-  display: inline-block;
-  text-align: left;
-  vertical-align: top;
-  &.login {
-    background-color: #EEE;
-    box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
-    border: 1px solid #DDD;
-  }
-}
-
 .row {
   margin-left: -$-m;
   margin-right: -$-m;
@@ -242,7 +243,7 @@ div[class^="col-"] img {
 .col-xs-offset-0 {
   margin-left: 0%;
 }
-@media (min-width: 768px) {
+@media (min-width: $screen-sm) {
   .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
     float: left;
   }
@@ -400,7 +401,7 @@ div[class^="col-"] img {
     margin-left: 0%;
   }
 }
-@media (min-width: 992px) {
+@media (min-width: $screen-md) {
   .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
     float: left;
   }
@@ -558,7 +559,7 @@ div[class^="col-"] img {
     margin-left: 0%;
   }
 }
-@media (min-width: 1200px) {
+@media (min-width: $screen-lg) {
   .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
     float: left;
   }