page-main -> flex-fill

Intelioum · Jul 19, 2018 · 36fc428 · 36fc428
1 parent b38cc53
commit 36fc428
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ deploy-site
 /assets/css/
 /vendor/
 /package-lock.json
+Gemfile.lock
diff --git a/package.json b/package.json
@@ -36,13 +36,13 @@
     "url": "https://github.com/tabler/tabler/issues"
   },
   "devDependencies": {
+    "bootstrap": "^4.1.0",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^5.0.0",
-    "gulp-rename": "^1.2.2",
+    "gulp-rename": "^1.3.0",
     "gulp-rtlcss": "^1.2.0",
     "gulp-sass": "^4.0.1",
-    "bootstrap": "^4.1.0",
-    "npm-run-all": "^4.1.2"
+    "npm-run-all": "^4.1.3"
   },
   "dependencies": {
     "opencollective": "^1.0.3"
@@ -67,4 +67,4 @@
     "type": "opencollective",
     "url": "https://opencollective.com/tabler"
   }
-}
+}
diff --git a/src/_layouts/default.html b/src/_layouts/default.html
@@ -6,7 +6,7 @@
 {% include aside.html %}
 {% endcomment %}
 
-<div class="page-main">
+<div class="flex-fill">
 	{% include header.html %}
 
 	<div class="my-3 my-md-5">

diff --git a/src/assets/scss/dashboard/_layout.scss b/src/assets/scss/dashboard/_layout.scss
@@ -15,9 +15,6 @@
 	}
 }
 
-.page-main {
-	flex: 1 1 auto;
-}
 
 .page-content {
 	margin: .75rem 0;