From b4d66b7f6b8ca49fbf45fccf445910d607969946 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Mar 2014 20:45:32 -0700 Subject: Fixes #12738 * Removes default max-height from .navbar-collapse (so not every navbar will get a max-height collapse section) * Scopes regular 340px max-height to fixed top and bottom navbars only (those are the only ones that really need a max-height to enable scrolling) * Adds a landscape media query for phones to cap the max-height at 200px for fixed navbars" --- dist/css/bootstrap-rtl.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap-rtl.css') diff --git a/dist/css/bootstrap-rtl.css b/dist/css/bootstrap-rtl.css index d8f5bfb46..9a118ffa5 100644 --- a/dist/css/bootstrap-rtl.css +++ b/dist/css/bootstrap-rtl.css @@ -4649,7 +4649,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-collapse { - max-height: 340px; padding-right: 15px; padding-left: 15px; overflow-x: visible; @@ -4690,6 +4689,18 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } +.navbar-fixed-top .navbar-collapse, +.navbar-fixed-bottom .navbar-collapse { + max-height: 340px; +} + +@media (max-width: 480px) and (orientation: landscape) { + .navbar-fixed-top .navbar-collapse, + .navbar-fixed-bottom .navbar-collapse { + max-height: 200px; + } +} + .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, -- cgit v1.2.3 From a15c24410be8b94671dcfc3b154e0034a3aaf35f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Mar 2014 21:25:51 -0700 Subject: Fixes #12759 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ensures proper sizing and alignment of input groups within inline and navbar forms. * Uses `inline-table` on the input group * Nukes the widths to `width: auto`—without this, the parent input group doesn’t size correctly and functions as `display: table;` or `block` --- dist/css/bootstrap-rtl.css | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'dist/css/bootstrap-rtl.css') diff --git a/dist/css/bootstrap-rtl.css b/dist/css/bootstrap-rtl.css index 9a118ffa5..7b1da09f1 100644 --- a/dist/css/bootstrap-rtl.css +++ b/dist/css/bootstrap-rtl.css @@ -3339,6 +3339,17 @@ select[multiple].input-lg { vertical-align: middle; } + .form-inline .input-group { + display: inline-table; + vertical-align: middle; + } + + .form-inline .input-group .input-group-addon, + .form-inline .input-group .input-group-btn, + .form-inline .input-group .form-control { + width: auto; + } + .form-inline .input-group > .form-control { width: 100%; } @@ -4902,6 +4913,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { vertical-align: middle; } + .navbar-form .input-group { + display: inline-table; + vertical-align: middle; + } + + .navbar-form .input-group .input-group-addon, + .navbar-form .input-group .input-group-btn, + .navbar-form .input-group .form-control { + width: auto; + } + .navbar-form .input-group > .form-control { width: 100%; } -- cgit v1.2.3 From 30deb5697c08c885b5b7fedac6c40c13d7aa034b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Mar 2014 22:06:14 -0700 Subject: grunt --- dist/css/bootstrap-rtl.css | 117 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) (limited to 'dist/css/bootstrap-rtl.css') diff --git a/dist/css/bootstrap-rtl.css b/dist/css/bootstrap-rtl.css index 7b1da09f1..fd1106f64 100644 --- a/dist/css/bootstrap-rtl.css +++ b/dist/css/bootstrap-rtl.css @@ -7230,6 +7230,21 @@ button.close { display: none !important; } +.visible-xs-block, +.visible-xs-inline, +.visible-xs-inline-block, +.visible-sm-block, +.visible-sm-inline, +.visible-sm-inline-block, +.visible-md-block, +.visible-md-inline, +.visible-md-inline-block, +.visible-lg-block, +.visible-lg-inline, +.visible-lg-inline-block { + display: none !important; +} + @media (max-width: 767px) { .visible-xs { display: block !important; @@ -7249,6 +7264,24 @@ button.close { } } +@media (max-width: 767px) { + .visible-xs-block { + display: block !important; + } +} + +@media (max-width: 767px) { + .visible-xs-inline { + display: inline !important; + } +} + +@media (max-width: 767px) { + .visible-xs-inline-block { + display: inline-block !important; + } +} + @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important; @@ -7268,6 +7301,24 @@ button.close { } } +@media (min-width: 768px) and (max-width: 991px) { + .visible-sm-block { + display: block !important; + } +} + +@media (min-width: 768px) and (max-width: 991px) { + .visible-sm-inline { + display: inline !important; + } +} + +@media (min-width: 768px) and (max-width: 991px) { + .visible-sm-inline-block { + display: inline-block !important; + } +} + @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important; @@ -7287,6 +7338,24 @@ button.close { } } +@media (min-width: 992px) and (max-width: 1199px) { + .visible-md-block { + display: block !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { + .visible-md-inline { + display: inline !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { + .visible-md-inline-block { + display: inline-block !important; + } +} + @media (min-width: 1200px) { .visible-lg { display: block !important; @@ -7306,6 +7375,24 @@ button.close { } } +@media (min-width: 1200px) { + .visible-lg-block { + display: block !important; + } +} + +@media (min-width: 1200px) { + .visible-lg-inline { + display: inline !important; + } +} + +@media (min-width: 1200px) { + .visible-lg-inline-block { + display: inline-block !important; + } +} + @media (max-width: 767px) { .hidden-xs { display: none !important; @@ -7353,6 +7440,36 @@ button.close { } } +.visible-print-block { + display: none !important; +} + +@media print { + .visible-print-block { + display: block !important; + } +} + +.visible-print-inline { + display: none !important; +} + +@media print { + .visible-print-inline { + display: inline !important; + } +} + +.visible-print-inline-block { + display: none !important; +} + +@media print { + .visible-print-inline-block { + display: inline-block !important; + } +} + @media print { .hidden-print { display: none !important; -- cgit v1.2.3