diff --git a/bower.json b/bower.json index aa013e0..a358a42 100644 --- a/bower.json +++ b/bower.json @@ -12,5 +12,11 @@ "bower_components", "test", "tests" - ] + ], + "dependencies": { + "bootstrap-sass": "~3.3.5", + "fontawesome": "~4.4.0", + "_s": "https://github.com/Automattic/_s.git", + "OwlCarousel2": "~2.0.0-beta.3" + } } diff --git a/css/theme.css b/css/theme.css index dd40c15..1bdbde2 100644 --- a/css/theme.css +++ b/css/theme.css @@ -27,469 +27,57 @@ Import all needed 3rd party sass files plus your own style and variables // Any additional imported files // 6. theme/theme.scss"; // <-- ADD YOUR STYLES HERE ***************************************************************** */ -/* -underscores.scss - Does the same than the original style.scss file from the _s theme. But if you edit this you don´t overwrite changes if you upgrade the original _s scss source files +/*! +Theme Name: _s +Theme URI: http://underscores.me/ +Author: Automattic +Author URI: http://automattic.com/ +Description: Hi. I'm a starter theme called _s, or underscores, if you like. I'm a theme meant for hacking so don't use me as a Parent Theme. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for. +Version: 1.0.0 +License: GNU General Public License v2 or later +License URI: http://www.gnu.org/licenses/gpl-2.0.html +Text Domain: _s +Tags: + +This theme, like WordPress, is licensed under the GPL. +Use it to make something cool, have fun, and share what you've learned with others. + +_s is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc. +Underscores is distributed under the terms of the GNU GPL v2 or later. + +Normalizing styles have been helped along thanks to the fine work of +Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/ */ /*-------------------------------------------------------------- >>> TABLE OF CONTENTS: ---------------------------------------------------------------- -1.0 Reset -2.0 Typography -3.0 Elements -4.0 Forms -5.0 Navigation - 5.1 Links - 5.2 Menus -6.0 Accessibility -7.0 Alignments -8.0 Clearings -9.0 Widgets -10.0 Content - 10.1 Posts and pages - 10.2 Asides - 10.3 Comments -11.0 Infinite scroll -12.0 Media - 12.1 Captions - 12.2 Galleries - +# Normalize +# Typography +# Elements +# Forms +# Navigation + ## Links + ## Menus +# Accessibility +# Alignments +# Clearings +# Widgets +# Content + ## Posts and pages + ## Asides + ## Comments +# Infinite scroll +# Media + ## Captions + ## Galleries --------------------------------------------------------------*/ /*-------------------------------------------------------------- -1.0 Reset +# Normalize --------------------------------------------------------------*/ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - border: 0; - font-family: inherit; - font-size: 100%; - font-style: inherit; - font-weight: inherit; - margin: 0; - outline: 0; - padding: 0; - vertical-align: baseline; } - -html { - font-size: 62.5%; - /* Corrects text resizing oddly in IE6/7 when body font-size is set using em units http://clagnut.com/blog/348/#c790 */ - overflow-y: scroll; - /* Keeps page centered in all browsers regardless of content height */ - -webkit-text-size-adjust: 100%; - /* Prevents iOS text size adjust after orientation change, without disabling user zoom */ - -ms-text-size-adjust: 100%; - /* www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ */ - box-sizing: border-box; - /* Apply a natural box layout model to the document; see http://www.paulirish.com/2012/box-sizing-border-box-ftw/ */ } - -*, -*:before, -*:after { - /* Inherit box-sizing to make it easier to change the property for components that leverage other behavior; see http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ */ - box-sizing: inherit; } - -body { - background: #fff; - /* Fallback for when there is no custom background color defined. */ } - -article, -aside, -details, -figcaption, -figure, -footer, -header, -main, -nav, -section { - display: block; } - -ol, ul { - list-style: none; } - -table { - /* tables still need 'cellspacing="0"' in the markup */ - border-collapse: separate; - border-spacing: 0; } - -caption, th, td { - font-weight: normal; - text-align: left; } - -blockquote:before, blockquote:after, -q:before, q:after { - content: ""; } - -blockquote, q { - quotes: "" ""; } - -a:focus { - outline: thin dotted; } - -a:hover, -a:active { - outline: 0; } - -a img { - border: 0; } - -/*-------------------------------------------------------------- -2.0 Typography ---------------------------------------------------------------*/ -/*-------------------------------------------------------------- -3.0 Elements ---------------------------------------------------------------*/ -hr { - background-color: #ccc; - border: 0; - height: 1px; - margin-bottom: 1.5em; } - -ul, ol { - margin: 0 0 1.5em 3em; } - -ul { - list-style: disc; } - -ol { - list-style: decimal; } - -li > ul, -li > ol { - margin-bottom: 0; - margin-left: 1.5em; } - -dt { - font-weight: bold; } - -dd { - margin: 0 1.5em 1.5em; } - -img { - height: auto; - /* Make sure images are scaled correctly. */ - max-width: 100%; - /* Adhere to container width. */ } - -figure { - margin: 0; } - -table { - margin: 0 0 1.5em; - width: 100%; } - -th { - font-weight: bold; } - -/*-------------------------------------------------------------- -4.0 Forms ---------------------------------------------------------------*/ -/*-------------------------------------------------------------- -5.0 Navigation ---------------------------------------------------------------*/ -/*-------------------------------------------------------------- -5.1 Links ---------------------------------------------------------------*/ -a { - color: royalblue; } - a:visited { - color: purple; } - a:hover, - a:focus, - a:active { - color: midnightblue; } - -/*-------------------------------------------------------------- -5.2 Menus ---------------------------------------------------------------*/ -.main-navigation { - clear: both; - display: block; - float: left; - width: 100%; } - .main-navigation ul { - list-style: none; - margin: 0; - padding-left: 0; } - .main-navigation ul ul { - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2); - float: left; - position: absolute; - top: 1.5em; - left: -999em; - z-index: 99999; } - .main-navigation ul ul ul { - left: -999em; - top: 0; } - .main-navigation ul ul li:hover > ul { - left: 100%; } - .main-navigation ul ul a { - width: 200px; } - .main-navigation ul li:hover > ul { - left: auto; } - .main-navigation li { - float: left; - position: relative; } - .main-navigation a { - display: block; - text-decoration: none; } - -/* Small menu */ -.menu-toggle { - display: none; } - -@media screen and (max-width: 600px) { - .menu-toggle, - .main-navigation.toggled .nav-menu { - display: block; } - .main-navigation ul { - display: none; } } - -.site-main .comment-navigation, -.site-main .paging-navigation, -.site-main .post-navigation { - margin: 0 0 1.5em; - overflow: hidden; } - -.comment-navigation .nav-previous, -.paging-navigation .nav-previous, -.post-navigation .nav-previous { - float: left; - width: 50%; } - -.comment-navigation .nav-next, -.paging-navigation .nav-next, -.post-navigation .nav-next { - float: right; - text-align: right; - width: 50%; } - -/*-------------------------------------------------------------- -6.0 Accessibility ---------------------------------------------------------------*/ -/* Text meant only for screen readers */ -.screen-reader-text { - clip: rect(1px, 1px, 1px, 1px); - position: absolute !important; - height: 1px; - width: 1px; - overflow: hidden; } - .screen-reader-text:hover, - .screen-reader-text:active, - .screen-reader-text:focus { - background-color: #f1f1f1; - border-radius: 3px; - box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6); - clip: auto !important; - color: #21759b; - display: block; - font-size: 14px; - font-size: 1.4rem; - font-weight: bold; - height: auto; - left: 5px; - line-height: normal; - padding: 15px 23px 14px; - text-decoration: none; - top: 5px; - width: auto; - z-index: 100000; - /* Above WP toolbar */ } - -/*-------------------------------------------------------------- -7.0 Alignments ---------------------------------------------------------------*/ -.alignleft { - display: inline; - float: left; - margin-right: 1.5em; } - -.alignright { - display: inline; - float: right; - margin-left: 1.5em; } - -.aligncenter { - display: block; - margin: 0 auto; } - -/*-------------------------------------------------------------- -8.0 Clearings ---------------------------------------------------------------*/ -.clear:before, -.clear:after, -.entry-content:before, -.entry-content:after, -.comment-content:before, -.comment-content:after, -.site-header:before, -.site-header:after, -.site-content:before, -.site-content:after, -.site-footer:before, -.site-footer:after { - content: ""; - display: table; } - -.clear:after, -.entry-content:after, -.comment-content:after, -.site-header:after, -.site-content:after, -.site-footer:after { - clear: both; } - -/*-------------------------------------------------------------- -9.0 Widgets ---------------------------------------------------------------*/ -.widget { - margin: 0 0 1.5em; - /* Make sure select elements fit in widgets */ } - .widget select { - max-width: 100%; } - -/* Search widget */ -.widget_search .search-submit { - display: none; } - -/*-------------------------------------------------------------- -10.0 Content ---------------------------------------------------------------*/ -/*-------------------------------------------------------------- -10.1 Posts and pages ---------------------------------------------------------------*/ -.sticky { - display: block; } - -.hentry { - margin: 0 0 1.5em; } - -.byline, -.updated:not(.published) { - display: none; } - -.single .byline, -.group-blog .byline { - display: inline; } - -.page-content, -.entry-content, -.entry-summary { - margin: 1.5em 0 0; } - -.page-links { - clear: both; - margin: 0 0 1.5em; } - -/*-------------------------------------------------------------- -10.2 Asides ---------------------------------------------------------------*/ -.blog .format-aside .entry-title, -.archive .format-aside .entry-title { - display: none; } - -/*-------------------------------------------------------------- -10.3 Comments ---------------------------------------------------------------*/ -.comment-content a { - word-wrap: break-word; } - -.bypostauthor { - display: block; } - -/*-------------------------------------------------------------- -11.0 Infinite scroll ---------------------------------------------------------------*/ -/* Globally hidden elements when Infinite Scroll is supported and in use. */ -.infinite-scroll .paging-navigation, .infinite-scroll.neverending .site-footer { - /* Theme Footer (when set to scrolling) */ - display: none; } - -/* When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before */ -.infinity-end.neverending .site-footer { - display: block; } - -/*-------------------------------------------------------------- -12.0 Media ---------------------------------------------------------------*/ -.page-content img.wp-smiley, -.entry-content img.wp-smiley, -.comment-content img.wp-smiley { - border: none; - margin-bottom: 0; - margin-top: 0; - padding: 0; } - -/* Make sure embeds and iframes fit their containers */ -embed, -iframe, -object { - max-width: 100%; } - -/*-------------------------------------------------------------- -12.1 Captions ---------------------------------------------------------------*/ -.wp-caption { - margin-bottom: 1.5em; - max-width: 100%; } - .wp-caption img[class*="wp-image-"] { - display: block; - margin: 0 auto; } - .wp-caption .wp-caption-text { - margin: 0.8075em 0; } - -.wp-caption-text { - text-align: center; } - -/*-------------------------------------------------------------- -12.2 Galleries ---------------------------------------------------------------*/ -.gallery { - margin-bottom: 1.5em; } - -.gallery-item { - display: inline-block; - text-align: center; - vertical-align: top; - width: 100%; } - -.gallery-columns-2 .gallery-item { - max-width: 50%; } - -.gallery-columns-3 .gallery-item { - max-width: 33.33%; } - -.gallery-columns-4 .gallery-item { - max-width: 25%; } - -.gallery-columns-5 .gallery-item { - max-width: 20%; } - -.gallery-columns-6 .gallery-item { - max-width: 16.66%; } - -.gallery-columns-7 .gallery-item { - max-width: 14.28%; } - -.gallery-columns-8 .gallery-item { - max-width: 12.5%; } - -.gallery-columns-9 .gallery-item { - max-width: 11.11%; } - -.gallery-caption { - display: block; } - -/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ html { font-family: sans-serif; - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; } + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; } body { margin: 0; } @@ -501,8 +89,8 @@ figcaption, figure, footer, header, -hgroup, main, +menu, nav, section, summary { @@ -524,7 +112,666 @@ template { display: none; } a { - background: transparent; } + background-color: transparent; } + +a:active, +a:hover { + outline: 0; } + +abbr[title] { + border-bottom: 1px dotted; } + +b, +strong { + font-weight: bold; } + +dfn { + font-style: italic; } + +h1 { + font-size: 2em; + margin: 0.67em 0; } + +mark { + background: #ff0; + color: #000; } + +small { + font-size: 80%; } + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } + +sup { + top: -0.5em; } + +sub { + bottom: -0.25em; } + +img { + border: 0; } + +svg:not(:root) { + overflow: hidden; } + +figure { + margin: 1em 40px; } + +hr { + box-sizing: content-box; + height: 0; } + +pre { + overflow: auto; } + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } + +button, +input, +optgroup, +select, +textarea { + color: inherit; + font: inherit; + margin: 0; } + +button { + overflow: visible; } + +button, +select { + text-transform: none; } + +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; } + +button[disabled], +html input[disabled] { + cursor: default; } + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; } + +input { + line-height: normal; } + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + padding: 0; } + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; } + +input[type="search"] { + -webkit-appearance: textfield; + box-sizing: content-box; } + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; } + +legend { + border: 0; + padding: 0; } + +textarea { + overflow: auto; } + +optgroup { + font-weight: bold; } + +table { + border-collapse: collapse; + border-spacing: 0; } + +td, +th { + padding: 0; } + +/*-------------------------------------------------------------- +# Typography +--------------------------------------------------------------*/ +body, +button, +input, +select, +textarea { + color: #404040; + font-family: sans-serif; + font-size: 16px; + font-size: 1rem; + line-height: 1.5; } + +h1, h2, h3, h4, h5, h6 { + clear: both; } + +p { + margin-bottom: 1.5em; } + +dfn, cite, em, i { + font-style: italic; } + +blockquote { + margin: 0 1.5em; } + +address { + margin: 0 0 1.5em; } + +pre { + background: #eee; + font-family: "Courier 10 Pitch", Courier, monospace; + font-size: 15px; + font-size: 0.9375rem; + line-height: 1.6; + margin-bottom: 1.6em; + max-width: 100%; + overflow: auto; + padding: 1.6em; } + +code, kbd, tt, var { + font-family: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace; + font-size: 15px; + font-size: 0.9375rem; } + +abbr, acronym { + border-bottom: 1px dotted #666; + cursor: help; } + +mark, ins { + background: #fff9c0; + text-decoration: none; } + +big { + font-size: 125%; } + +/*-------------------------------------------------------------- +# Elements +--------------------------------------------------------------*/ +html { + box-sizing: border-box; } + +*, +*:before, +*:after { + /* Inherit box-sizing to make it easier to change the property for components that leverage other behavior; see http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ */ + box-sizing: inherit; } + +body { + background: #fff; + /* Fallback for when there is no custom background color defined. */ } + +blockquote, q { + quotes: "" ""; } + blockquote:before, + blockquote:after, q:before, + q:after { + content: ""; } + +hr { + background-color: #ccc; + border: 0; + height: 1px; + margin-bottom: 1.5em; } + +ul, ol { + margin: 0 0 1.5em 3em; } + +ul { + list-style: disc; } + +ol { + list-style: decimal; } + +li > ul, +li > ol { + margin-bottom: 0; + margin-left: 1.5em; } + +dt { + font-weight: bold; } + +dd { + margin: 0 1.5em 1.5em; } + +img { + height: auto; + /* Make sure images are scaled correctly. */ + max-width: 100%; + /* Adhere to container width. */ } + +table { + margin: 0 0 1.5em; + width: 100%; } + +/*-------------------------------------------------------------- +# Forms +--------------------------------------------------------------*/ +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + border: 1px solid; + border-color: #ccc #ccc #bbb; + border-radius: 3px; + background: #e6e6e6; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05); + color: rgba(0, 0, 0, 0.8); + font-size: 12px; + font-size: 0.75rem; + line-height: 1; + padding: 0.6em 1em 0.4em; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); } + button:hover, + input[type="button"]:hover, + input[type="reset"]:hover, + input[type="submit"]:hover { + border-color: #ccc #bbb #aaa; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02); } + button:active, + button:focus, + input[type="button"]:active, + input[type="button"]:focus, + input[type="reset"]:active, + input[type="reset"]:focus, + input[type="submit"]:active, + input[type="submit"]:focus { + border-color: #aaa #bbb #bbb; + box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15); } + +input[type="text"], +input[type="email"], +input[type="url"], +input[type="password"], +input[type="search"], +textarea { + color: #666; + border: 1px solid #ccc; + border-radius: 3px; } + input[type="text"]:focus, + input[type="email"]:focus, + input[type="url"]:focus, + input[type="password"]:focus, + input[type="search"]:focus, + textarea:focus { + color: #111; } + +input[type="text"], +input[type="email"], +input[type="url"], +input[type="password"], +input[type="search"] { + padding: 3px; } + +textarea { + padding-left: 3px; + width: 100%; } + +/*-------------------------------------------------------------- +# Navigation +--------------------------------------------------------------*/ +/*-------------------------------------------------------------- +## Links +--------------------------------------------------------------*/ +a { + color: royalblue; } + a:visited { + color: purple; } + a:hover, + a:focus, + a:active { + color: midnightblue; } + a:focus { + outline: thin dotted; } + a:hover, + a:active { + outline: 0; } + +/*-------------------------------------------------------------- +## Menus +--------------------------------------------------------------*/ +.main-navigation { + clear: both; + display: block; + float: left; + width: 100%; } + .main-navigation ul { + display: none; + list-style: none; + margin: 0; + padding-left: 0; } + .main-navigation ul ul { + box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2); + float: left; + position: absolute; + top: 1.5em; + left: -999em; + z-index: 99999; } + .main-navigation ul ul ul { + left: -999em; + top: 0; } + .main-navigation ul ul li:hover > ul, + .main-navigation ul ul li.focus > ul { + left: 100%; } + .main-navigation ul ul a { + width: 200px; } + .main-navigation ul li:hover > ul, + .main-navigation ul li.focus > ul { + left: auto; } + .main-navigation li { + float: left; + position: relative; } + .main-navigation a { + display: block; + text-decoration: none; } + +/* Small menu. */ +.menu-toggle, +.main-navigation.toggled ul { + display: block; } + +@media screen and (min-width: 37.5em) { + .menu-toggle { + display: none; } + .main-navigation ul { + display: block; } } + +.site-main .comment-navigation, +.site-main .posts-navigation, +.site-main .post-navigation { + margin: 0 0 1.5em; + overflow: hidden; } + +.comment-navigation .nav-previous, +.posts-navigation .nav-previous, +.post-navigation .nav-previous { + float: left; + width: 50%; } + +.comment-navigation .nav-next, +.posts-navigation .nav-next, +.post-navigation .nav-next { + float: right; + text-align: right; + width: 50%; } + +/*-------------------------------------------------------------- +# Accessibility +--------------------------------------------------------------*/ +/* Text meant only for screen readers. */ +.screen-reader-text { + clip: rect(1px, 1px, 1px, 1px); + position: absolute !important; + height: 1px; + width: 1px; + overflow: hidden; } + .screen-reader-text:hover, + .screen-reader-text:active, + .screen-reader-text:focus { + background-color: #f1f1f1; + border-radius: 3px; + box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6); + clip: auto !important; + color: #21759b; + display: block; + font-size: 14px; + font-size: 0.875rem; + font-weight: bold; + height: auto; + left: 5px; + line-height: normal; + padding: 15px 23px 14px; + text-decoration: none; + top: 5px; + width: auto; + z-index: 100000; + /* Above WP toolbar. */ } + +/*-------------------------------------------------------------- +# Alignments +--------------------------------------------------------------*/ +.alignleft { + display: inline; + float: left; + margin-right: 1.5em; } + +.alignright { + display: inline; + float: right; + margin-left: 1.5em; } + +.aligncenter { + display: block; + margin-left: auto; + margin-right: auto; } + +/*-------------------------------------------------------------- +# Clearings +--------------------------------------------------------------*/ +.clear:before, +.clear:after, +.entry-content:before, +.entry-content:after, +.comment-content:before, +.comment-content:after, +.site-header:before, +.site-header:after, +.site-content:before, +.site-content:after, +.site-footer:before, +.site-footer:after { + content: ""; + display: table; } + +.clear:after, +.entry-content:after, +.comment-content:after, +.site-header:after, +.site-content:after, +.site-footer:after { + clear: both; } + +/*-------------------------------------------------------------- +# Widgets +--------------------------------------------------------------*/ +.widget { + margin: 0 0 1.5em; + /* Make sure select elements fit in widgets. */ } + .widget select { + max-width: 100%; } + +/* Search widget. */ +.widget_search .search-submit { + display: none; } + +/*-------------------------------------------------------------- +# Content +--------------------------------------------------------------*/ +/*-------------------------------------------------------------- +## Posts and pages +--------------------------------------------------------------*/ +.sticky { + display: block; } + +.hentry { + margin: 0 0 1.5em; } + +.byline, +.updated:not(.published) { + display: none; } + +.single .byline, +.group-blog .byline { + display: inline; } + +.page-content, +.entry-content, +.entry-summary { + margin: 1.5em 0 0; } + +.page-links { + clear: both; + margin: 0 0 1.5em; } + +/*-------------------------------------------------------------- +## Asides +--------------------------------------------------------------*/ +.blog .format-aside .entry-title, +.archive .format-aside .entry-title { + display: none; } + +/*-------------------------------------------------------------- +## Comments +--------------------------------------------------------------*/ +.comment-content a { + word-wrap: break-word; } + +.bypostauthor { + display: block; } + +/*-------------------------------------------------------------- +# Infinite scroll +--------------------------------------------------------------*/ +/* Globally hidden elements when Infinite Scroll is supported and in use. */ +.infinite-scroll .posts-navigation, .infinite-scroll.neverending .site-footer { + /* Theme Footer (when set to scrolling) */ + display: none; } + +/* When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before. */ +.infinity-end.neverending .site-footer { + display: block; } + +/*-------------------------------------------------------------- +# Media +--------------------------------------------------------------*/ +.page-content .wp-smiley, +.entry-content .wp-smiley, +.comment-content .wp-smiley { + border: none; + margin-bottom: 0; + margin-top: 0; + padding: 0; } + +/* Make sure embeds and iframes fit their containers. */ +embed, +iframe, +object { + max-width: 100%; } + +/*-------------------------------------------------------------- +## Captions +--------------------------------------------------------------*/ +.wp-caption { + margin-bottom: 1.5em; + max-width: 100%; } + .wp-caption img[class*="wp-image-"] { + display: block; + margin-left: auto; + margin-right: auto; } + .wp-caption .wp-caption-text { + margin: 0.8075em 0; } + +.wp-caption-text { + text-align: center; } + +/*-------------------------------------------------------------- +## Galleries +--------------------------------------------------------------*/ +.gallery { + margin-bottom: 1.5em; } + +.gallery-item { + display: inline-block; + text-align: center; + vertical-align: top; + width: 100%; } + .gallery-columns-2 .gallery-item { + max-width: 50%; } + .gallery-columns-3 .gallery-item { + max-width: 33.33%; } + .gallery-columns-4 .gallery-item { + max-width: 25%; } + .gallery-columns-5 .gallery-item { + max-width: 20%; } + .gallery-columns-6 .gallery-item { + max-width: 16.66%; } + .gallery-columns-7 .gallery-item { + max-width: 14.28%; } + .gallery-columns-8 .gallery-item { + max-width: 12.5%; } + .gallery-columns-9 .gallery-item { + max-width: 11.11%; } + +.gallery-caption { + display: block; } + +/*! + * Bootstrap v3.3.5 (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 */ +html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; } + +body { + margin: 0; } + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; } + +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; } + +audio:not([controls]) { + display: none; + height: 0; } + +[hidden], +template { + display: none; } + +a { + background-color: transparent; } a:active, a:hover { @@ -574,7 +821,6 @@ figure { margin: 1em 40px; } hr { - -moz-box-sizing: content-box; box-sizing: content-box; height: 0; } @@ -633,8 +879,6 @@ input[type="number"]::-webkit-outer-spin-button { input[type="search"] { -webkit-appearance: textfield; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; box-sizing: content-box; } input[type="search"]::-webkit-search-cancel-button, @@ -664,12 +908,15 @@ td, th { padding: 0; } +/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { - * { - text-shadow: none !important; - color: #000 !important; + *, + *:before, + *:after { background: transparent !important; - box-shadow: none !important; } + color: #000 !important; + box-shadow: none !important; + text-shadow: none !important; } a, a:visited { text-decoration: underline; } @@ -677,8 +924,8 @@ th { content: " (" attr(href) ")"; } abbr[title]:after { content: " (" attr(title) ")"; } - a[href^="javascript:"]:after, - a[href^="#"]:after { + a[href^="#"]:after, + a[href^="javascript:"]:after { content: ""; } pre, blockquote { @@ -699,13 +946,8 @@ th { h2, h3 { page-break-after: avoid; } - select { - background: #fff !important; } .navbar { display: none; } - .table td, - .table th { - background-color: #fff !important; } .btn > .caret, .dropup > .btn > .caret { border-top-color: #000 !important; } @@ -713,6 +955,9 @@ th { border: 1px solid #000; } .table { border-collapse: collapse !important; } + .table td, + .table th { + background-color: #fff !important; } .table-bordered th, .table-bordered td { border: 1px solid #ddd !important; } } @@ -720,7 +965,7 @@ th { @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.woff") format("woff"), url("../fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } + 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; @@ -739,7 +984,8 @@ th { .glyphicon-plus:before { content: "\2b"; } -.glyphicon-euro:before { +.glyphicon-euro:before, +.glyphicon-eur:before { content: "\20ac"; } .glyphicon-minus:before { @@ -1333,6 +1579,192 @@ th { .glyphicon-tree-deciduous:before { content: "\e200"; } +.glyphicon-cd:before { + content: "\e201"; } + +.glyphicon-save-file:before { + content: "\e202"; } + +.glyphicon-open-file:before { + content: "\e203"; } + +.glyphicon-level-up:before { + content: "\e204"; } + +.glyphicon-copy:before { + content: "\e205"; } + +.glyphicon-paste:before { + content: "\e206"; } + +.glyphicon-alert:before { + content: "\e209"; } + +.glyphicon-equalizer:before { + content: "\e210"; } + +.glyphicon-king:before { + content: "\e211"; } + +.glyphicon-queen:before { + content: "\e212"; } + +.glyphicon-pawn:before { + content: "\e213"; } + +.glyphicon-bishop:before { + content: "\e214"; } + +.glyphicon-knight:before { + content: "\e215"; } + +.glyphicon-baby-formula:before { + content: "\e216"; } + +.glyphicon-tent:before { + content: "\26fa"; } + +.glyphicon-blackboard:before { + content: "\e218"; } + +.glyphicon-bed:before { + content: "\e219"; } + +.glyphicon-apple:before { + content: "\f8ff"; } + +.glyphicon-erase:before { + content: "\e221"; } + +.glyphicon-hourglass:before { + content: "\231b"; } + +.glyphicon-lamp:before { + content: "\e223"; } + +.glyphicon-duplicate:before { + content: "\e224"; } + +.glyphicon-piggy-bank:before { + content: "\e225"; } + +.glyphicon-scissors:before { + content: "\e226"; } + +.glyphicon-bitcoin:before { + content: "\e227"; } + +.glyphicon-btc:before { + content: "\e227"; } + +.glyphicon-xbt:before { + content: "\e227"; } + +.glyphicon-yen:before { + content: "\00a5"; } + +.glyphicon-jpy:before { + content: "\00a5"; } + +.glyphicon-ruble:before { + content: "\20bd"; } + +.glyphicon-rub:before { + content: "\20bd"; } + +.glyphicon-scale:before { + content: "\e230"; } + +.glyphicon-ice-lolly:before { + content: "\e231"; } + +.glyphicon-ice-lolly-tasted:before { + content: "\e232"; } + +.glyphicon-education:before { + content: "\e233"; } + +.glyphicon-option-horizontal:before { + content: "\e234"; } + +.glyphicon-option-vertical:before { + content: "\e235"; } + +.glyphicon-menu-hamburger:before { + content: "\e236"; } + +.glyphicon-modal-window:before { + content: "\e237"; } + +.glyphicon-oil:before { + content: "\e238"; } + +.glyphicon-grain:before { + content: "\e239"; } + +.glyphicon-sunglasses:before { + content: "\e240"; } + +.glyphicon-text-size:before { + content: "\e241"; } + +.glyphicon-text-color:before { + content: "\e242"; } + +.glyphicon-text-background:before { + content: "\e243"; } + +.glyphicon-object-align-top:before { + content: "\e244"; } + +.glyphicon-object-align-bottom:before { + content: "\e245"; } + +.glyphicon-object-align-horizontal:before { + content: "\e246"; } + +.glyphicon-object-align-left:before { + content: "\e247"; } + +.glyphicon-object-align-vertical:before { + content: "\e248"; } + +.glyphicon-object-align-right:before { + content: "\e249"; } + +.glyphicon-triangle-right:before { + content: "\e250"; } + +.glyphicon-triangle-left:before { + content: "\e251"; } + +.glyphicon-triangle-bottom:before { + content: "\e252"; } + +.glyphicon-triangle-top:before { + content: "\e253"; } + +.glyphicon-console:before { + content: "\e254"; } + +.glyphicon-superscript:before { + content: "\e255"; } + +.glyphicon-subscript:before { + content: "\e256"; } + +.glyphicon-menu-left:before { + content: "\e257"; } + +.glyphicon-menu-right:before { + content: "\e258"; } + +.glyphicon-menu-down:before { + content: "\e259"; } + +.glyphicon-menu-up:before { + content: "\e260"; } + * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -1383,7 +1815,6 @@ img { .img-responsive { display: block; - width: 100% \9; max-width: 100%; height: auto; } @@ -1400,7 +1831,6 @@ img { -o-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; display: inline-block; - width: 100% \9; max-width: 100%; height: auto; } @@ -1432,6 +1862,9 @@ hr { overflow: visible; clip: auto; } +[role="button"] { + cursor: pointer; } + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { font-family: inherit; @@ -1522,9 +1955,6 @@ small, .small { font-size: 85%; } -cite { - font-style: normal; } - mark, .mark { background-color: #fcf8e3; @@ -1548,7 +1978,7 @@ mark, .text-lowercase { text-transform: lowercase; } -.text-uppercase { +.text-uppercase, .initialism { text-transform: uppercase; } .text-capitalize { @@ -1560,31 +1990,36 @@ mark, .text-primary { color: #ff6d5a; } -a.text-primary:hover { +a.text-primary:hover, +a.text-primary:focus { color: #ff4027; } .text-success { color: #3c763d; } -a.text-success:hover { +a.text-success:hover, +a.text-success:focus { color: #2b542c; } .text-info { color: #31708f; } -a.text-info:hover { +a.text-info:hover, +a.text-info:focus { color: #245269; } .text-warning { color: #8a6d3b; } -a.text-warning:hover { +a.text-warning:hover, +a.text-warning:focus { color: #66512c; } .text-danger { color: #a94442; } -a.text-danger:hover { +a.text-danger:hover, +a.text-danger:focus { color: #843534; } .bg-primary { @@ -1593,31 +2028,36 @@ a.text-danger:hover { .bg-primary { background-color: #ff6d5a; } -a.bg-primary:hover { +a.bg-primary:hover, +a.bg-primary:focus { background-color: #ff4027; } .bg-success { background-color: #dff0d8; } -a.bg-success:hover { +a.bg-success:hover, +a.bg-success:focus { background-color: #c1e2b3; } .bg-info { background-color: #d9edf7; } -a.bg-info:hover { +a.bg-info:hover, +a.bg-info:focus { background-color: #afd9ee; } .bg-warning { background-color: #fcf8e3; } -a.bg-warning:hover { +a.bg-warning:hover, +a.bg-warning:focus { background-color: #f7ecb5; } .bg-danger { background-color: #f2dede; } -a.bg-danger:hover { +a.bg-danger:hover, +a.bg-danger:focus { background-color: #e4b9b9; } .page-header { @@ -1635,11 +2075,13 @@ ol { ol ol { margin-bottom: 0; } -.list-unstyled, .list-inline { +.list-unstyled { padding-left: 0; list-style: none; } .list-inline { + padding-left: 0; + list-style: none; margin-left: -5px; } .list-inline > li { display: inline-block; @@ -1686,8 +2128,7 @@ abbr[data-original-title] { border-bottom: 1px dotted #777777; } .initialism { - font-size: 90%; - text-transform: uppercase; } + font-size: 90%; } blockquote { padding: 10px 20px; @@ -1732,10 +2173,6 @@ blockquote.pull-right { blockquote.pull-right .small:after { content: '\00A0 \2014'; } -blockquote:before, -blockquote:after { - content: ""; } - address { margin-bottom: 20px; font-style: normal; @@ -1764,6 +2201,7 @@ kbd { kbd kbd { padding: 0; font-size: 100%; + font-weight: bold; box-shadow: none; } pre { @@ -2316,6 +2754,12 @@ pre { table { background-color: transparent; } +caption { + padding-top: 8px; + padding-bottom: 8px; + color: #777777; + text-align: left; } + th { text-align: left; } @@ -2369,12 +2813,10 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) > td, -.table-striped > tbody > tr:nth-child(odd) > th { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9; } -.table-hover > tbody > tr:hover > td, -.table-hover > tbody > tr:hover > th { +.table-hover > tbody > tr:hover { background-color: #f5f5f5; } table col[class*="col-"] { @@ -2493,45 +2935,46 @@ table th[class*="col-"] { .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc; } -@media screen and (max-width: 767px) { - .table-responsive { - width: 100%; - margin-bottom: 15px; - overflow-y: hidden; - overflow-x: auto; - -ms-overflow-style: -ms-autohiding-scrollbar; - border: 1px solid #ddd; - -webkit-overflow-scrolling: touch; } - .table-responsive > .table { - margin-bottom: 0; } - .table-responsive > .table > thead > tr > th, - .table-responsive > .table > thead > tr > td, - .table-responsive > .table > tbody > tr > th, - .table-responsive > .table > tbody > tr > td, - .table-responsive > .table > tfoot > tr > th, - .table-responsive > .table > tfoot > tr > td { - white-space: nowrap; } - .table-responsive > .table-bordered { - border: 0; } - .table-responsive > .table-bordered > thead > tr > th:first-child, - .table-responsive > .table-bordered > thead > tr > td:first-child, - .table-responsive > .table-bordered > tbody > tr > th:first-child, - .table-responsive > .table-bordered > tbody > tr > td:first-child, - .table-responsive > .table-bordered > tfoot > tr > th:first-child, - .table-responsive > .table-bordered > tfoot > tr > td:first-child { - border-left: 0; } - .table-responsive > .table-bordered > thead > tr > th:last-child, - .table-responsive > .table-bordered > thead > tr > td:last-child, - .table-responsive > .table-bordered > tbody > tr > th:last-child, - .table-responsive > .table-bordered > tbody > tr > td:last-child, - .table-responsive > .table-bordered > tfoot > tr > th:last-child, - .table-responsive > .table-bordered > tfoot > tr > td:last-child { - border-right: 0; } - .table-responsive > .table-bordered > tbody > tr:last-child > th, - .table-responsive > .table-bordered > tbody > tr:last-child > td, - .table-responsive > .table-bordered > tfoot > tr:last-child > th, - .table-responsive > .table-bordered > tfoot > tr:last-child > td { - border-bottom: 0; } } +.table-responsive { + overflow-x: auto; + min-height: 0.01%; } + @media screen and (max-width: 767px) { + .table-responsive { + width: 100%; + margin-bottom: 15px; + overflow-y: hidden; + -ms-overflow-style: -ms-autohiding-scrollbar; + border: 1px solid #ddd; } + .table-responsive > .table { + margin-bottom: 0; } + .table-responsive > .table > thead > tr > th, + .table-responsive > .table > thead > tr > td, + .table-responsive > .table > tbody > tr > th, + .table-responsive > .table > tbody > tr > td, + .table-responsive > .table > tfoot > tr > th, + .table-responsive > .table > tfoot > tr > td { + white-space: nowrap; } + .table-responsive > .table-bordered { + border: 0; } + .table-responsive > .table-bordered > thead > tr > th:first-child, + .table-responsive > .table-bordered > thead > tr > td:first-child, + .table-responsive > .table-bordered > tbody > tr > th:first-child, + .table-responsive > .table-bordered > tbody > tr > td:first-child, + .table-responsive > .table-bordered > tfoot > tr > th:first-child, + .table-responsive > .table-bordered > tfoot > tr > td:first-child { + border-left: 0; } + .table-responsive > .table-bordered > thead > tr > th:last-child, + .table-responsive > .table-bordered > thead > tr > td:last-child, + .table-responsive > .table-bordered > tbody > tr > th:last-child, + .table-responsive > .table-bordered > tbody > tr > td:last-child, + .table-responsive > .table-bordered > tfoot > tr > th:last-child, + .table-responsive > .table-bordered > tfoot > tr > td:last-child { + border-right: 0; } + .table-responsive > .table-bordered > tbody > tr:last-child > th, + .table-responsive > .table-bordered > tbody > tr:last-child > td, + .table-responsive > .table-bordered > tfoot > tr:last-child > th, + .table-responsive > .table-bordered > tfoot > tr:last-child > td { + border-bottom: 0; } } fieldset { padding: 0; @@ -2615,18 +3058,20 @@ output { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); } .form-control::-moz-placeholder { - color: #777777; + color: #999; opacity: 1; } .form-control:-ms-input-placeholder { - color: #777777; } + color: #999; } .form-control::-webkit-input-placeholder { - color: #777777; } + color: #999; } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { - cursor: not-allowed; background-color: #eeeeee; opacity: 1; } + .form-control[disabled], + fieldset[disabled] .form-control { + cursor: not-allowed; } textarea.form-control { height: auto; } @@ -2634,50 +3079,54 @@ textarea.form-control { input[type="search"] { -webkit-appearance: none; } -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - line-height: 34px; - line-height: 1.42857 \0; } +@media screen and (-webkit-min-device-pixel-ratio: 0) { + input[type="date"].form-control, + input[type="time"].form-control, + input[type="datetime-local"].form-control, + input[type="month"].form-control { + line-height: 34px; } input[type="date"].input-sm, - .form-horizontal .form-group-sm input[type="date"].form-control, .input-group-sm > input[type="date"].form-control, .input-group-sm > input[type="date"].input-group-addon, .input-group-sm > .input-group-btn > input[type="date"].btn, + .input-group-sm input[type="date"], input[type="time"].input-sm, - .form-horizontal .form-group-sm input[type="time"].form-control, .input-group-sm > input[type="time"].form-control, .input-group-sm > input[type="time"].input-group-addon, .input-group-sm > .input-group-btn > input[type="time"].btn, + .input-group-sm input[type="time"], input[type="datetime-local"].input-sm, - .form-horizontal .form-group-sm input[type="datetime-local"].form-control, .input-group-sm > input[type="datetime-local"].form-control, .input-group-sm > input[type="datetime-local"].input-group-addon, .input-group-sm > .input-group-btn > input[type="datetime-local"].btn, - input[type="month"].input-sm, .form-horizontal .form-group-sm input[type="month"].form-control, .input-group-sm > input[type="month"].form-control, + .input-group-sm input[type="datetime-local"], + input[type="month"].input-sm, + .input-group-sm > input[type="month"].form-control, .input-group-sm > input[type="month"].input-group-addon, - .input-group-sm > .input-group-btn > input[type="month"].btn { + .input-group-sm > .input-group-btn > input[type="month"].btn, + .input-group-sm input[type="month"] { line-height: 30px; } input[type="date"].input-lg, - .form-horizontal .form-group-lg input[type="date"].form-control, .input-group-lg > input[type="date"].form-control, .input-group-lg > input[type="date"].input-group-addon, .input-group-lg > .input-group-btn > input[type="date"].btn, + .input-group-lg input[type="date"], input[type="time"].input-lg, - .form-horizontal .form-group-lg input[type="time"].form-control, .input-group-lg > input[type="time"].form-control, .input-group-lg > input[type="time"].input-group-addon, .input-group-lg > .input-group-btn > input[type="time"].btn, + .input-group-lg input[type="time"], input[type="datetime-local"].input-lg, - .form-horizontal .form-group-lg input[type="datetime-local"].form-control, .input-group-lg > input[type="datetime-local"].form-control, .input-group-lg > input[type="datetime-local"].input-group-addon, .input-group-lg > .input-group-btn > input[type="datetime-local"].btn, - input[type="month"].input-lg, .form-horizontal .form-group-lg input[type="month"].form-control, .input-group-lg > input[type="month"].form-control, + .input-group-lg input[type="datetime-local"], + input[type="month"].input-lg, + .input-group-lg > input[type="month"].form-control, .input-group-lg > input[type="month"].input-group-addon, - .input-group-lg > .input-group-btn > input[type="month"].btn { - line-height: 46px; } + .input-group-lg > .input-group-btn > input[type="month"].btn, + .input-group-lg input[type="month"] { + line-height: 46px; } } .form-group { margin-bottom: 15px; } @@ -2686,11 +3135,11 @@ input[type="month"] { .checkbox { position: relative; display: block; - min-height: 20px; margin-top: 10px; margin-bottom: 10px; } .radio label, .checkbox label { + min-height: 20px; padding-left: 20px; margin-bottom: 0; font-weight: normal; @@ -2710,6 +3159,7 @@ input[type="month"] { .radio-inline, .checkbox-inline { + position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; @@ -2745,19 +3195,19 @@ fieldset[disabled] .checkbox label { .form-control-static { padding-top: 7px; padding-bottom: 7px; - margin-bottom: 0; } + margin-bottom: 0; + min-height: 34px; } .form-control-static.input-lg, - .form-horizontal .form-group-lg .form-control-static.form-control, .input-group-lg > .form-control-static.form-control, .input-group-lg > .form-control-static.input-group-addon, .input-group-lg > .input-group-btn > .form-control-static.btn, - .form-control-static.input-sm, .form-horizontal .form-group-sm .form-control-static.form-control, .input-group-sm > .form-control-static.form-control, + .form-control-static.input-sm, .input-group-sm > .form-control-static.form-control, .input-group-sm > .form-control-static.input-group-addon, .input-group-sm > .input-group-btn > .form-control-static.btn { padding-left: 0; padding-right: 0; } -.input-sm, .form-horizontal .form-group-sm .form-control, .input-group-sm > .form-control, +.input-sm, .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { height: 30px; @@ -2766,47 +3216,89 @@ fieldset[disabled] .checkbox label { line-height: 1.5; border-radius: 3px; } -select.input-sm, .form-horizontal .form-group-sm select.form-control, .input-group-sm > select.form-control, +select.input-sm, .input-group-sm > select.form-control, .input-group-sm > select.input-group-addon, .input-group-sm > .input-group-btn > select.btn { height: 30px; line-height: 30px; } textarea.input-sm, -.form-horizontal .form-group-sm textarea.form-control, .input-group-sm > textarea.form-control, .input-group-sm > textarea.input-group-addon, .input-group-sm > .input-group-btn > textarea.btn, -select[multiple].input-sm, .form-horizontal .form-group-sm select[multiple].form-control, .input-group-sm > select[multiple].form-control, +select[multiple].input-sm, .input-group-sm > select[multiple].form-control, .input-group-sm > select[multiple].input-group-addon, .input-group-sm > .input-group-btn > select[multiple].btn { height: auto; } -.input-lg, .form-horizontal .form-group-lg .form-control, .input-group-lg > .form-control, +.form-group-sm .form-control { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; } + +.form-group-sm select.form-control { + height: 30px; + line-height: 30px; } + +.form-group-sm textarea.form-control, +.form-group-sm select[multiple].form-control { + height: auto; } + +.form-group-sm .form-control-static { + height: 30px; + min-height: 32px; + padding: 6px 10px; + font-size: 12px; + line-height: 1.5; } + +.input-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { height: 46px; padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.33333; border-radius: 6px; } -select.input-lg, .form-horizontal .form-group-lg select.form-control, .input-group-lg > select.form-control, +select.input-lg, .input-group-lg > select.form-control, .input-group-lg > select.input-group-addon, .input-group-lg > .input-group-btn > select.btn { height: 46px; line-height: 46px; } textarea.input-lg, -.form-horizontal .form-group-lg textarea.form-control, .input-group-lg > textarea.form-control, .input-group-lg > textarea.input-group-addon, .input-group-lg > .input-group-btn > textarea.btn, -select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form-control, .input-group-lg > select[multiple].form-control, +select[multiple].input-lg, .input-group-lg > select[multiple].form-control, .input-group-lg > select[multiple].input-group-addon, .input-group-lg > .input-group-btn > select[multiple].btn { height: auto; } +.form-group-lg .form-control { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.33333; + border-radius: 6px; } + +.form-group-lg select.form-control { + height: 46px; + line-height: 46px; } + +.form-group-lg textarea.form-control, +.form-group-lg select[multiple].form-control { + height: auto; } + +.form-group-lg .form-control-static { + height: 46px; + min-height: 38px; + padding: 11px 16px; + font-size: 18px; + line-height: 1.33333; } + .has-feedback { position: relative; } .has-feedback .form-control { @@ -2814,25 +3306,32 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .form-control-feedback { position: absolute; - top: 25px; + top: 0; right: 0; z-index: 2; display: block; width: 34px; height: 34px; line-height: 34px; - text-align: center; } + text-align: center; + pointer-events: none; } -.input-lg + .form-control-feedback, .form-horizontal .form-group-lg .form-control + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, +.input-lg + .form-control-feedback, +.input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, -.input-group-lg > .input-group-btn > .btn + .form-control-feedback { +.input-group-lg > .input-group-btn > .btn + .form-control-feedback, +.input-group-lg + .form-control-feedback, +.form-group-lg .form-control + .form-control-feedback { width: 46px; height: 46px; line-height: 46px; } -.input-sm + .form-control-feedback, .form-horizontal .form-group-sm .form-control + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, +.input-sm + .form-control-feedback, +.input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, -.input-group-sm > .input-group-btn > .btn + .form-control-feedback { +.input-group-sm > .input-group-btn > .btn + .form-control-feedback, +.input-group-sm + .form-control-feedback, +.form-group-sm .form-control + .form-control-feedback { width: 30px; height: 30px; line-height: 30px; } @@ -2842,7 +3341,11 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .has-success .radio, .has-success .checkbox, .has-success .radio-inline, -.has-success .checkbox-inline { +.has-success .checkbox-inline, +.has-success.radio label, +.has-success.checkbox label, +.has-success.radio-inline label, +.has-success.checkbox-inline label { color: #3c763d; } .has-success .form-control { @@ -2867,7 +3370,11 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .has-warning .radio, .has-warning .checkbox, .has-warning .radio-inline, -.has-warning .checkbox-inline { +.has-warning .checkbox-inline, +.has-warning.radio label, +.has-warning.checkbox label, +.has-warning.radio-inline label, +.has-warning.checkbox-inline label { color: #8a6d3b; } .has-warning .form-control { @@ -2892,7 +3399,11 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .has-error .radio, .has-error .checkbox, .has-error .radio-inline, -.has-error .checkbox-inline { +.has-error .checkbox-inline, +.has-error.radio label, +.has-error.checkbox label, +.has-error.radio-inline label, +.has-error.checkbox-inline label { color: #a94442; } .has-error .form-control { @@ -2912,6 +3423,9 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .has-error .form-control-feedback { color: #a94442; } +.has-feedback label ~ .form-control-feedback { + top: 25px; } + .has-feedback label.sr-only ~ .form-control-feedback { top: 0; } @@ -2922,45 +3436,42 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form color: #737373; } @media (min-width: 768px) { - .form-inline .form-group, .navbar-form .form-group { + .form-inline .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle; } - .form-inline .form-control, .navbar-form .form-control { + .form-inline .form-control { display: inline-block; width: auto; vertical-align: middle; } - .form-inline .input-group, .navbar-form .input-group { + .form-inline .form-control-static { + display: inline-block; } + .form-inline .input-group { display: inline-table; vertical-align: middle; } .form-inline .input-group .input-group-addon, - .navbar-form .input-group .input-group-addon, .form-inline .input-group .input-group-btn, - .navbar-form .input-group .input-group-btn, - .form-inline .input-group .form-control, .navbar-form .input-group .form-control { + .form-inline .input-group .form-control { width: auto; } - .form-inline .input-group > .form-control, .navbar-form .input-group > .form-control { + .form-inline .input-group > .form-control { width: 100%; } - .form-inline .control-label, .navbar-form .control-label { + .form-inline .control-label { margin-bottom: 0; vertical-align: middle; } .form-inline .radio, - .navbar-form .radio, - .form-inline .checkbox, .navbar-form .checkbox { + .form-inline .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle; } .form-inline .radio label, - .navbar-form .radio label, - .form-inline .checkbox label, .navbar-form .checkbox label { + .form-inline .checkbox label { padding-left: 0; } .form-inline .radio input[type="radio"], - .navbar-form .radio input[type="radio"], - .form-inline .checkbox input[type="checkbox"], .navbar-form .checkbox input[type="checkbox"] { + .form-inline .checkbox input[type="checkbox"] { position: relative; margin-left: 0; } - .form-inline .has-feedback .form-control-feedback, .navbar-form .has-feedback .form-control-feedback { + .form-inline .has-feedback .form-control-feedback { top: 0; } } .form-horizontal .radio, @@ -2992,16 +3503,17 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form padding-top: 7px; } } .form-horizontal .has-feedback .form-control-feedback { - top: 0; right: 15px; } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 14.3px; } } + padding-top: 14.33333px; + font-size: 18px; } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { - padding-top: 6px; } } + padding-top: 6px; + font-size: 12px; } } .btn { display: inline-block; @@ -3009,6 +3521,7 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form font-weight: normal; text-align: center; vertical-align: middle; + touch-action: manipulation; cursor: pointer; background-image: none; border: 1px solid transparent; @@ -3022,13 +3535,17 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form -ms-user-select: none; user-select: none; } .btn:focus, + .btn.focus, .btn:active:focus, - .btn.active:focus { + .btn:active.focus, + .btn.active:focus, + .btn.active.focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } .btn:hover, - .btn:focus { + .btn:focus, + .btn.focus { color: #333; text-decoration: none; } .btn:active, @@ -3041,24 +3558,46 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; - pointer-events: none; opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none; } +a.btn.disabled, +fieldset[disabled] a.btn { + pointer-events: none; } + .btn-default { color: #333; background-color: #fff; border-color: #ccc; } - .btn-default:hover, .btn-default:focus, + .btn-default.focus { + color: #333; + background-color: #e6e6e6; + border-color: #8c8c8c; } + .btn-default:hover { + color: #333; + background-color: #e6e6e6; + border-color: #adadad; } .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle { color: #333; background-color: #e6e6e6; border-color: #adadad; } + .btn-default:active:hover, + .btn-default:active:focus, + .btn-default:active.focus, + .btn-default.active:hover, + .btn-default.active:focus, + .btn-default.active.focus, + .open > .btn-default.dropdown-toggle:hover, + .open > .btn-default.dropdown-toggle:focus, + .open > .btn-default.dropdown-toggle.focus { + color: #333; + background-color: #d4d4d4; + border-color: #8c8c8c; } .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle { @@ -3066,16 +3605,19 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .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, 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 { background-color: #fff; @@ -3088,14 +3630,33 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form color: #fff; background-color: #ff6d5a; border-color: #ff5641; } - .btn-primary:hover, .btn-primary:focus, + .btn-primary.focus { + color: #fff; + background-color: #ff4027; + border-color: #c01600; } + .btn-primary:hover { + color: #fff; + background-color: #ff4027; + border-color: #ff2003; } .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle { color: #fff; background-color: #ff4027; border-color: #ff2003; } + .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: #ff2003; + border-color: #c01600; } .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle { @@ -3103,16 +3664,19 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .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, 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: #ff6d5a; @@ -3125,14 +3689,33 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form color: #fff; background-color: #5cb85c; border-color: #4cae4c; } - .btn-success:hover, .btn-success:focus, + .btn-success.focus { + color: #fff; + background-color: #449d44; + border-color: #255625; } + .btn-success:hover { + color: #fff; + background-color: #449d44; + border-color: #398439; } .btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle { color: #fff; background-color: #449d44; border-color: #398439; } + .btn-success:active:hover, + .btn-success:active:focus, + .btn-success:active.focus, + .btn-success.active:hover, + .btn-success.active:focus, + .btn-success.active.focus, + .open > .btn-success.dropdown-toggle:hover, + .open > .btn-success.dropdown-toggle:focus, + .open > .btn-success.dropdown-toggle.focus { + color: #fff; + background-color: #398439; + border-color: #255625; } .btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle { @@ -3140,16 +3723,19 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .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, 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 { background-color: #5cb85c; @@ -3162,14 +3748,33 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form color: #fff; background-color: #5bc0de; border-color: #46b8da; } - .btn-info:hover, .btn-info:focus, + .btn-info.focus { + color: #fff; + background-color: #31b0d5; + border-color: #1b6d85; } + .btn-info:hover { + color: #fff; + background-color: #31b0d5; + border-color: #269abc; } .btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle { color: #fff; background-color: #31b0d5; border-color: #269abc; } + .btn-info:active:hover, + .btn-info:active:focus, + .btn-info:active.focus, + .btn-info.active:hover, + .btn-info.active:focus, + .btn-info.active.focus, + .open > .btn-info.dropdown-toggle:hover, + .open > .btn-info.dropdown-toggle:focus, + .open > .btn-info.dropdown-toggle.focus { + color: #fff; + background-color: #269abc; + border-color: #1b6d85; } .btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle { @@ -3177,16 +3782,19 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .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, 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 { background-color: #5bc0de; @@ -3199,14 +3807,33 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form color: #fff; background-color: #f0ad4e; border-color: #eea236; } - .btn-warning:hover, .btn-warning:focus, + .btn-warning.focus { + color: #fff; + background-color: #ec971f; + border-color: #985f0d; } + .btn-warning:hover { + color: #fff; + background-color: #ec971f; + border-color: #d58512; } .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle { color: #fff; background-color: #ec971f; border-color: #d58512; } + .btn-warning:active:hover, + .btn-warning:active:focus, + .btn-warning:active.focus, + .btn-warning.active:hover, + .btn-warning.active:focus, + .btn-warning.active.focus, + .open > .btn-warning.dropdown-toggle:hover, + .open > .btn-warning.dropdown-toggle:focus, + .open > .btn-warning.dropdown-toggle.focus { + color: #fff; + background-color: #d58512; + border-color: #985f0d; } .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle { @@ -3214,16 +3841,19 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .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, 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 { background-color: #f0ad4e; @@ -3236,14 +3866,33 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form color: #fff; background-color: #d9534f; border-color: #d43f3a; } - .btn-danger:hover, .btn-danger:focus, + .btn-danger.focus { + color: #fff; + background-color: #c9302c; + border-color: #761c19; } + .btn-danger:hover { + color: #fff; + background-color: #c9302c; + border-color: #ac2925; } .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle { color: #fff; background-color: #c9302c; border-color: #ac2925; } + .btn-danger:active:hover, + .btn-danger:active:focus, + .btn-danger:active.focus, + .btn-danger.active:hover, + .btn-danger.active:focus, + .btn-danger.active.focus, + .open > .btn-danger.dropdown-toggle:hover, + .open > .btn-danger.dropdown-toggle:focus, + .open > .btn-danger.dropdown-toggle.focus { + color: #fff; + background-color: #ac2925; + border-color: #761c19; } .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle { @@ -3251,16 +3900,19 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .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, 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 { background-color: #d9534f; @@ -3272,10 +3924,10 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .btn-link { color: #ff6d5a; font-weight: normal; - cursor: pointer; border-radius: 0; } .btn-link, .btn-link:active, + .btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link { background-color: transparent; @@ -3301,7 +3953,7 @@ select[multiple].input-lg, .form-horizontal .form-group-lg select[multiple].form .btn-lg, .btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.33333; border-radius: 6px; } .btn-sm, .btn-group-sm > .btn { @@ -3351,9 +4003,12 @@ tbody.collapse.in { position: relative; height: 0; overflow: hidden; - -webkit-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; } + -webkit-transition-property: height, visibility; + transition-property: height, visibility; + -webkit-transition-duration: 0.35s; + transition-duration: 0.35s; + -webkit-transition-timing-function: ease; + transition-timing-function: ease; } .caret { display: inline-block; @@ -3361,10 +4016,12 @@ tbody.collapse.in { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid; + border-top: 4px dashed; + border-top: 4px solid \9; border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -3472,14 +4129,15 @@ tbody.collapse.in { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; - border-bottom: 4px solid; + border-bottom: 4px dashed; + border-bottom: 4px solid \9; content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; } + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3507,9 +4165,6 @@ tbody.collapse.in { .btn-group-vertical > .btn:active, .btn-group-vertical > .btn.active { z-index: 2; } - .btn-group > .btn:focus, - .btn-group-vertical > .btn:focus { - outline: 0; } .btn-group .btn + .btn, .btn-group .btn + .btn-group, @@ -3525,6 +4180,7 @@ tbody.collapse.in { display: table; } .btn-toolbar:after { clear: both; } + .btn-toolbar .btn, .btn-toolbar .btn-group, .btn-toolbar .input-group { float: left; } @@ -3553,12 +4209,12 @@ tbody.collapse.in { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group > .btn-group:first-child > .btn:last-child, -.btn-group > .btn-group:first-child > .dropdown-toggle { +.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 > .btn:first-child { +.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -3657,12 +4313,13 @@ tbody.collapse.in { .btn-group-justified > .btn-group .dropdown-menu { left: auto; } -[data-toggle="buttons"] > .btn > input[type="radio"], -[data-toggle="buttons"] > .btn > input[type="checkbox"] { +[data-toggle="buttons"] > .btn input[type="radio"], +[data-toggle="buttons"] > .btn input[type="checkbox"], +[data-toggle="buttons"] > .btn-group > .btn input[type="radio"], +[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; - z-index: -1; - opacity: 0; - filter: alpha(opacity=0); } + clip: rect(0, 0, 0, 0); + pointer-events: none; } .input-group { position: relative; @@ -3704,12 +4361,12 @@ tbody.collapse.in { background-color: #eeeeee; border: 1px solid #ccc; border-radius: 4px; } - .input-group-addon.input-sm, .form-horizontal .form-group-sm .input-group-addon.form-control, .input-group-sm > .input-group-addon, + .input-group-addon.input-sm, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .input-group-addon.btn { padding: 5px 10px; font-size: 12px; border-radius: 3px; } - .input-group-addon.input-lg, .form-horizontal .form-group-lg .input-group-addon.form-control, .input-group-lg > .input-group-addon, + .input-group-addon.input-lg, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .input-group-addon.btn { padding: 10px 16px; font-size: 18px; @@ -3761,6 +4418,7 @@ tbody.collapse.in { margin-right: -1px; } .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { + z-index: 2; margin-left: -1px; } .nav { @@ -3953,7 +4611,7 @@ tbody.collapse.in { .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 340px; } - @media (max-width: 480px) and (orientation: landscape) { + @media (max-device-width: 480px) and (orientation: landscape) { .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 200px; } } @@ -3984,9 +4642,7 @@ tbody.collapse.in { position: fixed; right: 0; left: 0; - z-index: 1030; - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); } + z-index: 1030; } @media (min-width: 768px) { .navbar-fixed-top, .navbar-fixed-bottom { @@ -4010,6 +4666,8 @@ tbody.collapse.in { .navbar-brand:hover, .navbar-brand:focus { text-decoration: none; } + .navbar-brand > img { + display: block; } @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { @@ -4070,15 +4728,7 @@ tbody.collapse.in { float: left; } .navbar-nav > li > a { padding-top: 15px; - padding-bottom: 15px; } - .navbar-nav.navbar-right:last-child { - margin-right: -15px; } } - -@media (min-width: 768px) { - .navbar-left { - float: left !important; } - .navbar-right { - float: right !important; } } + padding-bottom: 15px; } } .navbar-form { margin-left: -15px; @@ -4090,9 +4740,49 @@ tbody.collapse.in { 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; } + @media (min-width: 768px) { + .navbar-form .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; } + .navbar-form .form-control { + display: inline-block; + width: auto; + vertical-align: middle; } + .navbar-form .form-control-static { + display: inline-block; } + .navbar-form .input-group { + display: inline-table; + vertical-align: middle; } + .navbar-form .input-group .input-group-addon, + .navbar-form .input-group .input-group-btn, + .navbar-form .input-group .form-control { + width: auto; } + .navbar-form .input-group > .form-control { + width: 100%; } + .navbar-form .control-label { + margin-bottom: 0; + vertical-align: middle; } + .navbar-form .radio, + .navbar-form .checkbox { + display: inline-block; + margin-top: 0; + margin-bottom: 0; + vertical-align: middle; } + .navbar-form .radio label, + .navbar-form .checkbox label { + padding-left: 0; } + .navbar-form .radio input[type="radio"], + .navbar-form .checkbox input[type="checkbox"] { + position: relative; + margin-left: 0; } + .navbar-form .has-feedback .form-control-feedback { + top: 0; } } @media (max-width: 767px) { .navbar-form .form-group { - margin-bottom: 5px; } } + margin-bottom: 5px; } + .navbar-form .form-group:last-child { + margin-bottom: 0; } } @media (min-width: 768px) { .navbar-form { width: auto; @@ -4102,9 +4792,7 @@ tbody.collapse.in { padding-top: 0; padding-bottom: 0; -webkit-box-shadow: none; - box-shadow: none; } - .navbar-form.navbar-right:last-child { - margin-right: -15px; } } + box-shadow: none; } } .navbar-nav > li > .dropdown-menu { margin-top: 0; @@ -4112,6 +4800,9 @@ tbody.collapse.in { border-top-left-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + margin-bottom: 0; + border-top-right-radius: 4px; + border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } @@ -4132,9 +4823,16 @@ tbody.collapse.in { .navbar-text { float: left; margin-left: 15px; - margin-right: 15px; } - .navbar-text.navbar-right:last-child { - margin-right: 0; } } + margin-right: 15px; } } + +@media (min-width: 768px) { + .navbar-left { + float: left !important; } + .navbar-right { + float: right !important; + margin-right: -15px; } + .navbar-right ~ .navbar-right { + margin-right: 0; } } .navbar-default { background-color: #f8f8f8; @@ -4214,15 +4912,15 @@ tbody.collapse.in { background-color: #222; border-color: #090909; } .navbar-inverse .navbar-brand { - color: #777777; } + color: #9d9d9d; } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { color: #fff; background-color: transparent; } .navbar-inverse .navbar-text { - color: #777777; } + color: #9d9d9d; } .navbar-inverse .navbar-nav > li > a { - color: #777777; } + color: #9d9d9d; } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { color: #fff; @@ -4258,7 +4956,7 @@ tbody.collapse.in { .navbar-inverse .navbar-nav .open .dropdown-menu .divider { background-color: #090909; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { - color: #777777; } + color: #9d9d9d; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { color: #fff; @@ -4274,11 +4972,11 @@ tbody.collapse.in { color: #444; background-color: transparent; } } .navbar-inverse .navbar-link { - color: #777777; } + color: #9d9d9d; } .navbar-inverse .navbar-link:hover { color: #fff; } .navbar-inverse .btn-link { - color: #777777; } + color: #9d9d9d; } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { color: #fff; } @@ -4334,6 +5032,7 @@ tbody.collapse.in { .pagination > li > a:focus, .pagination > li > span:hover, .pagination > li > span:focus { + z-index: 3; color: #ff290e; background-color: #eeeeee; border-color: #ddd; } @@ -4362,7 +5061,8 @@ tbody.collapse.in { .pagination-lg > li > a, .pagination-lg > li > span { padding: 10px 16px; - font-size: 18px; } + font-size: 18px; + line-height: 1.33333; } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { @@ -4377,7 +5077,8 @@ tbody.collapse.in { .pagination-sm > li > a, .pagination-sm > li > span { padding: 5px 10px; - font-size: 12px; } + font-size: 12px; + line-height: 1.5; } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { @@ -4494,7 +5195,7 @@ a.label:focus { font-weight: bold; color: #fff; line-height: 1; - vertical-align: baseline; + vertical-align: middle; white-space: nowrap; text-align: center; background-color: #777777; @@ -4504,13 +5205,19 @@ a.label:focus { .btn .badge { position: relative; top: -1px; } - .btn-xs .badge, .btn-group-xs > .btn .badge { + .btn-xs .badge, + .btn-group-xs > .btn .badge, + .btn-group-xs > .btn .badge { top: 0; padding: 1px 5px; } - a.list-group-item.active > .badge, + .list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #ff6d5a; 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; } @@ -4521,7 +5228,8 @@ a.badge:focus { cursor: pointer; } .jumbotron { - padding: 30px; + padding-top: 30px; + padding-bottom: 30px; margin-bottom: 30px; color: inherit; background-color: #eeeeee; } @@ -4534,7 +5242,8 @@ a.badge:focus { font-weight: 200; } .jumbotron > hr { border-top-color: #d5d5d5; } - .container .jumbotron { + .container .jumbotron, + .container-fluid .jumbotron { border-radius: 6px; } .jumbotron .container { max-width: 100%; } @@ -4542,7 +5251,8 @@ a.badge:focus { .jumbotron { padding-top: 48px; padding-bottom: 48px; } - .container .jumbotron { + .container .jumbotron, + .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px; } .jumbotron h1, @@ -4557,13 +5267,12 @@ a.badge:focus { background-color: #fff; border: 1px solid #ddd; border-radius: 4px; - -webkit-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; } + -webkit-transition: border 0.2s ease-in-out; + -o-transition: border 0.2s ease-in-out; + transition: border 0.2s ease-in-out; } .thumbnail > img, .thumbnail a > img { display: block; - width: 100% \9; max-width: 100%; height: auto; margin-left: auto; @@ -4686,17 +5395,6 @@ a.thumbnail.active { -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress-bar[aria-valuenow="1"], -.progress-bar[aria-valuenow="2"] { - min-width: 30px; } - -.progress-bar[aria-valuenow="0"] { - color: #777777; - min-width: 30px; - background-color: transparent; - background-image: none; - box-shadow: none; } - .progress-bar-success { background-color: #5cb85c; } .progress-striped .progress-bar-success { @@ -4725,29 +5423,47 @@ a.thumbnail.active { background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } +.media { + margin-top: 15px; } + .media:first-child { + margin-top: 0; } + .media, .media-body { - overflow: hidden; - zoom: 1; } + zoom: 1; + overflow: hidden; } -.media, -.media .media { - margin-top: 15px; } - -.media:first-child { - margin-top: 0; } +.media-body { + width: 10000px; } .media-object { display: block; } + .media-object.img-thumbnail { + max-width: none; } + +.media-right, +.media > .pull-right { + padding-left: 10px; } + +.media-left, +.media > .pull-left { + padding-right: 10px; } + +.media-left, +.media-right, +.media-body { + display: table-cell; + vertical-align: top; } + +.media-middle { + vertical-align: middle; } + +.media-bottom { + vertical-align: bottom; } .media-heading { - margin: 0 0 5px; } - -.media > .pull-left { - margin-right: 10px; } - -.media > .pull-right { - margin-left: 10px; } + margin-top: 0; + margin-bottom: 5px; } .media-list { padding-left: 0; @@ -4771,21 +5487,25 @@ a.thumbnail.active { margin-bottom: 0; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } - .list-group-item > .badge { - float: right; } - .list-group-item > .badge + .badge { - margin-right: 5px; } -a.list-group-item { +a.list-group-item, +button.list-group-item { color: #555; } - a.list-group-item .list-group-item-heading { + a.list-group-item .list-group-item-heading, + button.list-group-item .list-group-item-heading { color: #333; } a.list-group-item:hover, - a.list-group-item:focus { + a.list-group-item:focus, + button.list-group-item:hover, + button.list-group-item:focus { text-decoration: none; color: #555; background-color: #f5f5f5; } +button.list-group-item { + width: 100%; + text-align: left; } + .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { @@ -4827,17 +5547,24 @@ a.list-group-item { color: #3c763d; background-color: #dff0d8; } -a.list-group-item-success { +a.list-group-item-success, +button.list-group-item-success { color: #3c763d; } - a.list-group-item-success .list-group-item-heading { + a.list-group-item-success .list-group-item-heading, + button.list-group-item-success .list-group-item-heading { color: inherit; } a.list-group-item-success:hover, - a.list-group-item-success:focus { + a.list-group-item-success:focus, + button.list-group-item-success:hover, + button.list-group-item-success:focus { color: #3c763d; background-color: #d0e9c6; } a.list-group-item-success.active, a.list-group-item-success.active:hover, - a.list-group-item-success.active:focus { + a.list-group-item-success.active:focus, + button.list-group-item-success.active, + button.list-group-item-success.active:hover, + button.list-group-item-success.active:focus { color: #fff; background-color: #3c763d; border-color: #3c763d; } @@ -4846,17 +5573,24 @@ a.list-group-item-success { color: #31708f; background-color: #d9edf7; } -a.list-group-item-info { +a.list-group-item-info, +button.list-group-item-info { color: #31708f; } - a.list-group-item-info .list-group-item-heading { + a.list-group-item-info .list-group-item-heading, + button.list-group-item-info .list-group-item-heading { color: inherit; } a.list-group-item-info:hover, - a.list-group-item-info:focus { + a.list-group-item-info:focus, + button.list-group-item-info:hover, + button.list-group-item-info:focus { color: #31708f; background-color: #c4e3f3; } a.list-group-item-info.active, a.list-group-item-info.active:hover, - a.list-group-item-info.active:focus { + a.list-group-item-info.active:focus, + button.list-group-item-info.active, + button.list-group-item-info.active:hover, + button.list-group-item-info.active:focus { color: #fff; background-color: #31708f; border-color: #31708f; } @@ -4865,17 +5599,24 @@ a.list-group-item-info { color: #8a6d3b; background-color: #fcf8e3; } -a.list-group-item-warning { +a.list-group-item-warning, +button.list-group-item-warning { color: #8a6d3b; } - a.list-group-item-warning .list-group-item-heading { + a.list-group-item-warning .list-group-item-heading, + button.list-group-item-warning .list-group-item-heading { color: inherit; } a.list-group-item-warning:hover, - a.list-group-item-warning:focus { + a.list-group-item-warning:focus, + button.list-group-item-warning:hover, + button.list-group-item-warning:focus { color: #8a6d3b; background-color: #faf2cc; } a.list-group-item-warning.active, a.list-group-item-warning.active:hover, - a.list-group-item-warning.active:focus { + a.list-group-item-warning.active:focus, + button.list-group-item-warning.active, + button.list-group-item-warning.active:hover, + button.list-group-item-warning.active:focus { color: #fff; background-color: #8a6d3b; border-color: #8a6d3b; } @@ -4884,17 +5625,24 @@ a.list-group-item-warning { color: #a94442; background-color: #f2dede; } -a.list-group-item-danger { +a.list-group-item-danger, +button.list-group-item-danger { color: #a94442; } - a.list-group-item-danger .list-group-item-heading { + a.list-group-item-danger .list-group-item-heading, + button.list-group-item-danger .list-group-item-heading { color: inherit; } a.list-group-item-danger:hover, - a.list-group-item-danger:focus { + a.list-group-item-danger:focus, + button.list-group-item-danger:hover, + button.list-group-item-danger:focus { color: #a94442; background-color: #ebcccc; } a.list-group-item-danger.active, a.list-group-item-danger.active:hover, - a.list-group-item-danger.active:focus { + a.list-group-item-danger.active:focus, + button.list-group-item-danger.active, + button.list-group-item-danger.active:hover, + button.list-group-item-danger.active:focus { color: #fff; background-color: #a94442; border-color: #a94442; } @@ -4937,7 +5685,11 @@ a.list-group-item-danger { margin-bottom: 0; font-size: 16px; color: inherit; } - .panel-title > a { + .panel-title > a, + .panel-title > small, + .panel-title > .small, + .panel-title > small > a, + .panel-title > .small > a { color: inherit; } .panel-footer { @@ -4947,20 +5699,28 @@ a.list-group-item-danger { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } -.panel > .list-group { +.panel > .list-group, +.panel > .panel-collapse > .list-group { margin-bottom: 0; } - .panel > .list-group .list-group-item { + .panel > .list-group .list-group-item, + .panel > .panel-collapse > .list-group .list-group-item { border-width: 1px 0; border-radius: 0; } - .panel > .list-group:first-child .list-group-item:first-child { + .panel > .list-group:first-child .list-group-item:first-child, + .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { border-top: 0; border-top-right-radius: 3px; border-top-left-radius: 3px; } - .panel > .list-group:last-child .list-group-item:last-child { + .panel > .list-group:last-child .list-group-item:last-child, + .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child { border-bottom: 0; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } +.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; } + .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; } @@ -4971,55 +5731,74 @@ a.list-group-item-danger { .panel > .table-responsive > .table, .panel > .panel-collapse > .table { margin-bottom: 0; } + .panel > .table caption, + .panel > .table-responsive > .table caption, + .panel > .panel-collapse > .table caption { + padding-left: 15px; + padding-right: 15px; } .panel > .table:first-child, .panel > .table-responsive:first-child > .table:first-child { border-top-right-radius: 3px; border-top-left-radius: 3px; } - .panel > .table:first-child > thead:first-child > tr:first-child td:first-child, - .panel > .table:first-child > thead:first-child > tr:first-child th:first-child, - .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, - .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, - .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, - .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, - .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, - .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { - border-top-left-radius: 3px; } - .panel > .table:first-child > thead:first-child > tr:first-child td:last-child, - .panel > .table:first-child > thead:first-child > tr:first-child th:last-child, - .panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, - .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, - .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, - .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, - .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, - .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { + .panel > .table:first-child > thead:first-child > tr:first-child, + .panel > .table:first-child > tbody:first-child > tr:first-child, + .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child, + .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child { + border-top-left-radius: 3px; border-top-right-radius: 3px; } + .panel > .table:first-child > thead:first-child > tr:first-child td:first-child, + .panel > .table:first-child > thead:first-child > tr:first-child th:first-child, + .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, + .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, + .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, + .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, + .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, + .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { + border-top-left-radius: 3px; } + .panel > .table:first-child > thead:first-child > tr:first-child td:last-child, + .panel > .table:first-child > thead:first-child > tr:first-child th:last-child, + .panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, + .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, + .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, + .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, + .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, + .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { + border-top-right-radius: 3px; } .panel > .table:last-child, .panel > .table-responsive:last-child > .table:last-child { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } - .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, - .panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, - .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, - .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, - .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, - .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, - .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, - .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { - border-bottom-left-radius: 3px; } - .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, - .panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, - .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, - .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, - .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, - .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, - .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, - .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { + .panel > .table:last-child > tbody:last-child > tr:last-child, + .panel > .table:last-child > tfoot:last-child > tr:last-child, + .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child, + .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child { + border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; } + .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, + .panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, + .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, + .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, + .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, + .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, + .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, + .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { + border-bottom-left-radius: 3px; } + .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, + .panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, + .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, + .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, + .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, + .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, + .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, + .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { + border-bottom-right-radius: 3px; } .panel > .panel-body + .table, -.panel > .panel-body + .table-responsive { +.panel > .panel-body + .table-responsive, +.panel > .table + .panel-body, +.panel > .table-responsive + .panel-body { border-top: 1px solid #ddd; } .panel > .table > tbody:first-child > tr:first-child th, @@ -5087,7 +5866,8 @@ a.list-group-item-danger { margin-top: 5px; } .panel-group .panel-heading { border-bottom: 0; } - .panel-group .panel-heading + .panel-collapse > .panel-body { + .panel-group .panel-heading + .panel-collapse > .panel-body, + .panel-group .panel-heading + .panel-collapse > .list-group { border-top: 1px solid #ddd; } .panel-group .panel-footer { border-top: 0; } @@ -5187,7 +5967,8 @@ a.list-group-item-danger { .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, - .embed-responsive object { + .embed-responsive object, + .embed-responsive video { position: absolute; top: 0; left: 0; @@ -5195,10 +5976,12 @@ a.list-group-item-danger { height: 100%; width: 100%; border: 0; } - .embed-responsive.embed-responsive-16by9 { - padding-bottom: 56.25%; } - .embed-responsive.embed-responsive-4by3 { - padding-bottom: 75%; } + +.embed-responsive-16by9 { + padding-bottom: 56.25%; } + +.embed-responsive-4by3 { + padding-bottom: 75%; } .well { min-height: 20px; @@ -5260,15 +6043,19 @@ button.close { -webkit-overflow-scrolling: touch; outline: 0; } .modal.fade .modal-dialog { - -webkit-transform: translate3d(0, -25%, 0); - transform: translate3d(0, -25%, 0); + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + -o-transform: translate(0, -25%); + transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; -moz-transition: -moz-transform 0.3s ease-out; -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out; } .modal.in .modal-dialog { - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); } + -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; @@ -5364,9 +6151,22 @@ button.close { position: absolute; z-index: 1070; display: block; - visibility: visible; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: 1.42857; + text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; font-size: 12px; - line-height: 1.4; opacity: 0; filter: alpha(opacity=0); } .tooltip.in { @@ -5390,7 +6190,6 @@ button.close { padding: 3px 8px; color: #fff; text-align: center; - text-decoration: none; background-color: #000; border-radius: 4px; } @@ -5410,13 +6209,15 @@ button.close { .tooltip.top-left .tooltip-arrow { bottom: 0; - left: 5px; + right: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000; } .tooltip.top-right .tooltip-arrow { bottom: 0; - right: 5px; + left: 5px; + margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000; } @@ -5443,13 +6244,15 @@ button.close { .tooltip.bottom-left .tooltip-arrow { top: 0; - left: 5px; + right: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000; } .tooltip.bottom-right .tooltip-arrow { top: 0; - right: 5px; + left: 5px; + margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000; } @@ -5461,15 +6264,29 @@ button.close { display: none; max-width: 276px; padding: 1px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: 1.42857; text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; + font-size: 14px; background-color: #fff; background-clip: padding-box; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - white-space: normal; } + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); } .popover.top { margin-top: -10px; } .popover.right { @@ -5483,8 +6300,6 @@ button.close { margin: 0; padding: 8px 14px; font-size: 14px; - font-weight: normal; - line-height: 18px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; border-radius: 5px 5px 0 0; } @@ -5580,10 +6395,37 @@ button.close { .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; - width: 100% \9; max-width: 100%; height: auto; line-height: 1; } + @media all and (transform-3d), (-webkit-transform-3d) { + .carousel-inner > .item { + -webkit-transition: -webkit-transform 0.6s ease-in-out; + -moz-transition: -moz-transform 0.6s ease-in-out; + -o-transition: -o-transform 0.6s ease-in-out; + transition: transform 0.6s ease-in-out; + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; + backface-visibility: hidden; + -webkit-perspective: 1000px; + -moz-perspective: 1000px; + perspective: 1000px; } + .carousel-inner > .item.next, + .carousel-inner > .item.active.right { + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + left: 0; } + .carousel-inner > .item.prev, + .carousel-inner > .item.active.left { + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + left: 0; } + .carousel-inner > .item.next.left, + .carousel-inner > .item.prev.right, + .carousel-inner > .item.active { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + left: 0; } } .carousel-inner > .active, .carousel-inner > .next, .carousel-inner > .prev { @@ -5646,6 +6488,7 @@ button.close { .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; + margin-top: -10px; z-index: 5; display: inline-block; } .carousel-control .icon-prev, @@ -5660,7 +6503,7 @@ button.close { .carousel-control .icon-next { width: 20px; height: 20px; - margin-top: -10px; + line-height: 1; font-family: serif; } .carousel-control .icon-prev:before { content: '\2039'; } @@ -5766,18 +6609,24 @@ button.close { border: 0; } .hidden { - display: none !important; - visibility: hidden !important; } + display: none !important; } .affix { - position: fixed; - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); } + position: fixed; } @-ms-viewport { width: device-width; } -.visible-xs, .visible-sm, .visible-md, .visible-lg { +.visible-xs { + display: none !important; } + +.visible-sm { + display: none !important; } + +.visible-md { + display: none !important; } + +.visible-lg { display: none !important; } .visible-xs-block, @@ -5798,7 +6647,7 @@ button.close { .visible-xs { display: block !important; } table.visible-xs { - display: table; } + display: table !important; } tr.visible-xs { display: table-row !important; } th.visible-xs, @@ -5821,7 +6670,7 @@ button.close { .visible-sm { display: block !important; } table.visible-sm { - display: table; } + display: table !important; } tr.visible-sm { display: table-row !important; } th.visible-sm, @@ -5844,7 +6693,7 @@ button.close { .visible-md { display: block !important; } table.visible-md { - display: table; } + display: table !important; } tr.visible-md { display: table-row !important; } th.visible-md, @@ -5867,7 +6716,7 @@ button.close { .visible-lg { display: block !important; } table.visible-lg { - display: table; } + display: table !important; } tr.visible-lg { display: table-row !important; } th.visible-lg, @@ -5909,7 +6758,7 @@ button.close { .visible-print { display: block !important; } table.visible-print { - display: table; } + display: table !important; } tr.visible-print { display: table-row !important; } th.visible-print, @@ -5954,24 +6803,23 @@ body { border-bottom: 1px solid #eeeeee; } /*! - * Font Awesome 4.1.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.4.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.1.0"); - src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.1.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff?v=4.1.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.1.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular") format("svg"); + 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: normal; font-style: normal; } .fa { display: inline-block; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; - line-height: 1; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -6018,6 +6866,19 @@ body { border: solid 0.08em #eee; border-radius: .1em; } +.fa-pull-left { + float: left; } + +.fa-pull-right { + float: right; } + +.fa.fa-pull-left { + margin-right: .3em; } + +.fa.fa-pull-right { + margin-left: .3em; } + +/* Deprecated as of 4.4.0 */ .pull-right { float: right; } @@ -6031,30 +6892,22 @@ body { margin-left: .3em; } .fa-spin { - -webkit-animation: spin 2s infinite linear; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; } + -webkit-animation: fa-spin 2s infinite linear; + animation: fa-spin 2s infinite linear; } -@-moz-keyframes spin { +.fa-pulse { + -webkit-animation: fa-spin 1s infinite steps(8); + animation: fa-spin 1s infinite steps(8); } + +@-webkit-keyframes fa-spin { 0% { - -moz-transform: rotate(0deg); } + -webkit-transform: rotate(0deg); + transform: rotate(0deg); } 100% { - -moz-transform: rotate(359deg); } } + -webkit-transform: rotate(359deg); + transform: rotate(359deg); } } -@-webkit-keyframes spin { - 0% { - -webkit-transform: rotate(0deg); } - 100% { - -webkit-transform: rotate(359deg); } } - -@-o-keyframes spin { - 0% { - -o-transform: rotate(0deg); } - 100% { - -o-transform: rotate(359deg); } } - -@keyframes spin { +@keyframes fa-spin { 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); } @@ -6065,43 +6918,40 @@ body { .fa-rotate-90 { filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); -webkit-transform: rotate(90deg); - -moz-transform: rotate(90deg); -ms-transform: rotate(90deg); - -o-transform: rotate(90deg); transform: rotate(90deg); } .fa-rotate-180 { filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -webkit-transform: rotate(180deg); - -moz-transform: rotate(180deg); -ms-transform: rotate(180deg); - -o-transform: rotate(180deg); transform: rotate(180deg); } .fa-rotate-270 { filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -webkit-transform: rotate(270deg); - -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); - -o-transform: rotate(270deg); transform: rotate(270deg); } .fa-flip-horizontal { filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0); -webkit-transform: scale(-1, 1); - -moz-transform: scale(-1, 1); -ms-transform: scale(-1, 1); - -o-transform: scale(-1, 1); transform: scale(-1, 1); } .fa-flip-vertical { filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -webkit-transform: scale(1, -1); - -moz-transform: scale(1, -1); -ms-transform: scale(1, -1); - -o-transform: scale(1, -1); transform: scale(1, -1); } +:root .fa-rotate-90, +:root .fa-rotate-180, +:root .fa-rotate-270, +:root .fa-flip-horizontal, +:root .fa-flip-vertical { + filter: none; } + .fa-stack { position: relative; display: inline-block; @@ -6166,6 +7016,8 @@ body { .fa-check:before { content: ""; } +.fa-remove:before, +.fa-close:before, .fa-times:before { content: ""; } @@ -6495,7 +7347,8 @@ body { .fa-arrows-h:before { content: ""; } -.fa-bar-chart-o:before { +.fa-bar-chart-o:before, +.fa-bar-chart:before { content: ""; } .fa-twitter-square:before { @@ -6571,6 +7424,7 @@ body { .fa-twitter:before { content: ""; } +.fa-facebook-f:before, .fa-facebook:before { content: ""; } @@ -6583,6 +7437,7 @@ body { .fa-credit-card:before { content: ""; } +.fa-feed:before, .fa-rss:before { content: ""; } @@ -7220,7 +8075,8 @@ body { .fa-male:before { content: ""; } -.fa-gittip:before { +.fa-gittip:before, +.fa-gratipay:before { content: ""; } .fa-sun-o:before { @@ -7324,7 +8180,6 @@ body { .fa-digg:before { content: ""; } -.fa-pied-piper-square:before, .fa-pied-piper:before { content: ""; } @@ -7441,6 +8296,7 @@ body { content: ""; } .fa-life-bouy:before, +.fa-life-buoy:before, .fa-life-saver:before, .fa-support:before, .fa-life-ring:before { @@ -7463,6 +8319,8 @@ body { .fa-git:before { content: ""; } +.fa-y-combinator-square:before, +.fa-yc-square:before, .fa-hacker-news:before { content: ""; } @@ -7507,3 +8365,458 @@ body { .fa-bomb:before { content: ""; } + +.fa-soccer-ball-o:before, +.fa-futbol-o:before { + content: ""; } + +.fa-tty:before { + content: ""; } + +.fa-binoculars:before { + content: ""; } + +.fa-plug:before { + content: ""; } + +.fa-slideshare:before { + content: ""; } + +.fa-twitch:before { + content: ""; } + +.fa-yelp:before { + content: ""; } + +.fa-newspaper-o:before { + content: ""; } + +.fa-wifi:before { + content: ""; } + +.fa-calculator:before { + content: ""; } + +.fa-paypal:before { + content: ""; } + +.fa-google-wallet:before { + content: ""; } + +.fa-cc-visa:before { + content: ""; } + +.fa-cc-mastercard:before { + content: ""; } + +.fa-cc-discover:before { + content: ""; } + +.fa-cc-amex:before { + content: ""; } + +.fa-cc-paypal:before { + content: ""; } + +.fa-cc-stripe:before { + content: ""; } + +.fa-bell-slash:before { + content: ""; } + +.fa-bell-slash-o:before { + content: ""; } + +.fa-trash:before { + content: ""; } + +.fa-copyright:before { + content: ""; } + +.fa-at:before { + content: ""; } + +.fa-eyedropper:before { + content: ""; } + +.fa-paint-brush:before { + content: ""; } + +.fa-birthday-cake:before { + content: ""; } + +.fa-area-chart:before { + content: ""; } + +.fa-pie-chart:before { + content: ""; } + +.fa-line-chart:before { + content: ""; } + +.fa-lastfm:before { + content: ""; } + +.fa-lastfm-square:before { + content: ""; } + +.fa-toggle-off:before { + content: ""; } + +.fa-toggle-on:before { + content: ""; } + +.fa-bicycle:before { + content: ""; } + +.fa-bus:before { + content: ""; } + +.fa-ioxhost:before { + content: ""; } + +.fa-angellist:before { + content: ""; } + +.fa-cc:before { + content: ""; } + +.fa-shekel:before, +.fa-sheqel:before, +.fa-ils:before { + content: ""; } + +.fa-meanpath:before { + content: ""; } + +.fa-buysellads:before { + content: ""; } + +.fa-connectdevelop:before { + content: ""; } + +.fa-dashcube:before { + content: ""; } + +.fa-forumbee:before { + content: ""; } + +.fa-leanpub:before { + content: ""; } + +.fa-sellsy:before { + content: ""; } + +.fa-shirtsinbulk:before { + content: ""; } + +.fa-simplybuilt:before { + content: ""; } + +.fa-skyatlas:before { + content: ""; } + +.fa-cart-plus:before { + content: ""; } + +.fa-cart-arrow-down:before { + content: ""; } + +.fa-diamond:before { + content: ""; } + +.fa-ship:before { + content: ""; } + +.fa-user-secret:before { + content: ""; } + +.fa-motorcycle:before { + content: ""; } + +.fa-street-view:before { + content: ""; } + +.fa-heartbeat:before { + content: ""; } + +.fa-venus:before { + content: ""; } + +.fa-mars:before { + content: ""; } + +.fa-mercury:before { + content: ""; } + +.fa-intersex:before, +.fa-transgender:before { + content: ""; } + +.fa-transgender-alt:before { + content: ""; } + +.fa-venus-double:before { + content: ""; } + +.fa-mars-double:before { + content: ""; } + +.fa-venus-mars:before { + content: ""; } + +.fa-mars-stroke:before { + content: ""; } + +.fa-mars-stroke-v:before { + content: ""; } + +.fa-mars-stroke-h:before { + content: ""; } + +.fa-neuter:before { + content: ""; } + +.fa-genderless:before { + content: ""; } + +.fa-facebook-official:before { + content: ""; } + +.fa-pinterest-p:before { + content: ""; } + +.fa-whatsapp:before { + content: ""; } + +.fa-server:before { + content: ""; } + +.fa-user-plus:before { + content: ""; } + +.fa-user-times:before { + content: ""; } + +.fa-hotel:before, +.fa-bed:before { + content: ""; } + +.fa-viacoin:before { + content: ""; } + +.fa-train:before { + content: ""; } + +.fa-subway:before { + content: ""; } + +.fa-medium:before { + content: ""; } + +.fa-yc:before, +.fa-y-combinator:before { + content: ""; } + +.fa-optin-monster:before { + content: ""; } + +.fa-opencart:before { + content: ""; } + +.fa-expeditedssl:before { + content: ""; } + +.fa-battery-4:before, +.fa-battery-full:before { + content: ""; } + +.fa-battery-3:before, +.fa-battery-three-quarters:before { + content: ""; } + +.fa-battery-2:before, +.fa-battery-half:before { + content: ""; } + +.fa-battery-1:before, +.fa-battery-quarter:before { + content: ""; } + +.fa-battery-0:before, +.fa-battery-empty:before { + content: ""; } + +.fa-mouse-pointer:before { + content: ""; } + +.fa-i-cursor:before { + content: ""; } + +.fa-object-group:before { + content: ""; } + +.fa-object-ungroup:before { + content: ""; } + +.fa-sticky-note:before { + content: ""; } + +.fa-sticky-note-o:before { + content: ""; } + +.fa-cc-jcb:before { + content: ""; } + +.fa-cc-diners-club:before { + content: ""; } + +.fa-clone:before { + content: ""; } + +.fa-balance-scale:before { + content: ""; } + +.fa-hourglass-o:before { + content: ""; } + +.fa-hourglass-1:before, +.fa-hourglass-start:before { + content: ""; } + +.fa-hourglass-2:before, +.fa-hourglass-half:before { + content: ""; } + +.fa-hourglass-3:before, +.fa-hourglass-end:before { + content: ""; } + +.fa-hourglass:before { + content: ""; } + +.fa-hand-grab-o:before, +.fa-hand-rock-o:before { + content: ""; } + +.fa-hand-stop-o:before, +.fa-hand-paper-o:before { + content: ""; } + +.fa-hand-scissors-o:before { + content: ""; } + +.fa-hand-lizard-o:before { + content: ""; } + +.fa-hand-spock-o:before { + content: ""; } + +.fa-hand-pointer-o:before { + content: ""; } + +.fa-hand-peace-o:before { + content: ""; } + +.fa-trademark:before { + content: ""; } + +.fa-registered:before { + content: ""; } + +.fa-creative-commons:before { + content: ""; } + +.fa-gg:before { + content: ""; } + +.fa-gg-circle:before { + content: ""; } + +.fa-tripadvisor:before { + content: ""; } + +.fa-odnoklassniki:before { + content: ""; } + +.fa-odnoklassniki-square:before { + content: ""; } + +.fa-get-pocket:before { + content: ""; } + +.fa-wikipedia-w:before { + content: ""; } + +.fa-safari:before { + content: ""; } + +.fa-chrome:before { + content: ""; } + +.fa-firefox:before { + content: ""; } + +.fa-opera:before { + content: ""; } + +.fa-internet-explorer:before { + content: ""; } + +.fa-tv:before, +.fa-television:before { + content: ""; } + +.fa-contao:before { + content: ""; } + +.fa-500px:before { + content: ""; } + +.fa-amazon:before { + content: ""; } + +.fa-calendar-plus-o:before { + content: ""; } + +.fa-calendar-minus-o:before { + content: ""; } + +.fa-calendar-times-o:before { + content: ""; } + +.fa-calendar-check-o:before { + content: ""; } + +.fa-industry:before { + content: ""; } + +.fa-map-pin:before { + content: ""; } + +.fa-map-signs:before { + content: ""; } + +.fa-map-o:before { + content: ""; } + +.fa-map:before { + content: ""; } + +.fa-commenting:before { + content: ""; } + +.fa-commenting-o:before { + content: ""; } + +.fa-houzz:before { + content: ""; } + +.fa-vimeo:before { + content: ""; } + +.fa-black-tie:before { + content: ""; } + +.fa-fonticons:before { + content: ""; } diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg index e3e2dc7..94fb549 100644 --- a/fonts/glyphicons-halflings-regular.svg +++ b/fonts/glyphicons-halflings-regular.svg @@ -6,224 +6,283 @@ - - - + + - - + + - - - - - - - - - + + + + + + + + + + - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf index 67fa00b..1413fc6 100644 Binary files a/fonts/glyphicons-halflings-regular.ttf and b/fonts/glyphicons-halflings-regular.ttf differ diff --git a/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff index 8c54182..9e61285 100644 Binary files a/fonts/glyphicons-halflings-regular.woff and b/fonts/glyphicons-halflings-regular.woff differ diff --git a/gulpfile.js b/gulpfile.js index b8e2f6a..eff70e6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,15 +1,55 @@ -'use strict'; - var gulp = require('gulp'); +var plumber = require('gulp-plumber'); var sass = require('gulp-sass'); +var watch = require('gulp-watch'); +var minifyCSS = require('gulp-minify-css'); +var rename = require('gulp-rename'); +var concat = require('gulp-concat'); +var uglify = require('gulp-uglify'); +var merge2 = require('merge2'); +var ignore = require('gulp-ignore'); +var rimraf = require('gulp-rimraf'); + gulp.task('sass', function () { gulp.src('./sass/*.scss') + .pipe(plumber()) .pipe(sass()) .pipe(gulp.dest('./css')); }); -gulp.task('sass:watch', function () { - gulp.watch('./sass/**/*.scss', ['sass']); +gulp.task('watch', function () { + gulp.watch('./sass/**/*.scss', ['sass']); + gulp.watch('./css/theme.css', ['minifycss']); +}); + +gulp.task('minifycss', ['cleancss'], function(){ + return gulp.src('./src/css/*.css') + .pipe(plumber()) + .pipe(rename({suffix: '.min'})) + .pipe(minifyCSS({keepBreaks:true})) + .pipe(gulp.dest('./src/css/')); +}); + +gulp.task('cleancss', function() { + return gulp.src('./css/*.min.css', { read: false }) // much faster + .pipe(ignore('theme.css')) + .pipe(rimraf()); +}); + +gulp.task('copy-assets', function() { + gulp.src('./bower_components/bootstrap-sass/assets/javascripts/*.js') + .pipe(gulp.dest('./js')); + gulp.src('./bower_components/bootstrap-sass/assets/stylesheets/*.scss') + .pipe(gulp.dest('./sass/bootstrap')); + gulp.src('./bower_components/bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,eof,svg}') + .pipe(gulp.dest('./fonts')); + gulp.src('./bower_components/font-awesome/fonts/**/*.{ttf,woff,eof,svg}') + .pipe(gulp.dest('./fonts')); + gulp.src('./bower_components/jquery/dist/*.js') + .pipe(gulp.dest('./js')); + gulp.src('./bower_components/_s/js/*.js') + .pipe(gulp.dest('./js')); + gulp.src('./bower_components/_s/sass/**/*.scss') + .pipe(gulp.dest('./sass/underscores')); }); - diff --git a/js/_bootstrap-compass.scss b/js/_bootstrap-compass.scss new file mode 100644 index 0000000..8fbc3cd --- /dev/null +++ b/js/_bootstrap-compass.scss @@ -0,0 +1,9 @@ +@function twbs-font-path($path) { + @return font-url($path, true); +} + +@function twbs-image-path($path) { + @return image-url($path, true); +} + +$bootstrap-sass-asset-helper: true; diff --git a/js/_bootstrap-mincer.scss b/js/_bootstrap-mincer.scss new file mode 100644 index 0000000..7ec4657 --- /dev/null +++ b/js/_bootstrap-mincer.scss @@ -0,0 +1,19 @@ +// Mincer asset helper functions +// +// This must be imported into a .css.ejs.scss file. +// Then, <% %>-interpolations will be parsed as strings by Sass, and evaluated by EJS after Sass compilation. + + +@function twbs-font-path($path) { + // do something like following + // from "path/to/font.ext#suffix" to "<%- asset_path(path/to/font.ext)) + #suffix %>" + // from "path/to/font.ext?#suffix" to "<%- asset_path(path/to/font.ext)) + ?#suffix %>" + // or from "path/to/font.ext" just "<%- asset_path(path/to/font.ext)) %>" + @return "<%- asset_path('#{$path}'.replace(/[#?].*$/, '')) + '#{$path}'.replace(/(^[^#?]*)([#?]?.*$)/, '$2') %>"; +} + +@function twbs-image-path($file) { + @return "<%- asset_path('#{$file}') %>"; +} + +$bootstrap-sass-asset-helper: true; diff --git a/js/_bootstrap-sprockets.scss b/js/_bootstrap-sprockets.scss new file mode 100644 index 0000000..9fffc1e --- /dev/null +++ b/js/_bootstrap-sprockets.scss @@ -0,0 +1,9 @@ +@function twbs-font-path($path) { + @return font-path($path); +} + +@function twbs-image-path($path) { + @return image-path($path); +} + +$bootstrap-sass-asset-helper: true; diff --git a/js/_bootstrap.scss b/js/_bootstrap.scss new file mode 100644 index 0000000..598b007 --- /dev/null +++ b/js/_bootstrap.scss @@ -0,0 +1,56 @@ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +// Core variables and mixins +@import "bootstrap/variables"; +@import "bootstrap/mixins"; + +// Reset and dependencies +@import "bootstrap/normalize"; +@import "bootstrap/print"; +@import "bootstrap/glyphicons"; + +// Core CSS +@import "bootstrap/scaffolding"; +@import "bootstrap/type"; +@import "bootstrap/code"; +@import "bootstrap/grid"; +@import "bootstrap/tables"; +@import "bootstrap/forms"; +@import "bootstrap/buttons"; + +// Components +@import "bootstrap/component-animations"; +@import "bootstrap/dropdowns"; +@import "bootstrap/button-groups"; +@import "bootstrap/input-groups"; +@import "bootstrap/navs"; +@import "bootstrap/navbar"; +@import "bootstrap/breadcrumbs"; +@import "bootstrap/pagination"; +@import "bootstrap/pager"; +@import "bootstrap/labels"; +@import "bootstrap/badges"; +@import "bootstrap/jumbotron"; +@import "bootstrap/thumbnails"; +@import "bootstrap/alerts"; +@import "bootstrap/progress-bars"; +@import "bootstrap/media"; +@import "bootstrap/list-group"; +@import "bootstrap/panels"; +@import "bootstrap/responsive-embed"; +@import "bootstrap/wells"; +@import "bootstrap/close"; + +// Components w/ JavaScript +@import "bootstrap/modals"; +@import "bootstrap/tooltip"; +@import "bootstrap/popovers"; +@import "bootstrap/carousel"; + +// Utility classes +@import "bootstrap/utilities"; +@import "bootstrap/responsive-utilities"; diff --git a/js/bootstrap-sprockets.js b/js/bootstrap-sprockets.js new file mode 100644 index 0000000..1abde49 --- /dev/null +++ b/js/bootstrap-sprockets.js @@ -0,0 +1,12 @@ +//= require ./bootstrap/affix +//= require ./bootstrap/alert +//= require ./bootstrap/button +//= require ./bootstrap/carousel +//= require ./bootstrap/collapse +//= require ./bootstrap/dropdown +//= require ./bootstrap/tab +//= require ./bootstrap/transition +//= require ./bootstrap/scrollspy +//= require ./bootstrap/modal +//= require ./bootstrap/tooltip +//= require ./bootstrap/popover diff --git a/js/bootstrap.js b/js/bootstrap.js old mode 100755 new mode 100644 index b6ac8d9..5debfd7 --- a/js/bootstrap.js +++ b/js/bootstrap.js @@ -1,7 +1,7 @@ /*! - * Bootstrap v3.3.1 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under the MIT license */ if (typeof jQuery === 'undefined') { @@ -9,6 +9,7 @@ if (typeof jQuery === 'undefined') { } +function ($) { + 'use strict'; var version = $.fn.jquery.split(' ')[0].split('.') if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) { throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher') @@ -16,10 +17,10 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: transition.js v3.3.1 + * Bootstrap: transition.js v3.3.5 * http://getbootstrap.com/javascript/#transitions * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -76,10 +77,10 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: alert.js v3.3.1 + * Bootstrap: alert.js v3.3.5 * http://getbootstrap.com/javascript/#alerts * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -95,7 +96,7 @@ if (typeof jQuery === 'undefined') { $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.3.1' + Alert.VERSION = '3.3.5' Alert.TRANSITION_DURATION = 150 @@ -171,10 +172,10 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: button.js v3.3.1 + * Bootstrap: button.js v3.3.5 * http://getbootstrap.com/javascript/#buttons * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -191,7 +192,7 @@ if (typeof jQuery === 'undefined') { this.isLoading = false } - Button.VERSION = '3.3.1' + Button.VERSION = '3.3.5' Button.DEFAULTS = { loadingText: 'loading...' @@ -203,7 +204,7 @@ if (typeof jQuery === 'undefined') { var val = $el.is('input') ? 'val' : 'html' var data = $el.data() - state = state + 'Text' + state += 'Text' if (data.resetText == null) $el.data('resetText', $el[val]()) @@ -228,15 +229,19 @@ if (typeof jQuery === 'undefined') { if ($parent.length) { var $input = this.$element.find('input') if ($input.prop('type') == 'radio') { - if ($input.prop('checked') && this.$element.hasClass('active')) changed = false - else $parent.find('.active').removeClass('active') + if ($input.prop('checked')) changed = false + $parent.find('.active').removeClass('active') + this.$element.addClass('active') + } else if ($input.prop('type') == 'checkbox') { + if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false + this.$element.toggleClass('active') } - if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') + $input.prop('checked', this.$element.hasClass('active')) + if (changed) $input.trigger('change') } else { this.$element.attr('aria-pressed', !this.$element.hasClass('active')) + this.$element.toggleClass('active') } - - if (changed) this.$element.toggleClass('active') } @@ -279,7 +284,7 @@ if (typeof jQuery === 'undefined') { var $btn = $(e.target) if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') Plugin.call($btn, 'toggle') - e.preventDefault() + if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault() }) .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type)) @@ -288,10 +293,10 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: carousel.js v3.3.1 + * Bootstrap: carousel.js v3.3.5 * http://getbootstrap.com/javascript/#carousel * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -306,10 +311,10 @@ if (typeof jQuery === 'undefined') { this.$element = $(element) this.$indicators = this.$element.find('.carousel-indicators') this.options = options - this.paused = - this.sliding = - this.interval = - this.$active = + this.paused = null + this.sliding = null + this.interval = null + this.$active = null this.$items = null this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this)) @@ -319,7 +324,7 @@ if (typeof jQuery === 'undefined') { .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } - Carousel.VERSION = '3.3.1' + Carousel.VERSION = '3.3.5' Carousel.TRANSITION_DURATION = 600 @@ -359,8 +364,11 @@ if (typeof jQuery === 'undefined') { } Carousel.prototype.getItemForDirection = function (direction, active) { - var delta = direction == 'prev' ? -1 : 1 var activeIndex = this.getItemIndex(active) + var willWrap = (direction == 'prev' && activeIndex === 0) + || (direction == 'next' && activeIndex == (this.$items.length - 1)) + if (willWrap && !this.options.wrap) return active + var delta = direction == 'prev' ? -1 : 1 var itemIndex = (activeIndex + delta) % this.$items.length return this.$items.eq(itemIndex) } @@ -405,14 +413,8 @@ if (typeof jQuery === 'undefined') { var $next = next || this.getItemForDirection(type, $active) var isCycling = this.interval var direction = type == 'next' ? 'left' : 'right' - var fallback = type == 'next' ? 'first' : 'last' var that = this - if (!$next.length) { - if (!this.options.wrap) return - $next = this.$element.find('.item')[fallback]() - } - if ($next.hasClass('active')) return (this.sliding = false) var relatedTarget = $next[0] @@ -529,10 +531,10 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: collapse.js v3.3.1 + * Bootstrap: collapse.js v3.3.5 * http://getbootstrap.com/javascript/#collapse * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -546,7 +548,8 @@ if (typeof jQuery === 'undefined') { var Collapse = function (element, options) { this.$element = $(element) this.options = $.extend({}, Collapse.DEFAULTS, options) - this.$trigger = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]') + this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' + + '[data-toggle="collapse"][data-target="#' + element.id + '"]') this.transitioning = null if (this.options.parent) { @@ -558,13 +561,12 @@ if (typeof jQuery === 'undefined') { if (this.options.toggle) this.toggle() } - Collapse.VERSION = '3.3.1' + Collapse.VERSION = '3.3.5' Collapse.TRANSITION_DURATION = 350 Collapse.DEFAULTS = { - toggle: true, - trigger: '[data-toggle="collapse"]' + toggle: true } Collapse.prototype.dimension = function () { @@ -576,7 +578,7 @@ if (typeof jQuery === 'undefined') { if (this.transitioning || this.$element.hasClass('in')) return var activesData - var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing') + var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing') if (actives && actives.length) { activesData = actives.data('bs.collapse') @@ -702,7 +704,7 @@ if (typeof jQuery === 'undefined') { var data = $this.data('bs.collapse') var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - if (!data && options.toggle && option == 'show') options.toggle = false + if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) @@ -733,7 +735,7 @@ if (typeof jQuery === 'undefined') { var $target = getTargetFromTrigger($this) var data = $target.data('bs.collapse') - var option = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this }) + var option = data ? 'toggle' : $this.data() Plugin.call($target, option) }) @@ -741,10 +743,10 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: dropdown.js v3.3.1 + * Bootstrap: dropdown.js v3.3.5 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -761,7 +763,41 @@ if (typeof jQuery === 'undefined') { $(element).on('click.bs.dropdown', this.toggle) } - Dropdown.VERSION = '3.3.1' + Dropdown.VERSION = '3.3.5' + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + function clearMenus(e) { + if (e && e.which === 3) return + $(backdrop).remove() + $(toggle).each(function () { + var $this = $(this) + var $parent = getParent($this) + var relatedTarget = { relatedTarget: this } + + if (!$parent.hasClass('open')) return + + if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return + + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $this.attr('aria-expanded', 'false') + $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget) + }) + } Dropdown.prototype.toggle = function (e) { var $this = $(this) @@ -776,7 +812,10 @@ if (typeof jQuery === 'undefined') { if (!isActive) { if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { // if mobile we use a backdrop because click events don't delegate - $('