Commit ae3382d7 authored by Jacob Thornton's avatar Jacob Thornton

working through new grid implementation...

parent 163f58ff
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
.clearfix { .clearfix {
*zoom: 1; *zoom: 1;
} }
.clearfix:before, .clearfix:after { .clearfix:before,
.clearfix:after {
display: table; display: table;
content: ""; content: "";
} }
...@@ -99,10 +100,12 @@ ...@@ -99,10 +100,12 @@
/* CSS3 spec*/ /* CSS3 spec*/
} }
.input-prepend input[class*="span"], .input-append input[class*="span"] { .input-prepend input[class*="span"],
.input-append input[class*="span"] {
width: auto; width: auto;
} }
input[type="checkbox"], input[type="radio"] { input[type="checkbox"],
input[type="radio"] {
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.form-horizontal .control-group > label { .form-horizontal .control-group > label {
...@@ -151,7 +154,8 @@ ...@@ -151,7 +154,8 @@
.row { .row {
margin-left: 0; margin-left: 0;
} }
.row > [class*="span"], .row-fluid > [class*="span"] { .row > [class*="span"],
.row-fluid > [class*="span"] {
float: none; float: none;
display: block; display: block;
width: auto; width: auto;
...@@ -163,7 +167,8 @@ ...@@ -163,7 +167,8 @@
margin-left: -20px; margin-left: -20px;
*zoom: 1; *zoom: 1;
} }
.row:before, .row:after { .row:before,
.row:after {
display: table; display: table;
content: ""; content: "";
} }
...@@ -174,7 +179,9 @@ ...@@ -174,7 +179,9 @@
float: left; float: left;
margin-left: 20px; margin-left: 20px;
} }
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 724px; width: 724px;
} }
.span1 { .span1 {
...@@ -253,7 +260,8 @@ ...@@ -253,7 +260,8 @@
width: 100%; width: 100%;
*zoom: 1; *zoom: 1;
} }
.row-fluid:before, .row-fluid:after { .row-fluid:before,
.row-fluid:after {
display: table; display: table;
content: ""; content: "";
} }
...@@ -267,79 +275,105 @@ ...@@ -267,79 +275,105 @@
.row-fluid > [class*="span"]:first-child { .row-fluid > [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid > .span1 { .row-fluid .span1 {
width: 5.801104972%; width: 5.801104972%;
} }
.row-fluid > .span2 { .row-fluid .span2 {
width: 14.364640883%; width: 14.364640883%;
} }
.row-fluid > .span3 { .row-fluid .span3 {
width: 22.928176794%; width: 22.928176794%;
} }
.row-fluid > .span4 { .row-fluid .span4 {
width: 31.491712705%; width: 31.491712705%;
} }
.row-fluid > .span5 { .row-fluid .span5 {
width: 40.055248616%; width: 40.055248616%;
} }
.row-fluid > .span6 { .row-fluid .span6 {
width: 48.618784527%; width: 48.618784527%;
} }
.row-fluid > .span7 { .row-fluid .span7 {
width: 57.182320438000005%; width: 57.182320438000005%;
} }
.row-fluid > .span8 { .row-fluid .span8 {
width: 65.74585634900001%; width: 65.74585634900001%;
} }
.row-fluid > .span9 { .row-fluid .span9 {
width: 74.30939226%; width: 74.30939226%;
} }
.row-fluid > .span10 { .row-fluid .span10 {
width: 82.87292817100001%; width: 82.87292817100001%;
} }
.row-fluid > .span11 { .row-fluid .span11 {
width: 91.436464082%; width: 91.436464082%;
} }
.row-fluid > .span12 { .row-fluid .span12 {
width: 99.999999993%; width: 99.999999993%;
} }
input, textarea, .uneditable-input { input,
textarea,
.uneditable-input {
margin-left: 0; margin-left: 0;
} }
input > .span1, textarea > .span1, .uneditable-input > .span1 { input .span1,
textarea .span1,
.uneditable-input .span1 {
width: 32px; width: 32px;
} }
input > .span2, textarea > .span2, .uneditable-input > .span2 { input .span2,
textarea .span2,
.uneditable-input .span2 {
width: 94px; width: 94px;
} }
input > .span3, textarea > .span3, .uneditable-input > .span3 { input .span3,
textarea .span3,
.uneditable-input .span3 {
width: 156px; width: 156px;
} }
input > .span4, textarea > .span4, .uneditable-input > .span4 { input .span4,
textarea .span4,
.uneditable-input .span4 {
width: 218px; width: 218px;
} }
input > .span5, textarea > .span5, .uneditable-input > .span5 { input .span5,
textarea .span5,
.uneditable-input .span5 {
width: 280px; width: 280px;
} }
input > .span6, textarea > .span6, .uneditable-input > .span6 { input .span6,
textarea .span6,
.uneditable-input .span6 {
width: 342px; width: 342px;
} }
input > .span7, textarea > .span7, .uneditable-input > .span7 { input .span7,
textarea .span7,
.uneditable-input .span7 {
width: 404px; width: 404px;
} }
input > .span8, textarea > .span8, .uneditable-input > .span8 { input .span8,
textarea .span8,
.uneditable-input .span8 {
width: 466px; width: 466px;
} }
input > .span9, textarea > .span9, .uneditable-input > .span9 { input .span9,
textarea .span9,
.uneditable-input .span9 {
width: 528px; width: 528px;
} }
input > .span10, textarea > .span10, .uneditable-input > .span10 { input .span10,
textarea .span10,
.uneditable-input .span10 {
width: 590px; width: 590px;
} }
input > .span11, textarea > .span11, .uneditable-input > .span11 { input .span11,
textarea .span11,
.uneditable-input .span11 {
width: 652px; width: 652px;
} }
input > .span12, textarea > .span12, .uneditable-input > .span12 { input .span12,
textarea .span12,
.uneditable-input .span12 {
width: 714px; width: 714px;
} }
} }
...@@ -383,7 +417,8 @@ ...@@ -383,7 +417,8 @@
color: #999999; color: #999999;
text-shadow: none; text-shadow: none;
} }
.navbar .nav > li > a, .navbar .dropdown-menu a { .navbar .nav > li > a,
.navbar .dropdown-menu a {
padding: 6px 15px; padding: 6px 15px;
font-weight: bold; font-weight: bold;
color: #999999; color: #999999;
...@@ -394,7 +429,8 @@ ...@@ -394,7 +429,8 @@
.navbar .dropdown-menu li + li a { .navbar .dropdown-menu li + li a {
margin-bottom: 2px; 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; background-color: #222222;
} }
.navbar .dropdown-menu { .navbar .dropdown-menu {
...@@ -415,13 +451,15 @@ ...@@ -415,13 +451,15 @@
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
.navbar .dropdown-menu:before, .navbar .dropdown-menu:after { .navbar .dropdown-menu:before,
.navbar .dropdown-menu:after {
display: none; display: none;
} }
.navbar .dropdown-menu .divider { .navbar .dropdown-menu .divider {
display: none; display: none;
} }
.navbar-form, .navbar-search { .navbar-form,
.navbar-search {
float: none; float: none;
padding: 9px 15px; padding: 9px 15px;
margin: 9px 0; margin: 9px 0;
...@@ -458,7 +496,8 @@ ...@@ -458,7 +496,8 @@
margin-left: -30px; margin-left: -30px;
*zoom: 1; *zoom: 1;
} }
.row:before, .row:after { .row:before,
.row:after {
display: table; display: table;
content: ""; content: "";
} }
...@@ -469,7 +508,9 @@ ...@@ -469,7 +508,9 @@
float: left; float: left;
margin-left: 30px; margin-left: 30px;
} }
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 1170px; width: 1170px;
} }
.span1 { .span1 {
...@@ -548,7 +589,8 @@ ...@@ -548,7 +589,8 @@
width: 100%; width: 100%;
*zoom: 1; *zoom: 1;
} }
.row-fluid:before, .row-fluid:after { .row-fluid:before,
.row-fluid:after {
display: table; display: table;
content: ""; content: "";
} }
...@@ -562,79 +604,105 @@ ...@@ -562,79 +604,105 @@
.row-fluid > [class*="span"]:first-child { .row-fluid > [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid > .span1 { .row-fluid .span1 {
width: 5.982905983%; width: 5.982905983%;
} }
.row-fluid > .span2 { .row-fluid .span2 {
width: 14.529914530000001%; width: 14.529914530000001%;
} }
.row-fluid > .span3 { .row-fluid .span3 {
width: 23.076923077%; width: 23.076923077%;
} }
.row-fluid > .span4 { .row-fluid .span4 {
width: 31.623931624%; width: 31.623931624%;
} }
.row-fluid > .span5 { .row-fluid .span5 {
width: 40.170940171000005%; width: 40.170940171000005%;
} }
.row-fluid > .span6 { .row-fluid .span6 {
width: 48.717948718%; width: 48.717948718%;
} }
.row-fluid > .span7 { .row-fluid .span7 {
width: 57.264957265%; width: 57.264957265%;
} }
.row-fluid > .span8 { .row-fluid .span8 {
width: 65.81196581200001%; width: 65.81196581200001%;
} }
.row-fluid > .span9 { .row-fluid .span9 {
width: 74.358974359%; width: 74.358974359%;
} }
.row-fluid > .span10 { .row-fluid .span10 {
width: 82.905982906%; width: 82.905982906%;
} }
.row-fluid > .span11 { .row-fluid .span11 {
width: 91.45299145300001%; width: 91.45299145300001%;
} }
.row-fluid > .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
} }
input, textarea, .uneditable-input { input,
textarea,
.uneditable-input {
margin-left: 0; margin-left: 0;
} }
input > .span1, textarea > .span1, .uneditable-input > .span1 { input .span1,
textarea .span1,
.uneditable-input .span1 {
width: 60px; width: 60px;
} }
input > .span2, textarea > .span2, .uneditable-input > .span2 { input .span2,
textarea .span2,
.uneditable-input .span2 {
width: 160px; width: 160px;
} }
input > .span3, textarea > .span3, .uneditable-input > .span3 { input .span3,
textarea .span3,
.uneditable-input .span3 {
width: 260px; width: 260px;
} }
input > .span4, textarea > .span4, .uneditable-input > .span4 { input .span4,
textarea .span4,
.uneditable-input .span4 {
width: 360px; width: 360px;
} }
input > .span5, textarea > .span5, .uneditable-input > .span5 { input .span5,
textarea .span5,
.uneditable-input .span5 {
width: 460px; width: 460px;
} }
input > .span6, textarea > .span6, .uneditable-input > .span6 { input .span6,
textarea .span6,
.uneditable-input .span6 {
width: 560px; width: 560px;
} }
input > .span7, textarea > .span7, .uneditable-input > .span7 { input .span7,
textarea .span7,
.uneditable-input .span7 {
width: 660px; width: 660px;
} }
input > .span8, textarea > .span8, .uneditable-input > .span8 { input .span8,
textarea .span8,
.uneditable-input .span8 {
width: 760px; width: 760px;
} }
input > .span9, textarea > .span9, .uneditable-input > .span9 { input .span9,
textarea .span9,
.uneditable-input .span9 {
width: 860px; width: 860px;
} }
input > .span10, textarea > .span10, .uneditable-input > .span10 { input .span10,
textarea .span10,
.uneditable-input .span10 {
width: 960px; width: 960px;
} }
input > .span11, textarea > .span11, .uneditable-input > .span11 { input .span11,
textarea .span11,
.uneditable-input .span11 {
width: 1060px; width: 1060px;
} }
input > .span12, textarea > .span12, .uneditable-input > .span12 { input .span12,
textarea .span12,
.uneditable-input .span12 {
width: 1160px; width: 1160px;
} }
.thumbnails { .thumbnails {
......
This diff is collapsed.
This diff is collapsed.
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