From 6aa15eb01f2e50e394ae172ff41e5bc0583de6da Mon Sep 17 00:00:00 2001 From: Robert McLaws Date: Sun, 16 Sep 2012 03:02:31 -0400 Subject: [PATCH 01/10] Support for left-opening dropdown submenus Adds a new class called .dropdown-submenu-left. It is useful when you have a .pull-right DropDown that has submenus. Without this, the menu opens left past the page boundary, which can trigger the scrollbars and cause other nastiness. --- less/dropdowns.less | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/less/dropdowns.less b/less/dropdowns.less index bed158612f..9622d2d46e 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -163,7 +163,6 @@ .dropdown-submenu { position: relative; } - // Default dropdowns .dropdown-submenu > .dropdown-menu { top: 0; @@ -207,6 +206,40 @@ border-left-color: @dropdownLinkColorHover; } +// Left-opening Sub menus +// --------------------------- +.dropdown-submenu-left { + position: relative; +} +.dropdown-submenu-left > .dropdown-menu { + top: 0; + left: -100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 6px 0px 6px 6px; + -moz-border-radius: 6px 0px 6px 6px; + border-radius: 6px 0px 6px 6px; +} +.dropdown-submenu-left:hover > .dropdown-menu { + display: block; +} + +.dropdown-submenu-left > a:before { + display: block; + content: " "; + float: left; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 5px 5px 0px; + border-right-color: darken(@dropdownBackground, 20%); + margin-top: 5px; + margin-left: -10px; +} +.dropdown-submenu-left:hover > a:after { + border-right-color: @dropdownLinkColorHover; +} // Tweak nav headers // ----------------- From ecbb0ed4df3975d473e3c3558db322e26c6620ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= Date: Thu, 27 Sep 2012 11:44:48 +0200 Subject: [PATCH 02/10] Making modal work with max width 767px - fixes #4860 --- docs/assets/css/bootstrap-responsive.css | 5 ++++- less/responsive-767px-max.less | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index f1efde190e..5320eadf82 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -872,8 +872,11 @@ width: auto; margin: 0; } + .modal.fade { + top: -100px; + } .modal.fade.in { - top: auto; + top: 20px; } } diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index 45ce4ebc77..1d5c1239c9 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -107,7 +107,8 @@ right: 20px; width: auto; margin: 0; - &.fade.in { top: auto; } + &.fade { top: -100px; } + &.fade.in { top: 20px; } } } From 50355929887bf1ff3ecbf4269d0ff05438a6ef5a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 11:53:52 -0700 Subject: [PATCH 03/10] fixes #5193 manually: checkbox and radio padding in .controls-row --- docs/assets/css/bootstrap.css | 5 +++++ less/forms.less | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index eb810c2099..54046fcd1a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1329,6 +1329,11 @@ textarea.span1, float: left; } +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; +} + input[disabled], select[disabled], textarea[disabled], diff --git a/less/forms.less b/less/forms.less index c9fafec274..e3da82265f 100644 --- a/less/forms.less +++ b/less/forms.less @@ -312,6 +312,11 @@ textarea[class*="span"], .row-fluid .controls-row [class*="span"] { float: left; } +// Explicity set top padding on all checkboxes/radios, not just first-child +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; +} From bc4f5d565ef2a7a8ff71f255d3c147efef4f7039 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 12:04:10 -0700 Subject: [PATCH 04/10] fixes #5275: inline-block badges and labels, then fix padding accordingly --- docs/assets/css/bootstrap.css | 6 ++++-- less/labels-badges.less | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 54046fcd1a..891a754a30 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5435,6 +5435,8 @@ a.thumbnail:hover { .label, .badge { + display: inline-block; + padding: 2px 4px; font-size: 11.844px; font-weight: bold; line-height: 14px; @@ -5446,14 +5448,14 @@ a.thumbnail:hover { } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-right: 9px; + padding-left: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; diff --git a/less/labels-badges.less b/less/labels-badges.less index 2f15fec05f..d118a0190e 100644 --- a/less/labels-badges.less +++ b/less/labels-badges.less @@ -6,6 +6,8 @@ // Base classes .label, .badge { + display: inline-block; + padding: 2px 4px; font-size: @baseFontSize * .846; font-weight: bold; line-height: 14px; // ensure proper line-height if floated @@ -17,11 +19,11 @@ } // Set unique padding and border-radii .label { - padding: 1px 4px 2px; .border-radius(3px); } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; .border-radius(9px); } From f8ac403d8b9fde348fe333903a62d644ce795826 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 13:08:21 -0700 Subject: [PATCH 05/10] fixes #5123: scope table grid classes to td and th elements only, plus drop columns 13-24 --- docs/assets/css/bootstrap.css | 108 ++++++++-------------------------- less/tables.less | 39 +++++------- 2 files changed, 38 insertions(+), 109 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 891a754a30..25b0a19829 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2023,150 +2023,90 @@ table [class*=span], margin-left: 0; } -.table .span1 { +.table td.span1, +.table th.span1 { float: none; width: 44px; margin-left: 0; } -.table .span2 { +.table td.span2, +.table th.span2 { float: none; width: 124px; margin-left: 0; } -.table .span3 { +.table td.span3, +.table th.span3 { float: none; width: 204px; margin-left: 0; } -.table .span4 { +.table td.span4, +.table th.span4 { float: none; width: 284px; margin-left: 0; } -.table .span5 { +.table td.span5, +.table th.span5 { float: none; width: 364px; margin-left: 0; } -.table .span6 { +.table td.span6, +.table th.span6 { float: none; width: 444px; margin-left: 0; } -.table .span7 { +.table td.span7, +.table th.span7 { float: none; width: 524px; margin-left: 0; } -.table .span8 { +.table td.span8, +.table th.span8 { float: none; width: 604px; margin-left: 0; } -.table .span9 { +.table td.span9, +.table th.span9 { float: none; width: 684px; margin-left: 0; } -.table .span10 { +.table td.span10, +.table th.span10 { float: none; width: 764px; margin-left: 0; } -.table .span11 { +.table td.span11, +.table th.span11 { float: none; width: 844px; margin-left: 0; } -.table .span12 { +.table td.span12, +.table th.span12 { float: none; width: 924px; margin-left: 0; } -.table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} - -.table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} - -.table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} - -.table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} - -.table .span17 { - float: none; - width: 1324px; - margin-left: 0; -} - -.table .span18 { - float: none; - width: 1404px; - margin-left: 0; -} - -.table .span19 { - float: none; - width: 1484px; - margin-left: 0; -} - -.table .span20 { - float: none; - width: 1564px; - margin-left: 0; -} - -.table .span21 { - float: none; - width: 1644px; - margin-left: 0; -} - -.table .span22 { - float: none; - width: 1724px; - margin-left: 0; -} - -.table .span23 { - float: none; - width: 1804px; - margin-left: 0; -} - -.table .span24 { - float: none; - width: 1884px; - margin-left: 0; -} - .table tbody tr.success td { background-color: #dff0d8; } diff --git a/less/tables.less b/less/tables.less index e5b3f39799..f676abed73 100644 --- a/less/tables.less +++ b/less/tables.less @@ -180,31 +180,20 @@ table [class*=span], } // Change the column widths to account for td/th padding -.table { - .span1 { .tableColumns(1); } - .span2 { .tableColumns(2); } - .span3 { .tableColumns(3); } - .span4 { .tableColumns(4); } - .span5 { .tableColumns(5); } - .span6 { .tableColumns(6); } - .span7 { .tableColumns(7); } - .span8 { .tableColumns(8); } - .span9 { .tableColumns(9); } - .span10 { .tableColumns(10); } - .span11 { .tableColumns(11); } - .span12 { .tableColumns(12); } - .span13 { .tableColumns(13); } - .span14 { .tableColumns(14); } - .span15 { .tableColumns(15); } - .span16 { .tableColumns(16); } - .span17 { .tableColumns(17); } - .span18 { .tableColumns(18); } - .span19 { .tableColumns(19); } - .span20 { .tableColumns(20); } - .span21 { .tableColumns(21); } - .span22 { .tableColumns(22); } - .span23 { .tableColumns(23); } - .span24 { .tableColumns(24); } +.table td, +.table th { + &.span1 { .tableColumns(1); } + &.span2 { .tableColumns(2); } + &.span3 { .tableColumns(3); } + &.span4 { .tableColumns(4); } + &.span5 { .tableColumns(5); } + &.span6 { .tableColumns(6); } + &.span7 { .tableColumns(7); } + &.span8 { .tableColumns(8); } + &.span9 { .tableColumns(9); } + &.span10 { .tableColumns(10); } + &.span11 { .tableColumns(11); } + &.span12 { .tableColumns(12); } } From fd1e9b1498f3bae87025839bf44865d937795cc7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 13:28:54 -0700 Subject: [PATCH 06/10] fix copy on modal popover button doodad --- docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/javascript.html b/docs/javascript.html index f136688772..c61c0bc4fd 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -224,7 +224,7 @@ $('#myModal').on('show', function (e) {

Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.

Popover in a modal

-

This button should trigger a popover on hover.

+

This button should trigger a popover on click.

Tooltips in a modal

This link and that link should have tooltips on hover.

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 0406fd769c..88ddbf6e0a 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -154,7 +154,7 @@ $('#myModal').on('show', function (e) {

Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.

{{_i}}Popover in a modal{{/i}}

-

{{_i}}This button should trigger a popover on hover.{{/i}}

+

{{_i}}This button should trigger a popover on click.{{/i}}

{{_i}}Tooltips in a modal{{/i}}

{{_i}}This link and that link should have tooltips on hover.{{/i}}

From 86d5ed6f4f688f8aa67a26c9b1f664123edf716f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 13:52:50 -0700 Subject: [PATCH 07/10] fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time --- docs/components.html | 8 ++++---- docs/templates/pages/components.mustache | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/components.html b/docs/components.html index ea0e12272b..f369cfa1b4 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1260,13 +1260,13 @@
- + Title -
+
  • Home
  • Link
    • @@ -1344,13 +1344,13 @@
    - + Title -
    +
    • Home
    • Link
      • diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 19f2e67e2a..67770a766a 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1189,13 +1189,13 @@
      - + {{_i}}Title{{/i}} -
      +
      • {{_i}}Home{{/i}}
      • {{_i}}Link{{/i}}
        • @@ -1273,13 +1273,13 @@
        - + {{_i}}Title{{/i}} -
        +
        • {{_i}}Home{{/i}}
        • {{_i}}Link{{/i}}
          • From d36e37214b718ed27a49f49ac4c6e72f373cbd0c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 15:26:17 -0700 Subject: [PATCH 08/10] fixes #5319: add backface-visibility for webkit skewing --- less/mixins.less | 1 + 1 file changed, 1 insertion(+) diff --git a/less/mixins.less b/less/mixins.less index 1466696bc2..98aa2b8a58 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -297,6 +297,7 @@ -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 -o-transform: skew(@x, @y); transform: skew(@x, @y); + -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319 } .translate3d(@x, @y, @z) { -webkit-transform: translate3d(@x, @y, @z); From 1b814458c9476c32a92390e9e5cd989a51d04f05 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 16:41:13 -0700 Subject: [PATCH 09/10] improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu --- docs/assets/css/bootstrap.css | 12 ++++ docs/components.html | 69 ++++++++++++++++------- docs/templates/pages/components.mustache | 71 +++++++++++++++++------- less/dropdowns.less | 45 +++++---------- 4 files changed, 126 insertions(+), 71 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 25b0a19829..69ac841423 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2929,6 +2929,18 @@ table [class*=span], border-left-color: #ffffff; } +.dropdown-submenu.pull-left { + float: none; +} + +.dropdown-submenu.pull-left > .dropdown-menu { + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} + .dropdown .dropdown-menu .nav-header { padding-right: 20px; padding-left: 20px; diff --git a/docs/components.html b/docs/components.html index f369cfa1b4..7623cda4b5 100644 --- a/docs/components.html +++ b/docs/components.html @@ -165,25 +165,11 @@

          Sub menus on dropdowns

          Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add .dropdown-submenu to any li in an existing dropdown menu for automatic styling.

          -
          -
          - -
          +
          + +
          +

          Default

          +
          + +
          +

          Dropup

          +
          + +
          +
          + +
          +

          Left submenu

          +
          + +
          +
          + 
           <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 67770a766a..6cb5aa69ec 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -94,25 +94,11 @@
 
           
          {{_i}}Sub menus on dropdowns{{/i}}
          
           
          {{_i}}Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add .dropdown-submenu to any li in an existing dropdown menu for automatic styling.{{/i}}
          
-          
          
-            
          
-              
-              
          
+          
          
+
+            
          
+              
          Default
          
+              
          
                 
               
          
-            
          
+            
          {{! /.pull-left }}
+
+            
          
+              
          Dropup
          
+              
          
+                
+              
          
+            
          {{! /.pull-left }}
+
+            
          
+              
          Left submenu
          
+              
          
+                
+              
          
+            
          {{! /.pull-left }}
+
           
          {{! /example }}
 
           <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 9622d2d46e..5ed279167e 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -206,39 +206,20 @@
   border-left-color: @dropdownLinkColorHover;
 }
 
-// Left-opening Sub menus
-// ---------------------------
-.dropdown-submenu-left {
-  position: relative;
-}
-.dropdown-submenu-left > .dropdown-menu {
-  top: 0;
-  left: -100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  -webkit-border-radius: 6px 0px 6px 6px;
-     -moz-border-radius: 6px 0px 6px 6px;
-          border-radius: 6px 0px 6px 6px;
-}
-.dropdown-submenu-left:hover > .dropdown-menu {
-  display: block;
-}
+// Left aligned submenus
+.dropdown-submenu.pull-left {
+  // Undo the float
+  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
+  float: none;
 
-.dropdown-submenu-left > a:before {
-  display: block;
-  content: "  ";
-  float: left;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-  border-width: 5px 5px 5px 0px;
-  border-right-color: darken(@dropdownBackground, 20%);
-  margin-top: 5px;
-  margin-left: -10px;
-}
-.dropdown-submenu-left:hover > a:after {
-  border-right-color: @dropdownLinkColorHover;
+  // Positioning the submenu
+  > .dropdown-menu {
+    left: -100%;
+    margin-left: 10px;
+    -webkit-border-radius: 6px 0 6px 6px;
+       -moz-border-radius: 6px 0 6px 6px;
+            border-radius: 6px 0 6px 6px;
+  }
 }
 
 // Tweak nav headers

From 7c9597f4e76d45571fab7a0e19d90b2fea8aab02 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 1 Oct 2012 23:34:03 -0700
Subject: [PATCH 10/10] remove double border effect: instead of inset shadow
 and border on fixed navbars, only border

---
 docs/assets/css/bootstrap.css | 12 ++++++------
 less/navbar.less              |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 69ac841423..e85923638a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4373,9 +4373,9 @@ input[type="submit"].btn.btn-mini {
 
 .navbar-fixed-top .navbar-inner,
 .navbar-static-top .navbar-inner {
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
 }
 
 .navbar-fixed-bottom {
@@ -4383,9 +4383,9 @@ input[type="submit"].btn.btn-mini {
 }
 
 .navbar-fixed-bottom .navbar-inner {
-  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
 }
 
 .navbar .nav {
diff --git a/less/navbar.less b/less/navbar.less
index 58621b4739..95131ff3a4 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -202,7 +202,7 @@
 .navbar-fixed-top,
 .navbar-static-top {
   .navbar-inner {
-    .box-shadow(~"inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)");
+    .box-shadow(~"0 1px 10px rgba(0,0,0,.1)");
   }
 }
 
@@ -210,7 +210,7 @@
 .navbar-fixed-bottom {
   bottom: 0;
   .navbar-inner {
-    .box-shadow(~"inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)");
+    .box-shadow(~"0 -1px 10px rgba(0,0,0,.1)");
   }
 }