From 9fc0e20381ec06bc85c68a5e6f1f2a5103a3267a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 22 Dec 2013 22:31:13 -0800 Subject: Fixes #10492 and some of #11970: round the proper corner on table cells in panels --- 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 39f8659f5..eb2165d98 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4835,7 +4835,7 @@ a.list-group-item-info.active:focus { .panel > .table-responsive > .table-striped > tbody > tr:last-child td:last-child, .panel > .table-striped > tbody > tr:last-child th:last-child, .panel > .table-responsive > .table-striped > tbody > tr:last-child th:last-child { - border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; } .panel-heading { padding: 10px 15px; -- cgit v1.2.3 From 608926e808712cfca1f4c7653c56a2b9aa94bf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 23 Dec 2013 18:02:42 +0100 Subject: Improve banner --- dist/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index eb2165d98..a1931292f 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4,7 +4,6 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ - /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ article, aside, -- cgit v1.2.3 From 4376ce84667264f63048bc3d13541bf273052579 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Dec 2013 13:25:51 -0800 Subject: Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces --- dist/css/bootstrap.css | 53 +++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 24 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index eb2165d98..07f35a651 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -35,6 +35,7 @@ template { } html { font-family: sans-serif; + -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; } @@ -154,10 +155,10 @@ input[type="radio"] { padding: 0; } input[type="search"] { - -webkit-appearance: textfield; -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; + -webkit-appearance: textfield; } input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { @@ -200,6 +201,7 @@ table { pre, blockquote { border: 1px solid #999; + page-break-inside: avoid; } thead { @@ -259,6 +261,7 @@ table { } html { font-size: 62.5%; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } body { @@ -1572,9 +1575,9 @@ table th[class*="col-"] { margin-bottom: 15px; overflow-x: scroll; overflow-y: hidden; + -webkit-overflow-scrolling: touch; -ms-overflow-style: -ms-autohiding-scrollbar; border: 1px solid #ddd; - -webkit-overflow-scrolling: touch; } .table-responsive > .table { margin-bottom: 0; @@ -1975,7 +1978,6 @@ textarea.input-lg { .btn { display: inline-block; padding: 6px 12px; - -o-user-select: none; margin-bottom: 0; font-size: 14px; font-weight: normal; @@ -1987,6 +1989,7 @@ textarea.input-lg { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; + -o-user-select: none; user-select: none; background-image: none; border: 1px solid transparent; @@ -2014,10 +2017,10 @@ textarea.input-lg { fieldset[disabled] .btn { pointer-events: none; cursor: not-allowed; - opacity: .65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none; + opacity: .65; } .btn-default { color: #333; @@ -2353,6 +2356,7 @@ input[type="button"].btn-block { } @font-face { 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'); } @@ -2364,6 +2368,7 @@ input[type="button"].btn-block { font-style: normal; font-weight: normal; line-height: 1; + -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -3044,10 +3049,10 @@ input[type="button"].btn-block { .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { text-decoration: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); cursor: not-allowed; background-color: transparent; background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .open > .dropdown-menu { display: block; @@ -3646,9 +3651,9 @@ textarea.input-group-sm > .input-group-btn > .btn { padding-right: 15px; padding-left: 15px; overflow-x: visible; + -webkit-overflow-scrolling: touch; border-top: 1px solid transparent; box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1); - -webkit-overflow-scrolling: touch; } .navbar-collapse.in { overflow-y: auto; @@ -4995,23 +5000,23 @@ a.list-group-item-info.active:focus { line-height: 1; color: #000; text-shadow: 0 1px 0 #fff; - opacity: .2; filter: alpha(opacity=20); + opacity: .2; } .close:hover, .close:focus { color: #000; text-decoration: none; cursor: pointer; - opacity: .5; filter: alpha(opacity=50); + opacity: .5; } button.close { + -webkit-appearance: none; padding: 0; cursor: pointer; background: transparent; border: 0; - -webkit-appearance: none; } .modal-open { overflow: hidden; @@ -5023,20 +5028,20 @@ button.close { bottom: 0; left: 0; z-index: 1050; - -webkit-overflow-scrolling: touch; display: none; overflow: auto; overflow-y: scroll; + -webkit-overflow-scrolling: touch; outline: 0; } .modal.fade .modal-dialog { -webkit-transition: -webkit-transform .3s ease-out; - -moz-transition: -moz-transform .3s ease-out; - -o-transition: -o-transform .3s ease-out; - transition: transform .3s ease-out; - -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - transform: translate(0, -25%); + -moz-transition: -moz-transform .3s ease-out; + -o-transition: -o-transform .3s ease-out; + transition: transform .3s ease-out; + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + transform: translate(0, -25%); } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); @@ -5069,12 +5074,12 @@ button.close { background-color: #000; } .modal-backdrop.fade { - opacity: 0; filter: alpha(opacity=0); + opacity: 0; } .modal-backdrop.in { - opacity: .5; filter: alpha(opacity=50); + opacity: .5; } .modal-header { min-height: 16.428571429px; @@ -5131,12 +5136,12 @@ button.close { font-size: 12px; line-height: 1.4; visibility: visible; - opacity: 0; filter: alpha(opacity=0); + opacity: 0; } .tooltip.in { - opacity: .9; filter: alpha(opacity=90); + opacity: .9; } .tooltip.top { padding: 5px 0; @@ -5401,31 +5406,31 @@ button.close { font-size: 20px; color: #fff; text-align: center; - filter: alpha(opacity=50); text-shadow: 0 1px 2px rgba(0, 0, 0, .6); + filter: alpha(opacity=50); opacity: .5; } .carousel-control.left { background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .5) 0%), color-stop(rgba(0, 0, 0, .0001) 100%)); background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); - background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); + background-repeat: repeat-x; } .carousel-control.right { right: 0; left: auto; background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .0001) 0%), color-stop(rgba(0, 0, 0, .5) 100%)); background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); - background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); + background-repeat: repeat-x; } .carousel-control:hover, .carousel-control:focus { color: #fff; text-decoration: none; + filter: alpha(opacity=90); outline: none; opacity: .9; - filter: alpha(opacity=90); } .carousel-control .icon-prev, .carousel-control .icon-next, -- cgit v1.2.3 From f3ce6a9696f61720f10576f5744296c67703558f Mon Sep 17 00:00:00 2001 From: Supergibbs Date: Mon, 23 Dec 2013 16:07:55 -0800 Subject: Fixes #10492 better: - Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped - Supports tfoot --- dist/css/bootstrap.css | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 41965a0d0..47bda2d7a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4771,6 +4771,26 @@ a.list-group-item-info.active:focus { .panel > .table-responsive > .table { margin-bottom: 0; } +.panel > .table > tbody:last-child > tr:last-child td:first-child, +.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:first-child, +.panel > .table > tfoot:last-child > tr:last-child td:first-child, +.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:first-child, +.panel > .table > tbody:last-child > tr:last-child th:first-child, +.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:first-child, +.panel > .table > tfoot:last-child > tr:last-child th:first-child, +.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:first-child { + border-bottom-left-radius: 3px; +} +.panel > .table > tbody:last-child > tr:last-child td:last-child, +.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:last-child, +.panel > .table > tfoot:last-child > tr:last-child td:last-child, +.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:last-child, +.panel > .table > tbody:last-child > tr:last-child th:last-child, +.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:last-child, +.panel > .table > tfoot:last-child > tr:last-child th:last-child, +.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:last-child { + border-bottom-right-radius: 3px; +} .panel > .panel-body + .table, .panel > .panel-body + .table-responsive { border-top: 1px solid #ddd; @@ -4829,18 +4849,6 @@ a.list-group-item-info.active:focus { margin-bottom: 0; border: 0; } -.panel > .table-striped > tbody > tr:last-child td:first-child, -.panel > .table-responsive > .table-striped > tbody > tr:last-child td:first-child, -.panel > .table-striped > tbody > tr:last-child th:first-child, -.panel > .table-responsive > .table-striped > tbody > tr:last-child th:first-child { - border-bottom-left-radius: 3px; -} -.panel > .table-striped > tbody > tr:last-child td:last-child, -.panel > .table-responsive > .table-striped > tbody > tr:last-child td:last-child, -.panel > .table-striped > tbody > tr:last-child th:last-child, -.panel > .table-responsive > .table-striped > tbody > tr:last-child th:last-child { - border-bottom-right-radius: 3px; -} .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; -- cgit v1.2.3 From 679c7862374be9b742862923181302f76b3a8c06 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Dec 2013 12:16:17 -0800 Subject: roll back version numbers to avoid broken links in docs and readme (fixes #12000) --- 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 47bda2d7a..e096091ca 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.1.0 (http://getbootstrap.com) + * Bootstrap v3.0.3 (http://getbootstrap.com) * Copyright 2013 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3