From 4902629282f25e0516a6929b2617d52365534630 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Wed, 4 Feb 2015 14:52:00 +0200 Subject: [PATCH] Update bootswatch and add wells --- css/themes/cerulean.css | 99 +++++++++++++++++++++++++++++++------- css/themes/cosmo.css | 99 +++++++++++++++++++++++++++++++------- css/themes/cyborg.css | 102 ++++++++++++++++++++++++++++++++-------- css/themes/slate.css | 99 +++++++++++++++++++++++++++++++------- 4 files changed, 328 insertions(+), 71 deletions(-) diff --git a/css/themes/cerulean.css b/css/themes/cerulean.css index 4ec74b3..9e2aa29 100644 --- a/css/themes/cerulean.css +++ b/css/themes/cerulean.css @@ -1,7 +1,7 @@ /*! - * bootswatch v3.3.1+2 + * bootswatch v3.3.2 * Homepage: http://bootswatch.com - * Copyright 2012-2014 Thomas Park + * Copyright 2012-2015 Thomas Park * Licensed under MIT * Based on Bootstrap */ @@ -1499,7 +1499,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9; } .table-hover > tbody > tr:hover { @@ -1786,13 +1786,21 @@ input[type="search"] { input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, - input[type="month"].input-sm { + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { line-height: 30px; } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, - input[type="month"].input-lg { + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { line-height: 54px; } } @@ -1870,7 +1878,21 @@ fieldset[disabled] .checkbox label { padding-left: 0; padding-right: 0; } -.input-sm, +.input-sm { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.input-sm { + height: 30px; + line-height: 30px; +} +textarea.input-sm, +select[multiple].input-sm { + height: auto; +} .form-group-sm .form-control { height: 30px; padding: 5px 10px; @@ -1878,36 +1900,56 @@ fieldset[disabled] .checkbox label { line-height: 1.5; border-radius: 3px; } -select.input-sm, select.form-group-sm .form-control { height: 30px; line-height: 30px; } -textarea.input-sm, textarea.form-group-sm .form-control, -select[multiple].input-sm, select[multiple].form-group-sm .form-control { height: auto; } -.input-lg, +.form-group-sm .form-control-static { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; +} +.input-lg { + height: 54px; + padding: 14px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} +select.input-lg { + height: 54px; + line-height: 54px; +} +textarea.input-lg, +select[multiple].input-lg { + height: auto; +} .form-group-lg .form-control { height: 54px; padding: 14px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } -select.input-lg, select.form-group-lg .form-control { height: 54px; line-height: 54px; } -textarea.input-lg, textarea.form-group-lg .form-control, -select[multiple].input-lg, select[multiple].form-group-lg .form-control { height: auto; } +.form-group-lg .form-control-static { + height: 54px; + padding: 14px 16px; + font-size: 18px; + line-height: 1.3333333; +} .has-feedback { position: relative; } @@ -2116,7 +2158,7 @@ select[multiple].form-group-lg .form-control { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 19.62px; + padding-top: 19.6666662px; } } @media (min-width: 768px) { @@ -2484,7 +2526,7 @@ fieldset[disabled] .btn-link:focus { .btn-lg { padding: 14px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } .btn-sm { @@ -2558,6 +2600,7 @@ tbody.collapse.in { border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -2676,7 +2719,7 @@ tbody.collapse.in { .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3090,6 +3133,28 @@ a.list-group-item-danger.active:focus { margin-bottom: 0; line-height: 1.3; } +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.well-lg { + padding: 24px; + border-radius: 6px; +} +.well-sm { + padding: 9px; + border-radius: 3px; +} .close { float: right; font-size: 21px; diff --git a/css/themes/cosmo.css b/css/themes/cosmo.css index 226f1b7..9b83754 100644 --- a/css/themes/cosmo.css +++ b/css/themes/cosmo.css @@ -1,7 +1,7 @@ /*! - * bootswatch v3.3.1+2 + * bootswatch v3.3.2 * Homepage: http://bootswatch.com - * Copyright 2012-2014 Thomas Park + * Copyright 2012-2015 Thomas Park * Licensed under MIT * Based on Bootstrap */ @@ -1499,7 +1499,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9; } .table-hover > tbody > tr:hover { @@ -1786,13 +1786,21 @@ input[type="search"] { input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, - input[type="month"].input-sm { + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { line-height: 31px; } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, - input[type="month"].input-lg { + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { line-height: 64px; } } @@ -1870,7 +1878,21 @@ fieldset[disabled] .checkbox label { padding-left: 0; padding-right: 0; } -.input-sm, +.input-sm { + height: 31px; + padding: 5px 10px; + font-size: 13px; + line-height: 1.5; + border-radius: 0; +} +select.input-sm { + height: 31px; + line-height: 31px; +} +textarea.input-sm, +select[multiple].input-sm { + height: auto; +} .form-group-sm .form-control { height: 31px; padding: 5px 10px; @@ -1878,36 +1900,56 @@ fieldset[disabled] .checkbox label { line-height: 1.5; border-radius: 0; } -select.input-sm, select.form-group-sm .form-control { height: 31px; line-height: 31px; } -textarea.input-sm, textarea.form-group-sm .form-control, -select[multiple].input-sm, select[multiple].form-group-sm .form-control { height: auto; } -.input-lg, +.form-group-sm .form-control-static { + height: 31px; + padding: 5px 10px; + font-size: 13px; + line-height: 1.5; +} +.input-lg { + height: 64px; + padding: 18px 30px; + font-size: 19px; + line-height: 1.3333333; + border-radius: 0; +} +select.input-lg { + height: 64px; + line-height: 64px; +} +textarea.input-lg, +select[multiple].input-lg { + height: auto; +} .form-group-lg .form-control { height: 64px; padding: 18px 30px; font-size: 19px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 0; } -select.input-lg, select.form-group-lg .form-control { height: 64px; line-height: 64px; } -textarea.input-lg, textarea.form-group-lg .form-control, -select[multiple].input-lg, select[multiple].form-group-lg .form-control { height: auto; } +.form-group-lg .form-control-static { + height: 64px; + padding: 18px 30px; + font-size: 19px; + line-height: 1.3333333; +} .has-feedback { position: relative; } @@ -2116,7 +2158,7 @@ select[multiple].form-group-lg .form-control { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 24.94px; + padding-top: 24.9999994px; } } @media (min-width: 768px) { @@ -2484,7 +2526,7 @@ fieldset[disabled] .btn-link:focus { .btn-lg { padding: 18px 30px; font-size: 19px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 0; } .btn-sm { @@ -2558,6 +2600,7 @@ tbody.collapse.in { border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -2676,7 +2719,7 @@ tbody.collapse.in { .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3090,6 +3133,28 @@ a.list-group-item-danger.active:focus { margin-bottom: 0; line-height: 1.3; } +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.well-lg { + padding: 24px; + border-radius: 0; +} +.well-sm { + padding: 9px; + border-radius: 0; +} .close { float: right; font-size: 22.5px; diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css index c76a941..ac0b0a5 100644 --- a/css/themes/cyborg.css +++ b/css/themes/cyborg.css @@ -1,7 +1,7 @@ /*! - * bootswatch v3.3.1+2 + * bootswatch v3.3.2 * Homepage: http://bootswatch.com - * Copyright 2012-2014 Thomas Park + * Copyright 2012-2015 Thomas Park * Licensed under MIT * Based on Bootstrap */ @@ -1499,7 +1499,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #080808; } .table-hover > tbody > tr:hover { @@ -1786,13 +1786,21 @@ input[type="search"] { input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, - input[type="month"].input-sm { + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { line-height: 30px; } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, - input[type="month"].input-lg { + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { line-height: 54px; } } @@ -1870,7 +1878,21 @@ fieldset[disabled] .checkbox label { padding-left: 0; padding-right: 0; } -.input-sm, +.input-sm { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.input-sm { + height: 30px; + line-height: 30px; +} +textarea.input-sm, +select[multiple].input-sm { + height: auto; +} .form-group-sm .form-control { height: 30px; padding: 5px 10px; @@ -1878,36 +1900,56 @@ fieldset[disabled] .checkbox label { line-height: 1.5; border-radius: 3px; } -select.input-sm, select.form-group-sm .form-control { height: 30px; line-height: 30px; } -textarea.input-sm, textarea.form-group-sm .form-control, -select[multiple].input-sm, select[multiple].form-group-sm .form-control { height: auto; } -.input-lg, +.form-group-sm .form-control-static { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; +} +.input-lg { + height: 54px; + padding: 14px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} +select.input-lg { + height: 54px; + line-height: 54px; +} +textarea.input-lg, +select[multiple].input-lg { + height: auto; +} .form-group-lg .form-control { height: 54px; padding: 14px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } -select.input-lg, select.form-group-lg .form-control { height: 54px; line-height: 54px; } -textarea.input-lg, textarea.form-group-lg .form-control, -select[multiple].input-lg, select[multiple].form-group-lg .form-control { height: auto; } +.form-group-lg .form-control-static { + height: 54px; + padding: 14px 16px; + font-size: 18px; + line-height: 1.3333333; +} .has-feedback { position: relative; } @@ -2116,7 +2158,7 @@ select[multiple].form-group-lg .form-control { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 19.62px; + padding-top: 19.6666662px; } } @media (min-width: 768px) { @@ -2484,7 +2526,7 @@ fieldset[disabled] .btn-link:focus { .btn-lg { padding: 14px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } .btn-sm { @@ -2558,6 +2600,7 @@ tbody.collapse.in { border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -2676,7 +2719,7 @@ tbody.collapse.in { .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3090,6 +3133,28 @@ a.list-group-item-danger.active:focus { margin-bottom: 0; line-height: 1.3; } +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #151515; + border: 1px solid #030303; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.well-lg { + padding: 24px; + border-radius: 6px; +} +.well-sm { + padding: 9px; + border-radius: 3px; +} .close { float: right; font-size: 21px; @@ -3533,9 +3598,6 @@ button.close { .text-info:hover { color: #9933cc; } -.table-responsive > .table { - background-color: #181818; -} .has-warning .help-block, .has-warning .control-label, .has-warning .form-control-feedback { diff --git a/css/themes/slate.css b/css/themes/slate.css index 4b2ea37..2445c53 100644 --- a/css/themes/slate.css +++ b/css/themes/slate.css @@ -1,7 +1,7 @@ /*! - * bootswatch v3.3.1+2 + * bootswatch v3.3.2 * Homepage: http://bootswatch.com - * Copyright 2012-2014 Thomas Park + * Copyright 2012-2015 Thomas Park * Licensed under MIT * Based on Bootstrap */ @@ -1499,7 +1499,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #353a41; } .table-hover > tbody > tr:hover { @@ -1786,13 +1786,21 @@ input[type="search"] { input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, - input[type="month"].input-sm { + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { line-height: 30px; } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, - input[type="month"].input-lg { + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { line-height: 54px; } } @@ -1870,7 +1878,21 @@ fieldset[disabled] .checkbox label { padding-left: 0; padding-right: 0; } -.input-sm, +.input-sm { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.input-sm { + height: 30px; + line-height: 30px; +} +textarea.input-sm, +select[multiple].input-sm { + height: auto; +} .form-group-sm .form-control { height: 30px; padding: 5px 10px; @@ -1878,36 +1900,56 @@ fieldset[disabled] .checkbox label { line-height: 1.5; border-radius: 3px; } -select.input-sm, select.form-group-sm .form-control { height: 30px; line-height: 30px; } -textarea.input-sm, textarea.form-group-sm .form-control, -select[multiple].input-sm, select[multiple].form-group-sm .form-control { height: auto; } -.input-lg, +.form-group-sm .form-control-static { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; +} +.input-lg { + height: 54px; + padding: 14px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} +select.input-lg { + height: 54px; + line-height: 54px; +} +textarea.input-lg, +select[multiple].input-lg { + height: auto; +} .form-group-lg .form-control { height: 54px; padding: 14px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } -select.input-lg, select.form-group-lg .form-control { height: 54px; line-height: 54px; } -textarea.input-lg, textarea.form-group-lg .form-control, -select[multiple].input-lg, select[multiple].form-group-lg .form-control { height: auto; } +.form-group-lg .form-control-static { + height: 54px; + padding: 14px 16px; + font-size: 18px; + line-height: 1.3333333; +} .has-feedback { position: relative; } @@ -2116,7 +2158,7 @@ select[multiple].form-group-lg .form-control { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 19.62px; + padding-top: 19.6666662px; } } @media (min-width: 768px) { @@ -2484,7 +2526,7 @@ fieldset[disabled] .btn-link:focus { .btn-lg { padding: 14px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } .btn-sm { @@ -2558,6 +2600,7 @@ tbody.collapse.in { border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -2676,7 +2719,7 @@ tbody.collapse.in { .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3090,6 +3133,28 @@ a.list-group-item-danger.active:focus { margin-bottom: 0; line-height: 1.3; } +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: #1c1e22; + border: 1px solid #0c0d0e; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.well blockquote { + border-color: #ddd; + border-color: rgba(0, 0, 0, 0.15); +} +.well-lg { + padding: 24px; + border-radius: 6px; +} +.well-sm { + padding: 9px; + border-radius: 3px; +} .close { float: right; font-size: 21px; -- 2.39.2