From f1bc840d4368a79f0f0872000c3fdf6356af2a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 2 Nov 2013 09:35:51 +0100 Subject: Use nesting for .placeholder() --- dist/css/bootstrap.css | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 9da8d0432..4d4be545b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1882,22 +1882,6 @@ output { vertical-align: middle; } -.form-control:-moz-placeholder { - color: #999999; -} - -.form-control::-moz-placeholder { - color: #999999; -} - -.form-control:-ms-input-placeholder { - color: #999999; -} - -.form-control::-webkit-input-placeholder { - color: #999999; -} - .form-control { display: block; width: 100%; @@ -1924,6 +1908,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: #999999; +} + +.form-control::-moz-placeholder { + color: #999999; +} + +.form-control:-ms-input-placeholder { + color: #999999; +} + +.form-control::-webkit-input-placeholder { + color: #999999; +} + .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { -- cgit v1.2.3 From 6a4230556532d3d947a84aa0d07f57e40a68a9ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 6 Nov 2013 12:57:28 -0800 Subject: bump versions to v3.0.2 --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4d4be545b..546b3af50 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.0.1 by @fat and @mdo + * Bootstrap v3.0.2 by @fat and @mdo * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 * -- cgit v1.2.3 From 88a06640ddc6bba4f05b41666f53c5daeb00fac8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 6 Nov 2013 13:03:08 -0800 Subject: Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0) --- dist/css/bootstrap.css | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 546b3af50..6aef1f6fd 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -996,6 +996,10 @@ pre code { right: 8.333333333333332%; } +.col-xs-pull-0 { + right: 0; +} + .col-xs-push-12 { left: 100%; } @@ -1044,6 +1048,10 @@ pre code { left: 8.333333333333332%; } +.col-xs-push-0 { + left: 0; +} + .col-xs-offset-12 { margin-left: 100%; } @@ -1092,6 +1100,10 @@ pre code { margin-left: 8.333333333333332%; } +.col-xs-offset-0 { + margin-left: 0; +} + @media (min-width: 768px) { .container { width: 750px; @@ -1181,6 +1193,9 @@ pre code { .col-sm-pull-1 { right: 8.333333333333332%; } + .col-sm-pull-0 { + right: 0; + } .col-sm-push-12 { left: 100%; } @@ -1217,6 +1232,9 @@ pre code { .col-sm-push-1 { left: 8.333333333333332%; } + .col-sm-push-0 { + left: 0; + } .col-sm-offset-12 { margin-left: 100%; } @@ -1253,6 +1271,9 @@ pre code { .col-sm-offset-1 { margin-left: 8.333333333333332%; } + .col-sm-offset-0 { + margin-left: 0; + } } @media (min-width: 992px) { @@ -1344,6 +1365,9 @@ pre code { .col-md-pull-1 { right: 8.333333333333332%; } + .col-md-pull-0 { + right: 0; + } .col-md-push-12 { left: 100%; } @@ -1380,6 +1404,9 @@ pre code { .col-md-push-1 { left: 8.333333333333332%; } + .col-md-push-0 { + left: 0; + } .col-md-offset-12 { margin-left: 100%; } @@ -1416,6 +1443,9 @@ pre code { .col-md-offset-1 { margin-left: 8.333333333333332%; } + .col-md-offset-0 { + margin-left: 0; + } } @media (min-width: 1200px) { @@ -1507,6 +1537,9 @@ pre code { .col-lg-pull-1 { right: 8.333333333333332%; } + .col-lg-pull-0 { + right: 0; + } .col-lg-push-12 { left: 100%; } @@ -1543,6 +1576,9 @@ pre code { .col-lg-push-1 { left: 8.333333333333332%; } + .col-lg-push-0 { + left: 0; + } .col-lg-offset-12 { margin-left: 100%; } @@ -1579,6 +1615,9 @@ pre code { .col-lg-offset-1 { margin-left: 8.333333333333332%; } + .col-lg-offset-0 { + margin-left: 0; + } } table { -- cgit v1.2.3