Skip to content

B
bootstrap
Commit 1a8d7576 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

Merge branch 'new_grid' into 2.0.2-wip 

Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
parents 15623811 29c63fdb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 314 additions and 402 deletions
docs/assets/css/bootstrap-responsive.css
View file @ 1a8d7576
This diff is collapsed.
docs/assets/css/bootstrap.css
View file @ 1a8d7576
......@@ -148,77 +148,77 @@ a:hover {
.navbar-fixed-bottom .container {
width: 940px;
}
.span1 {
width: 60px;
}
.span2 {
width: 140px;
.span12 {
width: 940px;
}
.span3 {
width: 220px;
.span11 {
width: 860px;
}
.span4 {
width: 300px;
.span10 {
width: 780px;
}
.span5 {
width: 380px;
.span9 {
width: 700px;
}
.span6 {
width: 460px;
.span8 {
width: 620px;
}
.span7 {
width: 540px;
}
.span8 {
width: 620px;
.span6 {
width: 460px;
}
.span9 {
width: 700px;
.span5 {
width: 380px;
}
.span10 {
width: 780px;
.span4 {
width: 300px;
}
.span11 {
width: 860px;
.span3 {
width: 220px;
}
.span12 {
width: 940px;
.span2 {
width: 140px;
}
.offset1 {
margin-left: 100px;
.span1 {
width: 60px;
}
.offset2 {
margin-left: 180px;
.offset12 {
margin-left: 980px;
}
.offset3 {
margin-left: 260px;
.offset11 {
margin-left: 900px;
}
.offset4 {
margin-left: 340px;
.offset10 {
margin-left: 820px;
}
.offset5 {
margin-left: 420px;
.offset9 {
margin-left: 740px;
}
.offset6 {
margin-left: 500px;
.offset8 {
margin-left: 660px;
}
.offset7 {
margin-left: 580px;
}
.offset8 {
margin-left: 660px;
.offset6 {
margin-left: 500px;
}
.offset9 {
margin-left: 740px;
.offset5 {
margin-left: 420px;
}
.offset10 {
margin-left: 820px;
.offset4 {
margin-left: 340px;
}
.offset11 {
margin-left: 900px;
.offset3 {
margin-left: 260px;
}
.offset12 {
margin-left: 980px;
.offset2 {
margin-left: 180px;
}
.offset1 {
margin-left: 100px;
}
.row-fluid {
width: 100%;
......@@ -239,41 +239,41 @@ a:hover {
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span1 {
width: 6.382978723%;
}
.row-fluid > .span2 {
width: 14.89361702%;
.row-fluid > .span12 {
width: 99.99999998999999%;
}
.row-fluid > .span3 {
width: 23.404255317%;
.row-fluid > .span11 {
width: 91.489361693%;
}
.row-fluid > .span4 {
width: 31.914893614%;
.row-fluid > .span10 {
width: 82.97872339599999%;
}
.row-fluid > .span5 {
width: 40.425531911%;
.row-fluid > .span9 {
width: 74.468085099%;
}
.row-fluid > .span6 {
width: 48.93617020799999%;
.row-fluid > .span8 {
width: 65.95744680199999%;
}
.row-fluid > .span7 {
width: 57.446808505%;
}
.row-fluid > .span8 {
width: 65.95744680199999%;
.row-fluid > .span6 {
width: 48.93617020799999%;
}
.row-fluid > .span9 {
width: 74.468085099%;
.row-fluid > .span5 {
width: 40.425531911%;
}
.row-fluid > .span10 {
width: 82.97872339599999%;
.row-fluid > .span4 {
width: 31.914893614%;
}
.row-fluid > .span11 {
width: 91.489361693%;
.row-fluid > .span3 {
width: 23.404255317%;
}
.row-fluid > .span12 {
width: 99.99999998999999%;
.row-fluid > .span2 {
width: 14.89361702%;
}
.row-fluid > .span1 {
width: 6.382978723%;
}
.container {
margin-left: auto;
......@@ -778,65 +778,41 @@ textarea,
.uneditable-input {
margin-left: 0;
}
input.span1,
textarea.span1,
.uneditable-input.span1 {
width: 50px;
}
input.span2,
textarea.span2,
.uneditable-input.span2 {
width: 130px;
input.span12, textarea.span12, .uneditable-input.span12 {
width: 930px;
}
input.span3,
textarea.span3,
.uneditable-input.span3 {
width: 210px;
input.span11, textarea.span11, .uneditable-input.span11 {
width: 850px;
}
input.span4,
textarea.span4,
.uneditable-input.span4 {
width: 290px;
input.span10, textarea.span10, .uneditable-input.span10 {
width: 770px;
}
input.span5,
textarea.span5,
.uneditable-input.span5 {
width: 370px;
input.span9, textarea.span9, .uneditable-input.span9 {
width: 690px;
}
input.span6,
textarea.span6,
.uneditable-input.span6 {
width: 450px;
input.span8, textarea.span8, .uneditable-input.span8 {
width: 610px;
}
input.span7,
textarea.span7,
.uneditable-input.span7 {
input.span7, textarea.span7, .uneditable-input.span7 {
width: 530px;
}
input.span8,
textarea.span8,
.uneditable-input.span8 {
width: 610px;
input.span6, textarea.span6, .uneditable-input.span6 {
width: 450px;
}
input.span9,
textarea.span9,
.uneditable-input.span9 {
width: 690px;
input.span5, textarea.span5, .uneditable-input.span5 {
width: 370px;
}
input.span10,
textarea.span10,
.uneditable-input.span10 {
width: 770px;
input.span4, textarea.span4, .uneditable-input.span4 {
width: 290px;
}
input.span11,
textarea.span11,
.uneditable-input.span11 {
width: 850px;
input.span3, textarea.span3, .uneditable-input.span3 {
width: 210px;
}
input.span12,
textarea.span12,
.uneditable-input.span12 {
width: 930px;
input.span2, textarea.span2, .uneditable-input.span2 {
width: 130px;
}
input.span1, textarea.span1, .uneditable-input.span1 {
width: 50px;
}
input[disabled],
select[disabled],
......@@ -2892,7 +2868,7 @@ input[type="submit"].btn.btn-small {
.navbar-search .search-query :-moz-placeholder {
color: #eeeeee;
}
.navbar-search .search-query::-webkit-input-placeholder {
.navbar-search .search-query ::-webkit-input-placeholder {
color: #eeeeee;
}
.navbar-search .search-query:hover {
......
less/mixins.less
View file @ 1a8d7576
......@@ -484,14 +484,26 @@
.core (@gridColumnWidth, @gridGutterWidth) {
.span (@columns) {
width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
.spanX (@index) when (@index > 0) {
(~".span@{index}") { .span(@index); }
.spanX(@index - 1);
}
.spanX (0) {}
.offsetX (@index) when (@index > 0) {
(~".offset@{index}") { .offset(@index); }
.offsetX(@index - 1);
}
.offsetX (0) {}
.offset (@columns) {
margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
}
.span (@columns) {
width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
}
.row {
margin-left: @gridGutterWidth * -1;
.clearfix();
......@@ -505,38 +517,22 @@
// Set the container width, and override it for fixed navbars in media queries
.container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container { .span(12); }
.span1 { .span(1); }
.span2 { .span(2); }
.span3 { .span(3); }
.span4 { .span(4); }
.span5 { .span(5); }
.span6 { .span(6); }
.span7 { .span(7); }
.span8 { .span(8); }
.span9 { .span(9); }
.span10 { .span(10); }
.span11 { .span(11); }
.span12 { .span(12); }
.offset1 { .offset(1); }
.offset2 { .offset(2); }
.offset3 { .offset(3); }
.offset4 { .offset(4); }
.offset5 { .offset(5); }
.offset6 { .offset(6); }
.offset7 { .offset(7); }
.offset8 { .offset(8); }
.offset9 { .offset(9); }
.offset10 { .offset(10); }
.offset11 { .offset(11); }
.offset12 { .offset(12); }
.navbar-fixed-bottom .container { .span(@gridColumns); }
// generate .spanX and .offsetX
.spanX (@gridColumns);
.offsetX (@gridColumns);
}
.fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
.spanX (@index) when (@index > 0) {
(~"> .span@{index}") { .span(@index); }
.spanX(@index - 1);
}
.spanX (0) {}
.span (@columns) {
width: 1% * (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
}
......@@ -551,24 +547,21 @@
> [class*="span"]:first-child {
margin-left: 0;
}
> .span1 { .span(1); }
> .span2 { .span(2); }
> .span3 { .span(3); }
> .span4 { .span(4); }
> .span5 { .span(5); }
> .span6 { .span(6); }
> .span7 { .span(7); }
> .span8 { .span(8); }
> .span9 { .span(9); }
> .span10 { .span(10); }
> .span11 { .span(11); }
> .span12 { .span(12); }
// generate .spanX
.spanX (@gridColumns);
}
}
.input(@gridColumnWidth, @gridGutterWidth) {
.spanX (@index) when (@index > 0) {
(~"input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index}") { .span(@index); }
.spanX(@index - 1);
}
.spanX (0) {}
.span(@columns) {
width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 10;
}
......@@ -577,20 +570,11 @@
textarea,
.uneditable-input {
margin-left: 0; // override margin-left from core grid system
&.span1 { .span(1); }
&.span2 { .span(2); }
&.span3 { .span(3); }
&.span4 { .span(4); }
&.span5 { .span(5); }
&.span6 { .span(6); }
&.span7 { .span(7); }
&.span8 { .span(8); }
&.span9 { .span(9); }
&.span10 { .span(10); }
&.span11 { .span(11); }
&.span12 { .span(12); }
}
// generate .spanX
.spanX (@gridColumns);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment