From f9db33d7dbc464a71d2143e3dd323fd7db47773b Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Fri, 12 Dec 2014 19:30:34 +0000 Subject: automatic grunt dist --- 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 1943a90e5..f89de14a9 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -905,7 +905,7 @@ th { content: "\1f6aa"; } .glyphicon-key:before { - content: "\1F511"; + content: "\1f511"; } .glyphicon-alert:before { content: "\e209"; -- cgit v1.2.3 From 181f4aebea957f364a1b42a6331d0fa4624cf5e9 Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Mon, 15 Dec 2014 00:30:39 +0000 Subject: automatic grunt dist --- 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 f89de14a9..68c22cef6 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -268,7 +268,7 @@ th { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; -- cgit v1.2.3 From 9c526bf519c21587273f3e5324ba42bc49507a3b Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Sun, 21 Dec 2014 06:20:46 +0000 Subject: automatic grunt dist --- dist/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 68c22cef6..145128875 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4322,6 +4322,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-top-right-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + margin-bottom: 0; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 0; @@ -5066,6 +5067,9 @@ a.thumbnail.active { overflow: hidden; zoom: 1; } +.media-body { + width: 10000px; +} .media-object { display: block; } -- cgit v1.2.3 From c41970c5797cd1c3b61a5396031a3258c9c07705 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 22 Dec 2014 19:28:29 -0800 Subject: Fixes #15422: Alternate fix for temporal input sizing in input groups --- dist/css/bootstrap.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 145128875..13155daf1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2590,13 +2590,21 @@ input[type="search"] { input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, - input[type="month"].input-sm { + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { line-height: 30px; } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, - input[type="month"].input-lg { + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { line-height: 46px; } } -- cgit v1.2.3 From ad138ed885626280be7e9c55b1719b1282e73817 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 29 Dec 2014 16:44:33 -0800 Subject: Disable .glyphicon-door & .glyphicon-key for the time being Closes #15419 Refs #10106 --- dist/css/bootstrap.css | 6 ------ 1 file changed, 6 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 13155daf1..9ab555524 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -901,12 +901,6 @@ th { .glyphicon-paste:before { content: "\e206"; } -.glyphicon-door:before { - content: "\1f6aa"; -} -.glyphicon-key:before { - content: "\1f511"; -} .glyphicon-alert:before { content: "\e209"; } -- cgit v1.2.3 From 6c383c5102011102d0d5157f6e37d7520f103ae7 Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Thu, 1 Jan 2015 00:02:16 +0000 Subject: automatic grunt dist --- 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 13155daf1..270dda446 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,6 +1,6 @@ /*! * Bootstrap v3.3.1 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3 From dbffb0b47f573097ec2a0500720accb6aeeab72e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Jan 2015 16:03:13 -0800 Subject: Fixes #15536, #15559: Add .form-group sizing support to .form-control-static --- dist/css/bootstrap.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8dd893ea7..01bdb0804 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2706,6 +2706,12 @@ textarea.form-group-sm .form-control, select[multiple].form-group-sm .form-control { height: auto; } +.form-group-sm .form-control-static { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; +} .input-lg { height: 46px; padding: 10px 16px; @@ -2736,6 +2742,12 @@ textarea.form-group-lg .form-control, select[multiple].form-group-lg .form-control { height: auto; } +.form-group-lg .form-control-static { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33; +} .has-feedback { position: relative; } -- cgit v1.2.3 From c020669b07f348ad4f3155850bbd5952cc47696e Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Sun, 18 Jan 2015 05:11:01 +0000 Subject: automatic grunt dist --- 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 01bdb0804..0c5e399ec 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2297,7 +2297,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9; } .table-hover > tbody > tr:hover { -- cgit v1.2.3 From de491e914af50b205ce3a74c28df9f547cff36ca Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Jan 2015 21:35:55 -0800 Subject: fixes #15493: inherit color on small/.small in .panel-title --- dist/css/bootstrap.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 0c5e399ec..5cfc62508 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5311,7 +5311,11 @@ a.list-group-item-danger.active:focus { font-size: 16px; color: inherit; } -.panel-title > a { +.panel-title > a, +.panel-title > small, +.panel-title > .small, +.panel-title > small > a, +.panel-title > .small > a { color: inherit; } .panel-footer { -- cgit v1.2.3