Permalink
Browse files

Updating bootstrap

  • Loading branch information...
1 parent f9f99db commit 0dcc929c1e6bc72523a079f020b3a420724fd192 @ifesdjeen ifesdjeen committed Feb 24, 2013
View
@@ -10,3 +10,4 @@ _site/*
*\#*
~*
_source/*
+_cache
@@ -5,12 +5,12 @@
<meta content='width=device-width, initial-scale=1.0' name='viewport' />
<meta content='' name='description' />
<meta content='The ClojureWerkz Team' name='author' />
- <link href='/assets/stylesheets/bootstrap.css' media='screen' rel='stylesheet' type='text/css' />
- <link href='/assets/stylesheets/bootstrap-responsive.css' media='screen' rel='stylesheet' type='text/css' />
+ <link href='/assets/stylesheets/bootstrap.min.css' media='screen' rel='stylesheet' type='text/css' />
+ <link href='/assets/stylesheets/bootstrap-responsive.min.css' media='screen' rel='stylesheet' type='text/css' />
<link href='/assets/stylesheets/pygments.css' media='screen' rel='stylesheet' type='text/css' />
<link href='/assets/stylesheets/sass/styles.css' media='screen' rel='stylesheet' type='text/css' />
<link href='http://fonts.googleapis.com/css?family=Signika+Negative:300,400,600' rel='stylesheet' type='text/css' />
- <script src='/assets/javascripts/jquery-1.7.min.js' type='text/javascript'></script>
+ <script src='/assets/javascripts/jquery-1.9.1.min.js' type='text/javascript'></script>
<script src='/assets/javascripts/toc.js'></script>
<meta content='text/html;charset=utf-8' http-equiv='Content-Type' />
<!-- Google Analytics placeholder -->
@@ -1,17 +1,18 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
<html lang='en' style='height: 100%'>
<head>
<title>{{page.title}}</title>
<meta content='width=device-width, initial-scale=1.0' name='viewport' />
<meta content='' name='description' />
<meta content='The ClojureWerkz Team' name='author' />
- <link href='/assets/stylesheets/bootstrap.css' media='screen' rel='stylesheet' type='text/css' />
- <link href='/assets/stylesheets/bootstrap-responsive.css' media='screen' rel='stylesheet' type='text/css' />
+ <link href='/assets/stylesheets/bootstrap.min.css' media='screen' rel='stylesheet' type='text/css' />
+ <link href='/assets/stylesheets/bootstrap-responsive.min.css' media='screen' rel='stylesheet' type='text/css' />
<link href='/assets/stylesheets/bootstrap-docs.css' media='screen' rel='stylesheet' type='text/css' />
<link href='/assets/stylesheets/pygments.css' media='screen' rel='stylesheet' type='text/css' />
<link href='/assets/stylesheets/sass/styles.css' media='screen' rel='stylesheet' type='text/css' />
<link href='http://fonts.googleapis.com/css?family=Signika+Negative:300,400,600' rel='stylesheet' type='text/css' />
- <script src='/assets/javascripts/jquery-1.7.min.js' type='text/javascript'></script>
+ <script src='/assets/javascripts/jquery-1.9.1.min.js' type='text/javascript'></script>
<script src='/assets/javascripts/toc.js'></script>
<script src='http://twitter.github.com/bootstrap/assets/js/bootstrap-dropdown.js'></script>
<meta content='text/html;charset=utf-8' http-equiv='Content-Type' />
@@ -1,6 +1,5 @@
/* Add additional stylesheets below
-------------------------------------------------- */
-
/*
Bootstrap's documentation styles
Special styles for presenting Bootstrap's documentation and examples
@@ -115,7 +114,7 @@ hr.soften {
.jumbotron p {
font-size: 24px;
font-weight: 300;
- line-height: 30px;
+ line-height: 1.25;
margin-bottom: 30px;
}
@@ -134,7 +133,7 @@ hr.soften {
/* Download button */
.masthead .btn {
- padding: 14px 24px;
+ padding: 19px 24px;
font-size: 24px;
font-weight: 200;
color: #fff; /* redeclare to override the `.jumbotron a` */
@@ -178,6 +177,16 @@ hr.soften {
background: url(../img/bs-docs-masthead-pattern.png) repeat center center;
opacity: .4;
}
+@media
+only screen and (-webkit-min-device-pixel-ratio: 2),
+only screen and ( min--moz-device-pixel-ratio: 2),
+only screen and ( -o-min-device-pixel-ratio: 2/1) {
+
+ .jumbotron:after {
+ background-size: 150px 150px;
+ }
+
+}
/* Masthead (docs home)
------------------------- */
@@ -276,12 +285,13 @@ hr.soften {
margin-bottom: 40px;
font-size: 20px;
font-weight: 300;
- line-height: 25px;
+ line-height: 1.25;
color: #999;
}
-.marketing img {
+.marketing-img {
display: block;
margin: 0 auto 30px;
+ max-height: 145px;
}
@@ -290,7 +300,8 @@ hr.soften {
-------------------------------------------------- */
.footer {
- padding: 70px 0;
+ text-align: center;
+ padding: 30px 0;
margin-top: 70px;
border-top: 1px solid #e5e5e5;
background-color: #f5f5f5;
@@ -304,7 +315,10 @@ hr.soften {
}
.footer-links li {
display: inline;
- margin-right: 10px;
+ padding: 0 2px;
+}
+.footer-links li:first-child {
+ padding-left: 0;
}
@@ -325,16 +339,22 @@ hr.soften {
min-height: 40px;
line-height: 40px;
}
-.show-grid:hover [class*="span"] {
- background: #ddd;
+.show-grid [class*="span"]:hover {
+ background-color: #ddd;
}
.show-grid .show-grid {
margin-top: 0;
margin-bottom: 0;
}
.show-grid .show-grid [class*="span"] {
+ margin-top: 5px;
+}
+.show-grid [class*="span"] [class*="span"] {
background-color: #ccc;
}
+.show-grid [class*="span"] [class*="span"] [class*="span"] {
+ background-color: #999;
+}
@@ -532,6 +552,9 @@ h2 + .row {
/* Example page
------------------------- */
+.bootstrap-examples h4 {
+ margin: 10px 0 5px;
+}
.bootstrap-examples p {
font-size: 13px;
line-height: 18px;
@@ -667,6 +690,21 @@ form.bs-docs-example {
margin: 20px;
}
+/* Dropdowns */
+.bs-docs-example-submenus {
+ min-height: 180px;
+}
+.bs-docs-example-submenus > .pull-left + .pull-left {
+ margin-left: 20px;
+}
+.bs-docs-example-submenus .dropup > .dropdown-menu,
+.bs-docs-example-submenus .dropdown > .dropdown-menu {
+ display: block;
+ position: static;
+ margin-bottom: 5px;
+ *width: 180px;
+}
+
/* Responsive docs
@@ -755,7 +793,7 @@ form.bs-docs-example {
}
.bs-docs-sidenav > li > a {
display: block;
- *width: 190px;
+ width: 190px \9;
margin: 0 0 -1px;
padding: 8px 14px;
border: 1px solid #e5e5e5;
@@ -822,6 +860,9 @@ form.bs-docs-example {
.bs-docs-sidenav {
width: 258px;
}
+ .bs-docs-sidenav > li > a {
+ width: 230px \9; /* Override the previous IE8-9 hack */
+ }
}
/* Desktop
@@ -844,14 +885,15 @@ form.bs-docs-example {
/* When affixed, space properly */
.bs-docs-sidenav {
top: 0;
+ width: 218px;
margin-top: 30px;
margin-right: 0;
}
}
/* Tablet to desktop
------------------------- */
-@media (min-width: 768px) and (max-width: 980px) {
+@media (min-width: 768px) and (max-width: 979px) {
/* Remove any padding from the body */
body {
padding-top: 0;
@@ -942,11 +984,11 @@ form.bs-docs-example {
/* Downsize the jumbotrons */
.jumbotron h1 {
- font-size: 60px;
+ font-size: 45px;
}
.jumbotron p,
.jumbotron .btn {
- font-size: 20px;
+ font-size: 18px;
}
.jumbotron .btn {
display: block;
@@ -961,7 +1003,10 @@ form.bs-docs-example {
/* Marketing on home */
.marketing h1 {
- font-size: 40px;
+ font-size: 30px;
+ }
+ .marketing-byline {
+ font-size: 18px;
}
/* center example sites */
@@ -986,7 +1031,26 @@ form.bs-docs-example {
word-break: break-all;
}
- /* Modal example */
+ /* Examples: dropdowns */
+ .bs-docs-example-submenus > .pull-left {
+ float: none;
+ clear: both;
+ }
+ .bs-docs-example-submenus > .pull-left,
+ .bs-docs-example-submenus > .pull-left + .pull-left {
+ margin-left: 0;
+ }
+ .bs-docs-example-submenus p {
+ margin-bottom: 0;
+ }
+ .bs-docs-example-submenus .dropup > .dropdown-menu,
+ .bs-docs-example-submenus .dropdown > .dropdown-menu {
+ margin-bottom: 10px;
+ float: none;
+ max-width: 180px;
+ }
+
+ /* Examples: modal */
.modal-example .modal {
position: relative;
top: auto;
@@ -995,8 +1059,9 @@ form.bs-docs-example {
left: auto;
}
- /* Unfloat the back to top in footer to prevent odd text wrapping */
- .footer .pull-right {
- float: none;
+ /* Tighten up footer */
+ .footer {
+ padding-top: 20px;
+ padding-bottom: 20px;
}
}
Oops, something went wrong. Retry.

0 comments on commit 0dcc929

Please sign in to comment.