diff --git a/assets/sass/_base.sass b/assets/sass/_base.sass index 61200ebf..9e86e4a7 100644 --- a/assets/sass/_base.sass +++ b/assets/sass/_base.sass @@ -1,9 +1,3 @@ -.bg-red - background: red - -body - padding-top: 60px - main a:link, a:hover diff --git a/assets/sass/main.sass b/assets/sass/main.sass index 064238b3..2bb020da 100644 --- a/assets/sass/main.sass +++ b/assets/sass/main.sass @@ -1,3 +1,21 @@ +@import 'node_modules/bulma/sass/utilities/initial-variables' + +$family-sans-serif: "Helvetica Neue", Arial, sans-serif +$body-size: 14px + +$blue: #0678BE + +$primary: $blue + +.is-circle + border-radius: 50% + +$properties: ( mb: 'margin-bottom', ml: 'margin-left', mr: 'margin-right', mt: 'margin-top', pb: 'padding-bottom', pl: 'padding-left', pr: 'padding-right', pt: 'padding-top' ) +@each $key, $property in $properties + @for $value from 1 through 5 + .#{$key}-#{$value} + #{$property}: #{$value}em !important + @import 'node_modules/bulma/bulma' @import 'base' @@ -18,6 +36,3 @@ @import "pages/project" @import "pages/talk" @import "pages/testimonials" - -body - background: red diff --git a/assets/sass/pages/_post.sass b/assets/sass/pages/_post.sass index cca6fdab..94ed1a3f 100644 --- a/assets/sass/pages/_post.sass +++ b/assets/sass/pages/_post.sass @@ -29,9 +29,7 @@ code[data-gist-id] padding: 0 .about-author - +clearfix - img - float: left - margin: 0 1em 1em 0 + // float: left + // margin: 0 1em 1em 0 width: 50px diff --git a/package.json b/package.json index 8ccad090..4552bfd3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "js:watch": "onchange $npm_package_config_jsInputDir -v -- npm run js", "prod": "npm run production", "production": "cross-env ENV=prod npm run build", - "sass": "npm run sass:$ENV:compile && npm run sass:concat && npm run sass:$ENV:move", + "sass": "npm run sass:concat && npm run sass:$ENV:compile && npm run sass:$ENV:move", "sass:clean": "rm -rf $npm_package_config_cssOutputDir output_*/assets/css/", "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:dev:compile": "node-sass assets/sass/main.sass $npm_package_config_cssOutputFile --source-map true", @@ -29,7 +29,7 @@ "sass:prod:compile": "node-sass assets/sass/main.sass $npm_package_config_cssOutputFile", "sass:prod:move": "mv $npm_package_config_cssOutputFile $npm_package_config_cssOutputDir && npm run sass:uglify", "sass:uglify": "uglifycss --ugly-comments $npm_package_config_cssOutputDir/$npm_package_config_cssOutputFile --output $npm_package_config_cssOutputDir/$npm_package_config_cssOutputFile", - "sass:watch": "onchange $npm_package_config_sassDir -v -- npm run sass" + "sass:watch": "ENV=dev onchange $npm_package_config_sassDir -v -- npm run sass" }, "devDependencies": { "autoprefixer": "^7.1.2", diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig index 1af15af2..4e5d5dd6 100644 --- a/source/_includes/nav.html.twig +++ b/source/_includes/nav.html.twig @@ -1,41 +1,31 @@ -