paul-english · paul-english · Mar 7, 2014 · Mar 7, 2014 · Mar 7, 2014 · Mar 7, 2014
diff --git a/README.md b/README.md
@@ -14,9 +14,9 @@ Install it to your bower componenet using,
 In the styles file you wish to use it in you may have something
 similar to,
 
-    @import "sass-bootstrap/lib/variables;
+    @import "bootstrap-sass-official/vendor/assets/stylesheets/bootstrap/variables;
     @import "bootswatch-scss/readable/variables";
-    @import "sass-bootstrap/lib/bootstrap";
+    @import "bootstrap-sass-official/vendor/assets/stylesheets/bootstrap/bootstrap";
     @import "bootswatch-scss/readable/bootswatch";
 
 It seems you have to shuffle the variables import around to make it load correctly. Some variable files will require the original bootstrap variables before as well. See `global/build.scss` for a working example.

diff --git a/amelia/_bootswatch.scss b/amelia/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Lobster|Cabin:400,700");
+@import url($web-font);
 
 // Navbar =====================================================================
 

diff --git a/amelia/_variables.scss b/amelia/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      $brand-warning;
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=Lobster|Cabin:400,700";
+
 $font-family-sans-serif:  "Cabin", Arial, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/bower.json b/bower.json
@@ -9,7 +9,7 @@
 	"url": "git://github.com/nrub/bootswatch-scss.git"
     },
     "dependencies": {
-        "sass-bootstrap": "~3.0.0"
+        "bootstrap-sass-official": "~3.0.0"
     },
     "licenses": [
 	{

diff --git a/cosmo/_bootswatch.scss b/cosmo/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700");
+@import url($web-font);
 
 // Navbar =====================================================================
 
@@ -135,4 +135,4 @@
 	@include box-shadow(none);
 }
 
-// Containers =================================================================
+// Containers =================================================================
diff --git a/cosmo/_variables.scss b/cosmo/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      darken($link-color, 15%);
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700";
+
 $font-family-sans-serif:  "Open Sans", Calibri, Candara, Arial, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/cyborg/_bootswatch.scss b/cyborg/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Droid+Sans:400,700");
+@import url($web-font);
 
 // Navbar =====================================================================
 
@@ -138,4 +138,4 @@ legend {
 	h1, h2, h3, h4, h5, h6 {
 		color: #fff;
 	}
-}
+}
diff --git a/cyborg/_variables.scss b/cyborg/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      $link-color;
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=Droid+Sans:400,700";
+
 $font-family-sans-serif:  "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/flatly/_bootswatch.scss b/flatly/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Lato:400,700,900,400italic");
+@import url($web-font);
 
 // Navbar =====================================================================
 

diff --git a/flatly/_variables.scss b/flatly/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      $link-color;
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=Lato:400,700,900,400italic";
+
 $font-family-sans-serif:  "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/global/build.scss b/global/build.scss
@@ -1,3 +1,3 @@
 @import "variables";
-@import "../bower_components/sass-bootstrap/lib/bootstrap";
+@import "../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap";
 @import "bootswatch";
diff --git a/journal/_bootswatch.scss b/journal/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=News+Cycle:400,700");
+@import url($web-font);
 
 // Navbar =====================================================================
 
@@ -93,4 +93,4 @@ h1, h2, h3, h4, h5, h6 {
 		font-weight: bold;
 		color: #000;
 	}
-}
+}
diff --git a/journal/_variables.scss b/journal/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      darken($link-color, 15%);
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=News+Cycle:400,700";
+
 $font-family-sans-serif:  "News Cycle", "Arial Narrow Bold", sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/readable/_bootswatch.scss b/readable/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic");
+@import url($web-font);
 
 @mixin btn-shadow($color) {
 

diff --git a/readable/_variables.scss b/readable/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      $link-color;
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic";
+
 $font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif:       "Lora", Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/simplex/_bootswatch.scss b/simplex/_bootswatch.scss
@@ -4,7 +4,7 @@
 
 $font-family-alt: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 
-@import url("//fonts.googleapis.com/css?family=Josefin+Sans:300,400,700");
+@import url($web-font);
 
 @mixin btn-shadow($color) {
 

diff --git a/simplex/_variables.scss b/simplex/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      darken($link-color, 15%);
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=Josefin+Sans:300,400,700";
+
 $font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/spacelab/_bootswatch.scss b/spacelab/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700");
+@import url($web-font);
 
 @mixin btn-shadow($color) {
 

diff --git a/spacelab/_variables.scss b/spacelab/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      $link-color;
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700";
+
 $font-family-sans-serif:  "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/united/_bootswatch.scss b/united/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Ubuntu");
+@import url($web-font);
 
 // Navbar =====================================================================
 
@@ -28,4 +28,4 @@
 
 // Progress bars ==============================================================
 
-// Containers =================================================================
+// Containers =================================================================
diff --git a/united/_variables.scss b/united/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      darken($link-color, 15%);
 // Typography
 // -------------------------
 
+$web-font:                "//fonts.googleapis.com/css?family=Ubuntu";
+
 $font-family-sans-serif:  "Ubuntu", Tahoma, "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;

diff --git a/yeti/_bootswatch.scss b/yeti/_bootswatch.scss
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700");
+@import url($web-font);
 
 // Navbar =====================================================================
 

diff --git a/yeti/_variables.scss b/yeti/_variables.scss
@@ -39,6 +39,8 @@ $link-hover-color:      darken($link-color, 15%);
 //
 //## Font, line-height, and color for body text, headings, and more.
 
+$web-font:                "//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700";
+
 $font-family-sans-serif:  "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.