Skip to content
GitLab
Commit c62a0239 authored by Mark Otto's avatar Mark Otto
Browse files

update to responsive to fix new masthead

parent 1888511d
Hide whitespace changes
Inline Side-by-side
Showing
with 117 additions and 141 deletions
+117 -141
bootstrap.css
+ 76
- 53
View file @ c62a0239
......@@ -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: Sun Oct 16 18:00:58 PDT 2011
* Date: Sun Oct 16 19:08:43 PDT 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).
......@@ -2379,60 +2379,83 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
margin-left: 768px;
}
}
/*
// LARGE DESKTOP & UP
// ------------------
@media (min-width: 1170px) {
// Reset grid variables
@gridColumns: 12;
@gridColumnWidth: 70px;
@gridGutterWidth: 30px;
@siteWidth: 1170px;
// Bring grid mixins to recalculate widths
.columns(@columnSpan: 1) {
width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
}
.offset(@columnOffset: 1) {
margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
}
@media (min-width: 1210px) {
.container {
width: @siteWidth;
width: 1170px;
}
[class*="span"] {
margin-left: @gridGutterWidth;
margin-left: 30px;
}
.span1 {
width: 70px;
}
.span2 {
width: 170px;
}
.span3 {
width: 270px;
}
.span4 {
width: 370px;
}
.span5 {
width: 470px;
}
.span6 {
width: 570px;
}
.span7 {
width: 670px;
}
.span8 {
width: 770px;
}
.span9 {
width: 870px;
}
.span10 {
width: 970px;
}
.span11 {
width: 1070px;
}
.span12 {
width: 1170px;
}
.offset1 {
margin-left: 100px;
}
.offset2 {
margin-left: 200px;
}
.offset3 {
margin-left: 300px;
}
.offset4 {
margin-left: 400px;
}
.offset5 {
margin-left: 500px;
}
.offset6 {
margin-left: 600px;
}
.offset7 {
margin-left: 700px;
}
.offset8 {
margin-left: 800px;
}
.offset9 {
margin-left: 900px;
}
.offset10 {
margin-left: 1000px;
}
.offset11 {
margin-left: 1100px;
}
.offset12 {
margin-left: 1200px;
}
// Default columns
.span1 { .columns(1); }
.span2 { .columns(2); }
.span3 { .columns(3); }
.span4 { .columns(4); }
.span5 { .columns(5); }
.span6 { .columns(6); }
.span7 { .columns(7); }
.span8 { .columns(8); }
.span9 { .columns(9); }
.span10 { .columns(10); }
.span11 { .columns(11); }
.span12 { .columns(12); }
// Offset column options
.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); }
}
*/
\ No newline at end of file
bootstrap.min.css
+ 1
- 1
View file @ c62a0239
......@@ -321,4 +321,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.media-grid li{display:inline;}
.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;}
.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;} .modal{width:auto;margin:0;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}@media (min-width: 1210px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12{width:1170px;} .offset1{margin-left:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}}
docs/assets/css/docs.css
+ 32
- 77
View file @ c62a0239
......@@ -37,34 +37,34 @@ section > .row {
-------------------------------------------------- */
.jumbotron {
position: relative;
}
.jumbotron h1,
.jumbotron p {
margin-bottom: 10px;
text-shadow: 0 1px 0 #fff;
}
.jumbotron h1 {
font-size: 90px;
line-height: 1;
margin-right: 40%;
margin-bottom: 10px;
font-size: 90px;
letter-spacing: -1px;
line-height: 1;
}
.jumbotron p {
font-weight: 300;
margin-right: 32%;
}
.jumbotron .lead {
margin-bottom: 20px;
font-size: 25px;
font-weight: 300;
line-height: 36px;
}
.jumbotron .btn {
font-size: 20px;
padding: 14px 24px;
margin-right: 5px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
}
.jumbotron .download-info {
font-size: 16px;
color: #999;
}
/* Benefits list in masthead */
.benefits {
......@@ -133,9 +133,9 @@ section > .row {
list-style: none;
text-align: center;
background-color: #eee;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.quick-links li {
display: inline;
......@@ -167,71 +167,6 @@ section > .row {
}
/* Quickstart section for getting le code
-------------------------------------------------- */
.quickstart {
background-color: #f5f5f5;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));
background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5);
background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5));
background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5);
background-image: -o-linear-gradient(#f9f9f9, #f5f5f5);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0);
background-image: linear-gradient(#f9f9f9, #f5f5f5);
border-top: 1px solid #fff;
border-bottom: 1px solid #eee;
}
.quickstart .container {
margin-bottom: 0;
}
.quickstart .row {
margin: 0 -20px;
-webkit-box-shadow: 1px 0 0 #f9f9f9;
-moz-box-shadow: 1px 0 0 #f9f9f9;
box-shadow: 1px 0 0 #f9f9f9;
}
.quickstart [class*="span"] {
width: 285px;
height: 117px;
margin-left: 0;
padding: 17px 20px 26px;
border-left: 1px solid #eee;
-webkit-box-shadow: inset 1px 0 0 #f9f9f9;
-moz-box-shadow: inset 1px 0 0 #f9f9f9;
box-shadow: inset 1px 0 0 #f9f9f9;
}
.quickstart [class*="span"]:last-child {
border-right: 1px solid #eee;
width: 286px;
}
.quickstart h6,
.quickstart p {
line-height: 18px;
text-align: center;
margin-bottom: 9px;
color: #333;
}
.quickstart .current-version,
.quickstart .current-version a {
color: #999;
}
.quickstart h6 {
color: #999;
}
.quickstart textarea {
display: block;
width: 275px;
height: auto;
margin: 0 0 9px;
line-height: 21px;
white-space: nowrap;
overflow: hidden;
}
/* Special grid styles
-------------------------------------------------- */
.show-grid {
......@@ -387,9 +322,29 @@ pre.prettyprint {
/* Responsive Docs
-------------------------------------------------- */
@media (max-width: 480px) {
body > .navbar-fixed .nav {
display: none;
}
.large-bird {
display: none;
}
.jumbotron h1 {
font-size: 36px;
margin-right: 0;
}
.jumbotron p {
margin-right: 0;
font-size: 18px;
line-height: 24px;
}
.jumbotron .benefits {
position: relative;
width: auto;
margin: 36px 0;
}
}
@media (min-width: 768px) and (max-width: 900px) {
......
docs/index.html
+ 7
- 7
View file @ c62a0239
......@@ -76,7 +76,13 @@
================================================== -->
<header class="jumbotron masthead">
<div class="inner">
<div class="benefits pull-right">
<h1>Bootstrap,<br> from Twitter</h1>
<p class="lead">Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.</p>
<p class="download-info">
<a href="#" class="btn primary btn-large">Download on GitHub</a>
Currently v2.0.0
</p>
<div class="benefits">
<h4>Feature highlights</h4>
<ul>
<li><span>&times;</span> Built on LESS</li>
......@@ -88,12 +94,6 @@
<li><span>&times;</span> Dozens of components</li>
</ul>
</div>
<h1>Bootstrap, from Twitter</h1>
<p class="lead">Bootstrap is a frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.</p>
<p class="download-info">
<a href="#" class="btn primary btn-large">Download on GitHub</a>
Currently v2.0.0
</p>
</div>
</header>
......
lib/responsive.less
+ 1
- 3
View file @ c62a0239
......@@ -121,11 +121,10 @@
}
/*
// LARGE DESKTOP & UP
// ------------------
@media (min-width: 1170px) {
@media (min-width: 1210px) {
// Reset grid variables
@gridColumns: 12;
......@@ -177,4 +176,3 @@
.offset12 { .offset(12); }
}
*/
\ No newline at end of file
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