tweaks

bleepsandblops · Oct 29, 2017 · 111ff38 · 111ff38
1 parent 5e433b9
commit 111ff38
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 124 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 1,4 @@
 # Include your project-specific ignores in this file
 # Read about how to use .gitignore: https://help.github.com/articles/ignoring-files
-dist
-bower_components
 node_modules
 npm-debug.log
-vendor
diff --git a/assets/styles/common/_variables.scss b/assets/styles/common/_variables.scss
@@ -1,3 0,0 @@
-// Grid settings
-$main-sm-columns: 12;
-$sidebar-sm-columns: 4;

diff --git a/assets/styles/components/_comments.scss b/assets/styles/components/_comments.scss
@@ -1,19 0,0 @@
-.comment-list {
- @extend .list-unstyled;
-}
-.comment-list ol {
- list-style: none;
-}
-.comment-form p {
- @extend .form-group;
-}
-.comment-form input[type="text"],
-.comment-form input[type="email"],
-.comment-form input[type="url"],
-.comment-form textarea {
- @extend .form-control;
-}
-.comment-form input[type="submit"] {
- @extend .btn;
- @extend .btn-secondary;
-}

diff --git a/assets/styles/components/_forms.scss b/assets/styles/components/_forms.scss
@@ -1,15 0,0 @@
-// Search form
-.search-form {
- @extend .form-inline;
-}
-.search-form label {
- font-weight: normal;
- @extend .form-group;
-}
-.search-form .search-field {
- @extend .form-control;
-}
-.search-form .search-submit {
- @extend .btn;
- @extend .btn-secondary;
-}

diff --git a/assets/styles/components/_grid.scss b/assets/styles/components/_grid.scss
@@ -1,16 0,0 @@
-// Grid system
-.main {
- @include make-col-ready();
- @include media-breakpoint-up(sm) {
- @include make-col($main-sm-columns);
- .sidebar-primary & {
- @include make-col($main-sm-columns - $sidebar-sm-columns);
- }
- }
-}
-.sidebar {
- @include make-col-ready();
- @include media-breakpoint-up(sm) {
- @include make-col($sidebar-sm-columns);
- }
-}

diff --git a/assets/styles/components/_wp-classes.scss b/assets/styles/components/_wp-classes.scss
@@ -1,52 0,0 @@
-// WordPress Generated Classes
-// http://codex.wordpress.org/CSS#WordPress_Generated_Classes
-
-// Media alignment
-.alignnone {
- margin-left: 0;
- margin-right: 0;
- max-width: 100%;
- height: auto;
-}
-.aligncenter {
- display: block;
- margin: ($spacer / 2) auto;
- height: auto;
-}
-.alignleft,
-.alignright {
- margin-bottom: ($spacer / 2);
- height: auto;
-}
-@include media-breakpoint-up(sm) {
- // Only float if not on an extra small device
- .alignleft {
- float: left;
- margin-right: ($spacer / 2);
- }
- .alignright {
- float: right;
- margin-left: ($spacer / 2);
- }
-}
-
-// Captions
-.wp-caption {
- @extend .figure;
-}
-.wp-caption > img {
- @extend .figure-img;
- @extend .img-fluid;
-}
-.wp-caption-text {
- @extend .figure-caption;
-}
-.wp-caption-text {
- @extend .figure-caption;
-}
-
-// Text meant only for screen readers
-.screen-reader-text {
- @extend .sr-only;
- @extend .sr-only-focusable;
-}

diff --git a/assets/styles/vendor/bulma.scss b/assets/styles/vendor/bulma.scss
@@ -0,0 1,33 @@
 
 @charset "utf-8";
 
 // Customization
 
 // You can easily customize Bulma with your own variables.
 // Just uncomment the following block to see the result.
 
 
 // 1. Import the initial variables
 @import "../../../node_modules/bulma/sass/utilities/initial-variables";
 
 // 2. Set your own initial variables
 // Update the blue shade, used for links
 //$blue: #000;
 // Add pink and its invert
 $pink: #ff8080;
 $pink-invert: #fff;
 // Update the sans-serif font family
 $family-sans-serif: "Helvetica", "Arial", sans-serif;
 
 // 3. Set the derived variables
 // Use the new pink as the primary color
 $primary: $pink;
 $primary-invert: $pink-invert;
 
 // 4. Import the rest of Bulma
 @import "../../../node_modules/bulma/sass/utilities/_all";
 @import "../../../node_modules/bulma/sass/base/_all";
 //@import "../../../node_modules/bulma/sass/elements/_all";
 //@import "../../../node_modules/bulma/sass/components/_all";
 @import "../../../node_modules/bulma/sass/grid/_all";
 //@import "../../../node_modules/bulma/sass/layout/_all";
diff --git a/bower.json b/bower.json
@@ -7,7 7,5 @@
  "license": "MIT",
  "private": true,
  "dependencies": {
- "bootstrap": "git://github.com/twbs/bootstrap.git#v4.0.0-beta",
- "popper.js": "^1.12.3"
  }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -193,7 193,7 @@ gulp.task('styles', ['wiredep'], function() {
 // ### Scripts
 // `gulp scripts` - Runs JSHint then compiles, combines, and optimizes Bower JS
 // and project JS.
-gulp.task('scripts', ['jshint'], function() {
 gulp.task('scripts', function() {
  var merged = merge();
  manifest.forEachDependency('js', function(dep) {
  merged.add(
@@ -254,18 254,10 @@ gulp.task('clean', require('del').bind(null, [path.dist]));
 // build step for that asset and inject the changes into the page.
 // See: http://www.browsersync.io
 gulp.task('watch', function() {
- browserSync.init({
- files: ['{lib,templates}/**/*.php', '*.php'],
- proxy: config.devUrl,
- snippetOptions: {
- whitelist: ['/wp-admin/admin-ajax.php'],
- blacklist: ['/wp-admin/**']
- }
- });
  gulp.watch([path.source   'styles/**/*'], ['styles']);
- gulp.watch([path.source   'scripts/**/*'], ['jshint', 'scripts']);
- gulp.watch([path.source   'fonts/**/*'], ['fonts']);
- gulp.watch([path.source   'images/**/*'], ['images']);
  gulp.watch([path.source   'scripts/**/*'], ['scripts']);
  //gulp.watch([path.source 'fonts/**/*'], ['fonts']);
  //gulp.watch([path.source 'images/**/*'], ['images']);
  gulp.watch(['bower.json', 'assets/manifest.json'], ['build']);
 });
 
@@ -275,7 267,6 @@ gulp.task('watch', function() {
 gulp.task('build', function(callback) {
  runSequence('styles',
  'scripts',
- ['fonts', 'images'],
  callback);
 });
 

diff --git a/package.json b/package.json
@@ -54,5 54,8 @@
  "run-sequence": "^1.1.2",
  "traverse": "^0.6.6",
  "wiredep": "^4.0.0"
- }
  },
  "dependencies": {
  "bulma": "^0.6.0"
  } 
 }