From fd260961e6fc0f2d84ba52589fde28901148c272 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 8 Apr 2016 20:58:40 -0500 Subject: grunt --- docs/dist/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/dist/css/bootstrap.css') diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css index d1e868b9d..c4afc1c55 100644 --- a/docs/dist/css/bootstrap.css +++ b/docs/dist/css/bootstrap.css @@ -2175,7 +2175,8 @@ select.form-control:not([size]):not([multiple]) { } .form-control-legend { - padding: 0.5rem 0.75rem; + padding-top: 0.5rem; + padding-bottom: 0.5rem; margin-bottom: 0; font-size: 1rem; } -- cgit v1.2.3 From 29ff8e8b1449887b0e07bd9e19befb0ce1e1cb81 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 8 Apr 2016 21:05:49 -0500 Subject: grunt --- docs/dist/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/dist/css/bootstrap.css') diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css index c4afc1c55..56af60f01 100644 --- a/docs/dist/css/bootstrap.css +++ b/docs/dist/css/bootstrap.css @@ -2156,25 +2156,25 @@ select.form-control:not([size]):not([multiple]) { display: block; } -.form-control-label { +.col-form-label { padding-top: 0.5rem; padding-bottom: 0.5rem; margin-bottom: 0; } -.form-control-label-lg { +.col-form-label-lg { padding-top: 0.75rem; padding-bottom: 0.75rem; font-size: 1.25rem; } -.form-control-label-sm { +.col-form-label-sm { padding-top: 0.25rem; padding-bottom: 0.25rem; font-size: 0.875rem; } -.form-control-legend { +.col-form-legend { padding-top: 0.5rem; padding-bottom: 0.5rem; margin-bottom: 0; -- cgit v1.2.3 From dde85e9888ee7d4c8a39c2ea2dadba1dcf55edf1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 May 2016 16:05:27 -0700 Subject: Redo checkboxes and radios - Move disabled radio and checkbox styles to Reboot - Collapse .radio and .checkbox into single class, .form-check - Collapse .radio-inline and .checkbox-inline into single class, .form-check-inline - Require classes for sub-elements in both new classes --- docs/dist/css/bootstrap.css | 55 +++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 34 deletions(-) (limited to 'docs/dist/css/bootstrap.css') diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css index bc5077d7d..6270ae97d 100644 --- a/docs/dist/css/bootstrap.css +++ b/docs/dist/css/bootstrap.css @@ -477,6 +477,11 @@ textarea { border-radius: 0; } +input[type="radio"]:disabled, +input[type="checkbox"]:disabled { + cursor: not-allowed; +} + input[type="date"], input[type="time"], input[type="datetime-local"], @@ -2242,41 +2247,37 @@ select.form-control:focus::-ms-value { margin-bottom: 1rem; } -.radio, -.checkbox { +.form-check { position: relative; display: block; margin-bottom: 0.75rem; } -.radio label, -.checkbox label { +.form-check + .form-check { + margin-top: -.25rem; +} + +.form-check.disabled .form-check-label { + cursor: not-allowed; +} + +.form-check-label { padding-left: 1.25rem; margin-bottom: 0; cursor: pointer; } -.radio label input:only-child, -.checkbox label input:only-child { - position: static; -} - -.radio input[type="radio"], -.radio-inline input[type="radio"], -.checkbox input[type="checkbox"], -.checkbox-inline input[type="checkbox"] { +.form-check-input { position: absolute; margin-top: .25rem; margin-left: -1.25rem; } -.radio + .radio, -.checkbox + .checkbox { - margin-top: -.25rem; +.form-check-input:only-child { + position: static; } -.radio-inline, -.checkbox-inline { +.form-check-inline { position: relative; display: inline-block; padding-left: 1.25rem; @@ -2285,25 +2286,11 @@ select.form-control:focus::-ms-value { cursor: pointer; } -.radio-inline + .radio-inline, -.checkbox-inline + .checkbox-inline { - margin-top: 0; +.form-check-inline + .form-check-inline { margin-left: .75rem; } -input[type="radio"]:disabled, input[type="radio"].disabled, -input[type="checkbox"]:disabled, -input[type="checkbox"].disabled { - cursor: not-allowed; -} - -.radio-inline.disabled, -.checkbox-inline.disabled { - cursor: not-allowed; -} - -.radio.disabled label, -.checkbox.disabled label { +.form-check-inline.disabled { cursor: not-allowed; } -- cgit v1.2.3 From 4e4fdb7228e2d1f3f2bc6dc1a2f15cf96372fc4d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 May 2016 17:31:11 -0700 Subject: grunt --- docs/dist/css/bootstrap.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'docs/dist/css/bootstrap.css') diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css index 6270ae97d..3fb37e970 100644 --- a/docs/dist/css/bootstrap.css +++ b/docs/dist/css/bootstrap.css @@ -2235,6 +2235,12 @@ select.form-control:focus::-ms-value { border-radius: 0.2rem; } +select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.form-control:not([size]):not([multiple]), +.input-group-sm > select.input-group-addon:not([size]):not([multiple]), +.input-group-sm > .input-group-btn > select.btn:not([size]):not([multiple]) { + height: 1.8125rem; +} + .form-control-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { @@ -2243,6 +2249,12 @@ select.form-control:focus::-ms-value { border-radius: 0.3rem; } +select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.form-control:not([size]):not([multiple]), +.input-group-lg > select.input-group-addon:not([size]):not([multiple]), +.input-group-lg > .input-group-btn > select.btn:not([size]):not([multiple]) { + height: 3.166667rem; +} + .form-group { margin-bottom: 1rem; } -- cgit v1.2.3 From 547290293c2fd16df9163254c878f2f5be34f832 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 May 2016 10:20:00 -0700 Subject: grunt --- docs/dist/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/dist/css/bootstrap.css') diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css index 3fb37e970..59a6f17cb 100644 --- a/docs/dist/css/bootstrap.css +++ b/docs/dist/css/bootstrap.css @@ -2270,6 +2270,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for } .form-check.disabled .form-check-label { + color: #818a91; cursor: not-allowed; } -- cgit v1.2.3