This commit is contained in:
Oliver Davies 2017-07-17 21:17:49 +01:00
parent 40e9de4a0e
commit 5f97597b7b
9 changed files with 1327 additions and 1197 deletions

View file

@ -1,4 +1,4 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap'
@import 'base'
@import 'mixins'

View file

@ -1,4 +1,4 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
.page--blog__list
ul.posts

View file

@ -1,6 +1,6 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
@import 'mixins'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
@import '../mixins'
.experience-item
margin-bottom: $padding-large-vertical * 3

View file

@ -1,4 +1,4 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
.post-pager
clear: both

View file

@ -1,5 +1,5 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
@import 'mixins'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
@import '../mixins'
.project-company
&.has-logo

View file

@ -1,5 +1,5 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
@import 'mixins'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
@import '../mixins'
.talk-full h1
margin-bottom: 25px

View file

@ -1,6 +1,6 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
@import 'mixins'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
@import '../mixins'
.testimonial
+clearfix

View file

@ -1,26 +1,43 @@
{
"config": {
"cssOutputDir": "source/assets/css/",
"cssOutputFile": "main.css",
"fontsDir": "source/assets/fonts/",
"jsInputDir": "assets/js/",
"jsOutputDir": "source/assets/js/",
"jsOutputFile": "site.js",
"sassDir": "assets/sass/"
},
"scripts": {
"init": "yarn --pure-lockfile && bower install",
"dev": "gulp watch",
"production": "gulp --production"
"clean": "npm-run-all -p sass:clean fonts:clean js:clean",
"dev": "npm run development",
"development": "npm run clean && npm run sass && npm-run-all -p fonts:copy sass:watch js:watch",
"fonts:clean": "rm -rf $npm_package_config_fontsDir",
"fonts:copy": "mkdir -p $npm_package_config_fontsDir && cp -R node_modules/font-awesome/fonts/* $npm_package_config_fontsDir",
"js": "npm run js:concat",
"js:clean": "rm -rf $npm_package_config_jsOutputDir",
"js:concat": "mkdir -p $npm_package_config_jsOutputDir && concat node_modules/jquery/dist/jquery.js node_modules/bootstrap-sass/assets/javascripts/bootstrap.js node_modules/prismjs/prism.js node_modules/prismjs/components/prism-{apacheconf,bash,css,diff,ini,json,nginx,php,sass,scss,sql,less,twig,yaml}.js $npm_package_config_jsInputDir/**/*.js $npm_package_config_jsInputDir/main.js -o $npm_package_config_jsOutputDir$npm_package_config_jsOutputFile",
"js:watch": "onchange $npm_package_config_jsInputDir -v -- npm run js",
"sass": "npm run sass:build && npm run sass:move",
"sass:build": "npm run sass:compile && npm run sass:concat",
"sass:clean": "del $npm_package_config_cssOutputDir",
"sass:compile": "node-sass assets/sass/main.sass $npm_package_config_cssOutputFile --source-map true",
"sass:concat": "mkdir -p $npm_package_config_cssOutputDir && concat node_modules/font-awesome/css/font-awesome.css node_modules/prismjs/themes/prism-twilight.css $npm_package_config_cssOutputFile -o $npm_package_config_cssOutputFile",
"sass:move": "mv $npm_package_config_cssOutputFile $npm_package_config_cssOutputFile.map $npm_package_config_cssOutputDir",
"sass:watch": "onchange $npm_package_config_sassDir -v -- npm run sass"
},
"devDependencies": {
"bower": "^1.7.7",
"del": "^2.2.0",
"gulp": "^3.9.0",
"gulp-autoprefixer": "^3.1.0",
"gulp-clean-css": "^2.3.2",
"gulp-concat": "^2.6.0",
"gulp-if": "^2.0.0",
"gulp-load-plugins": "^1.1.0",
"gulp-plumber": "^1.0.1",
"gulp-purifycss": "^0.2.0",
"gulp-refresh": "^1.1.0",
"gulp-sass": "^2.3.2",
"gulp-sass-glob": "^1.0.5",
"gulp-sourcemaps": "^1.6.0",
"gulp-uglify": "^1.5.3",
"gulp-util": "^3.0.7"
"autoprefixer": "^7.1.2",
"concat": "^1.0.3",
"copy": "^0.3.0",
"del": "^3.0.0",
"del-cli": "^1.1.0",
"mv": "^2.1.1",
"node-sass": "^4.5.3",
"npm-run-all": "^4.0.2",
"onchange": "^3.2.1",
"postcss-cli": "^4.1.0",
"purify-css": "^1.2.5"
},
"dependencies": {
"bootstrap-sass": "^3.3.7",

2443
yarn.lock

File diff suppressed because it is too large Load diff