Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2025-12-22 01:44:25 +04:00
Code Issues Projects Releases Wiki Activity

page-main -> flex-fill

Browse Source
This commit is contained in:
codecalm
2018-07-19 21:08:37 +02:00
parent b38cc5334c
commit 36fc428b72
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -15,3 +15,4 @@ deploy-site
/assets/css/ /assets/css/
/vendor/ /vendor/
/package-lock.json /package-lock.json
Gemfile.lock

8
package.json
View File

@@ -36,13 +36,13 @@
"url": "https://github.com/tabler/tabler/issues" "url": "https://github.com/tabler/tabler/issues"
}, },
"devDependencies": { "devDependencies": {
"bootstrap": "^4.1.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-autoprefixer": "^5.0.0", "gulp-autoprefixer": "^5.0.0",
"gulp-rename": "^1.2.2", "gulp-rename": "^1.3.0",
"gulp-rtlcss": "^1.2.0", "gulp-rtlcss": "^1.2.0",
"gulp-sass": "^4.0.1", "gulp-sass": "^4.0.1",
"bootstrap": "^4.1.0", "npm-run-all": "^4.1.3"
"npm-run-all": "^4.1.2"
}, },
"dependencies": { "dependencies": {
"opencollective": "^1.0.3" "opencollective": "^1.0.3"
@@ -67,4 +67,4 @@
"type": "opencollective", "type": "opencollective",
"url": "https://opencollective.com/tabler" "url": "https://opencollective.com/tabler"
} }
} }

2
src/_layouts/default.html
View File

@@ -6,7 +6,7 @@ layout: base
{% include aside.html %} {% include aside.html %}
{% endcomment %} {% endcomment %}
<div class="page-main"> <div class="flex-fill">
{% include header.html %} {% include header.html %}
<div class="my-3 my-md-5"> <div class="my-3 my-md-5">

3
src/assets/scss/dashboard/_layout.scss
View File

@@ -15,9 +15,6 @@
} }
} }
.page-main {
flex: 1 1 auto;
}
.page-content { .page-content {
margin: .75rem 0; margin: .75rem 0;