diff --git a/404.php b/404.php index 34a252e..dc4335f 100644 --- a/404.php +++ b/404.php @@ -7,7 +7,7 @@ get_header(); ?>
-
+
diff --git a/README.md b/README.md index c64bdc5..899ac06 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,12 @@ Website: http://understrap.com Changelog = + - **0.3.6 Jan. 4th 2016** + - Cleanup + - Updating dependencies + - Upgrade to Bootstrap 3.3.6 and Font Awesome 4.5.0 + + - **0.3.4 SEP. 9th 2015** - Adding basic WooCommerce support - Cleanup for submitting to wordpress.org @@ -51,9 +57,9 @@ At the moment UnderStrap is in a very early stage. But if you wan´t feel free t Basic Features = - Combines the _s WordPress Starter Theme PHP/JS files and Bootstrap´s HTML/CSS/JS -- Comes with Bootstrap (3.3.5) SASS source files and additional scss files. Nicely sorted and ready to add your own variables/customize the Bootstrap variables. +- Comes with Bootstrap (3.3.6) SASS source files and additional scss files. Nicely sorted and ready to add your own variables/customize the Bootstrap variables. - Uses a single and minified CSS file for all the basic stuff -- Font Awesome Icon Font integrated (V 4.4.0): http://fortawesome.github.io/Font-Awesome/ +- Font Awesome Icon Font integrated (V 4.5.0): http://fortawesome.github.io/Font-Awesome/ - Comes with extra slider script - By owl.carousel (V 2.0.0-beta.2.4): http://www.owlcarousel.owlgraphic.com/ - Simple RTL file - Jetpack ready diff --git a/archive.php b/archive.php index 702ee31..2095913 100644 --- a/archive.php +++ b/archive.php @@ -11,7 +11,7 @@ get_header(); ?>
-
+
diff --git a/bower.json b/bower.json index 13faae9..3ade674 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "understrap", - "version": "0.3.4", + "version": "0.3.6", "homepage": "http://understrap.com", "authors": [ "Holger Koenemann " @@ -24,13 +24,13 @@ "tests" ], "dependencies": { - "bootstrap-sass": "~3.3.5", - "fontawesome": "~4.4.0", + "bootstrap-sass": "~3.3.6", + "fontawesome": "~4.5.0", "_s": "https://github.com/Automattic/_s.git", "OwlCarousel2": "~2.0.0-beta.3" }, "_source": "https://github.com/holger1411/understrap.git", - "_target": "~0.3.4", + "_target": "~0.3.6", "_originalSource": "understrap" } diff --git a/content-none.php b/content-none.php index 8dcd0ba..82fd42a 100644 --- a/content-none.php +++ b/content-none.php @@ -8,12 +8,16 @@ */ ?> -
+
class="content-no-results-page not-found"> +
+

Get started here.', 'understrap' ), esc_url( admin_url( 'post-new.php' ) ) ); ?>

@@ -26,8 +30,11 @@

+ +
-
+ + diff --git a/content-page.php b/content-page.php index 5a27b6e..f15fff5 100644 --- a/content-page.php +++ b/content-page.php @@ -6,24 +6,33 @@ */ ?> -
> +
class="content-page-item"> +
+ ', '' ); ?> +
+ + '', ) ); ?> +
+ ', '' ); ?> +
+
diff --git a/content-search.php b/content-search.php index d16ad7f..154e8a7 100644 --- a/content-search.php +++ b/content-search.php @@ -8,22 +8,34 @@ */ ?> -
> + diff --git a/content-single.php b/content-single.php index f8812c0..8c6eead 100644 --- a/content-single.php +++ b/content-single.php @@ -4,28 +4,39 @@ */ ?> -
> +
class="content-single-item"> +
+ ', '' ); ?> +
+ + '', ) ); ?> +
+ +
+
diff --git a/content.php b/content.php index 9491fa9..459cb44 100644 --- a/content.php +++ b/content.php @@ -11,32 +11,36 @@ ', esc_url( get_permalink() ) ), '' ); ?> - + + + -
+
- + - '', - ) ); - ?> - -
+ '', + ) ); + ?> + +
+ +
\ No newline at end of file diff --git a/css/theme.css b/css/theme.css index 1f03627..b675ea4 100644 --- a/css/theme.css +++ b/css/theme.css @@ -29,7 +29,7 @@ Import all needed 3rd party sass files plus your own style and variables 6. theme/theme.scss"; // <-- ADD YOUR STYLES HERE ***************************************************************** */ /*! - * Bootstrap v3.3.5 (http://getbootstrap.com) + * Bootstrap v3.3.6 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -282,10 +282,10 @@ th { -moz-osx-font-smoothing: grayscale; } .glyphicon-asterisk:before { - content: "\2a"; } + content: "\002a"; } .glyphicon-plus:before { - content: "\2b"; } + content: "\002b"; } .glyphicon-euro:before, .glyphicon-eur:before { @@ -1099,10 +1099,10 @@ textarea { line-height: inherit; } a { - color: #9900ee; + color: #0CB4CE; text-decoration: none; } a:hover, a:focus { - color: #6800a2; + color: #087586; text-decoration: underline; } a:focus { outline: thin dotted; @@ -1289,11 +1289,11 @@ mark, color: #777777; } .text-primary { - color: #9900ee; } + color: #0CB4CE; } a.text-primary:hover, a.text-primary:focus { - color: #7800bb; } + color: #098a9e; } .text-success { color: #3c763d; } @@ -1327,11 +1327,11 @@ a.text-danger:focus { color: #fff; } .bg-primary { - background-color: #9900ee; } + background-color: #0CB4CE; } a.bg-primary:hover, a.bg-primary:focus { - background-color: #7800bb; } + background-color: #098a9e; } .bg-success { background-color: #dff0d8; } @@ -2361,6 +2361,9 @@ output { color: #999; } .form-control::-webkit-input-placeholder { color: #999; } + .form-control::-ms-expand { + border: 0; + background-color: transparent; } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { background-color: #eeeeee; @@ -2804,7 +2807,7 @@ select[multiple].input-lg, @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 14.33333px; + padding-top: 11px; font-size: 18px; } } @media (min-width: 768px) { @@ -2882,13 +2885,10 @@ fieldset[disabled] a.btn { .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle { background-image: none; } - .btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled.focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled].focus, .btn-default[disabled]:active, .btn-default[disabled].active, - fieldset[disabled] .btn-default, + .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled.focus, .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled].focus, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, - fieldset[disabled] .btn-default.focus, - fieldset[disabled] .btn-default:active, - fieldset[disabled] .btn-default.active { + fieldset[disabled] .btn-default.focus { background-color: #fff; border-color: #ccc; } .btn-default .badge { @@ -2897,42 +2897,39 @@ fieldset[disabled] a.btn { .btn-primary { color: #fff; - background-color: #9900ee; - border-color: #8900d5; } + background-color: #0CB4CE; + border-color: #0b9fb6; } .btn-primary:focus, .btn-primary.focus { color: #fff; - background-color: #7800bb; - border-color: #370055; } + background-color: #098a9e; + border-color: #04363d; } .btn-primary:hover { color: #fff; - background-color: #7800bb; - border-color: #610097; } + background-color: #098a9e; + border-color: #076c7c; } .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle { color: #fff; - background-color: #7800bb; - border-color: #610097; } + background-color: #098a9e; + border-color: #076c7c; } .btn-primary:active:hover, .btn-primary:active:focus, .btn-primary:active.focus, .btn-primary.active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .open > .btn-primary.dropdown-toggle:hover, .open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus { color: #fff; - background-color: #610097; - border-color: #370055; } + background-color: #076c7c; + border-color: #04363d; } .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle { background-image: none; } - .btn-primary.disabled, .btn-primary.disabled:hover, .btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary.disabled:active, .btn-primary.disabled.active, .btn-primary[disabled], .btn-primary[disabled]:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, .btn-primary[disabled]:active, .btn-primary[disabled].active, - fieldset[disabled] .btn-primary, + .btn-primary.disabled:hover, .btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary[disabled]:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, - fieldset[disabled] .btn-primary.focus, - fieldset[disabled] .btn-primary:active, - fieldset[disabled] .btn-primary.active { - background-color: #9900ee; - border-color: #8900d5; } + fieldset[disabled] .btn-primary.focus { + background-color: #0CB4CE; + border-color: #0b9fb6; } .btn-primary .badge { - color: #9900ee; + color: #0CB4CE; background-color: #fff; } .btn-success { @@ -2962,13 +2959,10 @@ fieldset[disabled] a.btn { .btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle { background-image: none; } - .btn-success.disabled, .btn-success.disabled:hover, .btn-success.disabled:focus, .btn-success.disabled.focus, .btn-success.disabled:active, .btn-success.disabled.active, .btn-success[disabled], .btn-success[disabled]:hover, .btn-success[disabled]:focus, .btn-success[disabled].focus, .btn-success[disabled]:active, .btn-success[disabled].active, - fieldset[disabled] .btn-success, + .btn-success.disabled:hover, .btn-success.disabled:focus, .btn-success.disabled.focus, .btn-success[disabled]:hover, .btn-success[disabled]:focus, .btn-success[disabled].focus, fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:focus, - fieldset[disabled] .btn-success.focus, - fieldset[disabled] .btn-success:active, - fieldset[disabled] .btn-success.active { + fieldset[disabled] .btn-success.focus { background-color: #5cb85c; border-color: #4cae4c; } .btn-success .badge { @@ -3002,13 +2996,10 @@ fieldset[disabled] a.btn { .btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle { background-image: none; } - .btn-info.disabled, .btn-info.disabled:hover, .btn-info.disabled:focus, .btn-info.disabled.focus, .btn-info.disabled:active, .btn-info.disabled.active, .btn-info[disabled], .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled].focus, .btn-info[disabled]:active, .btn-info[disabled].active, - fieldset[disabled] .btn-info, + .btn-info.disabled:hover, .btn-info.disabled:focus, .btn-info.disabled.focus, .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled].focus, fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:focus, - fieldset[disabled] .btn-info.focus, - fieldset[disabled] .btn-info:active, - fieldset[disabled] .btn-info.active { + fieldset[disabled] .btn-info.focus { background-color: #5bc0de; border-color: #46b8da; } .btn-info .badge { @@ -3042,13 +3033,10 @@ fieldset[disabled] a.btn { .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle { background-image: none; } - .btn-warning.disabled, .btn-warning.disabled:hover, .btn-warning.disabled:focus, .btn-warning.disabled.focus, .btn-warning.disabled:active, .btn-warning.disabled.active, .btn-warning[disabled], .btn-warning[disabled]:hover, .btn-warning[disabled]:focus, .btn-warning[disabled].focus, .btn-warning[disabled]:active, .btn-warning[disabled].active, - fieldset[disabled] .btn-warning, + .btn-warning.disabled:hover, .btn-warning.disabled:focus, .btn-warning.disabled.focus, .btn-warning[disabled]:hover, .btn-warning[disabled]:focus, .btn-warning[disabled].focus, fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:focus, - fieldset[disabled] .btn-warning.focus, - fieldset[disabled] .btn-warning:active, - fieldset[disabled] .btn-warning.active { + fieldset[disabled] .btn-warning.focus { background-color: #f0ad4e; border-color: #eea236; } .btn-warning .badge { @@ -3082,13 +3070,10 @@ fieldset[disabled] a.btn { .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle { background-image: none; } - .btn-danger.disabled, .btn-danger.disabled:hover, .btn-danger.disabled:focus, .btn-danger.disabled.focus, .btn-danger.disabled:active, .btn-danger.disabled.active, .btn-danger[disabled], .btn-danger[disabled]:hover, .btn-danger[disabled]:focus, .btn-danger[disabled].focus, .btn-danger[disabled]:active, .btn-danger[disabled].active, - fieldset[disabled] .btn-danger, + .btn-danger.disabled:hover, .btn-danger.disabled:focus, .btn-danger.disabled.focus, .btn-danger[disabled]:hover, .btn-danger[disabled]:focus, .btn-danger[disabled].focus, fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:focus, - fieldset[disabled] .btn-danger.focus, - fieldset[disabled] .btn-danger:active, - fieldset[disabled] .btn-danger.active { + fieldset[disabled] .btn-danger.focus { background-color: #d9534f; border-color: #d43f3a; } .btn-danger .badge { @@ -3096,7 +3081,7 @@ fieldset[disabled] a.btn { background-color: #fff; } .btn-link { - color: #9900ee; + color: #0CB4CE; font-weight: normal; border-radius: 0; } .btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled], @@ -3107,7 +3092,7 @@ fieldset[disabled] a.btn { .btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { border-color: transparent; } .btn-link:hover, .btn-link:focus { - color: #6800a2; + color: #087586; text-decoration: underline; background-color: transparent; } .btn-link[disabled]:hover, .btn-link[disabled]:focus, @@ -3240,7 +3225,7 @@ tbody.collapse.in { color: #fff; text-decoration: none; outline: 0; - background-color: #9900ee; } + background-color: #0CB4CE; } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { color: #777777; } @@ -3433,13 +3418,15 @@ tbody.collapse.in { .btn-group-vertical > .btn:first-child:not(:last-child) { border-top-right-radius: 4px; + border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } .btn-group-vertical > .btn:last-child:not(:first-child) { - border-bottom-left-radius: 4px; border-top-right-radius: 0; - border-top-left-radius: 0; } + border-top-left-radius: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } @@ -3490,6 +3477,8 @@ tbody.collapse.in { float: left; width: 100%; margin-bottom: 0; } + .input-group .form-control:focus { + z-index: 3; } .input-group-addon, .input-group-btn, @@ -3604,7 +3593,7 @@ tbody.collapse.in { cursor: not-allowed; } .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { background-color: #eeeeee; - border-color: #9900ee; } + border-color: #0CB4CE; } .nav .nav-divider { height: 1px; margin: 9px 0; @@ -3640,7 +3629,7 @@ tbody.collapse.in { margin-left: 2px; } .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #fff; - background-color: #9900ee; } + background-color: #0CB4CE; } .nav-stacked > li { float: none; } @@ -3696,8 +3685,8 @@ tbody.collapse.in { .navbar { position: relative; - min-height: 50px; - margin-bottom: 20px; + min-height: 60px; + margin-bottom: 0px; border: 1px solid transparent; } .navbar:before, .navbar:after { content: " "; @@ -3706,7 +3695,7 @@ tbody.collapse.in { clear: both; } @media (min-width: 768px) { .navbar { - border-radius: 4px; } } + border-radius: 0px; } } .navbar-header:before, .navbar-header:after { content: " "; @@ -3802,10 +3791,10 @@ tbody.collapse.in { .navbar-brand { float: left; - padding: 15px 15px; + padding: 20px 15px; font-size: 18px; line-height: 20px; - height: 50px; } + height: 60px; } .navbar-brand:hover, .navbar-brand:focus { text-decoration: none; } .navbar-brand > img { @@ -3820,8 +3809,8 @@ tbody.collapse.in { float: right; margin-right: 15px; padding: 9px 10px; - margin-top: 8px; - margin-bottom: 8px; + margin-top: 13px; + margin-bottom: 13px; background-color: transparent; background-image: none; border: 1px solid transparent; @@ -3840,7 +3829,7 @@ tbody.collapse.in { display: none; } } .navbar-nav { - margin: 7.5px -15px; } + margin: 10px -15px; } .navbar-nav > li > a { padding-top: 10px; padding-bottom: 10px; @@ -3868,8 +3857,8 @@ tbody.collapse.in { .navbar-nav > li { float: left; } .navbar-nav > li > a { - padding-top: 15px; - padding-bottom: 15px; } } + padding-top: 20px; + padding-bottom: 20px; } } .navbar-form { margin-left: -15px; @@ -3879,8 +3868,8 @@ tbody.collapse.in { border-bottom: 1px solid transparent; -webkit-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); - margin-top: 8px; - margin-bottom: 8px; } + margin-top: 13px; + margin-bottom: 13px; } @media (min-width: 768px) { .navbar-form .form-group { display: inline-block; @@ -3942,24 +3931,24 @@ tbody.collapse.in { .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { margin-bottom: 0; - border-top-right-radius: 4px; - border-top-left-radius: 4px; + border-top-right-radius: 0px; + border-top-left-radius: 0px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } .navbar-btn { - margin-top: 8px; - margin-bottom: 8px; } + margin-top: 13px; + margin-bottom: 13px; } .navbar-btn.btn-sm, .btn-group-sm > .navbar-btn.btn { - margin-top: 10px; - margin-bottom: 10px; } + margin-top: 15px; + margin-bottom: 15px; } .navbar-btn.btn-xs, .btn-group-xs > .navbar-btn.btn { - margin-top: 14px; - margin-bottom: 14px; } + margin-top: 19px; + margin-bottom: 19px; } .navbar-text { - margin-top: 15px; - margin-bottom: 15px; } + margin-top: 20px; + margin-bottom: 20px; } @media (min-width: 768px) { .navbar-text { float: left; @@ -4124,7 +4113,7 @@ tbody.collapse.in { padding: 6px 12px; line-height: 1.42857; text-decoration: none; - color: #9900ee; + color: #0CB4CE; background-color: #fff; border: 1px solid #ddd; margin-left: -1px; } @@ -4140,18 +4129,18 @@ tbody.collapse.in { .pagination > li > a:hover, .pagination > li > a:focus, .pagination > li > span:hover, .pagination > li > span:focus { - z-index: 3; - color: #6800a2; + z-index: 2; + color: #087586; background-color: #eeeeee; border-color: #ddd; } .pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus, .pagination > .active > span, .pagination > .active > span:hover, .pagination > .active > span:focus { - z-index: 2; + z-index: 3; color: #fff; - background-color: #9900ee; - border-color: #9900ee; + background-color: #0CB4CE; + border-color: #0CB4CE; cursor: default; } .pagination > .disabled > span, .pagination > .disabled > span:hover, @@ -4261,9 +4250,9 @@ a.label:hover, a.label:focus { background-color: #5e5e5e; } .label-primary { - background-color: #9900ee; } + background-color: #0CB4CE; } .label-primary[href]:hover, .label-primary[href]:focus { - background-color: #7800bb; } + background-color: #098a9e; } .label-success { background-color: #5cb85c; } @@ -4309,7 +4298,7 @@ a.label:hover, a.label:focus { padding: 1px 5px; } .list-group-item.active > .badge, .nav-pills > .active > a > .badge { - color: #9900ee; + color: #0CB4CE; background-color: #fff; } .list-group-item > .badge { float: right; } @@ -4340,7 +4329,9 @@ a.badge:hover, a.badge:focus { border-top-color: #d5d5d5; } .container .jumbotron, .container-fluid .jumbotron { - border-radius: 6px; } + border-radius: 6px; + padding-left: 15px; + padding-right: 15px; } .jumbotron .container { max-width: 100%; } @media screen and (min-width: 768px) { @@ -4380,7 +4371,7 @@ a.badge:hover, a.badge:focus { a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { - border-color: #9900ee; } + border-color: #0CB4CE; } .alert { padding: 15px; @@ -4473,7 +4464,7 @@ a.thumbnail.active { line-height: 20px; color: #fff; text-align: center; - background-color: #9900ee; + background-color: #0CB4CE; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width 0.6s ease; @@ -4615,8 +4606,8 @@ button.list-group-item { .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; color: #fff; - background-color: #9900ee; - border-color: #9900ee; } + background-color: #0CB4CE; + border-color: #0CB4CE; } .list-group-item.active .list-group-item-heading, .list-group-item.active .list-group-item-heading > small, .list-group-item.active .list-group-item-heading > .small, .list-group-item.active:hover .list-group-item-heading, @@ -4626,7 +4617,7 @@ button.list-group-item { .list-group-item.active:focus .list-group-item-heading > .small { color: inherit; } .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { - color: #e7bbff; } + color: #acf0fa; } .list-group-item-success { color: #3c763d; @@ -4961,18 +4952,18 @@ button.list-group-item-danger { border-bottom-color: #ddd; } .panel-primary { - border-color: #9900ee; } + border-color: #0CB4CE; } .panel-primary > .panel-heading { color: #fff; - background-color: #9900ee; - border-color: #9900ee; } + background-color: #0CB4CE; + border-color: #0CB4CE; } .panel-primary > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #9900ee; } + border-top-color: #0CB4CE; } .panel-primary > .panel-heading .badge { - color: #9900ee; + color: #0CB4CE; background-color: #fff; } .panel-primary > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #9900ee; } + border-bottom-color: #0CB4CE; } .panel-success { border-color: #d6e9c6; } @@ -5165,8 +5156,12 @@ button.close { .modal-header { padding: 15px; - border-bottom: 1px solid #e5e5e5; - min-height: 16.42857px; } + border-bottom: 1px solid #e5e5e5; } + .modal-header:before, .modal-header:after { + content: " "; + display: table; } + .modal-header:after { + clear: both; } .modal-header .close { margin-top: -2px; } @@ -5525,7 +5520,8 @@ button.close { font-size: 20px; color: #fff; text-align: center; - text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); + background-color: transparent; } .carousel-control.left { background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); @@ -5622,14 +5618,14 @@ button.close { .carousel-control .icon-next { width: 30px; height: 30px; - margin-top: -15px; + margin-top: -10px; font-size: 30px; } .carousel-control .glyphicon-chevron-left, .carousel-control .icon-prev { - margin-left: -15px; } + margin-left: -10px; } .carousel-control .glyphicon-chevron-right, .carousel-control .icon-next { - margin-right: -15px; } + margin-right: -10px; } .carousel-caption { left: 20%; right: 20%; @@ -5850,9 +5846,6 @@ button.close { .hidden-print { display: none !important; } } -body { - padding-top: 50px; } - .wrapper { padding: 30px 0; } @@ -5883,16 +5876,28 @@ body { .aligncenter { font-size: inherit; } +.entry-footer span { + padding-right: 10px; } + +img.wp-post-image, article img { + max-width: 100%; } + +a.skip-link { + z-index: 1000; + margin-bottom: -20px; + position: relative; + display: block; } + /*! - * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url("../fonts/fontawesome-webfont.eot?v=4.4.0"); - src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff2?v=4.4.0") format("woff2"), url("../fonts/fontawesome-webfont.woff?v=4.4.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.4.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular") format("svg"); + src: url("../fonts/fontawesome-webfont.eot?v=4.5.0"); + src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff2?v=4.5.0") format("woff2"), url("../fonts/fontawesome-webfont.woff?v=4.5.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.5.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular") format("svg"); font-weight: normal; font-style: normal; } @@ -7901,3 +7906,63 @@ body { .fa-fonticons:before { content: ""; } + +.fa-reddit-alien:before { + content: ""; } + +.fa-edge:before { + content: ""; } + +.fa-credit-card-alt:before { + content: ""; } + +.fa-codiepie:before { + content: ""; } + +.fa-modx:before { + content: ""; } + +.fa-fort-awesome:before { + content: ""; } + +.fa-usb:before { + content: ""; } + +.fa-product-hunt:before { + content: ""; } + +.fa-mixcloud:before { + content: ""; } + +.fa-scribd:before { + content: ""; } + +.fa-pause-circle:before { + content: ""; } + +.fa-pause-circle-o:before { + content: ""; } + +.fa-stop-circle:before { + content: ""; } + +.fa-stop-circle-o:before { + content: ""; } + +.fa-shopping-bag:before { + content: ""; } + +.fa-shopping-basket:before { + content: ""; } + +.fa-hashtag:before { + content: ""; } + +.fa-bluetooth:before { + content: ""; } + +.fa-bluetooth-b:before { + content: ""; } + +.fa-percent:before { + content: ""; } diff --git a/css/theme.min.css b/css/theme.min.css index 3842833..5c48d1d 100644 --- a/css/theme.min.css +++ b/css/theme.min.css @@ -1,12 +1,11 @@ @charset "UTF-8"; /*! - * Bootstrap v3.3.5 (http://getbootstrap.com) + * Bootstrap v3.3.6 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ .label,sub,sup{vertical-align:baseline} -.btn,.btn-group,.btn-group-vertical,.caret,.checkbox-inline,.radio-inline,img{vertical-align:middle} hr,img{border:0} body,figure{margin:0} .btn-group>.btn-group,.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left} @@ -27,6 +26,7 @@ mark{background:#ff0;color:#000} sub,sup{font-size:75%;line-height:0;position:relative} sup{top:-.5em} sub{bottom:-.25em} +img{vertical-align:middle} svg:not(:root){overflow:hidden} hr{box-sizing:content-box;height:0} pre,textarea{overflow:auto} @@ -65,8 +65,8 @@ h2,h3{page-break-after:avoid} .img-thumbnail,body{background-color:#fff} @font-face{font-family:'Glyphicons Halflings';src:url(../fonts/bootstrap/glyphicons-halflings-regular.eot);src:url(../fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix) format("embedded-opentype"),url(../fonts/bootstrap/glyphicons-halflings-regular.woff2) format("woff2"),url(../fonts/bootstrap/glyphicons-halflings-regular.woff) format("woff"),url(../fonts/bootstrap/glyphicons-halflings-regular.ttf) format("truetype"),url(../fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format("svg")} .glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased} -.glyphicon-asterisk:before{content:"\2a"} -.glyphicon-plus:before{content:"\2b"} +.glyphicon-asterisk:before{content:"\002a"} +.glyphicon-plus:before{content:"\002b"} .glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"} .glyphicon-minus:before{content:"\2212"} .glyphicon-cloud:before{content:"\2601"} @@ -327,8 +327,8 @@ h2,h3{page-break-after:avoid} html{font-size:10px;-webkit-tap-highlight-color:transparent} body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857;color:#333} button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit} -a{color:#90e;text-decoration:none} -a:focus,a:hover{color:#6800a2;text-decoration:underline} +a{color:#0CB4CE;text-decoration:none} +a:focus,a:hover{color:#087586;text-decoration:underline} a:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px} .img-responsive{display:block;height:auto} .img-rounded{border-radius:6px} @@ -367,8 +367,8 @@ dt,kbd kbd,label{font-weight:700} .initialism,.text-uppercase{text-transform:uppercase} .text-capitalize{text-transform:capitalize} .text-muted{color:#777} -.text-primary{color:#90e} -a.text-primary:focus,a.text-primary:hover{color:#7800bb} +.text-primary{color:#0CB4CE} +a.text-primary:focus,a.text-primary:hover{color:#098a9e} .text-success{color:#3c763d} a.text-success:focus,a.text-success:hover{color:#2b542c} .text-info{color:#31708f} @@ -377,8 +377,8 @@ a.text-info:focus,a.text-info:hover{color:#245269} a.text-warning:focus,a.text-warning:hover{color:#66512c} .text-danger{color:#a94442} a.text-danger:focus,a.text-danger:hover{color:#843534} -.bg-primary{color:#fff;background-color:#90e} -a.bg-primary:focus,a.bg-primary:hover{background-color:#7800bb} +.bg-primary{color:#fff;background-color:#0CB4CE} +a.bg-primary:focus,a.bg-primary:hover{background-color:#098a9e} .bg-success{background-color:#dff0d8} a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3} .bg-info{background-color:#d9edf7} @@ -403,7 +403,7 @@ dd{margin-left:0} .dl-horizontal dd{margin-left:180px} .container{width:750px} } -.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dropdown-menu>li>a,.form-horizontal .form-group:after,.modal-footer:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both} +.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dropdown-menu>li>a,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both} abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777} .initialism{font-size:90%} blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee} @@ -692,6 +692,7 @@ output{padding-top:7px} .form-control:-ms-input-placeholder{color:#999} .form-control::-webkit-input-placeholder{color:#999} .has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .form-control-feedback,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d} +.form-control::-ms-expand{border:0;background-color:transparent} .form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1} .form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed} textarea.form-control{height:auto} @@ -704,7 +705,7 @@ textarea.form-control{height:auto} .checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer} .checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-left:-20px;margin-top:4px\9} .checkbox+.checkbox,.radio+.radio{margin-top:-5px} -.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer} +.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:400;cursor:pointer} .checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px} .checkbox-inline.disabled,.checkbox.disabled label,.radio-inline.disabled,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio label,fieldset[disabled] .radio-inline,fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed} .form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0;min-height:34px} @@ -760,10 +761,10 @@ textarea.form-control{height:auto} .form-horizontal .form-group{margin-left:-15px;margin-right:-15px} .form-horizontal .form-group:after,.form-horizontal .form-group:before{content:" ";display:table} .form-horizontal .has-feedback .form-control-feedback{right:15px} -@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px;font-size:18px} +@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px} .form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px} } -.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;touch-action:manipulation;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} +.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;touch-action:manipulation;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} .btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px} .btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none} .btn.active,.btn:active{outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)} @@ -773,43 +774,43 @@ a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none} .btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c} .btn-default.active,.btn-default:active,.btn-default:hover,.open>.btn-default.dropdown-toggle{color:#333;background-color:#e6e6e6;border-color:#adadad} .btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.btn-default.dropdown-toggle.focus,.open>.btn-default.dropdown-toggle:focus,.open>.btn-default.dropdown-toggle:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c} -.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc} +.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc} .btn-default .badge{color:#fff;background-color:#333} -.btn-primary{color:#fff;background-color:#90e;border-color:#8900d5} -.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#7800bb;border-color:#370055} -.btn-primary.active,.btn-primary:active,.btn-primary:hover,.open>.btn-primary.dropdown-toggle{color:#fff;background-color:#7800bb;border-color:#610097} -.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.btn-primary.dropdown-toggle.focus,.open>.btn-primary.dropdown-toggle:focus,.open>.btn-primary.dropdown-toggle:hover{color:#fff;background-color:#610097;border-color:#370055} -.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#90e;border-color:#8900d5} -.btn-primary .badge{color:#90e;background-color:#fff} +.btn-primary{color:#fff;background-color:#0CB4CE;border-color:#0b9fb6} +.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#098a9e;border-color:#04363d} +.btn-primary.active,.btn-primary:active,.btn-primary:hover,.open>.btn-primary.dropdown-toggle{color:#fff;background-color:#098a9e;border-color:#076c7c} +.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.btn-primary.dropdown-toggle.focus,.open>.btn-primary.dropdown-toggle:focus,.open>.btn-primary.dropdown-toggle:hover{color:#fff;background-color:#076c7c;border-color:#04363d} +.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#0CB4CE;border-color:#0b9fb6} +.btn-primary .badge{color:#0CB4CE;background-color:#fff} .btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c} .btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625} .btn-success.active,.btn-success:active,.btn-success:hover,.open>.btn-success.dropdown-toggle{color:#fff;background-color:#449d44;border-color:#398439} .btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.btn-success.dropdown-toggle.focus,.open>.btn-success.dropdown-toggle:focus,.open>.btn-success.dropdown-toggle:hover{color:#fff;background-color:#398439;border-color:#255625} .btn-success.active,.btn-success:active,.open>.btn-success.dropdown-toggle{background-image:none} -.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c} +.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c} .btn-success .badge{color:#5cb85c;background-color:#fff} .btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da} .btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85} .btn-info.active,.btn-info:active,.btn-info:hover,.open>.btn-info.dropdown-toggle{color:#fff;background-color:#31b0d5;border-color:#269abc} .btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.btn-info.dropdown-toggle.focus,.open>.btn-info.dropdown-toggle:focus,.open>.btn-info.dropdown-toggle:hover{color:#fff;background-color:#269abc;border-color:#1b6d85} -.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da} +.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da} .btn-info .badge{color:#5bc0de;background-color:#fff} .btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236} .btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d} .btn-warning.active,.btn-warning:active,.btn-warning:hover,.open>.btn-warning.dropdown-toggle{color:#fff;background-color:#ec971f;border-color:#d58512} .btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.btn-warning.dropdown-toggle.focus,.open>.btn-warning.dropdown-toggle:focus,.open>.btn-warning.dropdown-toggle:hover{color:#fff;background-color:#d58512;border-color:#985f0d} -.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236} +.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236} .btn-warning .badge{color:#f0ad4e;background-color:#fff} .btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a} .btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19} .btn-danger.active,.btn-danger:active,.btn-danger:hover,.open>.btn-danger.dropdown-toggle{color:#fff;background-color:#c9302c;border-color:#ac2925} .btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.btn-danger.dropdown-toggle.focus,.open>.btn-danger.dropdown-toggle:focus,.open>.btn-danger.dropdown-toggle:hover{color:#fff;background-color:#ac2925;border-color:#761c19} -.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a} +.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a} .btn-danger .badge{color:#d9534f;background-color:#fff} -.btn-link{color:#90e;font-weight:400;border-radius:0} +.btn-link{color:#0CB4CE;font-weight:400;border-radius:0} .btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none} .btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent} -.btn-link:focus,.btn-link:hover{color:#6800a2;text-decoration:underline;background-color:transparent} +.btn-link:focus,.btn-link:hover{color:#087586;text-decoration:underline;background-color:transparent} .btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none} .btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33333;border-radius:6px} .btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px} @@ -824,16 +825,18 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn- tr.collapse.in{display:table-row} tbody.collapse.in{display:table-row-group} .collapsing{height:0;overflow:hidden;-webkit-transition-property:height,visibility;transition-property:height,visibility;-webkit-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;transition-timing-function:ease} -.caret{display:inline-block;width:0;height:0;margin-left:2px;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent} +.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent} .dropdown-toggle:focus{outline:0} .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box} .dropdown-menu-right,.dropdown-menu.pull-right{left:auto;right:0} .dropdown-header,.dropdown-menu>li>a{display:block;padding:3px 20px;line-height:1.42857;white-space:nowrap} +.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle,.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0} +.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child,.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0} .btn-group-vertical>.btn:not(:first-child):not(:last-child),.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn,.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0} .dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5} .dropdown-menu>li>a{font-weight:400;color:#333} .dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{text-decoration:none;color:#262626;background-color:#f5f5f5} -.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;outline:0;background-color:#90e} +.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;outline:0;background-color:#0CB4CE} .dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777} .dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);cursor:not-allowed} .open>.dropdown-menu{display:block} @@ -847,7 +850,7 @@ tbody.collapse.in{display:table-row-group} @media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto} .navbar-right .dropdown-menu-left{left:0;right:auto} } -.btn-group,.btn-group-vertical{position:relative;display:inline-block} +.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle} .btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left} .btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2} .btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px} @@ -855,10 +858,6 @@ tbody.collapse.in{display:table-row-group} .btn-toolbar:after,.btn-toolbar:before{content:" ";display:table} .btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px} .btn .caret,.btn-group>.btn:first-child{margin-left:0} -.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0} -.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0} -.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-top-right-radius:0} -.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0} .btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0} .btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px} .btn-group-lg.btn-group>.btn+.dropdown-toggle,.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px} @@ -870,8 +869,8 @@ tbody.collapse.in{display:table-row-group} .btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before{content:" ";display:table} .btn-group-vertical>.btn-group>.btn{float:none} .btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0} -.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0} -.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0} +.btn-group-vertical>.btn:first-child:not(:last-child){border-radius:4px 4px 0 0} +.btn-group-vertical>.btn:last-child:not(:first-child){border-radius:0 0 4px 4px} .btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn,.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0} .btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0} .btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0} @@ -884,6 +883,7 @@ tbody.collapse.in{display:table-row-group} .input-group{display:table;border-collapse:separate} .input-group[class*=col-]{float:none;padding-left:0;padding-right:0} .input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0} +.input-group .form-control:focus{z-index:3} .input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell} .input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle} .input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px} @@ -907,7 +907,7 @@ tbody.collapse.in{display:table-row-group} .nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee} .nav>li.disabled>a{color:#777} .nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;background-color:transparent;cursor:not-allowed} -.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#90e} +.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#0CB4CE} .nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5} .nav>li>a>img{max-width:none} .nav-tabs{border-bottom:1px solid #ddd} @@ -919,7 +919,7 @@ tbody.collapse.in{display:table-row-group} .nav-justified>li,.nav-stacked>li,.nav-tabs.nav-justified>li{float:none} .nav-pills>li>a{border-radius:4px} .nav-pills>li+li{margin-left:2px} -.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#90e} +.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#0CB4CE} .nav-stacked>li+li{margin-top:2px;margin-left:0} .nav-justified,.nav-tabs.nav-justified{width:100%} .nav-justified>li>a,.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px} @@ -934,14 +934,12 @@ tbody.collapse.in{display:table-row-group} } .tab-content>.tab-pane{display:none} .tab-content>.active{display:block} +.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before{display:table;content:" "} .nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0} -.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent} -.navbar:after,.navbar:before{content:" ";display:table} -.navbar-header:after,.navbar-header:before{content:" ";display:table} +.navbar{position:relative;min-height:60px;margin-bottom:0;border:1px solid transparent} .navbar-collapse{overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch} -.navbar-collapse:after,.navbar-collapse:before{content:" ";display:table} .navbar-collapse.in{overflow-y:auto} -@media (min-width:768px){.navbar{border-radius:4px} +@media (min-width:768px){.navbar{border-radius:0} .navbar-header{float:left} .navbar-collapse{width:auto;border-top:0;box-shadow:none} .navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important} @@ -956,18 +954,18 @@ tbody.collapse.in{display:table-row-group} .navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030} .navbar-fixed-top{top:0;border-width:0 0 1px} .navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0} -.navbar-brand{float:left;padding:15px;font-size:18px;line-height:20px;height:50px} +.navbar-brand{float:left;padding:20px 15px;font-size:18px;line-height:20px;height:60px} .navbar-brand:focus,.navbar-brand:hover{text-decoration:none} .navbar-brand>img{display:block} @media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0} .navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0} .navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px} } -.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px} +.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:13px;margin-bottom:13px;background-color:transparent;border:1px solid transparent;border-radius:4px} .navbar-toggle:focus{outline:0} .navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px} .navbar-toggle .icon-bar+.icon-bar{margin-top:4px} -.navbar-nav{margin:7.5px -15px} +.navbar-nav{margin:10px -15px} .navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px} @media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none} .navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px} @@ -978,9 +976,9 @@ tbody.collapse.in{display:table-row-group} @media (min-width:768px){.navbar-toggle{display:none} .navbar-nav{float:left;margin:0} .navbar-nav>li{float:left} -.navbar-nav>li>a{padding-top:15px;padding-bottom:15px} +.navbar-nav>li>a{padding-top:20px;padding-bottom:20px} } -.navbar-form{padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin:8px -15px} +.navbar-form{padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin:13px -15px} @media (min-width:768px){.navbar-form .form-control-static,.navbar-form .form-group{display:inline-block} .navbar-form .control-label,.navbar-form .form-group{margin-bottom:0;vertical-align:middle} .navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle} @@ -999,11 +997,11 @@ tbody.collapse.in{display:table-row-group} .navbar-form .form-group:last-child{margin-bottom:0} } .navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0} -.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-radius:4px 4px 0 0} -.navbar-btn{margin-top:8px;margin-bottom:8px} -.btn-group-sm>.navbar-btn.btn,.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px} -.btn-group-xs>.navbar-btn.btn,.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px} -.navbar-text{margin-top:15px;margin-bottom:15px} +.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-radius:0} +.navbar-btn{margin-top:13px;margin-bottom:13px} +.btn-group-sm>.navbar-btn.btn,.navbar-btn.btn-sm{margin-top:15px;margin-bottom:15px} +.btn-group-xs>.navbar-btn.btn,.navbar-btn.btn-xs{margin-top:19px;margin-bottom:19px} +.navbar-text{margin-top:20px;margin-bottom:20px} @media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px} .navbar-left{float:left!important} .navbar-right{float:right!important;margin-right:-15px} @@ -1060,12 +1058,11 @@ tbody.collapse.in{display:table-row-group} .breadcrumb>.active{color:#777} .pagination{padding-left:0;margin:20px 0;border-radius:4px} .pagination>li{display:inline} -.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857;text-decoration:none;color:#90e;background-color:#fff;border:1px solid #ddd;margin-left:-1px} -.list-group-item>.badge,.pager .next>a,.pager .next>span{float:right} +.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857;text-decoration:none;color:#0CB4CE;background-color:#fff;border:1px solid #ddd;margin-left:-1px} .pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px} .pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px} -.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#6800a2;background-color:#eee;border-color:#ddd} -.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;background-color:#90e;border-color:#90e;cursor:default} +.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#087586;background-color:#eee;border-color:#ddd} +.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;background-color:#0CB4CE;border-color:#0CB4CE;cursor:default} .pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;background-color:#fff;border-color:#ddd;cursor:not-allowed} .pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.33333} .pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px} @@ -1079,6 +1076,7 @@ tbody.collapse.in{display:table-row-group} .pager li{display:inline} .pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px} .pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee} +.pager .next>a,.pager .next>span{float:right} .pager .previous>a,.pager .previous>span{float:left} .pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;background-color:#fff;cursor:not-allowed} .label{display:inline;padding:.2em .6em .3em;font-size:75%;color:#fff;border-radius:.25em} @@ -1086,8 +1084,8 @@ tbody.collapse.in{display:table-row-group} a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer} .label-default{background-color:#777} .label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e} -.label-primary{background-color:#90e} -.label-primary[href]:focus,.label-primary[href]:hover{background-color:#7800bb} +.label-primary{background-color:#0CB4CE} +.label-primary[href]:focus,.label-primary[href]:hover{background-color:#098a9e} .label-success{background-color:#5cb85c} .label-success[href]:focus,.label-success[href]:hover{background-color:#449d44} .label-info{background-color:#5bc0de} @@ -1100,7 +1098,8 @@ a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer} .badge:empty{display:none} .media-object,.thumbnail{display:block} .btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px} -.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#90e;background-color:#fff} +.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#0CB4CE;background-color:#fff} +.list-group-item>.badge{float:right} .list-group-item>.badge+.badge{margin-right:5px} .nav-pills>li>a>.badge{margin-left:3px} a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer} @@ -1110,7 +1109,7 @@ a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer} .alert,.thumbnail{margin-bottom:20px} .alert .alert-link,.close{font-weight:700} .jumbotron>hr{border-top-color:#d5d5d5} -.container .jumbotron,.container-fluid .jumbotron{border-radius:6px} +.container .jumbotron,.container-fluid .jumbotron{border-radius:6px;padding-left:15px;padding-right:15px} .jumbotron .container{max-width:100%} @media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px} .container .jumbotron,.container-fluid .jumbotron{padding-left:60px;padding-right:60px} @@ -1119,7 +1118,7 @@ a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer} .thumbnail{padding:4px;line-height:1.42857;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out} .thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto;margin-left:auto;margin-right:auto} .thumbnail .caption{padding:9px;color:#333} -a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#90e} +a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#0CB4CE} .alert{padding:15px;border:1px solid transparent;border-radius:4px} .alert h4{margin-top:0;color:inherit} .alert>p,.alert>ul{margin-bottom:0} @@ -1146,7 +1145,7 @@ to{background-position:0 0} to{background-position:0 0} } .progress{height:20px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)} -.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#90e;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease} +.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#0CB4CE;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease} .progress-bar-striped,.progress-striped .progress-bar{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:40px 40px} .progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite} .progress-bar-success{background-color:#5cb85c} @@ -1181,9 +1180,9 @@ button.list-group-item{width:100%;text-align:left} .list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{background-color:#eee;color:#777;cursor:not-allowed} .list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit} .list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777} -.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#90e;border-color:#90e} +.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#0CB4CE;border-color:#0CB4CE} .list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit} -.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#e7bbff} +.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#acf0fa} .list-group-item-success{color:#3c763d;background-color:#dff0d8} a.list-group-item-success,button.list-group-item-success{color:#3c763d} a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit} @@ -1244,11 +1243,11 @@ a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-gro .panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd} .panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333} .panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd} -.panel-primary{border-color:#90e} -.panel-primary>.panel-heading{color:#fff;background-color:#90e;border-color:#90e} -.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#90e} -.panel-primary>.panel-heading .badge{color:#90e;background-color:#fff} -.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#90e} +.panel-primary{border-color:#0CB4CE} +.panel-primary>.panel-heading{color:#fff;background-color:#0CB4CE;border-color:#0CB4CE} +.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#0CB4CE} +.panel-primary>.panel-heading .badge{color:#0CB4CE;background-color:#fff} +.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#0CB4CE} .panel-success{border-color:#d6e9c6} .panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6} .panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6} @@ -1283,6 +1282,7 @@ a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-gro button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none} .modal-content,.popover{background-clip:padding-box} .modal{display:none;position:fixed;z-index:1050;-webkit-overflow-scrolling:touch;outline:0} +.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before{display:table;content:" "} .modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out} .modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)} .modal-open .modal{overflow-x:hidden;overflow-y:auto} @@ -1291,12 +1291,11 @@ button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance .modal-backdrop{position:fixed;z-index:1040;background-color:#000} .modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)} .modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)} -.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.43px} +.modal-header{padding:15px;border-bottom:1px solid #e5e5e5} .modal-header .close{margin-top:-2px} .modal-title{margin:0;line-height:1.42857} .modal-body{position:relative;padding:15px} .modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5} -.modal-footer:after,.modal-footer:before{content:" ";display:table} .modal-footer .btn+.btn{margin-left:5px;margin-bottom:0} .modal-footer .btn-group .btn+.btn{margin-left:-1px} .modal-footer .btn-block+.btn-block{margin-left:0} @@ -1362,7 +1361,7 @@ button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance .carousel-inner>.next.left,.carousel-inner>.prev.right{left:0} .carousel-inner>.active.left{left:-100%} .carousel-inner>.active.right{left:100%} -.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px} +.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px;background-color:transparent} .carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1)} .carousel-control.right{left:auto;right:0;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1)} .carousel-control:focus,.carousel-control:hover{outline:0;color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)} @@ -1377,9 +1376,9 @@ button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance .carousel-indicators .active{margin:0;width:12px;height:12px;background-color:#fff} .carousel-caption{position:absolute;left:15%;right:15%;bottom:20px;z-index:10;padding-top:20px;padding-bottom:20px} .carousel-caption .btn,.text-hide{text-shadow:none} -@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px} -.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px} -.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px} +@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px} +.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px} +.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px} .carousel-caption{left:20%;right:20%;padding-bottom:30px} .carousel-indicators{bottom:20px} } @@ -1395,6 +1394,7 @@ button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance .text-hide{font:0/0 a;color:transparent;background-color:transparent;border:0} .aligncenter,.alignleft,.alignright,.bypostauthor,.gallery-caption,.screen-reader-text,.sticky,.wp-caption,.wp-caption-text{font-size:inherit} .affix{position:fixed} +.fa-ul>li,a.skip-link{position:relative} @-ms-viewport{width:device-width} @media (max-width:767px){.visible-xs{display:block!important} table.visible-xs{display:table!important} @@ -1451,16 +1451,18 @@ td.visible-print,th.visible-print{display:table-cell!important} @media print{.visible-print-inline-block{display:inline-block!important} .hidden-print{display:none!important} } -.fa,.fa-stack{display:inline-block} -body{padding-top:50px} .wrapper{padding:30px 0} #wrapper-hero,#wrapper-static-hero{padding:0!important} .wrapper#wrapper-sticky{border-bottom:1px solid #eee} +.entry-footer span{padding-right:10px} +article img,img.wp-post-image{max-width:100%} +a.skip-link{z-index:1000;margin-bottom:-20px;display:block} +.fa,.fa-stack{display:inline-block} /*! - * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ -@font-face{font-family:FontAwesome;src:url(../fonts/fontawesome-webfont.eot?v=4.4.0);src:url(../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0) format("embedded-opentype"),url(../fonts/fontawesome-webfont.woff2?v=4.4.0) format("woff2"),url(../fonts/fontawesome-webfont.woff?v=4.4.0) format("woff"),url(../fonts/fontawesome-webfont.ttf?v=4.4.0) format("truetype"),url(../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular) format("svg");font-weight:400;font-style:normal} +@font-face{font-family:FontAwesome;src:url(../fonts/fontawesome-webfont.eot?v=4.5.0);src:url(../fonts/fontawesome-webfont.eot?#iefix&v=4.5.0) format("embedded-opentype"),url(../fonts/fontawesome-webfont.woff2?v=4.5.0) format("woff2"),url(../fonts/fontawesome-webfont.woff?v=4.5.0) format("woff"),url(../fonts/fontawesome-webfont.ttf?v=4.5.0) format("truetype"),url(../fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular) format("svg");font-weight:400;font-style:normal} .fa{font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased} .fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-15%} .fa-2x{font-size:2em} @@ -1470,7 +1472,6 @@ body{padding-top:50px} .fa-fw{width:1.28571em;text-align:center} .fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none} .fa.fa-pull-right,.fa.pull-right{margin-left:.3em} -.fa-ul>li{position:relative} .fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:.14286em;text-align:center} .fa-li.fa-lg{left:-1.85714em} .fa-border{padding:.2em .25em .15em;border:.08em solid #eee;border-radius:.1em} @@ -2079,4 +2080,24 @@ body{padding-top:50px} .fa-houzz:before{content:""} .fa-vimeo:before{content:""} .fa-black-tie:before{content:""} -.fa-fonticons:before{content:""} \ No newline at end of file +.fa-fonticons:before{content:""} +.fa-reddit-alien:before{content:""} +.fa-edge:before{content:""} +.fa-credit-card-alt:before{content:""} +.fa-codiepie:before{content:""} +.fa-modx:before{content:""} +.fa-fort-awesome:before{content:""} +.fa-usb:before{content:""} +.fa-product-hunt:before{content:""} +.fa-mixcloud:before{content:""} +.fa-scribd:before{content:""} +.fa-pause-circle:before{content:""} +.fa-pause-circle-o:before{content:""} +.fa-stop-circle:before{content:""} +.fa-stop-circle-o:before{content:""} +.fa-shopping-bag:before{content:""} +.fa-shopping-basket:before{content:""} +.fa-hashtag:before{content:""} +.fa-bluetooth:before{content:""} +.fa-bluetooth-b:before{content:""} +.fa-percent:before{content:""} \ No newline at end of file diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg index 6fd19ab..d05688e 100644 --- a/fonts/fontawesome-webfont.svg +++ b/fonts/fontawesome-webfont.svg @@ -1,6 +1,6 @@ - + @@ -219,8 +219,8 @@ - - + + @@ -362,7 +362,7 @@ - + @@ -410,7 +410,7 @@ - + @@ -454,7 +454,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -600,11 +600,11 @@ - - + + - + @@ -621,20 +621,35 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf index d7994e1..26dea79 100644 Binary files a/fonts/fontawesome-webfont.ttf and b/fonts/fontawesome-webfont.ttf differ diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff index 6fd4ede..dc35ce3 100644 Binary files a/fonts/fontawesome-webfont.woff and b/fonts/fontawesome-webfont.woff differ diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2 new file mode 100644 index 0000000..500e517 Binary files /dev/null and b/fonts/fontawesome-webfont.woff2 differ diff --git a/fonts/glyphicons-halflings-regular.woff2 b/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/gulpfile.js b/gulpfile.js index 3ccf6d4..f2b22fa 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -54,9 +54,9 @@ gulp.task('copy-assets', function() { gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/**/*.scss') >>>>>>> master .pipe(gulp.dest('./sass/bootstrap-sass')); - gulp.src(basePaths.bower + 'bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,eof,svg}') + gulp.src(basePaths.bower + 'bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,woff2,eof,svg}') .pipe(gulp.dest('./fonts')); - gulp.src(basePaths.bower + 'fontawesome/fonts/**/*.{ttf,woff,eof,svg}') + gulp.src(basePaths.bower + 'fontawesome/fonts/**/*.{ttf,woff,woff2,eof,svg}') .pipe(gulp.dest('./fonts')); gulp.src(basePaths.bower + 'fontawesome/scss/*.scss') .pipe(gulp.dest('./sass/fontawesome')); diff --git a/header.php b/header.php index c48c06a..8fa6003 100644 --- a/header.php +++ b/header.php @@ -28,7 +28,7 @@