From 38a9ffaac1c1b6785004ebd65ab272a28d27f479 Mon Sep 17 00:00:00 2001 From: Ryan Watters Date: Wed, 1 Mar 2017 10:32:11 -0600 Subject: [PATCH 01/29] Make first commit to homepage branch --- layouts/partials/head/site-style.html | 6 +++++- pipeline/gulpfile.js | 13 ++++++++++++- pipeline/package.json | 1 + pipeline/scss/homepage/_homepage.scss | 2 ++ 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pipeline/scss/homepage/_homepage.scss diff --git a/layouts/partials/head/site-style.html b/layouts/partials/head/site-style.html index c1b902c49..9ef3cccc3 100644 --- a/layouts/partials/head/site-style.html +++ b/layouts/partials/head/site-style.html @@ -3,4 +3,8 @@ {{if .Site.Params.usefontawesome}} -{{end}} \ No newline at end of file +{{end}} + +{{ if .IsHome }} + +{{ end }} \ No newline at end of file diff --git a/pipeline/gulpfile.js b/pipeline/gulpfile.js index 18086622e..e42cc7d1e 100644 --- a/pipeline/gulpfile.js +++ b/pipeline/gulpfile.js @@ -16,6 +16,7 @@ const pump = require('pump'); const rename = require("gulp-rename"); const sass = require('gulp-sass'); const sassfiles = "./scss/**/*.scss"; +const sassfileshp = "./scss/**/homepage/*.scss"; const sourcemaps = require('gulp-sourcemaps'); const uglify = require('gulp-uglify'); @@ -37,6 +38,15 @@ gulp.task('sass', function() { .pipe(gulp.dest('../static/css')); }); +gulp.task('homepage', function() { + gulp.src(sassfileshp) + .pipe(sass({ outputStyle: 'compressed' }).on('error', sass.logError)) + .pipe(prefix('last 2 versions', '> 1%', 'ie 10', 'Android 2', 'Firefox ESR')) + .pipe(plumber()) + .pipe(rename('homepage.min.css')) + .pipe(gulp.dest('../static/css')); +}); + gulp.task("image-resize", () => { return gulp.src("../source-images/*.{jpg,png,jpeg,gif}") .pipe(imagemin()) @@ -82,8 +92,9 @@ gulp.task('scripts', function(cb) { * - Watchs for file changes for images, scripts and sass/css * **/ -gulp.task('default', ['sass', 'scripts', 'image-resize'], function() { +gulp.task('default', ['sass', 'scripts', 'image-resize', 'homepage'], function() { gulp.watch('scss/**/*.scss', ['sass']); + gulpt.watch('scss/**/homepage/*.{sass,scss}', ['homepage']); gulp.watch('js/**/*.js', ['scripts']); gulp.watch('../source-images/*', ['image-resize']); }); diff --git a/pipeline/package.json b/pipeline/package.json index 0ab7388db..1f331fd56 100644 --- a/pipeline/package.json +++ b/pipeline/package.json @@ -23,6 +23,7 @@ "homepage": "https://github.com/dope/gulp-starter", "devDependencies": { "babel-preset-es2015": "^6.18.0", + "bulma": "^0.3.2", "concurrent-transform": "^1.0.0", "gulp": "^3.8.8", "gulp-autoprefixer": "^1.0.1", diff --git a/pipeline/scss/homepage/_homepage.scss b/pipeline/scss/homepage/_homepage.scss new file mode 100644 index 000000000..5c21bed19 --- /dev/null +++ b/pipeline/scss/homepage/_homepage.scss @@ -0,0 +1,2 @@ +@import '../scss/variables'; +@import '../node_modules/bulma/sass/bulma'; \ No newline at end of file From 8a8a0fc349152880d4667320749adf792d3c35e6 Mon Sep 17 00:00:00 2001 From: Ryan Watters Date: Wed, 1 Mar 2017 14:44:48 -0600 Subject: [PATCH 02/29] Make first content commit with beginnings of new homepage (testing Netlify subdomain) --- content/getting-started/installing.md | 2 +- layouts/_default/baseof.html | 12 +- layouts/index.html | 32 +- layouts/partials/head/site-style.html | 5 +- .../partials/homepage/homepage-content.html | 11 + .../partials/homepage/homepage-header.html | 14 + layouts/partials/site-footer.html | 2 +- layouts/partials/site-navigation.html | 4 +- layouts/partials/svg-icons/hugo-home.svg | 9 + pipeline/gulpfile.js | 20 +- pipeline/package.json | 2 + pipeline/scss/_variables.scss | 21 + pipeline/scss/components/_buttons.scss | 1 + pipeline/scss/components/_site-search.scss | 3 +- pipeline/scss/homepage/_homepage.scss | 2 - pipeline/scss/pages/_homepage-new.scss | 0 pipeline/scss/pages/_homepage-old.scss | 103 + pipeline/scss/pages/_homepage.scss | 164 +- pipeline/scss/style.scss | 8 +- pipeline/scss/vendor/_animate.scss | 3198 +++++++++++++++++ static/css/homepage.min.css | 1 + static/css/style.min.css | 8 +- static/images/hugo-icons/go-buffalo-logo.svg | 721 ++++ static/js/homepage.js | 1 + 24 files changed, 4195 insertions(+), 149 deletions(-) create mode 100644 layouts/partials/homepage/homepage-content.html create mode 100644 layouts/partials/homepage/homepage-header.html create mode 100644 layouts/partials/svg-icons/hugo-home.svg delete mode 100644 pipeline/scss/homepage/_homepage.scss delete mode 100644 pipeline/scss/pages/_homepage-new.scss create mode 100644 pipeline/scss/pages/_homepage-old.scss create mode 100644 pipeline/scss/vendor/_animate.scss create mode 100644 static/css/homepage.min.css create mode 100644 static/images/hugo-icons/go-buffalo-logo.svg create mode 100644 static/js/homepage.js diff --git a/content/getting-started/installing.md b/content/getting-started/installing.md index 4dfe62fef..419e34e39 100644 --- a/content/getting-started/installing.md +++ b/content/getting-started/installing.md @@ -10,7 +10,7 @@ authors: ["Michael Henderson"] tags: [install,fundamentals,pc,windows,linux,mac,osx,binary,tarball] weight: 30 draft: false -aliases: [/tutorials/installing-on-windows/,/tutorials/installing-on-mac/,/overview/installing/,/getting-started/install,/install/] +aliases: [/tutorials/installing-on-windows/,/tutorials/installing-on-mac/,/overview/installing/,/getting-started/install,/install/,/docs/] toc: true --- diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 383bce3dd..cb1687cc9 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,14 +2,18 @@ {{- partial "site-head.html" . -}} - {{- partial "site-header.html" . -}} - {{- partial "site-search.html" . -}} + {{ block "header" . }} + {{- partial "site-header.html" . -}} + {{- partial "site-search.html" . -}} + {{ end }}
- {{ block "main" . }} - {{ end}} + {{ block "main" . }} + {{ end}}
{{- partial "site-footer.html" . -}} {{- partial "site-navigation.html" . -}} {{- partial "site-scripts.html" . -}} + {{ block "addscripts" . }} + {{ end }} \ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index 4e0af9998..5c439d0cd 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,26 +1,10 @@ +{{ define "header" }} + {{- partial "homepage/homepage-header.html" . -}} + {{- partial "site-search.html" . -}} +{{ end }} {{ define "main" }} -
-
- Official full-size Hugo logo -
- -
+{{ partial "homepage/homepage-content.html" . }} +{{ end }} +{{ define "addscripts" }} + {{ end }} \ No newline at end of file diff --git a/layouts/partials/head/site-style.html b/layouts/partials/head/site-style.html index 9ef3cccc3..a49dda9d0 100644 --- a/layouts/partials/head/site-style.html +++ b/layouts/partials/head/site-style.html @@ -1,10 +1,7 @@ -{{if .Site.Params.usefontawesome}} - -{{end}} - {{ if .IsHome }} + {{ end }} \ No newline at end of file diff --git a/layouts/partials/homepage/homepage-content.html b/layouts/partials/homepage/homepage-content.html new file mode 100644 index 000000000..5942baec5 --- /dev/null +++ b/layouts/partials/homepage/homepage-content.html @@ -0,0 +1,11 @@ +
+
+
+ {{ partial "svg-icons/hugo-home.svg" . }} + UGO +
+
+
+ +
+
\ No newline at end of file diff --git a/layouts/partials/homepage/homepage-header.html b/layouts/partials/homepage/homepage-header.html new file mode 100644 index 000000000..7485fcfb9 --- /dev/null +++ b/layouts/partials/homepage/homepage-header.html @@ -0,0 +1,14 @@ + diff --git a/layouts/partials/site-footer.html b/layouts/partials/site-footer.html index fbde4a241..107805257 100644 --- a/layouts/partials/site-footer.html +++ b/layouts/partials/site-footer.html @@ -1,5 +1,5 @@ -