Skip to content

Commit bbc6ec6

Browse files
alademannalademann
committedOct 10, 2013
Merge pull request #12 from alademann/3.0.17_sass-wip
3.0.17 RC
·
3.0.213.0.2
2 parents 81f69b1 + 787af3c commit bbc6ec6

File tree

30 files changed

+668
-119
lines changed

30 files changed

+668
-119
lines changed
 

‎Gruntfile.js

+29-10
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,38 @@ module.exports = function(grunt) {
8888
}
8989
},
9090

91+
cssmin: {
92+
bootstrap: {
93+
expand : true,
94+
cwd : 'dist/css/',
95+
src : [
96+
'<%= pkg.name %>.css'
97+
],
98+
dest : 'dist/css/',
99+
ext : '.min.css',
100+
options : {
101+
banner : '' +
102+
'/*!\n' +
103+
'* <%= pkg.name %> v<%= pkg.version %>\n' +
104+
'*\n' +
105+
'* Copyright <%= grunt.template.today("yyyy") %> Twitter, Inc\n' +
106+
'* Licensed under the Apache License v2.0\n' +
107+
'* http://www.apache.org/licenses/LICENSE-2.0\n' +
108+
'*\n' +
109+
'* Designed and built with all the love in the world by @mdo and @fat.\n' +
110+
'* Sass -ified by Aaron Lademann @alademann\n' +
111+
'*/\n'
112+
}
113+
}
114+
},
115+
91116
compass: {
92117
bootstrap: {
93118
options: {
94119
config: 'config.rb',
95120
environment: 'development',
96121
force: grunt.option('force') || false
97122
}
98-
},
99-
min: {
100-
options: {
101-
config: 'config.rb',
102-
environment: 'production',
103-
force: grunt.option('force') || true
104-
}
105123
}
106124
},
107125

@@ -224,6 +242,7 @@ module.exports = function(grunt) {
224242
grunt.loadNpmTasks('grunt-contrib-connect');
225243
grunt.loadNpmTasks('grunt-contrib-clean');
226244
grunt.loadNpmTasks('grunt-contrib-compass');
245+
grunt.loadNpmTasks('grunt-contrib-cssmin');
227246
grunt.loadNpmTasks('grunt-contrib-concat');
228247
grunt.loadNpmTasks('grunt-contrib-compress');
229248
grunt.loadNpmTasks('grunt-contrib-copy');
@@ -232,6 +251,7 @@ module.exports = function(grunt) {
232251
grunt.loadNpmTasks('grunt-contrib-uglify');
233252
grunt.loadNpmTasks('grunt-contrib-watch');
234253
grunt.loadNpmTasks('grunt-html-validation');
254+
grunt.loadNpmTasks('grunt-css');
235255
grunt.loadNpmTasks('grunt-jekyll');
236256

237257
grunt.registerTask('lr', modules.livereload);
@@ -256,14 +276,13 @@ module.exports = function(grunt) {
256276
grunt.registerTask('dist-js', ['concat', 'uglify']);
257277

258278
// CSS distribution task.
259-
grunt.registerTask('dist-css', ['compass:bootstrap']);
260-
grunt.registerTask('dist-css-min', ['compass:min']);
279+
grunt.registerTask('dist-css', ['compass:bootstrap', 'cssmin:bootstrap']);
261280

262281
// Fonts distribution task.
263282
grunt.registerTask('dist-fonts', ['copy:fonts']);
264283

265284
// Full distribution task.
266-
grunt.registerTask('dist', ['clean', 'dist-fonts', 'dist-css-min', 'dist-js', 'compress:dist']);
285+
grunt.registerTask('dist', ['clean', 'dist-fonts', 'dist-css', 'dist-js', 'compress:dist']);
267286

268287
// Default task.
269288
grunt.registerTask('default', ['test', 'dist']);

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Sass Bootstrap v3.0.16
1+
# Sass Bootstrap v3.0.17
22

33
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).
44

@@ -10,7 +10,7 @@ To get started, check out the [SASS Bootstrap Documentation](http://alademann.gi
1010

1111
Three quick start options are available:
1212

13-
* [Download the latest release](https://github.com/alademann/sass-bootstrap/releases/tag/3.0.16).
13+
* [Download the latest release](https://github.com/alademann/sass-bootstrap/releases/tag/3.0.17).
1414
* Clone the repo: `$ git clone git://github.com/alademann/sass-bootstrap.git`.
1515
* Install with [Bower](http://bower.io): `bower install sass-bootstrap-compass`.
1616

‎_config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ source: ./
1010
destination: ./_gh_pages
1111
port: 9001
1212

13-
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"]
13+
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"]
1414

1515

1616
## CUSTOM VARS
1717
repo: https://github.com/alademann/sass-bootstrap
18-
download: https://github.com/alademann/sass-bootstrap/archive/3.0.16.zip
19-
download_dist: https://github.com/alademann/sass-bootstrap/raw/3.0.16/sass-bootstrap-dist.zip
18+
download: https://github.com/alademann/sass-bootstrap/archive/3.0.17.zip
19+
download_dist: https://github.com/alademann/sass-bootstrap/raw/3.0.17/sass-bootstrap-dist.zip
2020

2121
issues_open: https://github.com/alademann/sass-bootstrap/issues?state=open
2222
issues_new: https://github.com/alademann/sass-bootstrap/issues/new
2323

2424
# Misc Vars
2525
ga_id: UA-39735819-1
2626
app_name: Sass Bootstrap
27-
current_version: 3.0.16
27+
current_version: 3.0.17

‎_includes/ga-js.html

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

‎_includes/header.html

+1-10
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,4 @@
2121
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
2222
<link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
2323

24-
<script>
25-
var _gaq = _gaq || [];
26-
_gaq.push(['_setAccount', '{{ site.ga_id }}']);
27-
_gaq.push(['_trackPageview']);
28-
(function() {
29-
var ga = document.createElement('script'); ga.async = true;
30-
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
31-
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
32-
})();
33-
</script>
24+
{% include ga-js.html %}

‎_layouts/example.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{ content }}

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sass-bootstrap-compass",
3-
"version": "3.0.16",
3+
"version": "3.0.17",
44
"main": ["./dist/js/sass-bootstrap.js", "./dist/css/sass-bootstrap.css", "./dist/fonts/*"],
55
"ignore": [
66
"**/.*"

‎component.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sass-bootstrap-compass",
3-
"version": "3.0.16",
3+
"version": "3.0.17",
44
"main": ["./dist/js/sass-bootstrap.js", "./dist/css/sass-bootstrap.css", "./dist/fonts/*"],
55
"ignore": [
66
"**/.*"

‎components.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ <h1 id="btn-dropdowns">Button dropdowns</h1>
583583

584584
<div class="bs-callout bs-callout-danger">
585585
<h4>Plugin dependency</h4>
586-
<p>Button dropdowns require the <a href="../javascript/#dropdowns">dropdown plugin</a> to be included in your version of Sass Bootstrap.</p>
586+
<p>Button dropdowns require the <a href="../javascript/#dropdowns">dropdown plugin</a> to be included in your version of {{ site.app_name }}.</p>
587587
</div>
588588

589589
<h3 id="btn-dropdowns-single">Single button dropdowns</h3>
@@ -1220,7 +1220,7 @@ <h2 id="input-groups-buttons-segmented">Segmented buttons</h2>
12201220
<h1 id="nav">Navs</h1>
12211221
</div>
12221222

1223-
<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>
1223+
<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>
12241224

12251225
<h2 id="nav-tabs">Tabs</h2>
12261226
<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>
15261526

15271527
<div class="bs-callout bs-callout-danger">
15281528
<h4>Plugin dependency</h4>
1529-
<p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of Sass Bootstrap.</p>
1529+
<p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of {{ site.app_name }}.</p>
15301530
</div>
15311531

15321532
<div class="bs-callout bs-callout-warning">
@@ -1685,7 +1685,7 @@ <h4>Body padding required</h4>
16851685
{% highlight css %}
16861686
body { padding-top: 70px; }
16871687
{% endhighlight %}
1688-
<p>Make sure to include this <strong>after</strong> the core Sass Bootstrap CSS.</p>
1688+
<p>Make sure to include this <strong>after</strong> the core {{ site.app_name }} CSS.</p>
16891689
</div>
16901690

16911691

@@ -1726,7 +1726,7 @@ <h4>Body padding required</h4>
17261726
{% highlight css %}
17271727
body { padding-bottom: 70px; }
17281728
{% endhighlight %}
1729-
<p>Make sure to include this <strong>after</strong> the core Sass Bootstrap CSS.</p>
1729+
<p>Make sure to include this <strong>after</strong> the core {{ site.app_name }} CSS.</p>
17301730
</div>
17311731

17321732

@@ -2039,7 +2039,7 @@ <h3>Available variations</h3>
20392039
<div class="page-header">
20402040
<h1 id="badges">Badges</h1>
20412041
</div>
2042-
<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>
2042+
<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>
20432043

20442044
<div class="bs-example">
20452045
<a href="#">Inbox <span class="badge">42</span></a>
@@ -2152,10 +2152,10 @@ <h1>Example page header <small>Subtext for header</small></h1>
21522152
<div class="page-header">
21532153
<h1 id="thumbnails">Thumbnails</h1>
21542154
</div>
2155-
<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>
2155+
<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>
21562156

21572157
<h3 id="thumbnails-default">Default example</h3>
2158-
<p>By default, Sass Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
2158+
<p>By default, {{ site.app_name }}'s thumbnails are designed to showcase linked images with minimal required markup.</p>
21592159
<div class="bs-example">
21602160
<div class="row">
21612161
<div class="col-sm-6 col-md-3">

0 commit comments

Comments
 (0)