1
0
Fork 0

[GIT] add twitter bootstrap v4-alpha

This commit is contained in:
Jannik Beyerstedt 2016-03-31 16:56:10 +02:00
parent a23d1159fa
commit e98b1fc877
4 changed files with 25 additions and 2 deletions

View file

@ -1,7 +1,7 @@
{
"sass.enabled": false,
"path": {
"assets/scss/main.scss": {
"assets/scss/*": {
"sass.enabled": true,
"sass.options": {
"outputDir": "../css/",
@ -9,6 +9,24 @@
"sourceComments": true,
"outputStyle": "nested"
}
},
"assets/scss/templates/*": {
"sass.enabled": true,
"sass.options": {
"outputDir": "../../css/templates",
"includePaths": [],
"sourceComments": true,
"outputStyle": "nested"
}
},
"assets/vendors/bootstrap/scss/*": {
"sass.enabled": true,
"sass.options": {
"outputDir": "../../../css/twbs/",
"includePaths": [],
"sourceComments": true,
"outputStyle": "nested"
}
}
}
}

4
.gitmodules vendored
View file

@ -31,3 +31,7 @@
[submodule "modules/kirby-kirbytag-html5video"]
path = modules/kirby-kirbytag-html5video
url = https://github.com/jbeyerstedt/kirby-kirbytag-html5video.git
[submodule "assets/vendors/bootstrap"]
path = assets/vendors/bootstrap
url = https://github.com/twbs/bootstrap.git
branch = v4-dev

1
assets/vendors/bootstrap vendored Submodule

@ -0,0 +1 @@
Subproject commit 064fda0e802679e56e88db2910fdf5369dde6e4c

View file

@ -24,9 +24,9 @@
<?php endif; ?>
<?php echo css('assets/vendors/font-awesome/css/font-awesome.min.css') ?>
<?php echo css('assets/vendors/font-awesome/css/font-awesome.min.css') ?>
<?php echo css('assets/css/main.css') ?>
<?php echo css('@auto') ?>
<!-- Google web fonts -->