Merge pull request #12 from alademann/3.0.17_sass-wip

3.0.17 RC

Gruntfile.js

@@ -88,20 +88,38 @@ module.exports = function(grunt) {
       }
     },
 
+    cssmin: {
+      bootstrap: {
+        expand : true,
+        cwd    : 'dist/css/',
+        src    : [
+          '<%= pkg.name %>.css'
+        ],
+        dest : 'dist/css/',
+        ext  : '.min.css',
+        options : {
+          banner : '' +
+            '/*!\n' +
+            '* <%= pkg.name %> v<%= pkg.version %>\n' +
+            '*\n' +
+            '* Copyright <%= grunt.template.today("yyyy") %> Twitter, Inc\n' +
+            '* Licensed under the Apache License v2.0\n' +
+            '* http://www.apache.org/licenses/LICENSE-2.0\n' +
+            '*\n' +
+            '* Designed and built with all the love in the world by @mdo and @fat.\n' +
+            '* Sass -ified by Aaron Lademann @alademann\n' +
+            '*/\n'
+        }
+      }
+    },
+
     compass: {
       bootstrap: {
         options: {
           config: 'config.rb',
           environment: 'development',
           force: grunt.option('force') || false
         }
-      }, 
-      min: {
-        options: {
-          config: 'config.rb',
-          environment: 'production',
-          force: grunt.option('force') || true
-        }
       }
     },
 
@@ -224,6 +242,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-compass');
+  grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-compress');
   grunt.loadNpmTasks('grunt-contrib-copy');
@@ -232,6 +251,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-html-validation');
+  grunt.loadNpmTasks('grunt-css');
   grunt.loadNpmTasks('grunt-jekyll');
 
   grunt.registerTask('lr', modules.livereload);
@@ -256,14 +276,13 @@ module.exports = function(grunt) {
   grunt.registerTask('dist-js', ['concat', 'uglify']);
 
   // CSS distribution task.
-  grunt.registerTask('dist-css', ['compass:bootstrap']);
-  grunt.registerTask('dist-css-min', ['compass:min']);
+  grunt.registerTask('dist-css', ['compass:bootstrap', 'cssmin:bootstrap']);
 
   // Fonts distribution task.
   grunt.registerTask('dist-fonts', ['copy:fonts']);
 
   // Full distribution task.
-  grunt.registerTask('dist', ['clean', 'dist-fonts', 'dist-css-min', 'dist-js', 'compress:dist']);
+  grunt.registerTask('dist', ['clean', 'dist-fonts', 'dist-css', 'dist-js', 'compress:dist']);
 
   // Default task.
   grunt.registerTask('default', ['test', 'dist']);

README.md

@@ -1,4 +1,4 @@
-# Sass Bootstrap v3.0.16
+# Sass Bootstrap v3.0.17
 
 Sass Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat), and ported to Sass/Compass by [Aaron Lademann](https://github.com/alademann).
 
@@ -10,7 +10,7 @@ To get started, check out the [SASS Bootstrap Documentation](http://alademann.gi
 
 Three quick start options are available:
 
-* [Download the latest release](https://github.com/alademann/sass-bootstrap/releases/tag/3.0.16).
+* [Download the latest release](https://github.com/alademann/sass-bootstrap/releases/tag/3.0.17).
 * Clone the repo: `$ git clone git://github.com/alademann/sass-bootstrap.git`.
 * Install with [Bower](http://bower.io): `bower install sass-bootstrap-compass`.
 

_config.yml

@@ -10,18 +10,18 @@ source:       ./
 destination:  ./_gh_pages
 port:         9001
 
-exclude:      ["*.zip", "browserstack.json", "node_modules", "submodules", "temp-css", "sass", "less", ".editorconfig", "composer.json", ".ruby-version", ".gitignore", "bower.json", "config.rb", "Gemfile", "Gruntfile.js", "package.json", "Makefile", "Rakefile", "LICENSE", "README.md", "CONTRIBUTING.md", "requirements.txt"]
+exclude:      ["*.zip", "browserstack.json", "node_modules", "submodules", "temp-css", "sass", "less", "tests", ".editorconfig", "composer.json", ".ruby-version", ".gitignore", "bower.json", "config.rb", "Gemfile", "Gruntfile.js", "package.json", "Makefile", "Rakefile", "LICENSE", "README.md", "CONTRIBUTING.md", "requirements.txt"]
 
 
 ## CUSTOM VARS
 repo:               https://github.com/alademann/sass-bootstrap
-download:           https://github.com/alademann/sass-bootstrap/archive/3.0.16.zip
-download_dist:      https://github.com/alademann/sass-bootstrap/raw/3.0.16/sass-bootstrap-dist.zip
+download:           https://github.com/alademann/sass-bootstrap/archive/3.0.17.zip
+download_dist:      https://github.com/alademann/sass-bootstrap/raw/3.0.17/sass-bootstrap-dist.zip
 
 issues_open:        https://github.com/alademann/sass-bootstrap/issues?state=open
 issues_new:         https://github.com/alademann/sass-bootstrap/issues/new
 
 # Misc Vars
 ga_id:              UA-39735819-1
 app_name:           Sass Bootstrap
-current_version:    3.0.16
+current_version:    3.0.17

_includes/ga-js.html

@@ -0,0 +1,10 @@
+<script>
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '{{ site.ga_id }}']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>

_includes/header.html

@@ -21,13 +21,4 @@
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
                                <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
 
-<script>
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '{{ site.ga_id }}']);
-  _gaq.push(['_trackPageview']);
-  (function() {
-    var ga = document.createElement('script'); ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-</script>
+{% include ga-js.html %}

_layouts/example.html

@@ -0,0 +1 @@
+{{ content }}

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-bootstrap-compass",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "main": ["./dist/js/sass-bootstrap.js", "./dist/css/sass-bootstrap.css", "./dist/fonts/*"],
   "ignore": [
       "**/.*"

component.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-bootstrap-compass",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "main": ["./dist/js/sass-bootstrap.js", "./dist/css/sass-bootstrap.css", "./dist/fonts/*"],
   "ignore": [
       "**/.*"

components.html

@@ -583,7 +583,7 @@ <h1 id="btn-dropdowns">Button dropdowns</h1>
 
     <div class="bs-callout bs-callout-danger">
       <h4>Plugin dependency</h4>
-      <p>Button dropdowns require the <a href="../javascript/#dropdowns">dropdown plugin</a> to be included in your version of Sass Bootstrap.</p>
+      <p>Button dropdowns require the <a href="../javascript/#dropdowns">dropdown plugin</a> to be included in your version of {{ site.app_name }}.</p>
     </div>
 
     <h3 id="btn-dropdowns-single">Single button dropdowns</h3>
@@ -1220,7 +1220,7 @@ <h2 id="input-groups-buttons-segmented">Segmented buttons</h2>
       <h1 id="nav">Navs</h1>
     </div>
 
-    <p class="lead">Navs available in Sass Bootstrap have shared markup, starting with the base <code>.nav</code> class, as well as shared states. Swap modifier classes to switch between each style.</p>
+    <p class="lead">Navs available in {{ site.app_name }} have shared markup, starting with the base <code>.nav</code> class, as well as shared states. Swap modifier classes to switch between each style.</p>
 
     <h2 id="nav-tabs">Tabs</h2>
     <p>Note the <code>.nav-tabs</code> class requires the <code>.nav</code> base class.</p>
@@ -1526,7 +1526,7 @@ <h4>Customize the collapsing point</h4>
 
 <div class="bs-callout bs-callout-danger">
   <h4>Plugin dependency</h4>
-  <p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of Sass Bootstrap.</p>
+  <p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of {{ site.app_name }}.</p>
 </div>
 
 <div class="bs-callout bs-callout-warning">
@@ -1685,7 +1685,7 @@ <h4>Body padding required</h4>
 {% highlight css %}
 body { padding-top: 70px; }
 {% endhighlight %}
-      <p>Make sure to include this <strong>after</strong> the core Sass Bootstrap CSS.</p>
+      <p>Make sure to include this <strong>after</strong> the core {{ site.app_name }} CSS.</p>
     </div>
 
 
@@ -1726,7 +1726,7 @@ <h4>Body padding required</h4>
 {% highlight css %}
 body { padding-bottom: 70px; }
 {% endhighlight %}
-      <p>Make sure to include this <strong>after</strong> the core Sass Bootstrap CSS.</p>
+      <p>Make sure to include this <strong>after</strong> the core {{ site.app_name }} CSS.</p>
     </div>
 
 
@@ -2039,7 +2039,7 @@ <h3>Available variations</h3>
     <div class="page-header">
       <h1 id="badges">Badges</h1>
     </div>
-    <p class="lead">Easily highlight new or unread items by adding a <code>&lt;span class="badge"&gt;</code> to links, Sass Bootstrap navs, and more.</p>
+    <p class="lead">Easily highlight new or unread items by adding a <code>&lt;span class="badge"&gt;</code> to links, {{ site.app_name }} navs, and more.</p>
 
     <div class="bs-example">
       <a href="#">Inbox <span class="badge">42</span></a>
@@ -2152,10 +2152,10 @@ <h1>Example page header <small>Subtext for header</small></h1>
     <div class="page-header">
       <h1 id="thumbnails">Thumbnails</h1>
     </div>
-    <p class="lead">Extend Sass Bootstrap's <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
+    <p class="lead">Extend {{ site.app_name }}'s <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
 
     <h3 id="thumbnails-default">Default example</h3>
-    <p>By default, Sass Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
+    <p>By default, {{ site.app_name }}'s thumbnails are designed to showcase linked images with minimal required markup.</p>
     <div class="bs-example">
       <div class="row">
         <div class="col-sm-6 col-md-3">