Commit 3f6cb1a8 authored by Thomas Park's avatar Thomas Park
Browse files

new swatch, slate

parent a840bfab
......@@ -11,7 +11,7 @@
body {
position: relative;
padding-top: 90px;
background-color: #fff;
/* background-color: #fff;*/
/* background-image: url(../img/grid-18px-masked.png);*/
background-repeat: repeat-x;
background-position: 0 40px;
......
......@@ -26,7 +26,7 @@ body {
}
.twitter-follow-button {
width: 170px !important;
width: 160px !important;
}
.about {
......
......@@ -44,19 +44,7 @@
<div class="nav-collapse">
<ul class="nav">
<li><a id="swatch-link" href="#swatches">The Swatches</a></li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Preview <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="default">Default</a></li>
<li class="divider"></li>
<li><a href="cerulean">Cerulean</a></li>
<li><a href="cyborg">Cyborg</a></li>
<li><a href="journal">Journal</a></li>
<li><a href="simplex">Simplex</a></li>
<li><a href="spacelab">Spacelab</a></li>
<li><a href="united">United</a></li>
</ul>
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
......@@ -67,10 +55,6 @@
<div class="alert alert-info">
<p><strong>18 Feb:</strong> Added a swatchmaker, available on <a target="_blank" href="https://github.com/thomaspark/bootswatch/">GitHub</a>.</p>
<p><strong>17 Feb:</strong> Updated to the <a target="_blank" href="http://www.markdotto.com/2012/02/17/bootstrap-2-0-1-released/">newly released</a> Bootstrap 2.0.1. Previous versions can be downloaded from <a target="_blank" href="https://github.com/thomaspark/bootswatch/downloads">GitHub</a>.</p>
<p><strong>16 Feb:</strong> Follow the <a target="_blank" href="http://feeds.feedburner.com/bootswatch">RSS feed</a> or the <a target="_blank" href="http://feedburner.google.com/fb/a/mailverify?uri=bootswatch&loc=en_US">email list</a> to get notified when new swatches are released.</p>
<p><strong>14 Feb:</strong> Visit the <a target="_blank" onclick="pageTracker._link(this.href); return false;" href=" http://thomaspark.me/2012/02/introducing-bootswatch/">blog post</a> that discusses Bootswatch in more detail.</p>
......@@ -206,7 +190,6 @@
</li>
<li class="span4">
<div class="thumbnail">
<img src="journal/thumbnail.png" alt="">
......@@ -272,6 +255,39 @@
</div>
</li>
<li class="span4">
<div class="thumbnail">
<img src="slate/thumbnail.png" alt="">
<div class="caption">
<h3>Slate</h3>
<p>Shades of gunmetal gray.</p>
<div class="btn-toolbar">
<div class="btn-group"><a class="btn btn-large" href="slate">Preview</a></div>
<div class="btn-group">
<a class="btn btn-large btn-primary" target="_blank" href="slate/bootstrap.min.css"
onClick="_gaq.push(['_trackEvent', 'bootswatch', 'slate', 'bootstrap.min.css']);">Download</a>
<a class="btn btn-large btn-primary dropdown-toggle" data-toggle="dropdown" href="#">
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<!-- dropdown menu links -->
<li><a target="_blank" href="slate/bootstrap.min.css"
onClick="_gaq.push(['_trackEvent', 'bootswatch', 'slate', 'bootstrap.min.css']);">bootstrap.min.css</a></li>
<li><a target="_blank" href="slate/bootstrap.css"
onClick="_gaq.push(['_trackEvent', 'bootswatch', 'slate', 'bootstrap.css']);">bootstrap.css</a></li>
<li class="divider"></li>
<li><a target="_blank" href="slate/variables.less"
onClick="_gaq.push(['_trackEvent', 'bootswatch', 'slate', 'variables.less']);">variables.less</a></li>
<li><a target="_blank" href="slate/bootswatch.less"
onClick="_gaq.push(['_trackEvent', 'bootswatch', 'slate', 'bootswatch.less']);">bootswatch.less</a></li>
</ul>
</div>
</div>
</div>
</div>
</li>
<li class="span4">
<div class="thumbnail">
......@@ -358,6 +374,7 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery.js"></script>
<script src="js/bootswatch.js"></script>
<script src="js/bootstrap-dropdown.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>
......
$('.navbar .nav').first().append('<li class="dropdown"> \
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Preview <b class="caret"></b></a> \
<ul class="dropdown-menu"> \
<li><a href="../default">Default</a></li> \
<li><a href="/default">Default</a></li> \
<li class="divider"></li> \
<li><a href="../cerulean">Cerulean</a></li> \
<li><a href="../cyborg">Cyborg</a></li> \
<li><a href="../journal">Journal</a></li> \
<li><a href="../simplex">Simplex</a></li> \
<li><a href="../spacelab">Spacelab</a></li> \
<li><a href="../united">United</a></li> \
<li><a href="/cerulean">Cerulean</a></li> \
<li><a href="/cyborg">Cyborg</a></li> \
<li><a href="/journal">Journal</a></li> \
<li><a href="/simplex">Simplex</a></li> \
<li><a href="/slate">Slate</a></li> \
<li><a href="/spacelab">Spacelab</a></li> \
<li><a href="/united">United</a></li> \
</ul> \
</li>');
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
// Variables.less
// Variables to customize the look and feel of Bootstrap
// Swatch: Slate
// -----------------------------------------------------
// GLOBAL VALUES
// --------------------------------------------------
// Links
@linkColor: @white;
@linkColorHover: @white;
// Grays
@black: #000;
@grayDarker: #272B30;
@grayDark: #3A3F44;
@gray: #52575C;
@grayLight: #757C82;
@grayLighter: #BBBFC2;
@white: #fff;
// Accent colors
@blue: #02A1DD;
@blueDark: #108CBB;
@green: #87CA4D;
@red: #9d261d;
@yellow: #F6D30D;
@orange: #f89406;
@pink: #c3325f;
@purple: #7a43b6;
// Typography
@baseFontSize: 13px;
@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@baseLineHeight: 18px;
@textColor: @grayLight;
// Buttons
@primaryButtonBackground: @grayLight;
// COMPONENT VARIABLES
// --------------------------------------------------
// Z-index master list
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)
@zindexDropdown: 1000;
@zindexPopover: 1010;
@zindexTooltip: 1020;
@zindexFixedNavbar: 1030;
@zindexModalBackdrop: 1040;
@zindexModal: 1050;
// Sprite icons path
@iconSpritePath: "../img/glyphicons-halflings.png";
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
// Input placeholder text color
@placeholderText: @grayLight;
// Hr border color
@hrBorder: @grayLight;
// Navbar
@navbarHeight: 40px;
@navbarBackground: @grayDark;
@navbarBackgroundHighlight: @gray;
@navbarLinkBackgroundHover: transparent;
@navbarText: @textColor;
@navbarLinkColor: @grayLighter;
@navbarLinkColorHover: @grayLighter;
// Form states and alerts
@warningText: #c09853;
@warningBackground: #fcf8e3;
@warningBorder: darken(spin(@warningBackground, -10), 3%);
@errorText: #b94a48;
@errorBackground: #f2dede;
@errorBorder: darken(spin(@errorBackground, -10), 3%);
@successText: #468847;
@successBackground: #dff0d8;
@successBorder: darken(spin(@successBackground, -10), 5%);
@infoText: #3a87ad;
@infoBackground: #d9edf7;
@infoBorder: darken(spin(@infoBackground, -10), 7%);
// GRID
// --------------------------------------------------
// Default 940px grid
@gridColumns: 12;
@gridColumnWidth: 60px;
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Fluid grid
@fluidGridColumnWidth: 6.382978723%;
@fluidGridGutterWidth: 2.127659574%;
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