Skip to content

Commit

Permalink
3.0.1 -> 3.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaspark committed Nov 7, 2013
1 parent 22dcd86 commit d0d9744
Show file tree
Hide file tree
Showing 232 changed files with 939 additions and 451 deletions.
71 changes: 55 additions & 16 deletions amelia/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,10 @@ pre code {
right: 8.333333333333332%;
}

.col-xs-pull-0 {
right: 0;
}

.col-xs-push-12 {
left: 100%;
}
Expand Down Expand Up @@ -1122,6 +1126,10 @@ pre code {
left: 8.333333333333332%;
}

.col-xs-push-0 {
left: 0;
}

.col-xs-offset-12 {
margin-left: 100%;
}
Expand Down Expand Up @@ -1170,6 +1178,10 @@ pre code {
margin-left: 8.333333333333332%;
}

.col-xs-offset-0 {
margin-left: 0;
}

@media (min-width: 768px) {
.container {
width: 750px;
Expand Down Expand Up @@ -1259,6 +1271,9 @@ pre code {
.col-sm-pull-1 {
right: 8.333333333333332%;
}
.col-sm-pull-0 {
right: 0;
}
.col-sm-push-12 {
left: 100%;
}
Expand Down Expand Up @@ -1295,6 +1310,9 @@ pre code {
.col-sm-push-1 {
left: 8.333333333333332%;
}
.col-sm-push-0 {
left: 0;
}
.col-sm-offset-12 {
margin-left: 100%;
}
Expand Down Expand Up @@ -1331,6 +1349,9 @@ pre code {
.col-sm-offset-1 {
margin-left: 8.333333333333332%;
}
.col-sm-offset-0 {
margin-left: 0;
}
}

@media (min-width: 992px) {
Expand Down Expand Up @@ -1422,6 +1443,9 @@ pre code {
.col-md-pull-1 {
right: 8.333333333333332%;
}
.col-md-pull-0 {
right: 0;
}
.col-md-push-12 {
left: 100%;
}
Expand Down Expand Up @@ -1458,6 +1482,9 @@ pre code {
.col-md-push-1 {
left: 8.333333333333332%;
}
.col-md-push-0 {
left: 0;
}
.col-md-offset-12 {
margin-left: 100%;
}
Expand Down Expand Up @@ -1494,6 +1521,9 @@ pre code {
.col-md-offset-1 {
margin-left: 8.333333333333332%;
}
.col-md-offset-0 {
margin-left: 0;
}
}

@media (min-width: 1200px) {
Expand Down Expand Up @@ -1585,6 +1615,9 @@ pre code {
.col-lg-pull-1 {
right: 8.333333333333332%;
}
.col-lg-pull-0 {
right: 0;
}
.col-lg-push-12 {
left: 100%;
}
Expand Down Expand Up @@ -1621,6 +1654,9 @@ pre code {
.col-lg-push-1 {
left: 8.333333333333332%;
}
.col-lg-push-0 {
left: 0;
}
.col-lg-offset-12 {
margin-left: 100%;
}
Expand Down Expand Up @@ -1657,6 +1693,9 @@ pre code {
.col-lg-offset-1 {
margin-left: 8.333333333333332%;
}
.col-lg-offset-0 {
margin-left: 0;
}
}

table {
Expand Down Expand Up @@ -1960,22 +1999,6 @@ output {
vertical-align: middle;
}

.form-control:-moz-placeholder {
color: #bbbbbb;
}

.form-control::-moz-placeholder {
color: #bbbbbb;
}

.form-control:-ms-input-placeholder {
color: #bbbbbb;
}

.form-control::-webkit-input-placeholder {
color: #bbbbbb;
}

.form-control {
display: block;
width: 100%;
Expand All @@ -2002,6 +2025,22 @@ output {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
}

.form-control:-moz-placeholder {
color: #bbbbbb;
}

.form-control::-moz-placeholder {
color: #bbbbbb;
}

.form-control:-ms-input-placeholder {
color: #bbbbbb;
}

.form-control::-webkit-input-placeholder {
color: #bbbbbb;
}

.form-control[disabled],
.form-control[readonly],
fieldset[disabled] .form-control {
Expand Down
2 changes: 1 addition & 1 deletion amelia/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion amelia/bootswatch.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Amelia 3.0.1
// Amelia 3.0.2
// Bootswatch
// -----------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion amelia/variables.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Amelia 3.0.1
// Amelia 3.0.2
// Variables
// --------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "bootswatch",
"description": "Bootswatch is a collection of themes for Bootstrap.",
"version": "3.0.1",
"version": "3.0.2",
"author": "Thomas Park",
"homepage": "http://bootswatch.com",
"repository": {
"type": "git",
"url": "git://github.com/thomaspark/bootswatch.git"
},
"dependencies": {
"bootstrap": "~3.0.1",
"bootstrap": "~3.0.2",
"font-awesome": "~3.2.0"
},
"licenses": [
Expand Down
25 changes: 25 additions & 0 deletions bower_components/bootstrap/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "bootstrap",
"version": "3.0.2",
"main": [
"./dist/js/bootstrap.js",
"./dist/css/bootstrap.css",
"./dist/fonts/*"
],
"ignore": [
"**/.*"
],
"dependencies": {
"jquery": ">= 1.9.0"
},
"homepage": "https://github.com/twbs/bootstrap",
"_release": "3.0.2",
"_resolution": {
"type": "version",
"tag": "v3.0.2",
"commit": "3887f540b978d593f433bfef15888bc2d103de72"
},
"_source": "git://github.com/twbs/bootstrap.git",
"_target": "~3.0.1",
"_originalSource": "bootstrap"
}
11 changes: 0 additions & 11 deletions bower_components/bootstrap/.editorconfig

This file was deleted.

41 changes: 0 additions & 41 deletions bower_components/bootstrap/.gitignore

This file was deleted.

11 changes: 0 additions & 11 deletions bower_components/bootstrap/.travis.yml

This file was deleted.

Empty file modified bower_components/bootstrap/CNAME
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/CONTRIBUTING.md
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/DOCS-LICENSE
100755 → 100644
Empty file.
18 changes: 18 additions & 0 deletions bower_components/bootstrap/Gruntfile.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
module.exports = function(grunt) {
"use strict";

RegExp.quote = require('regexp-quote')
var btoa = require('btoa')
// Project configuration.
grunt.initConfig({
Expand Down Expand Up @@ -156,6 +157,17 @@ module.exports = function(grunt) {
files: 'less/*.less',
tasks: ['recess']
}
},

sed: {
versionNumber: {
pattern: (function () {
var old = grunt.option('oldver')
return old ? RegExp.quote(old) : old
})(),
replacement: grunt.option('newver'),
recursive: true
}
}
});

Expand All @@ -173,6 +185,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-html-validation');
grunt.loadNpmTasks('grunt-jekyll');
grunt.loadNpmTasks('grunt-recess');
grunt.loadNpmTasks('grunt-sed');

// Docs HTML validation task
grunt.registerTask('validate-html', ['jekyll', 'validation']);
Expand Down Expand Up @@ -203,6 +216,11 @@ module.exports = function(grunt) {
// Default task.
grunt.registerTask('default', ['test', 'dist', 'build-customizer']);

// Version numbering task.
// grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
// This can be overzealous, so its changes should always be manually reviewed!
grunt.registerTask('change-version-number', ['sed']);

// task for building customizer
grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', function () {
var fs = require('fs')
Expand Down
Empty file modified bower_components/bootstrap/LICENSE
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/LICENSE-MIT
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion bower_components/bootstrap/README.md
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ To get started, check out <http://getbootstrap.com>!

Three quick start options are available:

* [Download the latest release](https://github.com/twbs/bootstrap/releases/tag/v3.0.0).
* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.2.zip).
* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
* Install with [Bower](http://bower.io): `bower install bootstrap`.

Expand Down
12 changes: 6 additions & 6 deletions bower_components/bootstrap/_config.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ exclude: [".editorconfig", ".gitignore", "bower.json", "composer.json",
port: 9001

# Custom vars
current_version: 3.0.1
current_version: 3.0.2
repo: https://github.com/twbs/bootstrap

download_source: https://github.com/twbs/bootstrap/archive/v3.0.1.zip
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.1/bootstrap-3.0.1-dist.zip
download_source: https://github.com/twbs/bootstrap/archive/v3.0.2.zip
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.2/bootstrap-3.0.2-dist.zip

blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com

cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.1/css/bootstrap.min.css
cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.1/css/bootstrap-theme.min.css
cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js
cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css
cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap-theme.min.css
cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js
Empty file modified bower_components/bootstrap/_includes/ads.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/footer.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/header.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/nav-about.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/nav-components.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/nav-css.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/nav-customize.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/nav-getting-started.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/nav-javascript.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/nav-main.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/old-bs-docs.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_includes/social-buttons.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_layouts/default.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/_layouts/home.html
100755 → 100644
Empty file.
Empty file modified bower_components/bootstrap/about.html
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion bower_components/bootstrap/bower.json
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap",
"version": "3.0.1",
"version": "3.0.2",
"main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"],
"ignore": [
"**/.*"
Expand Down
Empty file modified bower_components/bootstrap/browserstack.json
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions bower_components/bootstrap/components.html
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2247,12 +2247,12 @@ <h2 id="navbar-links">Non-nav links</h2>
<a class="navbar-brand" href="#">Brand</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-5">
<p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
<p class="navbar-text navbar-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
</div>
</nav>
</div>
{% highlight html %}
<p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
<p class="navbar-text navbar-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
{% endhighlight %}


Expand Down
Loading

0 comments on commit d0d9744

Please sign in to comment.