Skip to content
GitLab
Commit ae3382d7 authored by Jacob Thornton's avatar Jacob Thornton
Browse files

working through new grid implementation...

parent 163f58ff
1 merge request!1952Tabulation navigation with Typeahead
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 712 additions and 286 deletions
+712 -286
bootstrap/css/bootstrap.css 0 → 100644
+ 0
- 0
View file @ ae3382d7
bootstrap/img/glyphicons-halflings-white.png 0 → 100644
+ 0
- 0
View file @ ae3382d7
bootstrap/img/glyphicons-halflings-white.png

4.25 KB

bootstrap/img/glyphicons-halflings.png 0 → 100644
+ 0
- 0
View file @ ae3382d7
bootstrap/img/glyphicons-halflings.png

4.25 KB

docs/assets/bootstrap.zip
+ 0
- 0
View file @ ae3382d7
No preview for this file type
docs/assets/css/bootstrap-responsive.css
+ 132
- 64
View file @ ae3382d7
......@@ -10,7 +10,8 @@
.clearfix {
*zoom: 1;
}
.clearfix:before, .clearfix:after {
.clearfix:before,
.clearfix:after {
display: table;
content: "";
}
......@@ -99,10 +100,12 @@
/* CSS3 spec*/
}
.input-prepend input[class*="span"], .input-append input[class*="span"] {
.input-prepend input[class*="span"],
.input-append input[class*="span"] {
width: auto;
}
input[type="checkbox"], input[type="radio"] {
input[type="checkbox"],
input[type="radio"] {
border: 1px solid #ccc;
}
.form-horizontal .control-group > label {
......@@ -151,7 +154,8 @@
.row {
margin-left: 0;
}
.row > [class*="span"], .row-fluid > [class*="span"] {
.row > [class*="span"],
.row-fluid > [class*="span"] {
float: none;
display: block;
width: auto;
......@@ -163,7 +167,8 @@
margin-left: -20px;
*zoom: 1;
}
.row:before, .row:after {
.row:before,
.row:after {
display: table;
content: "";
}
......@@ -174,7 +179,9 @@
float: left;
margin-left: 20px;
}
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
.container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 724px;
}
.span1 {
......@@ -253,7 +260,8 @@
width: 100%;
*zoom: 1;
}
.row-fluid:before, .row-fluid:after {
.row-fluid:before,
.row-fluid:after {
display: table;
content: "";
}
......@@ -267,79 +275,105 @@
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span1 {
.row-fluid .span1 {
width: 5.801104972%;
}
.row-fluid > .span2 {
.row-fluid .span2 {
width: 14.364640883%;
}
.row-fluid > .span3 {
.row-fluid .span3 {
width: 22.928176794%;
}
.row-fluid > .span4 {
.row-fluid .span4 {
width: 31.491712705%;
}
.row-fluid > .span5 {
.row-fluid .span5 {
width: 40.055248616%;
}
.row-fluid > .span6 {
.row-fluid .span6 {
width: 48.618784527%;
}
.row-fluid > .span7 {
.row-fluid .span7 {
width: 57.182320438000005%;
}
.row-fluid > .span8 {
.row-fluid .span8 {
width: 65.74585634900001%;
}
.row-fluid > .span9 {
.row-fluid .span9 {
width: 74.30939226%;
}
.row-fluid > .span10 {
.row-fluid .span10 {
width: 82.87292817100001%;
}
.row-fluid > .span11 {
.row-fluid .span11 {
width: 91.436464082%;
}
.row-fluid > .span12 {
.row-fluid .span12 {
width: 99.999999993%;
}
input, textarea, .uneditable-input {
input,
textarea,
.uneditable-input {
margin-left: 0;
}
input > .span1, textarea > .span1, .uneditable-input > .span1 {
input .span1,
textarea .span1,
.uneditable-input .span1 {
width: 32px;
}
input > .span2, textarea > .span2, .uneditable-input > .span2 {
input .span2,
textarea .span2,
.uneditable-input .span2 {
width: 94px;
}
input > .span3, textarea > .span3, .uneditable-input > .span3 {
input .span3,
textarea .span3,
.uneditable-input .span3 {
width: 156px;
}
input > .span4, textarea > .span4, .uneditable-input > .span4 {
input .span4,
textarea .span4,
.uneditable-input .span4 {
width: 218px;
}
input > .span5, textarea > .span5, .uneditable-input > .span5 {
input .span5,
textarea .span5,
.uneditable-input .span5 {
width: 280px;
}
input > .span6, textarea > .span6, .uneditable-input > .span6 {
input .span6,
textarea .span6,
.uneditable-input .span6 {
width: 342px;
}
input > .span7, textarea > .span7, .uneditable-input > .span7 {
input .span7,
textarea .span7,
.uneditable-input .span7 {
width: 404px;
}
input > .span8, textarea > .span8, .uneditable-input > .span8 {
input .span8,
textarea .span8,
.uneditable-input .span8 {
width: 466px;
}
input > .span9, textarea > .span9, .uneditable-input > .span9 {
input .span9,
textarea .span9,
.uneditable-input .span9 {
width: 528px;
}
input > .span10, textarea > .span10, .uneditable-input > .span10 {
input .span10,
textarea .span10,
.uneditable-input .span10 {
width: 590px;
}
input > .span11, textarea > .span11, .uneditable-input > .span11 {
input .span11,
textarea .span11,
.uneditable-input .span11 {
width: 652px;
}
input > .span12, textarea > .span12, .uneditable-input > .span12 {
input .span12,
textarea .span12,
.uneditable-input .span12 {
width: 714px;
}
}
......@@ -383,7 +417,8 @@
color: #999999;
text-shadow: none;
}
.navbar .nav > li > a, .navbar .dropdown-menu a {
.navbar .nav > li > a,
.navbar .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
color: #999999;
......@@ -394,7 +429,8 @@
.navbar .dropdown-menu li + li a {
margin-bottom: 2px;
}
.navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover {
.navbar .nav > li > a:hover,
.navbar .dropdown-menu a:hover {
background-color: #222222;
}
.navbar .dropdown-menu {
......@@ -415,13 +451,15 @@
-moz-box-shadow: none;
box-shadow: none;
}
.navbar .dropdown-menu:before, .navbar .dropdown-menu:after {
.navbar .dropdown-menu:before,
.navbar .dropdown-menu:after {
display: none;
}
.navbar .dropdown-menu .divider {
display: none;
}
.navbar-form, .navbar-search {
.navbar-form,
.navbar-search {
float: none;
padding: 9px 15px;
margin: 9px 0;
......@@ -458,7 +496,8 @@
margin-left: -30px;
*zoom: 1;
}
.row:before, .row:after {
.row:before,
.row:after {
display: table;
content: "";
}
......@@ -469,7 +508,9 @@
float: left;
margin-left: 30px;
}
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
.container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 1170px;
}
.span1 {
......@@ -548,7 +589,8 @@
width: 100%;
*zoom: 1;
}
.row-fluid:before, .row-fluid:after {
.row-fluid:before,
.row-fluid:after {
display: table;
content: "";
}
......@@ -562,79 +604,105 @@
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span1 {
.row-fluid .span1 {
width: 5.982905983%;
}
.row-fluid > .span2 {
.row-fluid .span2 {
width: 14.529914530000001%;
}
.row-fluid > .span3 {
.row-fluid .span3 {
width: 23.076923077%;
}
.row-fluid > .span4 {
.row-fluid .span4 {
width: 31.623931624%;
}
.row-fluid > .span5 {
.row-fluid .span5 {
width: 40.170940171000005%;
}
.row-fluid > .span6 {
.row-fluid .span6 {
width: 48.717948718%;
}
.row-fluid > .span7 {
.row-fluid .span7 {
width: 57.264957265%;
}
.row-fluid > .span8 {
.row-fluid .span8 {
width: 65.81196581200001%;
}
.row-fluid > .span9 {
.row-fluid .span9 {
width: 74.358974359%;
}
.row-fluid > .span10 {
.row-fluid .span10 {
width: 82.905982906%;
}
.row-fluid > .span11 {
.row-fluid .span11 {
width: 91.45299145300001%;
}
.row-fluid > .span12 {
.row-fluid .span12 {
width: 100%;
}
input, textarea, .uneditable-input {
input,
textarea,
.uneditable-input {
margin-left: 0;
}
input > .span1, textarea > .span1, .uneditable-input > .span1 {
input .span1,
textarea .span1,
.uneditable-input .span1 {
width: 60px;
}
input > .span2, textarea > .span2, .uneditable-input > .span2 {
input .span2,
textarea .span2,
.uneditable-input .span2 {
width: 160px;
}
input > .span3, textarea > .span3, .uneditable-input > .span3 {
input .span3,
textarea .span3,
.uneditable-input .span3 {
width: 260px;
}
input > .span4, textarea > .span4, .uneditable-input > .span4 {
input .span4,
textarea .span4,
.uneditable-input .span4 {
width: 360px;
}
input > .span5, textarea > .span5, .uneditable-input > .span5 {
input .span5,
textarea .span5,
.uneditable-input .span5 {
width: 460px;
}
input > .span6, textarea > .span6, .uneditable-input > .span6 {
input .span6,
textarea .span6,
.uneditable-input .span6 {
width: 560px;
}
input > .span7, textarea > .span7, .uneditable-input > .span7 {
input .span7,
textarea .span7,
.uneditable-input .span7 {
width: 660px;
}
input > .span8, textarea > .span8, .uneditable-input > .span8 {
input .span8,
textarea .span8,
.uneditable-input .span8 {
width: 760px;
}
input > .span9, textarea > .span9, .uneditable-input > .span9 {
input .span9,
textarea .span9,
.uneditable-input .span9 {
width: 860px;
}
input > .span10, textarea > .span10, .uneditable-input > .span10 {
input .span10,
textarea .span10,
.uneditable-input .span10 {
width: 960px;
}
input > .span11, textarea > .span11, .uneditable-input > .span11 {
input .span11,
textarea .span11,
.uneditable-input .span11 {
width: 1060px;
}
input > .span12, textarea > .span12, .uneditable-input > .span12 {
input .span12,
textarea .span12,
.uneditable-input .span12 {
width: 1160px;
}
.thumbnails {
......
docs/assets/css/bootstrap.css
+ 363
- 167
View file @ ae3382d7
This diff is collapsed.
less/mixins.less
+ 217
- 55
View file @ ae3382d7
......@@ -482,16 +482,126 @@
#grid {
.core (@gridColumnWidth, @gridGutterWidth) {
// we have to define these bogus mixins otherwise
// less throws an exception when we call for them
// below and a guard hasn't overridden them
// (@fat will work with @cloudhead on coming up with something better hopefully)
.span1 (@gridColumns) {}
.span2 (@gridColumns) {}
.span3 (@gridColumns) {}
.span4 (@gridColumns) {}
.span5 (@gridColumns) {}
.span6 (@gridColumns) {}
.span7 (@gridColumns) {}
.span8 (@gridColumns) {}
.span9 (@gridColumns) {}
.span10 (@gridColumns) {}
.span11 (@gridColumns) {}
.span12 (@gridColumns) {}
.span13 (@gridColumns) {}
.span14 (@gridColumns) {}
.span15 (@gridColumns) {}
.span16 (@gridColumns) {}
.span17 (@gridColumns) {}
.span18 (@gridColumns) {}
.span19 (@gridColumns) {}
.span20 (@gridColumns) {}
.span21 (@gridColumns) {}
.span22 (@gridColumns) {}
.span23 (@gridColumns) {}
.span24 (@gridColumns) {}
// override mixins with guards
.span1 (@gridColumns) when (@gridColumns > 0) { .span1 { .span(1); } }
.span2 (@gridColumns) when (@gridColumns > 1) { .span2 { .span(2); } }
.span3 (@gridColumns) when (@gridColumns > 2) { .span3 { .span(3); } }
.span4 (@gridColumns) when (@gridColumns > 3) { .span4 { .span(4); } }
.span5 (@gridColumns) when (@gridColumns > 4) { .span5 { .span(5); } }
.span6 (@gridColumns) when (@gridColumns > 5) { .span6 { .span(6); } }
.span7 (@gridColumns) when (@gridColumns > 6) { .span7 { .span(7); } }
.span8 (@gridColumns) when (@gridColumns > 7) { .span8 { .span(8); } }
.span9 (@gridColumns) when (@gridColumns > 8) { .span9 { .span(9); } }
.span10 (@gridColumns) when (@gridColumns > 9) { .span10 { .span(10); } }
.span11 (@gridColumns) when (@gridColumns > 10) { .span11 { .span(11); } }
.span12 (@gridColumns) when (@gridColumns > 11) { .span12 { .span(12); } }
.span13 (@gridColumns) when (@gridColumns > 12) { .span13 { .span(13); } }
.span14 (@gridColumns) when (@gridColumns > 13) { .span14 { .span(14); } }
.span15 (@gridColumns) when (@gridColumns > 14) { .span15 { .span(15); } }
.span16 (@gridColumns) when (@gridColumns > 15) { .span16 { .span(16); } }
.span17 (@gridColumns) when (@gridColumns > 16) { .span17 { .span(17); } }
.span18 (@gridColumns) when (@gridColumns > 17) { .span18 { .span(18); } }
.span19 (@gridColumns) when (@gridColumns > 18) { .span19 { .span(19); } }
.span20 (@gridColumns) when (@gridColumns > 19) { .span20 { .span(20); } }
.span21 (@gridColumns) when (@gridColumns > 20) { .span21 { .span(21); } }
.span22 (@gridColumns) when (@gridColumns > 21) { .span22 { .span(22); } }
.span23 (@gridColumns) when (@gridColumns > 22) { .span23 { .span(23); } }
.span24 (@gridColumns) when (@gridColumns > 23) { .span24 { .span(24); } }
// do the same with offset as we did with spans ;_;
.offset1 (@gridColumns) {}
.offset2 (@gridColumns) {}
.offset3 (@gridColumns) {}
.offset4 (@gridColumns) {}
.offset5 (@gridColumns) {}
.offset6 (@gridColumns) {}
.offset7 (@gridColumns) {}
.offset8 (@gridColumns) {}
.offset9 (@gridColumns) {}
.offset10 (@gridColumns) {}
.offset11 (@gridColumns) {}
.offset12 (@gridColumns) {}
.offset13 (@gridColumns) {}
.offset14 (@gridColumns) {}
.offset15 (@gridColumns) {}
.offset16 (@gridColumns) {}
.offset17 (@gridColumns) {}
.offset18 (@gridColumns) {}
.offset19 (@gridColumns) {}
.offset20 (@gridColumns) {}
.offset21 (@gridColumns) {}
.offset22 (@gridColumns) {}
.offset23 (@gridColumns) {}
.offset24 (@gridColumns) {}
// override with guards
.offset1 (@gridColumns) when (@gridColumns > 0) { .offset1 { .offset(1); } }
.offset2 (@gridColumns) when (@gridColumns > 1) { .offset2 { .offset(2); } }
.offset3 (@gridColumns) when (@gridColumns > 2) { .offset3 { .offset(3); } }
.offset4 (@gridColumns) when (@gridColumns > 3) { .offset4 { .offset(4); } }
.offset5 (@gridColumns) when (@gridColumns > 4) { .offset5 { .offset(5); } }
.offset6 (@gridColumns) when (@gridColumns > 5) { .offset6 { .offset(6); } }
.offset7 (@gridColumns) when (@gridColumns > 6) { .offset7 { .offset(7); } }
.offset8 (@gridColumns) when (@gridColumns > 7) { .offset8 { .offset(8); } }
.offset9 (@gridColumns) when (@gridColumns > 8) { .offset9 { .offset(9); } }
.offset10 (@gridColumns) when (@gridColumns > 9) { .offset10 { .offset(10); } }
.offset11 (@gridColumns) when (@gridColumns > 10) { .offset11 { .offset(11); } }
.offset12 (@gridColumns) when (@gridColumns > 11) { .offset12 { .offset(12); } }
.offset13 (@gridColumns) when (@gridColumns > 12) { .offset13 { .offset(13); } }
.offset14 (@gridColumns) when (@gridColumns > 13) { .offset14 { .offset(14); } }
.offset15 (@gridColumns) when (@gridColumns > 14) { .offset15 { .offset(15); } }
.offset16 (@gridColumns) when (@gridColumns > 15) { .offset16 { .offset(16); } }
.offset17 (@gridColumns) when (@gridColumns > 16) { .offset17 { .offset(17); } }
.offset18 (@gridColumns) when (@gridColumns > 17) { .offset18 { .offset(18); } }
.offset19 (@gridColumns) when (@gridColumns > 18) { .offset19 { .offset(19); } }
.offset20 (@gridColumns) when (@gridColumns > 19) { .offset20 { .offset(20); } }
.offset21 (@gridColumns) when (@gridColumns > 20) { .offset21 { .offset(21); } }
.offset22 (@gridColumns) when (@gridColumns > 21) { .offset22 { .offset(22); } }
.offset23 (@gridColumns) when (@gridColumns > 22) { .offset23 { .offset(23); } }
.offset24 (@gridColumns) when (@gridColumns > 23) { .offset24 { .offset(24); } }
.span (@columns) {
width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
}
.core (@gridColumnWidth, @gridGutterWidth) {
.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,33 +615,59 @@
// Set the container width, and reset it for fixed navbars
.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); }
// define up to max of 24 columns (default is 12)
#grid .span1(@gridColumns);
#grid .span2(@gridColumns);
#grid .span3(@gridColumns);
#grid .span4(@gridColumns);
#grid .span5(@gridColumns);
#grid .span6(@gridColumns);
#grid .span7(@gridColumns);
#grid .span8(@gridColumns);
#grid .span9(@gridColumns);
#grid .span10(@gridColumns);
#grid .span11(@gridColumns);
#grid .span12(@gridColumns);
#grid .span13(@gridColumns);
#grid .span14(@gridColumns);
#grid .span15(@gridColumns);
#grid .span16(@gridColumns);
#grid .span17(@gridColumns);
#grid .span18(@gridColumns);
#grid .span19(@gridColumns);
#grid .span20(@gridColumns);
#grid .span21(@gridColumns);
#grid .span22(@gridColumns);
#grid .span23(@gridColumns);
#grid .span24(@gridColumns);
// define up to max of 24 offsets (default is 12)
#grid .offset1(@gridColumns);
#grid .offset2(@gridColumns);
#grid .offset3(@gridColumns);
#grid .offset4(@gridColumns);
#grid .offset5(@gridColumns);
#grid .offset6(@gridColumns);
#grid .offset7(@gridColumns);
#grid .offset8(@gridColumns);
#grid .offset9(@gridColumns);
#grid .offset10(@gridColumns);
#grid .offset11(@gridColumns);
#grid .offset12(@gridColumns);
#grid .offset13(@gridColumns);
#grid .offset14(@gridColumns);
#grid .offset15(@gridColumns);
#grid .offset16(@gridColumns);
#grid .offset17(@gridColumns);
#grid .offset18(@gridColumns);
#grid .offset19(@gridColumns);
#grid .offset20(@gridColumns);
#grid .offset21(@gridColumns);
#grid .offset22(@gridColumns);
#grid .offset23(@gridColumns);
#grid .offset24(@gridColumns);
}
......@@ -551,18 +687,31 @@
> [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); }
#grid .span1(@gridColumns);
#grid .span2(@gridColumns);
#grid .span3(@gridColumns);
#grid .span4(@gridColumns);
#grid .span5(@gridColumns);
#grid .span6(@gridColumns);
#grid .span7(@gridColumns);
#grid .span8(@gridColumns);
#grid .span9(@gridColumns);
#grid .span10(@gridColumns);
#grid .span11(@gridColumns);
#grid .span12(@gridColumns);
#grid .span13(@gridColumns);
#grid .span14(@gridColumns);
#grid .span15(@gridColumns);
#grid .span16(@gridColumns);
#grid .span17(@gridColumns);
#grid .span18(@gridColumns);
#grid .span19(@gridColumns);
#grid .span20(@gridColumns);
#grid .span21(@gridColumns);
#grid .span22(@gridColumns);
#grid .span23(@gridColumns);
#grid .span24(@gridColumns);
}
}
......@@ -577,18 +726,31 @@
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); }
#grid .span1(@gridColumns);
#grid .span2(@gridColumns);
#grid .span3(@gridColumns);
#grid .span4(@gridColumns);
#grid .span5(@gridColumns);
#grid .span6(@gridColumns);
#grid .span7(@gridColumns);
#grid .span8(@gridColumns);
#grid .span9(@gridColumns);
#grid .span10(@gridColumns);
#grid .span11(@gridColumns);
#grid .span12(@gridColumns);
#grid .span13(@gridColumns);
#grid .span14(@gridColumns);
#grid .span15(@gridColumns);
#grid .span16(@gridColumns);
#grid .span17(@gridColumns);
#grid .span18(@gridColumns);
#grid .span19(@gridColumns);
#grid .span20(@gridColumns);
#grid .span21(@gridColumns);
#grid .span22(@gridColumns);
#grid .span23(@gridColumns);
#grid .span24(@gridColumns);
}
}
......
Supports Markdown
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