From c9ef232ec1ff33e89bf64d53e53eb1b2fa6a2eb7 Mon Sep 17 00:00:00 2001
From: QWp6t <hi@qwp6t.me>
Date: Sat, 19 Dec 2015 22:31:32 -0800
Subject: [PATCH] bootstrap 4

---
 assets/styles/common/_variables.scss      |  4 +---
 assets/styles/components/_comments.scss   |  2 +-
 assets/styles/components/_grid.scss       | 16 ++++++++++----
 assets/styles/components/_wp-classes.scss | 12 +++++-----
 assets/styles/layouts/_header.scss        |  6 +++++
 assets/styles/main.scss                   |  2 +-
 bower.json                                | 27 ++---------------------
 7 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/assets/styles/common/_variables.scss b/assets/styles/common/_variables.scss
index 7a0eb40..3a1ae7a 100644
--- a/assets/styles/common/_variables.scss
+++ b/assets/styles/common/_variables.scss
@@ -1,7 +1,5 @@
-// Glyphicons font path
-$icon-font-path:        "../fonts/";
-
 // Grid settings
+$enable-flex:           true;
 $main-sm-columns:       12;
 $sidebar-sm-columns:    4;
 
diff --git a/assets/styles/components/_comments.scss b/assets/styles/components/_comments.scss
index 29ec32c..4184591 100644
--- a/assets/styles/components/_comments.scss
+++ b/assets/styles/components/_comments.scss
@@ -1,5 +1,5 @@
 .comment-list {
-  @include list-unstyled;
+  @extend .list-unstyled;
 }
 .comment-list ol {
   list-style: none;
diff --git a/assets/styles/components/_grid.scss b/assets/styles/components/_grid.scss
index b6e5199..fb3e829 100644
--- a/assets/styles/components/_grid.scss
+++ b/assets/styles/components/_grid.scss
@@ -1,10 +1,18 @@
 // Grid system
 .main {
-  @include make-sm-column($main-sm-columns);
-  .sidebar-primary & {
-    @include make-sm-column($main-sm-columns - $sidebar-sm-columns);
+  @include make-col();
+
+  @include media-breakpoint-up(sm) {
+    @include make-col-span($main-sm-columns);
+    .sidebar-primary & {
+      @include make-col-span($main-sm-columns - $sidebar-sm-columns);
+    }
   }
 }
 .sidebar {
-  @include make-sm-column($sidebar-sm-columns);
+  @include make-col();
+
+  @include media-breakpoint-up(sm) {
+    @include make-col-span($sidebar-sm-columns);
+  }
 }
diff --git a/assets/styles/components/_wp-classes.scss b/assets/styles/components/_wp-classes.scss
index edbb835..106aa76 100644
--- a/assets/styles/components/_wp-classes.scss
+++ b/assets/styles/components/_wp-classes.scss
@@ -10,23 +10,23 @@
 }
 .aligncenter {
   display: block;
-  margin: ($line-height-computed / 2) auto;
+  margin: ($spacer / 2) auto;
   height: auto;
 }
 .alignleft,
 .alignright {
-  margin-bottom: ($line-height-computed / 2);
+  margin-bottom: ($spacer / 2);
   height: auto;
 }
-@media (min-width: $screen-sm-min) {
+@include media-breakpoint-up(sm) {
   // Only float if not on an extra small device
   .alignleft {
     float: left;
-    margin-right: ($line-height-computed / 2);
+    margin-right: ($spacer / 2);
   }
   .alignright {
     float: right;
-    margin-left: ($line-height-computed / 2);
+    margin-left: ($spacer / 2);
   }
 }
 
@@ -35,7 +35,7 @@
   @extend .thumbnail;
 }
 .wp-caption-text {
-  padding: $thumbnail-caption-padding;
+  padding: $thumbnail-padding;
 }
 
 // Text meant only for screen readers
diff --git a/assets/styles/layouts/_header.scss b/assets/styles/layouts/_header.scss
index e69de29..2ad1956 100644
--- a/assets/styles/layouts/_header.scss
+++ b/assets/styles/layouts/_header.scss
@@ -0,0 +1,6 @@
+.banner .nav li {
+  @extend .nav-item;
+}
+.banner .nav a {
+  @extend .nav-link;
+}
diff --git a/assets/styles/main.scss b/assets/styles/main.scss
index cecbd4b..7ae1198 100644
--- a/assets/styles/main.scss
+++ b/assets/styles/main.scss
@@ -2,7 +2,7 @@
 
 // Automatically injected Bower dependencies via wiredep (never manually edit this block)
 // bower:scss
-@import "../../bower_components/bootstrap-sass/assets/stylesheets/_bootstrap.scss";
+@import "../../bower_components/bootstrap/scss/bootstrap.scss";
 // endbower
 
 @import "common/global";
diff --git a/bower.json b/bower.json
index 72132a8..0d79283 100644
--- a/bower.json
+++ b/bower.json
@@ -7,30 +7,7 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "bootstrap-sass": "3.3.6"
-  },
-  "overrides": {
-    "bootstrap-sass": {
-      "main": [
-        "./assets/stylesheets/_bootstrap.scss",
-        "./assets/javascripts/bootstrap/transition.js",
-        "./assets/javascripts/bootstrap/alert.js",
-        "./assets/javascripts/bootstrap/button.js",
-        "./assets/javascripts/bootstrap/carousel.js",
-        "./assets/javascripts/bootstrap/collapse.js",
-        "./assets/javascripts/bootstrap/dropdown.js",
-        "./assets/javascripts/bootstrap/modal.js",
-        "./assets/javascripts/bootstrap/tooltip.js",
-        "./assets/javascripts/bootstrap/popover.js",
-        "./assets/javascripts/bootstrap/scrollspy.js",
-        "./assets/javascripts/bootstrap/tab.js",
-        "./assets/javascripts/bootstrap/affix.js",
-        "./assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
-        "./assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
-        "./assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
-        "./assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
-        "./assets/fonts/bootstrap/glyphicons-halflings-regular.woff2"
-      ]
-    }
+    "bootstrap": "git://github.com/twbs/bootstrap.git#v4-dev",
+    "tether": "^1.1.1"
   }
 }