Bootstrap 4 Beta, Sage 8.5.2

shash7 · Aug 12, 2017 · 418a7e8 · 418a7e8
1 parent 1460c0d
commit 418a7e8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
+### 8.5.2: August 11th, 2017
+* Update to Bootstrap 4 Beta ([#1944](https://github.com/roots/sage/pull/1944))
+
 ### 8.5.1: February 21st, 2017
 * Update gulp-imagemin options ([#1839](https://github.com/roots/sage/pull/1839))
 * Add error handling to `scripts` and `styles` gulp tasks ([#1832](https://github.com/roots/sage/pull/1832))
-* Update to Bootstrap 4.0.0-alpha.6  ([#1832](https://github.com/roots/sage/pull/1832))
+* Update to Bootstrap 4.0.0-alpha.6 ([#1832](https://github.com/roots/sage/pull/1832))
 
 ### 8.5.0: September 20th, 2016
 * Update installation instructions

diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ Install Sage using Composer from your WordPress themes directory (replace `your-
 
 ```shell
 # @ example.com/site/web/app/themes/
-$ composer create-project roots/sage your-theme-name 8.5.1
+$ composer create-project roots/sage your-theme-name 8.5.2
 ```
 
 ## Theme setup

diff --git a/assets/styles/common/_variables.scss b/assets/styles/common/_variables.scss
@@ -1,6 +1,3 @@
 // Grid settings
 $main-sm-columns:       12;
 $sidebar-sm-columns:    4;
-
-// Colors
-$brand-primary:         #27ae60;
diff --git a/bower.json b/bower.json
@@ -7,6 +7,17 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "bootstrap": "git://github.com/twbs/bootstrap.git#v4.0.0-alpha.6"
+    "bootstrap": "git://github.com/twbs/bootstrap.git#v4.0.0-beta",
+    "popper.js": "https://unpkg.com/popper.js"
+  },
+  "overrides": {
+    "popper.js": {
+      "main": [
+        "./index.js"
+      ]
+    }
+  },
+  "resolutions": {
+    "popper.js": "e-tag:W/\"13b6b-1"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sage",
-  "version": "8.5.1",
+  "version": "8.5.2",
   "author": "Ben Word <ben@benword.com>",
   "homepage": "https://roots.io/sage/",
   "private": true,

diff --git a/style.css b/style.css
@@ -2,7 +2,7 @@
 Theme Name:         Sage Starter Theme
 Theme URI:          https://roots.io/sage/
 Description:        Sage is a WordPress starter theme. <a href="https://github.com/roots/sage">Contribute on GitHub</a>
-Version:            8.5.1
+Version:            8.5.2
 Author:             Roots
 Author URI:         https://roots.io/
 Text Domain:        sage