Commit 2ec92281 authored by Francesco Pontillo's avatar Francesco Pontillo
Browse files

Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
	amelia/index.html
	cerulean/index.html
	cosmo/index.html
	cyborg/index.html
	default/index.html
	index.html
	journal/index.html
	readable/index.html
	simplex/index.html
	slate/index.html
	spacelab/index.html
	spruce/index.html
	superhero/index.html
	united/index.html
parents 266c8ea2 5a8fb4bf
......@@ -16,7 +16,7 @@ module.exports = function (grunt) {
' * @license <%= pkg.license %>' + ' */'
},
swatch: {
amelia:{}, cerulean:{}, cosmo:{}, cyborg:{}, journal:{}, readable:{},
amelia:{}, cerulean:{}, cosmo:{}, cyborg:{}, flatly:{}, journal:{}, readable:{},
simplex:{}, slate:{}, spacelab:{}, spruce:{}, superhero:{}, united:{}
},
clean: {
......
......@@ -9,14 +9,14 @@ Head over to [Bootswatch](http://bootswatch.com) and download the `bootstrap.min
The themes are also hosted on [BootstrapCDN](http://www.bootstrapcdn.com/).
For use with Rails, check out [bootswatch-rails](https://github.com/maxim/bootswatch-rails) (Sass) and [twitter-bootswatch-rails](https://github.com/scottvrosenthal/twitter-bootswatch-rails) (LESS).
For use with Rails, check out [bootswatch-rails](https://github.com/maxim/bootswatch-rails) (Sass) and [twitter-bootswatch-rails](https://github.com/scottvrosenthal/twitter-bootswatch-rails) (LESS). For use with a Yeoman app or with Bower check out [bootswatch-scss](https://github.com/nrub/bootswatch-scss).
Customization
------
Bootswatch is an open source project, and you’re welcome to modify the themes further. If you’re interested, fork or follow the GitHub repository. The files of interest are in the `gh-pages` branch.
Each raw theme consists of two LESS files. One is `variables.less`, which is included by default in Bootstrap and allows you to customize [these settings](http://twitter.github.com/bootstrap/less.html#variables). The other is called `bootswatch.less` and introduces more extensive structural changes.
Each raw theme consists of two LESS files. One is `variables.less`, which is included by default in Bootstrap and allows you to customize [these settings](http://twitter.github.io/bootstrap/customize.html#variables). The other is called `bootswatch.less` and introduces more extensive structural changes.
Check out the README in the [swatchmaker directory](https://github.com/thomaspark/bootswatch/tree/master/swatchmaker) for step-by-step instructions on building your own swatch.
......@@ -60,4 +60,4 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
\ No newline at end of file
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
......@@ -228,7 +228,7 @@ body {
font-family: 'Cabin', Verdana, sans-serif;
font-size: 14px;
line-height: 20px;
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: #003f4d;
}
......@@ -687,39 +687,39 @@ a.muted:focus {
}
.text-warning {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
a.text-warning:hover,
a.text-warning:focus {
color: rgba(230, 230, 230, 0.9);
color: #bfdfdf;
}
.text-error {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
a.text-error:hover,
a.text-error:focus {
color: rgba(230, 230, 230, 0.9);
color: #bfdfdf;
}
.text-info {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
a.text-info:hover,
a.text-info:focus {
color: rgba(230, 230, 230, 0.9);
color: #bfdfdf;
}
.text-success {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
a.text-success:hover,
a.text-success:focus {
color: rgba(230, 230, 230, 0.9);
color: #bfdfdf;
}
.text-left {
......@@ -1459,7 +1459,7 @@ input[type="checkbox"][readonly] {
.control-group.warning .control-label,
.control-group.warning .help-block,
.control-group.warning .help-inline {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.control-group.warning .checkbox,
......@@ -1467,13 +1467,13 @@ input[type="checkbox"][readonly] {
.control-group.warning input,
.control-group.warning select,
.control-group.warning textarea {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.control-group.warning input,
.control-group.warning select,
.control-group.warning textarea {
border-color: rgba(255, 255, 255, 0.9);
border-color: #e1f0f0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
......@@ -1482,23 +1482,23 @@ input[type="checkbox"][readonly] {
.control-group.warning input:focus,
.control-group.warning select:focus,
.control-group.warning textarea:focus {
border-color: rgba(230, 230, 230, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
border-color: #bfdfdf;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
}
.control-group.warning .input-prepend .add-on,
.control-group.warning .input-append .add-on {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: #df6e1e;
border-color: rgba(255, 255, 255, 0.9);
border-color: #e1f0f0;
}
.control-group.error .control-label,
.control-group.error .help-block,
.control-group.error .help-inline {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.control-group.error .checkbox,
......@@ -1506,13 +1506,13 @@ input[type="checkbox"][readonly] {
.control-group.error input,
.control-group.error select,
.control-group.error textarea {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.control-group.error input,
.control-group.error select,
.control-group.error textarea {
border-color: rgba(255, 255, 255, 0.9);
border-color: #e1f0f0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
......@@ -1521,23 +1521,23 @@ input[type="checkbox"][readonly] {
.control-group.error input:focus,
.control-group.error select:focus,
.control-group.error textarea:focus {
border-color: rgba(230, 230, 230, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
border-color: #bfdfdf;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
}
.control-group.error .input-prepend .add-on,
.control-group.error .input-append .add-on {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: #ad1d28;
border-color: rgba(255, 255, 255, 0.9);
border-color: #e1f0f0;
}
.control-group.success .control-label,
.control-group.success .help-block,
.control-group.success .help-inline {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.control-group.success .checkbox,
......@@ -1545,13 +1545,13 @@ input[type="checkbox"][readonly] {
.control-group.success input,
.control-group.success select,
.control-group.success textarea {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.control-group.success input,
.control-group.success select,
.control-group.success textarea {
border-color: rgba(255, 255, 255, 0.9);
border-color: #e1f0f0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
......@@ -1560,23 +1560,23 @@ input[type="checkbox"][readonly] {
.control-group.success input:focus,
.control-group.success select:focus,
.control-group.success textarea:focus {
border-color: rgba(230, 230, 230, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
border-color: #bfdfdf;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
}
.control-group.success .input-prepend .add-on,
.control-group.success .input-append .add-on {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: #48ca3b;
border-color: rgba(255, 255, 255, 0.9);
border-color: #e1f0f0;
}
.control-group.info .control-label,
.control-group.info .help-block,
.control-group.info .help-inline {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.control-group.info .checkbox,
......@@ -1584,13 +1584,13 @@ input[type="checkbox"][readonly] {
.control-group.info input,
.control-group.info select,
.control-group.info textarea {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.control-group.info input,
.control-group.info select,
.control-group.info textarea {
border-color: rgba(255, 255, 255, 0.9);
border-color: #e1f0f0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
......@@ -1599,17 +1599,17 @@ input[type="checkbox"][readonly] {
.control-group.info input:focus,
.control-group.info select:focus,
.control-group.info textarea:focus {
border-color: rgba(230, 230, 230, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
border-color: #bfdfdf;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
}
.control-group.info .input-prepend .add-on,
.control-group.info .input-append .add-on {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: #4d3a7d;
border-color: rgba(255, 255, 255, 0.9);
border-color: #e1f0f0;
}
input:focus:invalid,
......@@ -1650,7 +1650,7 @@ select:focus:invalid:focus {
.help-block,
.help-inline {
color: rgba(255, 255, 255, 0.9);
color: #ffffff;
}
.help-block {
......@@ -3879,7 +3879,7 @@ input[type="submit"].btn.btn-mini {
.alert,
.alert h4 {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.alert h4 {
......@@ -3894,35 +3894,35 @@ input[type="submit"].btn.btn-mini {
}
.alert-success {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: #48ca3b;
border-color: #55b932;
}
.alert-success h4 {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.alert-danger,
.alert-error {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: #ad1d28;
border-color: #a01b3b;
}
.alert-danger h4,
.alert-error h4 {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.alert-info {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: #4d3a7d;
border-color: #352f65;
}
.alert-info h4 {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.alert-block {
......@@ -5665,12 +5665,12 @@ a.badge:focus {
.label-important,
.badge-important {
background-color: rgba(255, 255, 255, 0.9);
background-color: #e1f0f0;
}
.label-important[href],
.badge-important[href] {
background-color: rgba(230, 230, 230, 0.9);
background-color: #bfdfdf;
}
.label-warning,
......@@ -5685,22 +5685,22 @@ a.badge:focus {
.label-success,
.badge-success {
background-color: rgba(255, 255, 255, 0.9);
background-color: #e1f0f0;
}
.label-success[href],
.badge-success[href] {
background-color: rgba(230, 230, 230, 0.9);
background-color: #bfdfdf;
}
.label-info,
.badge-info {
background-color: rgba(255, 255, 255, 0.9);
background-color: #e1f0f0;
}
.label-info[href],
.badge-info[href] {
background-color: rgba(230, 230, 230, 0.9);
background-color: #bfdfdf;
}
.label-inverse,
......@@ -6160,7 +6160,7 @@ a.badge:focus {
}
h6 {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
h1 small,
......@@ -6170,7 +6170,7 @@ h4 small,
h5 small,
h6 small {
font-family: 'Cabin', Verdana, sans-serif;
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
code,
......@@ -6192,7 +6192,7 @@ blockquote small {
}
.muted {
color: rgba(255, 255, 255, 0.5);
color: rgba(255, 255, 255, 0.6);
}
body {
......@@ -6271,7 +6271,7 @@ hr {
@media (max-width: 979px) {
.navbar .nav-collapse .nav li > a {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
......@@ -6292,7 +6292,7 @@ hr {
box-shadow: none;
}
.navbar .nav-collapse .navbar-search .search-query {
border: 2px solid rgba(255, 255, 255, 0.9);
border: 2px solid #e1f0f0;
}
.navbar .nav-collapse .nav-header {
color: rgba(255, 255, 255, 0.5);
......@@ -6320,7 +6320,7 @@ div.subnav {
}
div.subnav .nav > li > a {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
border-color: transparent;
}
......@@ -6332,7 +6332,7 @@ div.subnav .nav > li:first-child > a:hover {
}
div.subnav .nav > .active > a {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: rgba(255, 255, 255, 0.4);
border-color: transparent;
-webkit-box-shadow: none;
......@@ -6342,7 +6342,7 @@ div.subnav .nav > .active > a {
div.subnav .nav > li > a:hover,
div.subnav .nav > .active > a:hover {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: rgba(255, 255, 255, 0.4);
border-right-color: transparent;
}
......@@ -6363,20 +6363,13 @@ div.subnav-fixed {
}
}
.nav-tabs li.open > .dropdown-toggle,
.nav-pills li.open > .dropdown-toggle {
color: #e8d069;
background-color: #8AD5DC;
border-color: transparent;
}
.nav-tabs,
.nav-pills {
border-color: transparent;
}
.nav-tabs li > a,
.nav-pills li > a {
.nav-tabs > li > a,
.nav-pills > li > a {
border-color: transparent;
-webkit-border-radius: 0;
-moz-border-radius: 0;
......@@ -6386,26 +6379,41 @@ div.subnav-fixed {
box-shadow: 0;
}
.nav-tabs li.active > a,
.nav-pills li.active > a,
.nav-tabs li.active > a:hover,
.nav-pills li.active > a:hover {
color: rgba(255, 255, 255, 0.9);
.nav-tabs > li > a:hover,
.nav-pills > li > a:hover {
text-shadow: none;
background-color: #8AD5DC;
border-color: transparent;
}
.nav-tabs li.active > a,
.nav-pills li.active > a,
.nav-tabs li > a:hover,
.nav-pills li > a:hover,
.nav-tabs li.active > a:hover,
.nav-pills li.active > a:hover {
.nav-tabs > .active > a,
.nav-pills > .active > a,
.nav-tabs > .active > a:hover,
.nav-pills > .active > a:hover {
color: #e1f0f0;
text-shadow: none;
background-color: #8AD5DC;
border-color: transparent;
}
.nav-tabs,
.nav-tabs > li > a {
.nav-tabs > .disabled > a,
.nav-pills > .disabled > a,
.nav-tabs > .disabled > a:hover,
.nav-pills > .disabled > a:hover {
color: #dddddd;
background: none;
}
.nav-tabs > .open > .dropdown-toggle,
.nav-pills > .open > .dropdown-toggle,
.nav-tabs > .open > .dropdown-toggle,
.nav-pills > .open > .dropdown-toggle {
color: #e8d069;
background-color: #8AD5DC;
border-color: transparent;
}
.nav-tabs {
border-bottom: 1px solid rgba(255, 255, 255, 0.5);
}
......@@ -6428,7 +6436,7 @@ div.subnav-fixed {
}
.nav-list .nav-header {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
text-shadow: none;
}
......@@ -6473,8 +6481,9 @@ div.subnav-fixed {
color: #ffffff;
}
.breadcrumb .divider {
color: #e8d069;
.breadcrumb > li > a.divider,
.breadcrumb > li > span.divider {
color: #dddddd;
}
.pagination ul {
......@@ -6501,14 +6510,14 @@ div.subnav-fixed {
.pagination ul > .disabled > a:hover,
.pagination ul > .disabled > span,
.pagination ul > .disabled > span:hover {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
}
.pagination ul > .active > a,
.pagination ul > .active > a:hover,
.pagination ul > .active > span,
.pagination ul > .active > span:hover {
color: rgba(255, 255, 255, 0.9);
color: #e1f0f0;
background-color: rgba(255, 255, 255, 0.4);
}
......@@ -6825,7 +6834,7 @@ legend,
label,
.help-block,
.input-file {
color: rgba(255, 255, 255, 0.9);
color: inherit;
border: 0 solid transparent;
}
......@@ -6869,13 +6878,169 @@ textarea,
.control-group.warning .control-label,
.control-group.warning .help-block,
.control-group.warning .help-inline {
color: #f3c4a3;
color: #debb27;
}
.control-group.warning .checkbox,
.control-group.warning .radio,
.control-group.warning input,
.control-group.warning select,
.control-group.warning textarea {
color: #debb27;
}
.control-group.warning input,
.control-group.warning select,
.control-group.warning textarea {
border-color: #f2e5ac;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.control-group.warning input:focus,
.control-group.warning select:focus,
.control-group.warning textarea:focus {
border-color: #ecd77f;