diff options
author | Thomas Park <thomas@thomaspark.me> | 2012-03-12 13:36:08 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2012-03-12 13:36:08 -0400 |
commit | 8bde66808ecd630519bd39561b64839a85abc41a (patch) | |
tree | ba9705826775227d5315cb530b52870d535d19cc | |
parent | b0d8783653cda72b85c413ad672f726baff47c2a (diff) |
index: new thumbnails, responsive layout, clickable images
-rw-r--r-- | amelia/thumbnail.png | bin | 41453 -> 56241 bytes | |||
-rw-r--r-- | cerulean/thumbnail.png | bin | 18825 -> 25062 bytes | |||
-rwxr-xr-x | css/bootstrap-responsive.css | 567 | ||||
-rw-r--r-- | css/bootswatch.css | 83 | ||||
-rw-r--r-- | cyborg/thumbnail.png | bin | 30998 -> 41365 bytes | |||
-rw-r--r-- | index.html | 28 | ||||
-rw-r--r-- | journal/thumbnail.png | bin | 17731 -> 23592 bytes | |||
-rw-r--r-- | readable/thumbnail.png | bin | 18683 -> 27537 bytes | |||
-rw-r--r-- | simplex/thumbnail.png | bin | 18138 -> 24026 bytes | |||
-rw-r--r-- | slate/thumbnail.png | bin | 24990 -> 32564 bytes | |||
-rw-r--r-- | spacelab/thumbnail.png | bin | 21977 -> 29591 bytes | |||
-rw-r--r-- | spruce/thumbnail.png | bin | 18998 -> 26432 bytes | |||
-rw-r--r-- | superhero/thumbnail.png | bin | 21317 -> 30448 bytes | |||
-rw-r--r-- | united/thumbnail.png | bin | 21652 -> 28343 bytes |
14 files changed, 658 insertions, 20 deletions
diff --git a/amelia/thumbnail.png b/amelia/thumbnail.png Binary files differindex e31d7626..98b05896 100644 --- a/amelia/thumbnail.png +++ b/amelia/thumbnail.png diff --git a/cerulean/thumbnail.png b/cerulean/thumbnail.png Binary files differindex 50f87766..df0a42d0 100644 --- a/cerulean/thumbnail.png +++ b/cerulean/thumbnail.png diff --git a/css/bootstrap-responsive.css b/css/bootstrap-responsive.css new file mode 100755 index 00000000..4b032cdb --- /dev/null +++ b/css/bootstrap-responsive.css @@ -0,0 +1,567 @@ +/*! + * Bootstrap Responsive v2.0.0 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ +.hidden { + display: none; + visibility: hidden; +} +@media (max-width: 480px) { + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); + } + .page-header h1 small { + display: block; + line-height: 18px; + } + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + 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; + /* Older Webkit */ + + -moz-box-sizing: border-box; + /* Older FF */ + + -ms-box-sizing: border-box; + /* IE8 */ + + box-sizing: border-box; + /* CSS3 spec*/ + + } + .input-prepend input[class*="span"], .input-append input[class*="span"] { + width: auto; + } + input[type="checkbox"], input[type="radio"] { + border: 1px solid #ccc; + } + .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: 10px; + padding-right: 10px; + } + .modal { + position: absolute; + top: 10px; + left: 10px; + right: 10px; + width: auto; + margin: 0; + } + .modal.fade.in { + top: auto; + } + .modal-header .close { + padding: 10px; + margin: -10px; + } + .carousel-caption { + position: static; + } +} +@media (max-width: 768px) { + .container { + width: auto; + padding: 0 20px; + } + .row-fluid { + width: 100%; + } + .row { + margin-left: 0; + } + .row > [class*="span"], .row-fluid > [class*="span"] { + float: none; + display: block; + width: auto; + margin: 0; + } +} +@media (min-width: 768px) and (max-width: 980px) { + .row { + margin-left: -20px; + *zoom: 1; + } + .row:before, .row:after { + display: table; + content: ""; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + margin-left: 20px; + } + .span1 { + width: 42px; + } + .span2 { + width: 104px; + } + .span3 { + width: 166px; + } + .span4 { + width: 228px; + } + .span5 { + width: 290px; + } + .span6 { + width: 352px; + } + .span7 { + width: 414px; + } + .span8 { + width: 476px; + } + .span9 { + width: 538px; + } + .span10 { + width: 600px; + } + .span11 { + width: 662px; + } + .span12, .container { + width: 724px; + } + .offset1 { + margin-left: 82px; + } + .offset2 { + margin-left: 144px; + } + .offset3 { + margin-left: 206px; + } + .offset4 { + margin-left: 268px; + } + .offset5 { + margin-left: 330px; + } + .offset6 { + margin-left: 392px; + } + .offset7 { + margin-left: 454px; + } + .offset8 { + margin-left: 516px; + } + .offset9 { + margin-left: 578px; + } + .offset10 { + margin-left: 640px; + } + .offset11 { + margin-left: 702px; + } + .row-fluid { + width: 100%; + *zoom: 1; + } + .row-fluid:before, .row-fluid:after { + display: table; + content: ""; + } + .row-fluid:after { + clear: both; + } + .row-fluid > [class*="span"] { + float: left; + margin-left: 2.762430939%; + } + .row-fluid > [class*="span"]:first-child { + margin-left: 0; + } + .row-fluid .span1 { + width: 5.801104972%; + } + .row-fluid .span2 { + width: 14.364640883%; + } + .row-fluid .span3 { + width: 22.928176794%; + } + .row-fluid .span4 { + width: 31.491712705%; + } + .row-fluid .span5 { + width: 40.055248616%; + } + .row-fluid .span6 { + width: 48.618784527%; + } + .row-fluid .span7 { + width: 57.182320438000005%; + } + .row-fluid .span8 { + width: 65.74585634900001%; + } + .row-fluid .span9 { + width: 74.30939226%; + } + .row-fluid .span10 { + width: 82.87292817100001%; + } + .row-fluid .span11 { + width: 91.436464082%; + } + .row-fluid .span12 { + width: 99.999999993%; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 32px; + } + input.span2, textarea.span2, .uneditable-input.span2 { + width: 94px; + } + input.span3, textarea.span3, .uneditable-input.span3 { + width: 156px; + } + input.span4, textarea.span4, .uneditable-input.span4 { + width: 218px; + } + input.span5, textarea.span5, .uneditable-input.span5 { + width: 280px; + } + input.span6, textarea.span6, .uneditable-input.span6 { + width: 342px; + } + input.span7, textarea.span7, .uneditable-input.span7 { + width: 404px; + } + input.span8, textarea.span8, .uneditable-input.span8 { + width: 466px; + } + input.span9, textarea.span9, .uneditable-input.span9 { + width: 528px; + } + input.span10, textarea.span10, .uneditable-input.span10 { + width: 590px; + } + input.span11, textarea.span11, .uneditable-input.span11 { + width: 652px; + } + input.span12, textarea.span12, .uneditable-input.span12 { + width: 714px; + } +} +@media (max-width: 980px) { + 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 > 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; + } +} +@media (min-width: 1200px) { + .row { + margin-left: -30px; + *zoom: 1; + } + .row:before, .row:after { + display: table; + content: ""; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + 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, .container { + width: 1170px; + } + .offset1 { + margin-left: 130px; + } + .offset2 { + margin-left: 230px; + } + .offset3 { + margin-left: 330px; + } + .offset4 { + margin-left: 430px; + } + .offset5 { + margin-left: 530px; + } + .offset6 { + margin-left: 630px; + } + .offset7 { + margin-left: 730px; + } + .offset8 { + margin-left: 830px; + } + .offset9 { + margin-left: 930px; + } + .offset10 { + margin-left: 1030px; + } + .offset11 { + margin-left: 1130px; + } + .row-fluid { + width: 100%; + *zoom: 1; + } + .row-fluid:before, .row-fluid:after { + display: table; + content: ""; + } + .row-fluid:after { + clear: both; + } + .row-fluid > [class*="span"] { + float: left; + margin-left: 2.564102564%; + } + .row-fluid > [class*="span"]:first-child { + margin-left: 0; + } + .row-fluid .span1 { + width: 5.982905983%; + } + .row-fluid .span2 { + width: 14.529914530000001%; + } + .row-fluid .span3 { + width: 23.076923077%; + } + .row-fluid .span4 { + width: 31.623931624%; + } + .row-fluid .span5 { + width: 40.170940171000005%; + } + .row-fluid .span6 { + width: 48.717948718%; + } + .row-fluid .span7 { + width: 57.264957265%; + } + .row-fluid .span8 { + width: 65.81196581200001%; + } + .row-fluid .span9 { + width: 74.358974359%; + } + .row-fluid .span10 { + width: 82.905982906%; + } + .row-fluid .span11 { + width: 91.45299145300001%; + } + .row-fluid .span12 { + width: 100%; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 60px; + } + input.span2, textarea.span2, .uneditable-input.span2 { + width: 160px; + } + input.span3, textarea.span3, .uneditable-input.span3 { + width: 260px; + } + input.span4, textarea.span4, .uneditable-input.span4 { + width: 360px; + } + input.span5, textarea.span5, .uneditable-input.span5 { + width: 460px; + } + input.span6, textarea.span6, .uneditable-input.span6 { + width: 560px; + } + input.span7, textarea.span7, .uneditable-input.span7 { + width: 660px; + } + input.span8, textarea.span8, .uneditable-input.span8 { + width: 760px; + } + input.span9, textarea.span9, .uneditable-input.span9 { + width: 860px; + } + input.span10, textarea.span10, .uneditable-input.span10 { + width: 960px; + } + input.span11, textarea.span11, .uneditable-input.span11 { + width: 1060px; + } + input.span12, textarea.span12, .uneditable-input.span12 { + width: 1160px; + } + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; + } +} diff --git a/css/bootswatch.css b/css/bootswatch.css index b72f17c8..3b72f02e 100644 --- a/css/bootswatch.css +++ b/css/bootswatch.css @@ -1,6 +1,6 @@ body { - padding-top: 60px; - padding-bottom: 30px; + padding-top: 60px; + padding-bottom: 20px; } .navbar .nav > li > a { @@ -8,7 +8,7 @@ body { } .nav i { - opacity: 0.4; + opacity: 0.5; } .nav a:hover i { @@ -30,6 +30,7 @@ body { .hero-unit { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + margin-bottom: 60px; } .hero-unit, .thumbnail { @@ -50,6 +51,7 @@ body { } .rss { + width: 40px; height: 14px; font-size: 11px; line-height: 14px; @@ -69,7 +71,7 @@ body { } .about { - margin-top: 50px; + margin-top: 20px; } .about h3 { @@ -88,12 +90,11 @@ body { } .thumbnail { - max-width: 300px; + max-width: 370px; } .thumbnail img { - width: 290px; - height: 200px; + max-height: 250px; -webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px; @@ -106,4 +107,72 @@ body { .thumbnail .btn-toolbar { text-align: right; } + +.thumbnail .btn-group { + margin-top: 10px; +} + +/* Landscape phones and down */ +@media (max-width: 480px) { + + body { + padding-top: 0px; + } + + .hero-unit { + padding-bottom: 80px; + } + + .about { + margin-top: -10px; + } + + .about h3 { + margin-top: 20px; + } + + .span4 { + width: 95%; + } + +} + +/* Landscape phone to portrait tablet */ +@media (max-width: 768px) { + body { + padding-top: 0px; + } + + .hero-unit { + padding-bottom: 80px; + } + + .about { + margin-top: -10px; + } + + .about h3 { + margin-top: 20px; + } + + .span4 { + width: 95%; + } + +} + +/* Portrait tablet to landscape and desktop */ +@media (min-width: 768px) and (max-width: 980px) { + body { + padding-top: 0px; + } + + +} + +/* Large desktop */ +@media (min-width: 1200px) { + + +}
\ No newline at end of file diff --git a/cyborg/thumbnail.png b/cyborg/thumbnail.png Binary files differindex 1f3a1c49..bcc64f84 100644 --- a/cyborg/thumbnail.png +++ b/cyborg/thumbnail.png @@ -11,6 +11,7 @@ <!-- Le styles --> <link href="css/bootstrap.css" rel="stylesheet"> + <link href="assets/css/bootstrap-responsive.css" rel="stylesheet"> <link href="css/bootswatch.css" rel="stylesheet"> <link rel="alternate" type="application/rss+xml" title="Bootswatch" @@ -63,11 +64,11 @@ <iframe src="http://markdotto.github.com/github-buttons/github-btn.html?user=thomaspark&repo=bootswatch&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe> <iframe src="http://markdotto.github.com/github-buttons/github-btn.html?user=thomaspark&repo=bootswatch&type=fork" allowtransparency="true" frameborder="0" scrolling="0" width="53px" height="20px"></iframe> </div> - <div class="span4"> + <div class="span3 offset1"> <a href="https://twitter.com/thomashpark" class="twitter-follow-button" data-show-count="false" data-show-screen-name="true">Follow @thomashpark</a> <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://bootswatch.com" data-via="thomashpark">Tweet</a> </div> - <div class="span1"> + <div class="span1 offset1"> <a class="btn rss" href="http://feeds.feedburner.com/bootswatch"><i class="icon-rss"></i><span>RSS</span></a> </div> </div> @@ -118,7 +119,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="amelia/thumbnail.png" alt=""> + <a href="amelia"><img src="amelia/thumbnail.png" alt=""></a> <div class="caption"> <h3>Amelia <span class="label label-warning">new!</label></h3> <p>Sweet and cheery.</p> @@ -152,7 +153,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="cerulean/thumbnail.png" alt=""> + <a href="cerulean"><img src="cerulean/thumbnail.png" alt=""></a> <div class="caption"> <h3>Cerulean</h3> <p>A calm, blue sky.</p> @@ -185,7 +186,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="cyborg/thumbnail.png" alt=""> + <a href="cyborg"><img src="cyborg/thumbnail.png" alt=""></a> <div class="caption"> <h3>Cyborg</h3> <p>Jet black and electric blue.</p> @@ -218,7 +219,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="journal/thumbnail.png" alt=""> + <a href="journal"><img src="journal/thumbnail.png" alt=""></a> <div class="caption"> <h3>Journal</h3> <p>Crisp like a new sheet of paper.</p> @@ -252,7 +253,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="readable/thumbnail.png" alt=""> + <a href="readable"><img src="readable/thumbnail.png" alt=""></a> <div class="caption"> <h3>Readable <span class="label label-warning">new!</label></h3> <p>Optimized for legibility.</p> @@ -285,7 +286,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="simplex/thumbnail.png" alt=""> + <a href="simplex"><img src="simplex/thumbnail.png" alt=""></a> <div class="caption"> <h3>Simplex</h3> <p>Flat, matte, minimalist.</p> @@ -318,7 +319,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="slate/thumbnail.png" alt=""> + <a href="slate"><img src="slate/thumbnail.png" alt=""></a> <div class="caption"> <h3>Slate</h3> <p>Shades of gunmetal gray.</p> @@ -351,7 +352,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="spacelab/thumbnail.png" alt=""> + <a href="spacelab"><img src="spacelab/thumbnail.png" alt=""></a> <div class="caption"> <h3>Spacelab</h3> <p>Silvery and sleek.</p> @@ -385,7 +386,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="spruce/thumbnail.png" alt=""> + <a href="spruce"><img src="spruce/thumbnail.png" alt=""></a> <div class="caption"> <h3>Spruce</h3> <p>Camping in the woods.</p> @@ -418,7 +419,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="superhero/thumbnail.png" alt=""> + <a href="superhero"><img src="superhero/thumbnail.png" alt=""></a> <div class="caption"> <h3>Superhero</h3> <p>Batman meets... Aquaman?</p> @@ -451,7 +452,7 @@ <li class="span4"> <div class="thumbnail"> - <img src="united/thumbnail.png" alt=""> + <a href="united"><img src="united/thumbnail.png" alt=""></a> <div class="caption"> <h3>United</h3> <p>Bright colors and a unique font.</p> @@ -503,6 +504,7 @@ <script src="js/jquery.js"></script> <script src="js/bootstrap-dropdown.js"></script> <script src="js/bootstrap-tooltip.js"></script> + <script src="js/bootstrap-collapse.js"></script> <script src="js/bootswatch.js"></script> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> diff --git a/journal/thumbnail.png b/journal/thumbnail.png Binary files differindex 417abad1..176894ea 100644 --- a/journal/thumbnail.png +++ b/journal/thumbnail.png diff --git a/readable/thumbnail.png b/readable/thumbnail.png Binary files differindex ab312eb1..7aa4465b 100644 --- a/readable/thumbnail.png +++ b/readable/thumbnail.png diff --git a/simplex/thumbnail.png b/simplex/thumbnail.png Binary files differindex 36ee583f..4ec649b8 100644 --- a/simplex/thumbnail.png +++ b/simplex/thumbnail.png diff --git a/slate/thumbnail.png b/slate/thumbnail.png Binary files differindex 3b8d2e5b..8ecfec05 100644 --- a/slate/thumbnail.png +++ b/slate/thumbnail.png diff --git a/spacelab/thumbnail.png b/spacelab/thumbnail.png Binary files differindex 409255fd..9f3a1008 100644 --- a/spacelab/thumbnail.png +++ b/spacelab/thumbnail.png diff --git a/spruce/thumbnail.png b/spruce/thumbnail.png Binary files differindex 9d628245..b3bdb65d 100644 --- a/spruce/thumbnail.png +++ b/spruce/thumbnail.png diff --git a/superhero/thumbnail.png b/superhero/thumbnail.png Binary files differindex 1e85efd6..65c6b324 100644 --- a/superhero/thumbnail.png +++ b/superhero/thumbnail.png diff --git a/united/thumbnail.png b/united/thumbnail.png Binary files differindex ffa90906..d3a83778 100644 --- a/united/thumbnail.png +++ b/united/thumbnail.png |