Skip to content

Commit

Permalink
added paper and sandstone, deprecated amelia
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomaspark
thomaspark committed Aug 13, 2014
1 parent 4ed8626 commit f88f3fb
Show file tree
Hide file tree
Showing 66 changed files with 18,573 additions and 816 deletions.
2 changes: 1 addition & 1 deletion amelia/bootstrap.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import url("//fonts.googleapis.com/css?family=Lobster|Cabin:400,700");
/*!
* Bootswatch v3.2.0
* bootswatch v3.2.0
* Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park
* Licensed under MIT
Expand Down
2 changes: 1 addition & 1 deletion amelia/bootstrap.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

89 changes: 45 additions & 44 deletions amelia/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@
<ul class="dropdown-menu" aria-labelledby="themes">
<li><a href="../default/">Default</a></li>
<li class="divider"></li>
<li><a href="../amelia/">Amelia</a></li>
<li><a href="../cerulean/">Cerulean</a></li>
<li><a href="../cosmo/">Cosmo</a></li>
<li><a href="../cyborg/">Cyborg</a></li>
<li><a href="../darkly/">Darkly</a></li>
<li><a href="../flatly/">Flatly</a></li>
<li><a href="../journal/">Journal</a></li>
<li><a href="../lumen/">Lumen</a></li>
<li><a href="../paper/">Paper</a></li>
<li><a href="../readable/">Readable</a></li>
<li><a href="../sandstone/">Sandstone</a></li>
<li><a href="../simplex/">Simplex</a></li>
<li><a href="../slate/">Slate</a></li>
<li><a href="../spacelab/">Spacelab</a></li>
Expand Down Expand Up @@ -229,31 +230,31 @@ <h1 id="buttons">Buttons</h1>
<div class="col-lg-6">

<p class="bs-component">
<button type="button" class="btn btn-default">Default</button>
<button type="button" class="btn btn-primary">Primary</button>
<button type="button" class="btn btn-success">Success</button>
<button type="button" class="btn btn-info">Info</button>
<button type="button" class="btn btn-warning">Warning</button>
<button type="button" class="btn btn-danger">Danger</button>
<button type="button" class="btn btn-link">Link</button>
<a href="#" class="btn btn-default">Default</a>
<a href="#" class="btn btn-primary">Primary</a>
<a href="#" class="btn btn-success">Success</a>
<a href="#" class="btn btn-info">Info</a>
<a href="#" class="btn btn-warning">Warning</a>
<a href="#" class="btn btn-danger">Danger</a>
<a href="#" class="btn btn-link">Link</a>
</p>

<p class="bs-component">
<button type="button" class="btn btn-default disabled">Default</button>
<button type="button" class="btn btn-primary disabled">Primary</button>
<button type="button" class="btn btn-success disabled">Success</button>
<button type="button" class="btn btn-info disabled">Info</button>
<button type="button" class="btn btn-warning disabled">Warning</button>
<button type="button" class="btn btn-danger disabled">Danger</button>
<button type="button" class="btn btn-link disabled">Link</button>
<a href="#" class="btn btn-default disabled">Default</a>
<a href="#" class="btn btn-primary disabled">Primary</a>
<a href="#" class="btn btn-success disabled">Success</a>
<a href="#" class="btn btn-info disabled">Info</a>
<a href="#" class="btn btn-warning disabled">Warning</a>
<a href="#" class="btn btn-danger disabled">Danger</a>
<a href="#" class="btn btn-link disabled">Link</a>
</p>


<div style="margin-bottom: 15px;">
<div class="btn-toolbar bs-component" style="margin: 0;">
<div class="btn-group">
<button type="button" class="btn btn-default">Default</button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<a href="#" class="btn btn-default">Default</a>
<a href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
Expand All @@ -264,8 +265,8 @@ <h1 id="buttons">Buttons</h1>
</div>

<div class="btn-group">
<button type="button" class="btn btn-primary">Primary</button>
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<a href="#" class="btn btn-primary">Primary</a>
<a href="#" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
Expand All @@ -276,8 +277,8 @@ <h1 id="buttons">Buttons</h1>
</div>

<div class="btn-group">
<button type="button" class="btn btn-success">Success</button>
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<a href="#" class="btn btn-success">Success</a>
<a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
Expand All @@ -288,8 +289,8 @@ <h1 id="buttons">Buttons</h1>
</div>

<div class="btn-group">
<button type="button" class="btn btn-info">Info</button>
<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<a href="#" class="btn btn-info">Info</a>
<a href="#" class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
Expand All @@ -300,8 +301,8 @@ <h1 id="buttons">Buttons</h1>
</div>

<div class="btn-group">
<button type="button" class="btn btn-warning">Warning</button>
<button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<a href="#" class="btn btn-warning">Warning</a>
<a href="#" class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
Expand All @@ -314,17 +315,17 @@ <h1 id="buttons">Buttons</h1>
</div>

<p class="bs-component">
<button type="button" class="btn btn-primary btn-lg">Large button</button>
<button type="button" class="btn btn-primary">Default button</button>
<button type="button" class="btn btn-primary btn-sm">Small button</button>
<button type="button" class="btn btn-primary btn-xs">Mini button</button>
<a href="#" class="btn btn-primary btn-lg">Large button</a>
<a href="#" class="btn btn-primary">Default button</a>
<a href="#" class="btn btn-primary btn-sm">Small button</a>
<a href="#" class="btn btn-primary btn-xs">Mini button</a>
</p>

</div>
<div class="col-lg-6">

<p class="bs-component">
<button type="button" class="btn btn-default btn-lg btn-block">Block level button</button>
<a href="#" class="btn btn-default btn-lg btn-block">Block level button</a>
</p>


Expand All @@ -339,25 +340,25 @@ <h1 id="buttons">Buttons</h1>
<div class="bs-component" style="margin-bottom: 15px;">
<div class="btn-toolbar">
<div class="btn-group">
<button type="button" class="btn btn-default">1</button>
<button type="button" class="btn btn-default">2</button>
<button type="button" class="btn btn-default">3</button>
<button type="button" class="btn btn-default">4</button>
<a href="#" class="btn btn-default">1</a>
<a href="#" class="btn btn-default">2</a>
<a href="#" class="btn btn-default">3</a>
<a href="#" class="btn btn-default">4</a>
</div>

<div class="btn-group">
<button type="button" class="btn btn-default">5</button>
<button type="button" class="btn btn-default">6</button>
<button type="button" class="btn btn-default">7</button>
<a href="#" class="btn btn-default">5</a>
<a href="#" class="btn btn-default">6</a>
<a href="#" class="btn btn-default">7</a>
</div>

<div class="btn-group">
<button type="button" class="btn btn-default">8</button>
<a href="#" class="btn btn-default">8</a>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<a href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
Dropdown
<span class="caret"></span>
</button>
</a>
<ul class="dropdown-menu">
<li><a href="#">Dropdown link</a></li>
<li><a href="#">Dropdown link</a></li>
Expand All @@ -370,10 +371,10 @@ <h1 id="buttons">Buttons</h1>

<div class="bs-component">
<div class="btn-group-vertical">
<button type="button" class="btn btn-default">Button</button>
<button type="button" class="btn btn-default">Button</button>
<button type="button" class="btn btn-default">Button</button>
<button type="button" class="btn btn-default">Button</button>
<a href="#" class="btn btn-default">Button</a>
<a href="#" class="btn btn-default">Button</a>
<a href="#" class="btn btn-default">Button</a>
<a href="#" class="btn btn-default">Button</a>
</div>
</div>

Expand Down
22 changes: 22 additions & 0 deletions api/3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@
"less": "http://bootswatch.com/lumen/bootswatch.less",
"lessVariables": "http://bootswatch.com/lumen/variables.less"
},
{
"name": "Paper",
"description": "Material is the metaphor",
"thumbnail": "http://bootswatch.com/paper/thumbnail.png",
"preview": "http://bootswatch.com/paper/",
"css": "http://bootswatch.com/paper/bootstrap.css",
"cssMin": "http://bootswatch.com/paper/bootstrap.min.css",
"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/paper/bootstrap.min.css",
"less": "http://bootswatch.com/paper/bootswatch.less",
"lessVariables": "http://bootswatch.com/paper/variables.less"
},
{
"name": "Readable",
"description": "Optimized for legibility",
Expand All @@ -100,6 +111,17 @@
"less": "http://bootswatch.com/readable/bootswatch.less",
"lessVariables": "http://bootswatch.com/readable/variables.less"
},
{
"name": "Sandstone",
"description": "A touch of warmth",
"thumbnail": "http://bootswatch.com/sandstone/thumbnail.png",
"preview": "http://bootswatch.com/sandstone/",
"css": "http://bootswatch.com/sandstone/bootstrap.css",
"cssMin": "http://bootswatch.com/sandstone/bootstrap.min.css",
"cssCdn": "//netdna.bootstrapcdn.com/bootswatch/latest/sandstone/bootstrap.min.css",
"less": "http://bootswatch.com/sandstone/bootswatch.less",
"lessVariables": "http://bootswatch.com/sandstone/variables.less"
},
{
"name": "Simplex",
"description": "Mini and minimalist",
Expand Down
2 changes: 1 addition & 1 deletion cerulean/bootstrap.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootswatch v3.2.0
* bootswatch v3.2.0
* Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park
* Licensed under MIT
Expand Down
2 changes: 1 addition & 1 deletion cerulean/bootstrap.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f88f3fb

Please sign in to comment.