Skip to content

Commit

Permalink
[#9] Created Bootstrap 4 version.
Browse files Browse the repository at this point in the history
  • Loading branch information
bladeaweb committed Sep 16, 2018
1 parent 00a43b3 commit 409983a
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 13 deletions.
4 changes: 3 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

/* global module */
var prod = 'production/',
dev = 'source/';
dev = 'source/',
bootstrap = 'node_modules/bootstrap/';
serverPort = 3088;

const sass = require('node-sass');
Expand Down Expand Up @@ -75,6 +76,7 @@ module.exports = function (grunt) {
},
dist: {
src: [
bootstrap + 'dist/js/bootstrap.min.js',
dev + 'js/*.js',
dev + 'js/**/*.js'
],
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# workflow for Alexander Sharkov
# Workflow by Alexander Sharkov with included Bootstrap 4.

v 1.1.2
v 1.1.2 - bootstrap 4

> #### What's new?
> Fixed normalize.css issue.
> Bootstrap 4 included.
> There are a base created for compiling html + css + js + png sprites + image compress from pug and sass. It based on gulp task runner.
> There are a base created for compiling html + css + js + png sprites + image compress from pug and sass + Bootstrap 4. It based on grunt as a task runner.
19 changes: 19 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "Workflow for Alexander Sharkov",
"main": "Gruntfile.js",
"dependencies": {
"bootstrap": "^4.0.0-alpha.6",
"normalize-scss": "^7.0.1"
},
"devDependencies": {
Expand Down
12 changes: 8 additions & 4 deletions source/pug/index.pug
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ extends base/layouts/basic
block title
title Test workflow
block content
h1 Test workflow for Alexander Sharkov
h2 Sprite test:
i.sprite-icon-github
i.sprite-icon-fork
.container
h1 Test workflow for Alexander Sharkov
h2 Sprite test:
.row
.col-6
i.sprite-icon-github
.col-6
i.sprite-icon-fork
2 changes: 2 additions & 0 deletions source/sass/variables/_bootstrap.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// Import base bootstrap variables.
@import '../../../node_modules/bootstrap/scss/variables'
47 changes: 47 additions & 0 deletions source/sass/vendors/_bootstrap.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@

// Core variables and mixins
@import "../../../node_modules/bootstrap/scss/mixins"
@import "../../../node_modules/bootstrap/scss/custom"

// Reset and dependencies
@import "../../../node_modules/bootstrap/scss/normalize"
@import "../../../node_modules/bootstrap/scss/print"

// Core CSS
@import "../../../node_modules/bootstrap/scss/reboot"
@import "../../../node_modules/bootstrap/scss/type"
@import "../../../node_modules/bootstrap/scss/images"
@import "../../../node_modules/bootstrap/scss/code"
@import "../../../node_modules/bootstrap/scss/grid"
@import "../../../node_modules/bootstrap/scss/tables"
@import "../../../node_modules/bootstrap/scss/forms"
@import "../../../node_modules/bootstrap/scss/buttons"

// Components
@import "../../../node_modules/bootstrap/scss/transitions"
@import "../../../node_modules/bootstrap/scss/dropdown"
@import "../../../node_modules/bootstrap/scss/button-group"
@import "../../../node_modules/bootstrap/scss/input-group"
@import "../../../node_modules/bootstrap/scss/custom-forms"
@import "../../../node_modules/bootstrap/scss/nav"
@import "../../../node_modules/bootstrap/scss/navbar"
@import "../../../node_modules/bootstrap/scss/card"
@import "../../../node_modules/bootstrap/scss/breadcrumb"
@import "../../../node_modules/bootstrap/scss/pagination"
@import "../../../node_modules/bootstrap/scss/badge"
@import "../../../node_modules/bootstrap/scss/jumbotron"
@import "../../../node_modules/bootstrap/scss/alert"
@import "../../../node_modules/bootstrap/scss/progress"
@import "../../../node_modules/bootstrap/scss/media"
@import "../../../node_modules/bootstrap/scss/list-group"
@import "../../../node_modules/bootstrap/scss/responsive-embed"
@import "../../../node_modules/bootstrap/scss/close"

// Components w/ JavaScript
@import "../../../node_modules/bootstrap/scss/modal"
@import "../../../node_modules/bootstrap/scss/tooltip"
@import "../../../node_modules/bootstrap/scss/popover"
@import "../../../node_modules/bootstrap/scss/carousel"

// Utility classes
@import "../../../node_modules/bootstrap/scss/utilities"
4 changes: 0 additions & 4 deletions source/sass/vendors/_normalize.sass

This file was deleted.

0 comments on commit 409983a

Please sign in to comment.