From e6ffd3a86fcc3585cf2291b151fb4625f435586e Mon Sep 17 00:00:00 2001 From: pthrasher Date: Fri, 2 Sep 2011 10:43:26 -0400 Subject: [PATCH 1/4] Fix for issue #136. Now nests fine in both layouts. --- lib/patterns.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/patterns.less b/lib/patterns.less index d0e4cda123..83d7c5428c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -742,6 +742,9 @@ input[type=submit].btn { .content { background-color: @white; padding: 14px; + min-width:inherit; + max-width:inherit; + margin:auto; .border-radius(0 0 3px 3px); .background-clip(padding-box); p, ul, ol { From ce1d1c2146fd9f11335671464232d7ec1fd7f401 Mon Sep 17 00:00:00 2001 From: pthrasher Date: Fri, 2 Sep 2011 11:19:05 -0400 Subject: [PATCH 2/4] ran make build, issues #136 and #138 --- bootstrap-1.1.1.css | 5 ++++- bootstrap-1.1.1.min.css | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index 9f422a2431..28d1420ac1 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Aug 26 19:31:44 PDT 2011 + * Date: Fri Sep 2 11:18:43 EDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1978,6 +1978,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .popover .content { background-color: #ffffff; padding: 14px; + min-width: inherit; + max-width: inherit; + margin: auto; -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index 8d8a00b958..43bbc3d391 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -252,4 +252,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .popover .arrow{position:absolute;width:0;height:0;} .popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#333;padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} -.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} +.popover .content{background-color:#ffffff;padding:14px;min-width:inherit;max-width:inherit;margin:auto;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} From 5960afc3490a174cadaf3bc0f4fe3cf605666756 Mon Sep 17 00:00:00 2001 From: pthrasher Date: Fri, 2 Sep 2011 12:45:03 -0400 Subject: [PATCH 3/4] incorporated idea from @markdotto in #138 --- lib/patterns.less | 3 --- lib/scaffolding.less | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/patterns.less b/lib/patterns.less index 83d7c5428c..d0e4cda123 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -742,9 +742,6 @@ input[type=submit].btn { .content { background-color: @white; padding: 14px; - min-width:inherit; - max-width:inherit; - margin:auto; .border-radius(0 0 3px 3px); .background-clip(padding-box); p, ul, ol { diff --git a/lib/scaffolding.less b/lib/scaffolding.less index ded9a1e5f1..5863659c2c 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -90,11 +90,11 @@ body { .container-fluid { padding: 0 20px; .clearfix(); - .sidebar { + > .sidebar { float: left; width: 220px; } - .content { + > .content { min-width: 700px; max-width: 1180px; margin-left: 240px; From 55698b303d58c08636637bf4147b22c521beb8b8 Mon Sep 17 00:00:00 2001 From: pthrasher Date: Fri, 2 Sep 2011 12:48:32 -0400 Subject: [PATCH 4/4] ran make build --- bootstrap-1.1.1.css | 9 +++------ bootstrap-1.1.1.min.css | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index 28d1420ac1..2fd6680fd3 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Sep 2 11:18:43 EDT 2011 + * Date: Fri Sep 2 12:48:19 EDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -412,11 +412,11 @@ body { .container-fluid:after { clear: both; } -.container-fluid .sidebar { +.container-fluid > .sidebar { float: left; width: 220px; } -.container-fluid .content { +.container-fluid > .content { min-width: 700px; max-width: 1180px; margin-left: 240px; @@ -1978,9 +1978,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .popover .content { background-color: #ffffff; padding: 14px; - min-width: inherit; - max-width: inherit; - margin: auto; -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index 43bbc3d391..fb05d053bd 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -65,8 +65,8 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size: .container{width:940px;margin:0 auto;} .container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";} .container-fluid:after{clear:both;} -.container-fluid .sidebar{float:left;width:220px;} -.container-fluid .content{min-width:700px;max-width:1180px;margin-left:240px;} +.container-fluid>.sidebar{float:left;width:220px;} +.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;} .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} .primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;} @@ -252,4 +252,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .popover .arrow{position:absolute;width:0;height:0;} .popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#333;padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} -.popover .content{background-color:#ffffff;padding:14px;min-width:inherit;max-width:inherit;margin:auto;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} +.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}