Updated bootstrap & structure.

This commit is contained in:
Glenn Y. Rolland 2012-07-30 21:21:28 +02:00
parent 42a04dd6b8
commit 371ea2db9b
9 changed files with 3926 additions and 955 deletions

View file

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap Responsive v2.0.2 * Bootstrap Responsive v2.0.4
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
@ -7,85 +7,86 @@
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
*/ */
.clearfix { .clearfix {
*zoom: 1; *zoom: 1;
} }
.clearfix:before, .clearfix:before,
.clearfix:after { .clearfix:after {
display: table; display: table;
content: ""; content: "";
} }
.clearfix:after { .clearfix:after {
clear: both; clear: both;
} }
.hide-text { .hide-text {
overflow: hidden; font: 0/0 a;
text-indent: 100%; color: transparent;
white-space: nowrap; text-shadow: none;
background-color: transparent;
border: 0;
} }
.input-block-level { .input-block-level {
display: block; display: block;
width: 100%; width: 100%;
min-height: 28px; min-height: 28px;
/* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-ms-box-sizing: border-box; -ms-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.hidden { .hidden {
display: none; display: none;
visibility: hidden; visibility: hidden;
} }
.visible-phone { .visible-phone {
display: none; display: none !important;
} }
.visible-tablet { .visible-tablet {
display: none; display: none !important;
}
.visible-desktop {
display: block;
}
.hidden-phone {
display: block;
}
.hidden-tablet {
display: block;
} }
.hidden-desktop { .hidden-desktop {
display: none; display: none !important;
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.visible-phone { .visible-phone {
display: block; display: inherit !important;
} }
.hidden-phone { .hidden-phone {
display: none; display: none !important;
} }
.hidden-desktop { .hidden-desktop {
display: block; display: inherit !important;
} }
.visible-desktop { .visible-desktop {
display: none; display: none !important;
} }
} }
@media (min-width: 768px) and (max-width: 979px) { @media (min-width: 768px) and (max-width: 979px) {
.visible-tablet { .visible-tablet {
display: block; display: inherit !important;
} }
.hidden-tablet { .hidden-tablet {
display: none; display: none !important;
} }
.hidden-desktop { .hidden-desktop {
display: block; display: inherit !important;
} }
.visible-desktop { .visible-desktop {
display: none; display: none !important ;
} }
} }
@media (max-width: 480px) { @media (max-width: 480px) {
.nav-collapse { .nav-collapse {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
@ -111,14 +112,14 @@
padding-top: 0; padding-top: 0;
} }
.form-horizontal .form-actions { .form-horizontal .form-actions {
padding-left: 10px;
padding-right: 10px; padding-right: 10px;
padding-left: 10px;
} }
.modal { .modal {
position: absolute; position: absolute;
top: 10px; top: 10px;
left: 10px;
right: 10px; right: 10px;
left: 10px;
width: auto; width: auto;
margin: 0; margin: 0;
} }
@ -133,14 +134,28 @@
position: static; position: static;
} }
} }
@media (max-width: 767px) { @media (max-width: 767px) {
body { body {
padding-left: 20px;
padding-right: 20px; padding-right: 20px;
padding-left: 20px;
} }
.navbar-fixed-top { .navbar-fixed-top,
margin-left: -20px; .navbar-fixed-bottom {
margin-right: -20px; margin-right: -20px;
margin-left: -20px;
}
.container-fluid {
padding: 0;
}
.dl-horizontal dt {
float: none;
width: auto;
clear: none;
text-align: left;
}
.dl-horizontal dd {
margin-left: 0;
} }
.container { .container {
width: auto; width: auto;
@ -148,19 +163,20 @@
.row-fluid { .row-fluid {
width: 100%; width: 100%;
} }
.row { .row,
.thumbnails {
margin-left: 0; margin-left: 0;
} }
.row > [class*="span"], [class*="span"],
.row-fluid > [class*="span"] { .row-fluid [class*="span"] {
float: none;
display: block; display: block;
float: none;
width: auto; width: auto;
margin: 0; margin-left: 0;
}
.thumbnails [class*="span"] {
width: auto;
} }
.input-large,
.input-xlarge,
.input-xxlarge,
input[class*="span"], input[class*="span"],
select[class*="span"], select[class*="span"],
textarea[class*="span"], textarea[class*="span"],
@ -168,20 +184,20 @@
display: block; display: block;
width: 100%; width: 100%;
min-height: 28px; min-height: 28px;
/* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-ms-box-sizing: border-box; -ms-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.input-prepend input,
.input-append input,
.input-prepend input[class*="span"], .input-prepend input[class*="span"],
.input-append input[class*="span"] { .input-append input[class*="span"] {
display: inline-block;
width: auto; width: auto;
} }
} }
@media (min-width: 768px) and (max-width: 979px) { @media (min-width: 768px) and (max-width: 979px) {
.row { .row {
margin-left: -20px; margin-left: -20px;
@ -288,205 +304,136 @@
.row-fluid:after { .row-fluid:after {
clear: both; clear: both;
} }
.row-fluid > [class*="span"] { .row-fluid [class*="span"] {
display: block;
float: left; float: left;
width: 100%;
min-height: 28px;
margin-left: 2.762430939%; margin-left: 2.762430939%;
*margin-left: 2.709239449638298%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
} }
.row-fluid > [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid > .span12 { .row-fluid .span12 {
width: 99.999999993%; width: 99.999999993%;
*width: 99.9468085036383%;
} }
.row-fluid > .span11 { .row-fluid .span11 {
width: 91.436464082%; width: 91.436464082%;
*width: 91.38327259263829%;
} }
.row-fluid > .span10 { .row-fluid .span10 {
width: 82.87292817100001%; width: 82.87292817100001%;
*width: 82.8197366816383%;
} }
.row-fluid > .span9 { .row-fluid .span9 {
width: 74.30939226%; width: 74.30939226%;
*width: 74.25620077063829%;
} }
.row-fluid > .span8 { .row-fluid .span8 {
width: 65.74585634900001%; width: 65.74585634900001%;
*width: 65.6926648596383%;
} }
.row-fluid > .span7 { .row-fluid .span7 {
width: 57.182320438000005%; width: 57.182320438000005%;
*width: 57.129128948638304%;
} }
.row-fluid > .span6 { .row-fluid .span6 {
width: 48.618784527%; width: 48.618784527%;
*width: 48.5655930376383%;
} }
.row-fluid > .span5 { .row-fluid .span5 {
width: 40.055248616%; width: 40.055248616%;
*width: 40.0020571266383%;
} }
.row-fluid > .span4 { .row-fluid .span4 {
width: 31.491712705%; width: 31.491712705%;
*width: 31.4385212156383%;
} }
.row-fluid > .span3 { .row-fluid .span3 {
width: 22.928176794%; width: 22.928176794%;
*width: 22.874985304638297%;
} }
.row-fluid > .span2 { .row-fluid .span2 {
width: 14.364640883%; width: 14.364640883%;
*width: 14.311449393638298%;
} }
.row-fluid > .span1 { .row-fluid .span1 {
width: 5.801104972%; width: 5.801104972%;
*width: 5.747913482638298%;
} }
input, input,
textarea, textarea,
.uneditable-input { .uneditable-input {
margin-left: 0; margin-left: 0;
} }
input.span12, textarea.span12, .uneditable-input.span12 { input.span12,
textarea.span12,
.uneditable-input.span12 {
width: 714px; width: 714px;
} }
input.span11, textarea.span11, .uneditable-input.span11 { input.span11,
textarea.span11,
.uneditable-input.span11 {
width: 652px; width: 652px;
} }
input.span10, textarea.span10, .uneditable-input.span10 { input.span10,
textarea.span10,
.uneditable-input.span10 {
width: 590px; width: 590px;
} }
input.span9, textarea.span9, .uneditable-input.span9 { input.span9,
textarea.span9,
.uneditable-input.span9 {
width: 528px; width: 528px;
} }
input.span8, textarea.span8, .uneditable-input.span8 { input.span8,
textarea.span8,
.uneditable-input.span8 {
width: 466px; width: 466px;
} }
input.span7, textarea.span7, .uneditable-input.span7 { input.span7,
textarea.span7,
.uneditable-input.span7 {
width: 404px; width: 404px;
} }
input.span6, textarea.span6, .uneditable-input.span6 { input.span6,
textarea.span6,
.uneditable-input.span6 {
width: 342px; width: 342px;
} }
input.span5, textarea.span5, .uneditable-input.span5 { input.span5,
textarea.span5,
.uneditable-input.span5 {
width: 280px; width: 280px;
} }
input.span4, textarea.span4, .uneditable-input.span4 { input.span4,
textarea.span4,
.uneditable-input.span4 {
width: 218px; width: 218px;
} }
input.span3, textarea.span3, .uneditable-input.span3 { input.span3,
textarea.span3,
.uneditable-input.span3 {
width: 156px; width: 156px;
} }
input.span2, textarea.span2, .uneditable-input.span2 { input.span2,
textarea.span2,
.uneditable-input.span2 {
width: 94px; width: 94px;
} }
input.span1, textarea.span1, .uneditable-input.span1 { input.span1,
textarea.span1,
.uneditable-input.span1 {
width: 32px; width: 32px;
} }
} }
@media (max-width: 979px) {
body {
padding-top: 0;
}
.navbar-fixed-top {
position: static;
margin-bottom: 18px;
}
.navbar-fixed-top .navbar-inner {
padding: 5px;
}
.navbar .container {
width: auto;
padding: 0;
}
.navbar .brand {
padding-left: 10px;
padding-right: 10px;
margin: 0 0 0 -5px;
}
.navbar .nav-collapse {
clear: left;
}
.navbar .nav {
float: none;
margin: 0 0 9px;
}
.navbar .nav > li {
float: none;
}
.navbar .nav > li > a {
margin-bottom: 2px;
}
.navbar .nav > .divider-vertical {
display: none;
}
.navbar .nav .nav-header {
color: #999999;
text-shadow: none;
}
.navbar .nav > li > a,
.navbar .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
color: #999999;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.navbar .dropdown-menu li + li a {
margin-bottom: 2px;
}
.navbar .nav > li > a:hover,
.navbar .dropdown-menu a:hover {
background-color: #222222;
}
.navbar .dropdown-menu {
position: static;
top: auto;
left: auto;
float: none;
display: block;
max-width: none;
margin: 0 15px;
padding: 0;
background-color: transparent;
border: none;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.navbar .dropdown-menu:before,
.navbar .dropdown-menu:after {
display: none;
}
.navbar .dropdown-menu .divider {
display: none;
}
.navbar-form,
.navbar-search {
float: none;
padding: 9px 15px;
margin: 9px 0;
border-top: 1px solid #222222;
border-bottom: 1px solid #222222;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
}
.navbar .nav.pull-right {
float: none;
margin-left: 0;
}
.navbar-static .navbar-inner {
padding-left: 10px;
padding-right: 10px;
}
.btn-navbar {
display: block;
}
.nav-collapse {
overflow: hidden;
height: 0;
}
}
@media (min-width: 980px) {
.nav-collapse.collapse {
height: auto !important;
overflow: visible !important;
}
}
@media (min-width: 1200px) { @media (min-width: 1200px) {
.row { .row {
margin-left: -30px; margin-left: -30px;
@ -593,88 +540,132 @@
.row-fluid:after { .row-fluid:after {
clear: both; clear: both;
} }
.row-fluid > [class*="span"] { .row-fluid [class*="span"] {
display: block;
float: left; float: left;
width: 100%;
min-height: 28px;
margin-left: 2.564102564%; margin-left: 2.564102564%;
*margin-left: 2.510911074638298%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
} }
.row-fluid > [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid > .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%;
} }
.row-fluid > .span11 { .row-fluid .span11 {
width: 91.45299145300001%; width: 91.45299145300001%;
*width: 91.3997999636383%;
} }
.row-fluid > .span10 { .row-fluid .span10 {
width: 82.905982906%; width: 82.905982906%;
*width: 82.8527914166383%;
} }
.row-fluid > .span9 { .row-fluid .span9 {
width: 74.358974359%; width: 74.358974359%;
*width: 74.30578286963829%;
} }
.row-fluid > .span8 { .row-fluid .span8 {
width: 65.81196581200001%; width: 65.81196581200001%;
*width: 65.7587743226383%;
} }
.row-fluid > .span7 { .row-fluid .span7 {
width: 57.264957265%; width: 57.264957265%;
*width: 57.2117657756383%;
} }
.row-fluid > .span6 { .row-fluid .span6 {
width: 48.717948718%; width: 48.717948718%;
*width: 48.6647572286383%;
} }
.row-fluid > .span5 { .row-fluid .span5 {
width: 40.170940171000005%; width: 40.170940171000005%;
*width: 40.117748681638304%;
} }
.row-fluid > .span4 { .row-fluid .span4 {
width: 31.623931624%; width: 31.623931624%;
*width: 31.5707401346383%;
} }
.row-fluid > .span3 { .row-fluid .span3 {
width: 23.076923077%; width: 23.076923077%;
*width: 23.0237315876383%;
} }
.row-fluid > .span2 { .row-fluid .span2 {
width: 14.529914530000001%; width: 14.529914530000001%;
*width: 14.4767230406383%;
} }
.row-fluid > .span1 { .row-fluid .span1 {
width: 5.982905983%; width: 5.982905983%;
*width: 5.929714493638298%;
} }
input, input,
textarea, textarea,
.uneditable-input { .uneditable-input {
margin-left: 0; margin-left: 0;
} }
input.span12, textarea.span12, .uneditable-input.span12 { input.span12,
textarea.span12,
.uneditable-input.span12 {
width: 1160px; width: 1160px;
} }
input.span11, textarea.span11, .uneditable-input.span11 { input.span11,
textarea.span11,
.uneditable-input.span11 {
width: 1060px; width: 1060px;
} }
input.span10, textarea.span10, .uneditable-input.span10 { input.span10,
textarea.span10,
.uneditable-input.span10 {
width: 960px; width: 960px;
} }
input.span9, textarea.span9, .uneditable-input.span9 { input.span9,
textarea.span9,
.uneditable-input.span9 {
width: 860px; width: 860px;
} }
input.span8, textarea.span8, .uneditable-input.span8 { input.span8,
textarea.span8,
.uneditable-input.span8 {
width: 760px; width: 760px;
} }
input.span7, textarea.span7, .uneditable-input.span7 { input.span7,
textarea.span7,
.uneditable-input.span7 {
width: 660px; width: 660px;
} }
input.span6, textarea.span6, .uneditable-input.span6 { input.span6,
textarea.span6,
.uneditable-input.span6 {
width: 560px; width: 560px;
} }
input.span5, textarea.span5, .uneditable-input.span5 { input.span5,
textarea.span5,
.uneditable-input.span5 {
width: 460px; width: 460px;
} }
input.span4, textarea.span4, .uneditable-input.span4 { input.span4,
textarea.span4,
.uneditable-input.span4 {
width: 360px; width: 360px;
} }
input.span3, textarea.span3, .uneditable-input.span3 { input.span3,
textarea.span3,
.uneditable-input.span3 {
width: 260px; width: 260px;
} }
input.span2, textarea.span2, .uneditable-input.span2 { input.span2,
textarea.span2,
.uneditable-input.span2 {
width: 160px; width: 160px;
} }
input.span1, textarea.span1, .uneditable-input.span1 { input.span1,
textarea.span1,
.uneditable-input.span1 {
width: 60px; width: 60px;
} }
.thumbnails { .thumbnails {
@ -683,4 +674,142 @@
.thumbnails > li { .thumbnails > li {
margin-left: 30px; margin-left: 30px;
} }
.row-fluid .thumbnails {
margin-left: 0;
}
}
@media (max-width: 979px) {
body {
padding-top: 0;
}
.navbar-fixed-top,
.navbar-fixed-bottom {
position: static;
}
.navbar-fixed-top {
margin-bottom: 18px;
}
.navbar-fixed-bottom {
margin-top: 18px;
}
.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
padding: 5px;
}
.navbar .container {
width: auto;
padding: 0;
}
.navbar .brand {
padding-right: 10px;
padding-left: 10px;
margin: 0 0 0 -5px;
}
.nav-collapse {
clear: both;
}
.nav-collapse .nav {
float: none;
margin: 0 0 9px;
}
.nav-collapse .nav > li {
float: none;
}
.nav-collapse .nav > li > a {
margin-bottom: 2px;
}
.nav-collapse .nav > .divider-vertical {
display: none;
}
.nav-collapse .nav .nav-header {
color: #999999;
text-shadow: none;
}
.nav-collapse .nav > li > a,
.nav-collapse .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
color: #999999;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.nav-collapse .btn {
padding: 4px 10px 4px;
font-weight: normal;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.nav-collapse .dropdown-menu li + li a {
margin-bottom: 2px;
}
.nav-collapse .nav > li > a:hover,
.nav-collapse .dropdown-menu a:hover {
background-color: #222222;
}
.nav-collapse.in .btn-group {
padding: 0;
margin-top: 5px;
}
.nav-collapse .dropdown-menu {
position: static;
top: auto;
left: auto;
display: block;
float: none;
max-width: none;
padding: 0;
margin: 0 15px;
background-color: transparent;
border: none;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.nav-collapse .dropdown-menu:before,
.nav-collapse .dropdown-menu:after {
display: none;
}
.nav-collapse .dropdown-menu .divider {
display: none;
}
.nav-collapse .navbar-form,
.nav-collapse .navbar-search {
float: none;
padding: 9px 15px;
margin: 9px 0;
border-top: 1px solid #222222;
border-bottom: 1px solid #222222;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
}
.navbar .nav-collapse .nav.pull-right {
float: none;
margin-left: 0;
}
.nav-collapse,
.nav-collapse.collapse {
height: 0;
overflow: hidden;
}
.navbar .btn-navbar {
display: block;
}
.navbar-static .navbar-inner {
padding-right: 10px;
padding-left: 10px;
}
}
@media (min-width: 980px) {
.nav-collapse.collapse {
height: auto !important;
overflow: visible !important;
}
} }

9
css/bootstrap-responsive.min.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff

9
css/bootstrap.min.css vendored Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

1825
js/bootstrap.js vendored Normal file

File diff suppressed because it is too large Load diff

6
js/bootstrap.min.js vendored Normal file

File diff suppressed because one or more lines are too long