From b847faf37f53111ca6bd435e4374b3bbbe4a8c28 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 30 Dec 2014 22:02:55 +1300 Subject: Fix fonts, stylesheets, add much more flexible bootstrap over-rides. --- libmproxy/web/fonts/fontawesome-webfont.eot | Bin 0 -> 56006 bytes libmproxy/web/fonts/fontawesome-webfont.svg | 520 ++++++++++ libmproxy/web/fonts/fontawesome-webfont.ttf | Bin 0 -> 112160 bytes libmproxy/web/fonts/fontawesome-webfont.woff | Bin 0 -> 65452 bytes libmproxy/web/images/chrome-devtools/LICENSE | 30 + .../web/images/chrome-devtools/resourceCSSIcon.png | Bin 0 -> 1005 bytes .../chrome-devtools/resourceDocumentIcon.png | Bin 0 -> 951 bytes .../web/images/chrome-devtools/resourceJSIcon.png | Bin 0 -> 787 bytes .../images/chrome-devtools/resourcePlainIcon.png | Bin 0 -> 295 bytes libmproxy/web/images/resourceExecutableIcon.png | Bin 0 -> 853 bytes libmproxy/web/images/resourceFlashIcon.png | Bin 0 -> 921 bytes libmproxy/web/images/resourceImageIcon.png | Bin 0 -> 976 bytes libmproxy/web/images/resourceJavaIcon.png | Bin 0 -> 861 bytes libmproxy/web/images/resourceNotModifiedIcon.png | Bin 0 -> 1072 bytes libmproxy/web/images/resourceRedirectIcon.png | Bin 0 -> 1174 bytes libmproxy/web/static/app.css | 20 +- libmproxy/web/static/vendor.css | 1015 +++++++++----------- libmproxy/webfonts/fontawesome-webfont.eot | Bin 0 -> 56006 bytes libmproxy/webfonts/fontawesome-webfont.svg | 520 ++++++++++ libmproxy/webfonts/fontawesome-webfont.ttf | Bin 0 -> 112160 bytes libmproxy/webfonts/fontawesome-webfont.woff | Bin 0 -> 65452 bytes 21 files changed, 1524 insertions(+), 581 deletions(-) create mode 100644 libmproxy/web/fonts/fontawesome-webfont.eot create mode 100644 libmproxy/web/fonts/fontawesome-webfont.svg create mode 100644 libmproxy/web/fonts/fontawesome-webfont.ttf create mode 100644 libmproxy/web/fonts/fontawesome-webfont.woff create mode 100644 libmproxy/web/images/chrome-devtools/LICENSE create mode 100644 libmproxy/web/images/chrome-devtools/resourceCSSIcon.png create mode 100644 libmproxy/web/images/chrome-devtools/resourceDocumentIcon.png create mode 100644 libmproxy/web/images/chrome-devtools/resourceJSIcon.png create mode 100644 libmproxy/web/images/chrome-devtools/resourcePlainIcon.png create mode 100644 libmproxy/web/images/resourceExecutableIcon.png create mode 100644 libmproxy/web/images/resourceFlashIcon.png create mode 100644 libmproxy/web/images/resourceImageIcon.png create mode 100644 libmproxy/web/images/resourceJavaIcon.png create mode 100644 libmproxy/web/images/resourceNotModifiedIcon.png create mode 100644 libmproxy/web/images/resourceRedirectIcon.png create mode 100644 libmproxy/webfonts/fontawesome-webfont.eot create mode 100644 libmproxy/webfonts/fontawesome-webfont.svg create mode 100644 libmproxy/webfonts/fontawesome-webfont.ttf create mode 100644 libmproxy/webfonts/fontawesome-webfont.woff (limited to 'libmproxy') diff --git a/libmproxy/web/fonts/fontawesome-webfont.eot b/libmproxy/web/fonts/fontawesome-webfont.eot new file mode 100644 index 00000000..84677bc0 Binary files /dev/null and b/libmproxy/web/fonts/fontawesome-webfont.eot differ diff --git a/libmproxy/web/fonts/fontawesome-webfont.svg b/libmproxy/web/fonts/fontawesome-webfont.svg new file mode 100644 index 00000000..d907b25a --- /dev/null +++ b/libmproxy/web/fonts/fontawesome-webfont.svg @@ -0,0 +1,520 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libmproxy/web/fonts/fontawesome-webfont.ttf b/libmproxy/web/fonts/fontawesome-webfont.ttf new file mode 100644 index 00000000..96a3639c Binary files /dev/null and b/libmproxy/web/fonts/fontawesome-webfont.ttf differ diff --git a/libmproxy/web/fonts/fontawesome-webfont.woff b/libmproxy/web/fonts/fontawesome-webfont.woff new file mode 100644 index 00000000..628b6a52 Binary files /dev/null and b/libmproxy/web/fonts/fontawesome-webfont.woff differ diff --git a/libmproxy/web/images/chrome-devtools/LICENSE b/libmproxy/web/images/chrome-devtools/LICENSE new file mode 100644 index 00000000..6e4f8b9f --- /dev/null +++ b/libmproxy/web/images/chrome-devtools/LICENSE @@ -0,0 +1,30 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// +// The Chromium Authors can be found at +// http://src.chromium.org/svn/trunk/src/AUTHORS +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/libmproxy/web/images/chrome-devtools/resourceCSSIcon.png b/libmproxy/web/images/chrome-devtools/resourceCSSIcon.png new file mode 100644 index 00000000..18828d06 Binary files /dev/null and b/libmproxy/web/images/chrome-devtools/resourceCSSIcon.png differ diff --git a/libmproxy/web/images/chrome-devtools/resourceDocumentIcon.png b/libmproxy/web/images/chrome-devtools/resourceDocumentIcon.png new file mode 100644 index 00000000..fdc10e47 Binary files /dev/null and b/libmproxy/web/images/chrome-devtools/resourceDocumentIcon.png differ diff --git a/libmproxy/web/images/chrome-devtools/resourceJSIcon.png b/libmproxy/web/images/chrome-devtools/resourceJSIcon.png new file mode 100644 index 00000000..c1b72189 Binary files /dev/null and b/libmproxy/web/images/chrome-devtools/resourceJSIcon.png differ diff --git a/libmproxy/web/images/chrome-devtools/resourcePlainIcon.png b/libmproxy/web/images/chrome-devtools/resourcePlainIcon.png new file mode 100644 index 00000000..8c82a4c7 Binary files /dev/null and b/libmproxy/web/images/chrome-devtools/resourcePlainIcon.png differ diff --git a/libmproxy/web/images/resourceExecutableIcon.png b/libmproxy/web/images/resourceExecutableIcon.png new file mode 100644 index 00000000..fa70c2fd Binary files /dev/null and b/libmproxy/web/images/resourceExecutableIcon.png differ diff --git a/libmproxy/web/images/resourceFlashIcon.png b/libmproxy/web/images/resourceFlashIcon.png new file mode 100644 index 00000000..ead5a4d0 Binary files /dev/null and b/libmproxy/web/images/resourceFlashIcon.png differ diff --git a/libmproxy/web/images/resourceImageIcon.png b/libmproxy/web/images/resourceImageIcon.png new file mode 100644 index 00000000..23163042 Binary files /dev/null and b/libmproxy/web/images/resourceImageIcon.png differ diff --git a/libmproxy/web/images/resourceJavaIcon.png b/libmproxy/web/images/resourceJavaIcon.png new file mode 100644 index 00000000..553b3391 Binary files /dev/null and b/libmproxy/web/images/resourceJavaIcon.png differ diff --git a/libmproxy/web/images/resourceNotModifiedIcon.png b/libmproxy/web/images/resourceNotModifiedIcon.png new file mode 100644 index 00000000..9c6a879d Binary files /dev/null and b/libmproxy/web/images/resourceNotModifiedIcon.png differ diff --git a/libmproxy/web/images/resourceRedirectIcon.png b/libmproxy/web/images/resourceRedirectIcon.png new file mode 100644 index 00000000..58fe3ac1 Binary files /dev/null and b/libmproxy/web/images/resourceRedirectIcon.png differ diff --git a/libmproxy/web/static/app.css b/libmproxy/web/static/app.css index b106b4bd..f4aec31b 100644 --- a/libmproxy/web/static/app.css +++ b/libmproxy/web/static/app.css @@ -11,34 +11,34 @@ html { height: 32px; } .resource-icon-css { - background-image: url(../images/chrome-devtools/resourceCSSIcon.png); + background-image: url(images/chrome-devtools/resourceCSSIcon.png); } .resource-icon-document { - background-image: url(../images/chrome-devtools/resourceDocumentIcon.png); + background-image: url(images/chrome-devtools/resourceDocumentIcon.png); } .resource-icon-js { - background-image: url(../images/chrome-devtools/resourceJSIcon.png); + background-image: url(images/chrome-devtools/resourceJSIcon.png); } .resource-icon-plain { - background-image: url(../images/chrome-devtools/resourcePlainIcon.png); + background-image: url(images/chrome-devtools/resourcePlainIcon.png); } .resource-icon-executable { - background-image: url(../images/resourceExecutableIcon.png); + background-image: url(images/resourceExecutableIcon.png); } .resource-icon-flash { - background-image: url(../images/resourceFlashIcon.png); + background-image: url(images/resourceFlashIcon.png); } .resource-icon-image { - background-image: url(../images/resourceImageIcon.png); + background-image: url(images/resourceImageIcon.png); } .resource-icon-java { - background-image: url(../images/resourceJavaIcon.png); + background-image: url(images/resourceJavaIcon.png); } .resource-icon-not-modified { - background-image: url(../images/resourceNotModifiedIcon.png); + background-image: url(images/resourceNotModifiedIcon.png); } .resource-icon-redirect { - background-image: url(../images/resourceRedirectIcon.png); + background-image: url(images/resourceRedirectIcon.png); } html, body, diff --git a/libmproxy/web/static/vendor.css b/libmproxy/web/static/vendor.css index f10d2b38..31aed3a3 100644 --- a/libmproxy/web/static/vendor.css +++ b/libmproxy/web/static/vendor.css @@ -1,13 +1,8 @@ -/*! - * Bootstrap v3.3.1 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ /*! normalize.css v3.0.2 | MIT License | git.io/normalize */ html { font-family: sans-serif; - -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; } body { margin: 0; @@ -60,21 +55,21 @@ dfn { font-style: italic; } h1 { - margin: .67em 0; font-size: 2em; + margin: 0.67em 0; } mark { - color: #000; background: #ff0; + color: #000; } small { font-size: 80%; } sub, sup { - position: relative; font-size: 75%; line-height: 0; + position: relative; vertical-align: baseline; } sup { @@ -93,10 +88,9 @@ figure { margin: 1em 40px; } hr { - height: 0; - -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; + height: 0; } pre { overflow: auto; @@ -113,9 +107,9 @@ input, optgroup, select, textarea { - margin: 0; - font: inherit; color: inherit; + font: inherit; + margin: 0; } button { overflow: visible; @@ -137,16 +131,14 @@ html input[disabled] { } button::-moz-focus-inner, input::-moz-focus-inner { - padding: 0; border: 0; + padding: 0; } input { line-height: normal; } input[type="checkbox"], input[type="radio"] { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; box-sizing: border-box; padding: 0; } @@ -155,23 +147,23 @@ input[type="number"]::-webkit-outer-spin-button { height: auto; } input[type="search"] { - -webkit-box-sizing: content-box; + -webkit-appearance: textfield; -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; box-sizing: content-box; - -webkit-appearance: textfield; } input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } fieldset { - padding: .35em .625em .75em; - margin: 0 2px; border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; } legend { - padding: 0; border: 0; + padding: 0; } textarea { overflow: auto; @@ -180,8 +172,8 @@ optgroup { font-weight: bold; } table { - border-spacing: 0; border-collapse: collapse; + border-spacing: 0; } td, th { @@ -192,11 +184,10 @@ th { *, *:before, *:after { - color: #000 !important; - text-shadow: none !important; background: transparent !important; - -webkit-box-shadow: none !important; + color: #000 !important; box-shadow: none !important; + text-shadow: none !important; } a, a:visited { @@ -898,8 +889,8 @@ body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.42857143; - color: #333; - background-color: #fff; + color: #333333; + background-color: #ffffff; } input, button, @@ -942,17 +933,17 @@ img { border-radius: 6px; } .img-thumbnail { - display: inline-block; - max-width: 100%; - height: auto; padding: 4px; line-height: 1.42857143; - background-color: #fff; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; 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; + display: inline-block; + max-width: 100%; + height: auto; } .img-circle { border-radius: 50%; @@ -961,14 +952,14 @@ hr { margin-top: 20px; margin-bottom: 20px; border: 0; - border-top: 1px solid #eee; + border-top: 1px solid #eeeeee; } .sr-only { position: absolute; width: 1px; height: 1px; - padding: 0; margin: -1px; + padding: 0; overflow: hidden; clip: rect(0, 0, 0, 0); border: 0; @@ -1025,7 +1016,7 @@ h6 .small, .h6 .small { font-weight: normal; line-height: 1; - color: #777; + color: #777777; } h1, .h1, @@ -1117,8 +1108,8 @@ small, } mark, .mark { - padding: .2em; background-color: #fcf8e3; + padding: .2em; } .text-left { text-align: left; @@ -1145,7 +1136,7 @@ mark, text-transform: capitalize; } .text-muted { - color: #777; + color: #777777; } .text-primary { color: #337ab7; @@ -1211,7 +1202,7 @@ a.bg-danger:hover { .page-header { padding-bottom: 9px; margin: 40px 0 20px; - border-bottom: 1px solid #eee; + border-bottom: 1px solid #eeeeee; } ul, ol { @@ -1230,13 +1221,13 @@ ol ol { } .list-inline { padding-left: 0; - margin-left: -5px; list-style: none; + margin-left: -5px; } .list-inline > li { display: inline-block; - padding-right: 5px; padding-left: 5px; + padding-right: 5px; } dl { margin-top: 0; @@ -1256,9 +1247,9 @@ dd { .dl-horizontal dt { float: left; width: 160px; - overflow: hidden; clear: left; text-align: right; + overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } @@ -1269,7 +1260,7 @@ dd { abbr[title], abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #777; + border-bottom: 1px dotted #777777; } .initialism { font-size: 90%; @@ -1279,7 +1270,7 @@ blockquote { padding: 10px 20px; margin: 0 0 20px; font-size: 17.5px; - border-left: 5px solid #eee; + border-left: 5px solid #eeeeee; } blockquote p:last-child, blockquote ul:last-child, @@ -1292,7 +1283,7 @@ blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; - color: #777; + color: #777777; } blockquote footer:before, blockquote small:before, @@ -1303,9 +1294,9 @@ blockquote .small:before { blockquote.pull-right { padding-right: 15px; padding-left: 0; - text-align: right; - border-right: 5px solid #eee; + border-right: 5px solid #eeeeee; border-left: 0; + text-align: right; } .blockquote-reverse footer:before, blockquote.pull-right footer:before, @@ -1344,17 +1335,15 @@ code { kbd { padding: 2px 4px; font-size: 90%; - color: #fff; - background-color: #333; + color: #ffffff; + background-color: #333333; border-radius: 3px; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); } kbd kbd { padding: 0; font-size: 100%; font-weight: bold; - -webkit-box-shadow: none; box-shadow: none; } pre { @@ -1363,11 +1352,11 @@ pre { margin: 0 0 10px; font-size: 13px; line-height: 1.42857143; - color: #333; word-break: break-all; word-wrap: break-word; + color: #333333; background-color: #f5f5f5; - border: 1px solid #ccc; + border: 1px solid #cccccc; border-radius: 4px; } pre code { @@ -1383,10 +1372,10 @@ pre code { overflow-y: scroll; } .container { - padding-right: 15px; - padding-left: 15px; margin-right: auto; margin-left: auto; + padding-left: 15px; + padding-right: 15px; } @media (min-width: 768px) { .container { @@ -1404,80 +1393,22 @@ pre code { } } .container-fluid { - padding-right: 15px; - padding-left: 15px; margin-right: auto; margin-left: auto; + padding-left: 15px; + padding-right: 15px; } .row { - margin-right: -15px; margin-left: -15px; + margin-right: -15px; } -.col-xs-1, -.col-sm-1, -.col-md-1, -.col-lg-1, -.col-xs-2, -.col-sm-2, -.col-md-2, -.col-lg-2, -.col-xs-3, -.col-sm-3, -.col-md-3, -.col-lg-3, -.col-xs-4, -.col-sm-4, -.col-md-4, -.col-lg-4, -.col-xs-5, -.col-sm-5, -.col-md-5, -.col-lg-5, -.col-xs-6, -.col-sm-6, -.col-md-6, -.col-lg-6, -.col-xs-7, -.col-sm-7, -.col-md-7, -.col-lg-7, -.col-xs-8, -.col-sm-8, -.col-md-8, -.col-lg-8, -.col-xs-9, -.col-sm-9, -.col-md-9, -.col-lg-9, -.col-xs-10, -.col-sm-10, -.col-md-10, -.col-lg-10, -.col-xs-11, -.col-sm-11, -.col-md-11, -.col-lg-11, -.col-xs-12, -.col-sm-12, -.col-md-12, -.col-lg-12 { +.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; - padding-right: 15px; padding-left: 15px; + padding-right: 15px; } -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11, -.col-xs-12 { +.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { float: left; } .col-xs-12 { @@ -1631,21 +1562,10 @@ pre code { margin-left: 8.33333333%; } .col-xs-offset-0 { - margin-left: 0; + margin-left: 0%; } @media (min-width: 768px) { - .col-sm-1, - .col-sm-2, - .col-sm-3, - .col-sm-4, - .col-sm-5, - .col-sm-6, - .col-sm-7, - .col-sm-8, - .col-sm-9, - .col-sm-10, - .col-sm-11, - .col-sm-12 { + .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { float: left; } .col-sm-12 { @@ -1799,22 +1719,11 @@ pre code { margin-left: 8.33333333%; } .col-sm-offset-0 { - margin-left: 0; + margin-left: 0%; } } @media (min-width: 992px) { - .col-md-1, - .col-md-2, - .col-md-3, - .col-md-4, - .col-md-5, - .col-md-6, - .col-md-7, - .col-md-8, - .col-md-9, - .col-md-10, - .col-md-11, - .col-md-12 { + .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { float: left; } .col-md-12 { @@ -1968,22 +1877,11 @@ pre code { margin-left: 8.33333333%; } .col-md-offset-0 { - margin-left: 0; + margin-left: 0%; } } @media (min-width: 1200px) { - .col-lg-1, - .col-lg-2, - .col-lg-3, - .col-lg-4, - .col-lg-5, - .col-lg-6, - .col-lg-7, - .col-lg-8, - .col-lg-9, - .col-lg-10, - .col-lg-11, - .col-lg-12 { + .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { float: left; } .col-lg-12 { @@ -2137,7 +2035,7 @@ pre code { margin-left: 8.33333333%; } .col-lg-offset-0 { - margin-left: 0; + margin-left: 0%; } } table { @@ -2146,7 +2044,7 @@ table { caption { padding-top: 8px; padding-bottom: 8px; - color: #777; + color: #777777; text-align: left; } th { @@ -2166,11 +2064,11 @@ th { padding: 8px; line-height: 1.42857143; vertical-align: top; - border-top: 1px solid #ddd; + border-top: 1px solid #dddddd; } .table > thead > tr > th { vertical-align: bottom; - border-bottom: 2px solid #ddd; + border-bottom: 2px solid #dddddd; } .table > caption + thead > tr:first-child > th, .table > colgroup + thead > tr:first-child > th, @@ -2181,10 +2079,10 @@ th { border-top: 0; } .table > tbody + tbody { - border-top: 2px solid #ddd; + border-top: 2px solid #dddddd; } .table .table { - background-color: #fff; + background-color: #ffffff; } .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, @@ -2195,7 +2093,7 @@ th { padding: 5px; } .table-bordered { - border: 1px solid #ddd; + border: 1px solid #dddddd; } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, @@ -2203,7 +2101,7 @@ th { .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { - border: 1px solid #ddd; + border: 1px solid #dddddd; } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { @@ -2217,14 +2115,14 @@ th { } table col[class*="col-"] { position: static; - display: table-column; float: none; + display: table-column; } table td[class*="col-"], table th[class*="col-"] { position: static; - display: table-cell; float: none; + display: table-cell; } .table > thead > tr > td.active, .table > tbody > tr > td.active, @@ -2332,8 +2230,8 @@ table th[class*="col-"] { background-color: #ebcccc; } .table-responsive { - min-height: .01%; overflow-x: auto; + min-height: 0.01%; } @media screen and (max-width: 767px) { .table-responsive { @@ -2341,7 +2239,7 @@ table th[class*="col-"] { margin-bottom: 15px; overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; - border: 1px solid #ddd; + border: 1px solid #dddddd; } .table-responsive > .table { margin-bottom: 0; @@ -2381,10 +2279,10 @@ table th[class*="col-"] { } } fieldset { - min-width: 0; padding: 0; margin: 0; border: 0; + min-width: 0; } legend { display: block; @@ -2393,7 +2291,7 @@ legend { margin-bottom: 20px; font-size: 21px; line-height: inherit; - color: #333; + color: #333333; border: 0; border-bottom: 1px solid #e5e5e5; } @@ -2437,7 +2335,7 @@ output { padding-top: 7px; font-size: 14px; line-height: 1.42857143; - color: #555; + color: #555555; } .form-control { display: block; @@ -2446,38 +2344,38 @@ output { padding: 6px 12px; font-size: 14px; line-height: 1.42857143; - color: #555; - background-color: #fff; + color: #555555; + background-color: #ffffff; background-image: none; - border: 1px solid #ccc; + border: 1px solid #cccccc; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border-color ease-in-out 0.15s, -webkit-box-shadow ease-in-out 0.15s; - -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; - transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } .form-control:focus { border-color: #66afe9; outline: 0; - -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); + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); } .form-control::-moz-placeholder { - color: #999; + color: #999999; opacity: 1; } .form-control:-ms-input-placeholder { - color: #999; + color: #999999; } .form-control::-webkit-input-placeholder { - color: #999; + color: #999999; } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { cursor: not-allowed; - background-color: #eee; + background-color: #eeeeee; opacity: 1; } textarea.form-control { @@ -2529,8 +2427,8 @@ input[type="search"] { .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { position: absolute; - margin-top: 4px \9; margin-left: -20px; + margin-top: 4px \9; } .radio + .radio, .checkbox + .checkbox { @@ -2541,8 +2439,8 @@ input[type="search"] { display: inline-block; padding-left: 20px; margin-bottom: 0; - font-weight: normal; vertical-align: middle; + font-weight: normal; cursor: pointer; } .radio-inline + .radio-inline, @@ -2577,8 +2475,8 @@ fieldset[disabled] .checkbox label { } .form-control-static.input-lg, .form-control-static.input-sm { - padding-right: 0; padding-left: 0; + padding-right: 0; } .input-sm, .form-group-sm .form-control { @@ -2670,8 +2568,8 @@ select[multiple].form-group-lg .form-control { } .has-success .input-group-addon { color: #3c763d; - background-color: #dff0d8; border-color: #3c763d; + background-color: #dff0d8; } .has-success .form-control-feedback { color: #3c763d; @@ -2700,8 +2598,8 @@ select[multiple].form-group-lg .form-control { } .has-warning .input-group-addon { color: #8a6d3b; - background-color: #fcf8e3; border-color: #8a6d3b; + background-color: #fcf8e3; } .has-warning .form-control-feedback { color: #8a6d3b; @@ -2730,8 +2628,8 @@ select[multiple].form-group-lg .form-control { } .has-error .input-group-addon { color: #a94442; - background-color: #f2dede; border-color: #a94442; + background-color: #f2dede; } .has-error .form-control-feedback { color: #a94442; @@ -2802,23 +2700,23 @@ select[multiple].form-group-lg .form-control { .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { - padding-top: 7px; margin-top: 0; margin-bottom: 0; + padding-top: 7px; } .form-horizontal .radio, .form-horizontal .checkbox { min-height: 27px; } .form-horizontal .form-group { - margin-right: -15px; margin-left: -15px; + margin-right: -15px; } @media (min-width: 768px) { .form-horizontal .control-label { - padding-top: 7px; - margin-bottom: 0; text-align: right; + margin-bottom: 0; + padding-top: 7px; } } .form-horizontal .has-feedback .form-control-feedback { @@ -2836,24 +2734,23 @@ select[multiple].form-group-lg .form-control { } .btn { display: inline-block; - padding: 6px 12px; margin-bottom: 0; - font-size: 14px; font-weight: normal; - line-height: 1.42857143; text-align: center; - white-space: nowrap; vertical-align: middle; - -ms-touch-action: manipulation; touch-action: manipulation; cursor: pointer; + background-image: none; + border: 1px solid transparent; + white-space: nowrap; + padding: 6px 12px; + font-size: 14px; + line-height: 1.42857143; + border-radius: 4px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; - background-image: none; - border: 1px solid transparent; - border-radius: 4px; } .btn:focus, .btn:active:focus, @@ -2868,30 +2765,30 @@ select[multiple].form-group-lg .form-control { .btn:hover, .btn:focus, .btn.focus { - color: #333; + color: #333333; text-decoration: none; } .btn:active, .btn.active { - background-image: none; outline: 0; + background-image: none; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); } .btn.disabled, .btn[disabled], fieldset[disabled] .btn { - pointer-events: none; cursor: not-allowed; + pointer-events: none; + opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none; - opacity: .65; } .btn-default { - color: #333; - background-color: #fff; - border-color: #ccc; + color: #333333; + background-color: #ffffff; + border-color: #cccccc; } .btn-default:hover, .btn-default:focus, @@ -2899,7 +2796,7 @@ fieldset[disabled] .btn { .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { - color: #333; + color: #333333; background-color: #e6e6e6; border-color: #adadad; } @@ -2926,15 +2823,15 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #fff; - border-color: #ccc; + background-color: #ffffff; + border-color: #cccccc; } .btn-default .badge { - color: #fff; - background-color: #333; + color: #ffffff; + background-color: #333333; } .btn-primary { - color: #fff; + color: #ffffff; background-color: #337ab7; border-color: #2e6da4; } @@ -2944,7 +2841,7 @@ fieldset[disabled] .btn-default.active { .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { - color: #fff; + color: #ffffff; background-color: #286090; border-color: #204d74; } @@ -2976,10 +2873,10 @@ fieldset[disabled] .btn-primary.active { } .btn-primary .badge { color: #337ab7; - background-color: #fff; + background-color: #ffffff; } .btn-success { - color: #fff; + color: #ffffff; background-color: #5cb85c; border-color: #4cae4c; } @@ -2989,7 +2886,7 @@ fieldset[disabled] .btn-primary.active { .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { - color: #fff; + color: #ffffff; background-color: #449d44; border-color: #398439; } @@ -3021,10 +2918,10 @@ fieldset[disabled] .btn-success.active { } .btn-success .badge { color: #5cb85c; - background-color: #fff; + background-color: #ffffff; } .btn-info { - color: #fff; + color: #ffffff; background-color: #5bc0de; border-color: #46b8da; } @@ -3034,7 +2931,7 @@ fieldset[disabled] .btn-success.active { .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { - color: #fff; + color: #ffffff; background-color: #31b0d5; border-color: #269abc; } @@ -3066,10 +2963,10 @@ fieldset[disabled] .btn-info.active { } .btn-info .badge { color: #5bc0de; - background-color: #fff; + background-color: #ffffff; } .btn-warning { - color: #fff; + color: #ffffff; background-color: #f0ad4e; border-color: #eea236; } @@ -3079,7 +2976,7 @@ fieldset[disabled] .btn-info.active { .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { - color: #fff; + color: #ffffff; background-color: #ec971f; border-color: #d58512; } @@ -3111,10 +3008,10 @@ fieldset[disabled] .btn-warning.active { } .btn-warning .badge { color: #f0ad4e; - background-color: #fff; + background-color: #ffffff; } .btn-danger { - color: #fff; + color: #ffffff; background-color: #d9534f; border-color: #d43f3a; } @@ -3124,7 +3021,7 @@ fieldset[disabled] .btn-warning.active { .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { - color: #fff; + color: #ffffff; background-color: #c9302c; border-color: #ac2925; } @@ -3156,11 +3053,11 @@ fieldset[disabled] .btn-danger.active { } .btn-danger .badge { color: #d9534f; - background-color: #fff; + background-color: #ffffff; } .btn-link { - font-weight: normal; color: #337ab7; + font-weight: normal; border-radius: 0; } .btn-link, @@ -3188,7 +3085,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #777; + color: #777777; text-decoration: none; } .btn-lg, @@ -3226,9 +3123,9 @@ input[type="button"].btn-block { } .fade { opacity: 0; - -webkit-transition: opacity .15s linear; - -o-transition: opacity .15s linear; - transition: opacity .15s linear; + -webkit-transition: opacity 0.15s linear; + -o-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; } .fade.in { opacity: 1; @@ -3251,15 +3148,12 @@ tbody.collapse.in { position: relative; height: 0; overflow: hidden; - -webkit-transition-timing-function: ease; - -o-transition-timing-function: ease; - transition-timing-function: ease; - -webkit-transition-duration: .35s; - -o-transition-duration: .35s; - transition-duration: .35s; -webkit-transition-property: height, visibility; - -o-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; @@ -3287,17 +3181,16 @@ tbody.collapse.in { min-width: 160px; padding: 5px 0; margin: 2px 0 0; + list-style: none; font-size: 14px; text-align: left; - list-style: none; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid #ccc; + background-color: #ffffff; + border: 1px solid #cccccc; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 4px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + background-clip: padding-box; } .dropdown-menu.pull-right { right: 0; @@ -3315,35 +3208,35 @@ tbody.collapse.in { clear: both; font-weight: normal; line-height: 1.42857143; - color: #333; + color: #333333; white-space: nowrap; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { - color: #262626; text-decoration: none; + color: #262626; background-color: #f5f5f5; } .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { - color: #fff; + color: #ffffff; text-decoration: none; - background-color: #337ab7; outline: 0; + background-color: #337ab7; } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { - color: #777; + color: #777777; } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { text-decoration: none; - cursor: not-allowed; background-color: transparent; background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + cursor: not-allowed; } .open > .dropdown-menu { display: block; @@ -3352,27 +3245,27 @@ tbody.collapse.in { outline: 0; } .dropdown-menu-right { - right: 0; left: auto; + right: 0; } .dropdown-menu-left { - right: auto; left: 0; + right: auto; } .dropdown-header { display: block; padding: 3px 20px; font-size: 12px; line-height: 1.42857143; - color: #777; + color: #777777; white-space: nowrap; } .dropdown-backdrop { position: fixed; - top: 0; + left: 0; right: 0; bottom: 0; - left: 0; + top: 0; z-index: 990; } .pull-right > .dropdown-menu { @@ -3381,9 +3274,9 @@ tbody.collapse.in { } .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - content: ""; border-top: 0; border-bottom: 4px solid; + content: ""; } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { @@ -3393,12 +3286,12 @@ tbody.collapse.in { } @media (min-width: 768px) { .navbar-right .dropdown-menu { - right: 0; left: auto; + right: 0; } .navbar-right .dropdown-menu-left { - right: auto; left: 0; + right: auto; } } .btn-group, @@ -3447,13 +3340,13 @@ tbody.collapse.in { margin-left: 0; } .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { - border-top-right-radius: 0; border-bottom-right-radius: 0; + border-top-right-radius: 0; } .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { - border-top-left-radius: 0; border-bottom-left-radius: 0; + border-top-left-radius: 0; } .btn-group > .btn-group { float: left; @@ -3463,24 +3356,24 @@ tbody.collapse.in { } .btn-group > .btn-group:first-child > .btn:last-child, .btn-group > .btn-group:first-child > .dropdown-toggle { - border-top-right-radius: 0; border-bottom-right-radius: 0; + border-top-right-radius: 0; } .btn-group > .btn-group:last-child > .btn:first-child { - border-top-left-radius: 0; border-bottom-left-radius: 0; + border-top-left-radius: 0; } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0; } .btn-group > .btn + .dropdown-toggle { - padding-right: 8px; padding-left: 8px; + padding-right: 8px; } .btn-group > .btn-lg + .dropdown-toggle { - padding-right: 12px; padding-left: 12px; + padding-right: 12px; } .btn-group.open .dropdown-toggle { -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); @@ -3527,9 +3420,9 @@ tbody.collapse.in { border-bottom-left-radius: 0; } .btn-group-vertical > .btn:last-child:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-top-left-radius: 0; } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; @@ -3540,8 +3433,8 @@ tbody.collapse.in { border-bottom-left-radius: 0; } .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { - border-top-left-radius: 0; border-top-right-radius: 0; + border-top-left-radius: 0; } .btn-group-justified { display: table; @@ -3551,8 +3444,8 @@ tbody.collapse.in { } .btn-group-justified > .btn, .btn-group-justified > .btn-group { - display: table-cell; float: none; + display: table-cell; width: 1%; } .btn-group-justified > .btn-group .btn { @@ -3576,8 +3469,8 @@ tbody.collapse.in { } .input-group[class*="col-"] { float: none; - padding-right: 0; padding-left: 0; + padding-right: 0; } .input-group .form-control { position: relative; @@ -3653,10 +3546,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn { font-size: 14px; font-weight: normal; line-height: 1; - color: #555; + color: #555555; text-align: center; - background-color: #eee; - border: 1px solid #ccc; + background-color: #eeeeee; + border: 1px solid #cccccc; border-radius: 4px; } .input-group-addon.input-sm { @@ -3680,8 +3573,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { - border-top-right-radius: 0; border-bottom-right-radius: 0; + border-top-right-radius: 0; } .input-group-addon:first-child { border-right: 0; @@ -3693,8 +3586,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { - border-top-left-radius: 0; border-bottom-left-radius: 0; + border-top-left-radius: 0; } .input-group-addon:last-child { border-left: 0; @@ -3724,8 +3617,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-left: -1px; } .nav { - padding-left: 0; margin-bottom: 0; + padding-left: 0; list-style: none; } .nav > li { @@ -3740,22 +3633,22 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; - background-color: #eee; + background-color: #eeeeee; } .nav > li.disabled > a { - color: #777; + color: #777777; } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { - color: #777; + color: #777777; text-decoration: none; - cursor: not-allowed; background-color: transparent; + cursor: not-allowed; } .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { - background-color: #eee; + background-color: #eeeeee; border-color: #337ab7; } .nav .nav-divider { @@ -3768,7 +3661,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { max-width: none; } .nav-tabs { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #dddddd; } .nav-tabs > li { float: left; @@ -3781,16 +3674,16 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { - border-color: #eee #eee #ddd; + border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { - color: #555; - cursor: default; - background-color: #fff; - border: 1px solid #ddd; + color: #555555; + background-color: #ffffff; + border: 1px solid #dddddd; border-bottom-color: transparent; + cursor: default; } .nav-tabs.nav-justified { width: 100%; @@ -3800,8 +3693,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: none; } .nav-tabs.nav-justified > li > a { - margin-bottom: 5px; text-align: center; + margin-bottom: 5px; } .nav-tabs.nav-justified > .dropdown .dropdown-menu { top: auto; @@ -3823,17 +3716,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { - border: 1px solid #ddd; + border: 1px solid #dddddd; } @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #dddddd; border-radius: 4px 4px 0 0; } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { - border-bottom-color: #fff; + border-bottom-color: #ffffff; } } .nav-pills > li { @@ -3848,7 +3741,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { - color: #fff; + color: #ffffff; background-color: #337ab7; } .nav-stacked > li { @@ -3865,8 +3758,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: none; } .nav-justified > li > a { - margin-bottom: 5px; text-align: center; + margin-bottom: 5px; } .nav-justified > .dropdown .dropdown-menu { top: auto; @@ -3891,17 +3784,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { - border: 1px solid #ddd; + border: 1px solid #dddddd; } @media (min-width: 768px) { .nav-tabs-justified > li > a { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #dddddd; border-radius: 4px 4px 0 0; } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { - border-bottom-color: #fff; + border-bottom-color: #ffffff; } } .tab-content > .tab-pane { @@ -3914,12 +3807,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .nav-tabs .dropdown-menu { margin-top: -1px; - border-top-left-radius: 0; border-top-right-radius: 0; + border-top-left-radius: 0; } .navbar { position: relative; - min-height: 50px; + min-height: 32px; margin-bottom: 20px; border: 1px solid transparent; } @@ -3934,13 +3827,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-collapse { + overflow-x: visible; padding-right: 15px; padding-left: 15px; - overflow-x: visible; - -webkit-overflow-scrolling: touch; border-top: 1px solid transparent; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); + -webkit-overflow-scrolling: touch; } .navbar-collapse.in { overflow-y: auto; @@ -3949,15 +3841,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-collapse { width: auto; border-top: 0; - -webkit-box-shadow: none; box-shadow: none; } .navbar-collapse.collapse { display: block !important; + visibility: visible !important; height: auto !important; padding-bottom: 0; overflow: visible !important; - visibility: visible !important; } .navbar-collapse.in { overflow-y: visible; @@ -3965,8 +3856,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { - padding-right: 0; padding-left: 0; + padding-right: 0; } } .navbar-fixed-top .navbar-collapse, @@ -4028,10 +3919,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-brand { float: left; - height: 50px; - padding: 15px 15px; + padding: 6px 15px; font-size: 18px; line-height: 20px; + height: 32px; } .navbar-brand:hover, .navbar-brand:focus { @@ -4049,10 +3940,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-toggle { position: relative; float: right; - padding: 9px 10px; - margin-top: 8px; margin-right: 15px; - margin-bottom: 8px; + padding: 9px 10px; + margin-top: -1px; + margin-bottom: -1px; background-color: transparent; background-image: none; border: 1px solid transparent; @@ -4076,7 +3967,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-nav { - margin: 7.5px -15px; + margin: 3px -15px; } .navbar-nav > li > a { padding-top: 10px; @@ -4091,7 +3982,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-top: 0; background-color: transparent; border: 0; - -webkit-box-shadow: none; box-shadow: none; } .navbar-nav .open .dropdown-menu > li > a, @@ -4115,20 +4005,20 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: left; } .navbar-nav > li > a { - padding-top: 15px; - padding-bottom: 15px; + padding-top: 6px; + padding-bottom: 6px; } } .navbar-form { - padding: 10px 15px; - margin-top: 8px; - margin-right: -15px; - margin-bottom: 8px; margin-left: -15px; + margin-right: -15px; + padding: 10px 15px; border-top: 1px solid transparent; border-bottom: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + margin-top: -1px; + margin-bottom: -1px; } @media (min-width: 768px) { .navbar-form .form-group { @@ -4191,55 +4081,57 @@ select[multiple].input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .navbar-form { width: auto; + border: 0; + margin-left: 0; + margin-right: 0; padding-top: 0; padding-bottom: 0; - margin-right: 0; - margin-left: 0; - border: 0; -webkit-box-shadow: none; box-shadow: none; } } .navbar-nav > li > .dropdown-menu { margin-top: 0; - border-top-left-radius: 0; border-top-right-radius: 0; + border-top-left-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { - border-top-left-radius: 4px; border-top-right-radius: 4px; + border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } .navbar-btn { - margin-top: 8px; - margin-bottom: 8px; + margin-top: -1px; + margin-bottom: -1px; } .navbar-btn.btn-sm { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 1px; + margin-bottom: 1px; } .navbar-btn.btn-xs { - margin-top: 14px; - margin-bottom: 14px; + margin-top: 5px; + margin-bottom: 5px; } .navbar-text { - margin-top: 15px; - margin-bottom: 15px; + margin-top: 6px; + margin-bottom: 6px; } @media (min-width: 768px) { .navbar-text { float: left; - margin-right: 15px; margin-left: 15px; + margin-right: 15px; } } @media (min-width: 768px) { .navbar-left { float: left !important; + float: left; } .navbar-right { float: right !important; + float: right; margin-right: -15px; } .navbar-right ~ .navbar-right { @@ -4247,103 +4139,103 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-default { - background-color: #f8f8f8; - border-color: #e7e7e7; + background-color: #ffffff; + border-color: #e0e0e0; } .navbar-default .navbar-brand { - color: #777; + color: #303030; } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { - color: #5e5e5e; + color: #161616; background-color: transparent; } .navbar-default .navbar-text { - color: #777; + color: #303030; } .navbar-default .navbar-nav > li > a { - color: #777; + color: #303030; } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: #333; + color: #333333; background-color: transparent; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { - color: #555; - background-color: #e7e7e7; + color: #555555; + background-color: #eeeeee; } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { - color: #ccc; + color: #cccccc; background-color: transparent; } .navbar-default .navbar-toggle { - border-color: #ddd; + border-color: #dddddd; } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { - background-color: #ddd; + background-color: #dddddd; } .navbar-default .navbar-toggle .icon-bar { - background-color: #888; + background-color: #888888; } .navbar-default .navbar-collapse, .navbar-default .navbar-form { - border-color: #e7e7e7; + border-color: #e0e0e0; } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { - color: #555; - background-color: #e7e7e7; + background-color: #eeeeee; + color: #555555; } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { - color: #777; + color: #303030; } .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { - color: #333; + color: #333333; background-color: transparent; } .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #555; - background-color: #e7e7e7; + color: #555555; + background-color: #eeeeee; } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #ccc; + color: #cccccc; background-color: transparent; } } .navbar-default .navbar-link { - color: #777; + color: #303030; } .navbar-default .navbar-link:hover { - color: #333; + color: #333333; } .navbar-default .btn-link { - color: #777; + color: #303030; } .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { - color: #333; + color: #333333; } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { - color: #ccc; + color: #cccccc; } .navbar-inverse { - background-color: #222; + background-color: #222222; border-color: #080808; } .navbar-inverse .navbar-brand { @@ -4351,7 +4243,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { - color: #fff; + color: #ffffff; background-color: transparent; } .navbar-inverse .navbar-text { @@ -4362,30 +4254,30 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { - color: #fff; + color: #ffffff; background-color: transparent; } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - color: #fff; + color: #ffffff; background-color: #080808; } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { - color: #444; + color: #444444; background-color: transparent; } .navbar-inverse .navbar-toggle { - border-color: #333; + border-color: #333333; } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: #333; + background-color: #333333; } .navbar-inverse .navbar-toggle .icon-bar { - background-color: #fff; + background-color: #ffffff; } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { @@ -4394,8 +4286,8 @@ fieldset[disabled] .navbar-default .btn-link:focus { .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { - color: #fff; background-color: #080808; + color: #ffffff; } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { @@ -4409,19 +4301,19 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { - color: #fff; + color: #ffffff; background-color: transparent; } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #fff; + color: #ffffff; background-color: #080808; } .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #444; + color: #444444; background-color: transparent; } } @@ -4429,20 +4321,20 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #9d9d9d; } .navbar-inverse .navbar-link:hover { - color: #fff; + color: #ffffff; } .navbar-inverse .btn-link { color: #9d9d9d; } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { - color: #fff; + color: #ffffff; } .navbar-inverse .btn-link[disabled]:hover, fieldset[disabled] .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:focus { - color: #444; + color: #444444; } .breadcrumb { padding: 8px 15px; @@ -4455,12 +4347,12 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { display: inline-block; } .breadcrumb > li + li:before { - padding: 0 5px; - color: #ccc; content: "/\00a0"; + padding: 0 5px; + color: #cccccc; } .breadcrumb > .active { - color: #777; + color: #777777; } .pagination { display: inline-block; @@ -4476,31 +4368,31 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { position: relative; float: left; padding: 6px 12px; - margin-left: -1px; line-height: 1.42857143; - color: #337ab7; text-decoration: none; - background-color: #fff; - border: 1px solid #ddd; + color: #337ab7; + background-color: #ffffff; + border: 1px solid #dddddd; + margin-left: -1px; } .pagination > li:first-child > a, .pagination > li:first-child > span { margin-left: 0; - border-top-left-radius: 4px; border-bottom-left-radius: 4px; + border-top-left-radius: 4px; } .pagination > li:last-child > a, .pagination > li:last-child > span { - border-top-right-radius: 4px; border-bottom-right-radius: 4px; + border-top-right-radius: 4px; } .pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { color: #23527c; - background-color: #eee; - border-color: #ddd; + background-color: #eeeeee; + border-color: #dddddd; } .pagination > .active > a, .pagination > .active > span, @@ -4509,10 +4401,10 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .active > a:focus, .pagination > .active > span:focus { z-index: 2; - color: #fff; - cursor: default; + color: #ffffff; background-color: #337ab7; border-color: #337ab7; + cursor: default; } .pagination > .disabled > span, .pagination > .disabled > span:hover, @@ -4520,10 +4412,10 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { - color: #777; + color: #777777; + background-color: #ffffff; + border-color: #dddddd; cursor: not-allowed; - background-color: #fff; - border-color: #ddd; } .pagination-lg > li > a, .pagination-lg > li > span { @@ -4532,13 +4424,13 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { - border-top-left-radius: 6px; border-bottom-left-radius: 6px; + border-top-left-radius: 6px; } .pagination-lg > li:last-child > a, .pagination-lg > li:last-child > span { - border-top-right-radius: 6px; border-bottom-right-radius: 6px; + border-top-right-radius: 6px; } .pagination-sm > li > a, .pagination-sm > li > span { @@ -4547,19 +4439,19 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { - border-top-left-radius: 3px; border-bottom-left-radius: 3px; + border-top-left-radius: 3px; } .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span { - border-top-right-radius: 3px; border-bottom-right-radius: 3px; + border-top-right-radius: 3px; } .pager { padding-left: 0; margin: 20px 0; - text-align: center; list-style: none; + text-align: center; } .pager li { display: inline; @@ -4568,14 +4460,14 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager li > span { display: inline-block; padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-radius: 15px; } .pager li > a:hover, .pager li > a:focus { text-decoration: none; - background-color: #eee; + background-color: #eeeeee; } .pager .next > a, .pager .next > span { @@ -4589,9 +4481,9 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { - color: #777; + color: #777777; + background-color: #ffffff; cursor: not-allowed; - background-color: #fff; } .label { display: inline; @@ -4599,7 +4491,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { font-size: 75%; font-weight: bold; line-height: 1; - color: #fff; + color: #ffffff; text-align: center; white-space: nowrap; vertical-align: baseline; @@ -4607,7 +4499,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } a.label:hover, a.label:focus { - color: #fff; + color: #ffffff; text-decoration: none; cursor: pointer; } @@ -4619,7 +4511,7 @@ a.label:focus { top: -1px; } .label-default { - background-color: #777; + background-color: #777777; } .label-default[href]:hover, .label-default[href]:focus { @@ -4666,12 +4558,12 @@ a.label:focus { padding: 3px 7px; font-size: 12px; font-weight: bold; + color: #ffffff; line-height: 1; - color: #fff; - text-align: center; - white-space: nowrap; vertical-align: baseline; - background-color: #777; + white-space: nowrap; + text-align: center; + background-color: #777777; border-radius: 10px; } .badge:empty { @@ -4687,14 +4579,14 @@ a.label:focus { } a.badge:hover, a.badge:focus { - color: #fff; + color: #ffffff; text-decoration: none; cursor: pointer; } .list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #337ab7; - background-color: #fff; + background-color: #ffffff; } .list-group-item > .badge { float: right; @@ -4709,7 +4601,7 @@ a.badge:focus { padding: 30px 15px; margin-bottom: 30px; color: inherit; - background-color: #eee; + background-color: #eeeeee; } .jumbotron h1, .jumbotron .h1 { @@ -4736,8 +4628,8 @@ a.badge:focus { } .container .jumbotron, .container-fluid .jumbotron { - padding-right: 60px; padding-left: 60px; + padding-right: 60px; } .jumbotron h1, .jumbotron .h1 { @@ -4749,8 +4641,8 @@ a.badge:focus { padding: 4px; margin-bottom: 20px; line-height: 1.42857143; - background-color: #fff; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; border-radius: 4px; -webkit-transition: border 0.2s ease-in-out; -o-transition: border 0.2s ease-in-out; @@ -4758,8 +4650,8 @@ a.badge:focus { } .thumbnail > img, .thumbnail a > img { - margin-right: auto; margin-left: auto; + margin-right: auto; } a.thumbnail:hover, a.thumbnail:focus, @@ -4768,7 +4660,7 @@ a.thumbnail.active { } .thumbnail .caption { padding: 9px; - color: #333; + color: #333333; } .alert { padding: 15px; @@ -4802,9 +4694,9 @@ a.thumbnail.active { color: inherit; } .alert-success { - color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6; + color: #3c763d; } .alert-success hr { border-top-color: #c9e2b3; @@ -4813,9 +4705,9 @@ a.thumbnail.active { color: #2b542c; } .alert-info { - color: #31708f; background-color: #d9edf7; border-color: #bce8f1; + color: #31708f; } .alert-info hr { border-top-color: #a6e1ec; @@ -4824,9 +4716,9 @@ a.thumbnail.active { color: #245269; } .alert-warning { - color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc; + color: #8a6d3b; } .alert-warning hr { border-top-color: #f7e1b5; @@ -4835,9 +4727,9 @@ a.thumbnail.active { color: #66512c; } .alert-danger { - color: #a94442; background-color: #f2dede; border-color: #ebccd1; + color: #a94442; } .alert-danger hr { border-top-color: #e4b9c0; @@ -4853,14 +4745,6 @@ a.thumbnail.active { background-position: 0 0; } } -@-o-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} @keyframes progress-bar-stripes { from { background-position: 40px 0; @@ -4870,9 +4754,9 @@ a.thumbnail.active { } } .progress { + overflow: hidden; height: 20px; margin-bottom: 20px; - overflow: hidden; background-color: #f5f5f5; border-radius: 4px; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -4880,25 +4764,24 @@ a.thumbnail.active { } .progress-bar { float: left; - width: 0; + width: 0%; height: 100%; font-size: 12px; line-height: 20px; - color: #fff; + color: #ffffff; text-align: center; background-color: #337ab7; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-transition: width .6s ease; - -o-transition: width .6s ease; - transition: width .6s ease; + -webkit-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; } .progress-striped .progress-bar, .progress-bar-striped { background-image: -webkit-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: -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); - -webkit-background-size: 40px 40px; background-size: 40px 40px; } .progress.active .progress-bar, @@ -4974,20 +4857,20 @@ a.thumbnail.active { list-style: none; } .list-group { - padding-left: 0; margin-bottom: 20px; + padding-left: 0; } .list-group-item { position: relative; display: block; padding: 10px 15px; margin-bottom: -1px; - background-color: #fff; - border: 1px solid #ddd; + background-color: #ffffff; + border: 1px solid #dddddd; } .list-group-item:first-child { - border-top-left-radius: 4px; border-top-right-radius: 4px; + border-top-left-radius: 4px; } .list-group-item:last-child { margin-bottom: 0; @@ -4995,23 +4878,23 @@ a.thumbnail.active { border-bottom-left-radius: 4px; } a.list-group-item { - color: #555; + color: #555555; } a.list-group-item .list-group-item-heading { - color: #333; + color: #333333; } a.list-group-item:hover, a.list-group-item:focus { - color: #555; text-decoration: none; + color: #555555; background-color: #f5f5f5; } .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { - color: #777; + background-color: #eeeeee; + color: #777777; cursor: not-allowed; - background-color: #eee; } .list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, @@ -5021,13 +4904,13 @@ a.list-group-item:focus { .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { - color: #777; + color: #777777; } .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; - color: #fff; + color: #ffffff; background-color: #337ab7; border-color: #337ab7; } @@ -5145,7 +5028,7 @@ a.list-group-item-danger.active:focus { } .panel { margin-bottom: 20px; - background-color: #fff; + background-color: #ffffff; border: 1px solid transparent; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); @@ -5157,8 +5040,8 @@ a.list-group-item-danger.active:focus { .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; - border-top-left-radius: 3px; border-top-right-radius: 3px; + border-top-left-radius: 3px; } .panel-heading > .dropdown .dropdown-toggle { color: inherit; @@ -5175,7 +5058,7 @@ a.list-group-item-danger.active:focus { .panel-footer { padding: 10px 15px; background-color: #f5f5f5; - border-top: 1px solid #ddd; + border-top: 1px solid #dddddd; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } @@ -5191,8 +5074,8 @@ a.list-group-item-danger.active:focus { .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-left-radius: 3px; border-top-right-radius: 3px; + border-top-left-radius: 3px; } .panel > .list-group:last-child .list-group-item:last-child, .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child { @@ -5214,13 +5097,13 @@ a.list-group-item-danger.active:focus { .panel > .table caption, .panel > .table-responsive > .table caption, .panel > .panel-collapse > .table caption { - padding-right: 15px; padding-left: 15px; + padding-right: 15px; } .panel > .table:first-child, .panel > .table-responsive:first-child > .table:first-child { - border-top-left-radius: 3px; border-top-right-radius: 3px; + border-top-left-radius: 3px; } .panel > .table:first-child > thead:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child, @@ -5258,8 +5141,8 @@ a.list-group-item-danger.active:focus { .panel > .table-responsive:last-child > .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 > tfoot:last-child > tr:last-child { - border-bottom-right-radius: 3px; 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-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, @@ -5285,7 +5168,7 @@ a.list-group-item-danger.active:focus { .panel > .panel-body + .table-responsive, .panel > .table + .panel-body, .panel > .table-responsive + .panel-body { - border-top: 1px solid #ddd; + border-top: 1px solid #dddddd; } .panel > .table > tbody:first-child > tr:first-child th, .panel > .table > tbody:first-child > tr:first-child td { @@ -5344,8 +5227,8 @@ a.list-group-item-danger.active:focus { border-bottom: 0; } .panel > .table-responsive { - margin-bottom: 0; border: 0; + margin-bottom: 0; } .panel-group { margin-bottom: 20px; @@ -5362,37 +5245,37 @@ a.list-group-item-danger.active:focus { } .panel-group .panel-heading + .panel-collapse > .panel-body, .panel-group .panel-heading + .panel-collapse > .list-group { - border-top: 1px solid #ddd; + border-top: 1px solid #dddddd; } .panel-group .panel-footer { border-top: 0; } .panel-group .panel-footer + .panel-collapse .panel-body { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #dddddd; } .panel-default { - border-color: #ddd; + border-color: #dddddd; } .panel-default > .panel-heading { - color: #333; + color: #333333; background-color: #f5f5f5; - border-color: #ddd; + border-color: #dddddd; } .panel-default > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #ddd; + border-top-color: #dddddd; } .panel-default > .panel-heading .badge { color: #f5f5f5; - background-color: #333; + background-color: #333333; } .panel-default > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #ddd; + border-bottom-color: #dddddd; } .panel-primary { border-color: #337ab7; } .panel-primary > .panel-heading { - color: #fff; + color: #ffffff; background-color: #337ab7; border-color: #337ab7; } @@ -5401,7 +5284,7 @@ a.list-group-item-danger.active:focus { } .panel-primary > .panel-heading .badge { color: #337ab7; - background-color: #fff; + background-color: #ffffff; } .panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #337ab7; @@ -5492,10 +5375,10 @@ a.list-group-item-danger.active:focus { .embed-responsive video { position: absolute; top: 0; - bottom: 0; left: 0; - width: 100%; + bottom: 0; height: 100%; + width: 100%; border: 0; } .embed-responsive.embed-responsive-16by9 { @@ -5531,49 +5414,50 @@ a.list-group-item-danger.active:focus { font-size: 21px; font-weight: bold; line-height: 1; - color: #000; - text-shadow: 0 1px 0 #fff; + color: #000000; + text-shadow: 0 1px 0 #ffffff; + opacity: 0.2; filter: alpha(opacity=20); - opacity: .2; } .close:hover, .close:focus { - color: #000; + color: #000000; text-decoration: none; cursor: pointer; + opacity: 0.5; filter: alpha(opacity=50); - opacity: .5; } button.close { - -webkit-appearance: none; padding: 0; cursor: pointer; background: transparent; border: 0; + -webkit-appearance: none; } .modal-open { overflow: hidden; } .modal { + display: none; + overflow: hidden; position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1040; - display: none; - overflow: hidden; -webkit-overflow-scrolling: touch; outline: 0; } .modal.fade .modal-dialog { - -webkit-transition: -webkit-transform 0.3s ease-out; - -o-transition: -o-transform 0.3s ease-out; - transition: transform 0.3s ease-out; -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: translate(0, 0); @@ -5592,35 +5476,34 @@ button.close { } .modal-content { position: relative; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid #999; + background-color: #ffffff; + border: 1px solid #999999; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; - outline: 0; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + background-clip: padding-box; + outline: 0; } .modal-backdrop { position: absolute; top: 0; right: 0; left: 0; - background-color: #000; + background-color: #000000; } .modal-backdrop.fade { - filter: alpha(opacity=0); opacity: 0; + filter: alpha(opacity=0); } .modal-backdrop.in { + opacity: 0.5; filter: alpha(opacity=50); - opacity: .5; } .modal-header { - min-height: 16.42857143px; padding: 15px; border-bottom: 1px solid #e5e5e5; + min-height: 16.42857143px; } .modal-header .close { margin-top: -2px; @@ -5639,8 +5522,8 @@ button.close { border-top: 1px solid #e5e5e5; } .modal-footer .btn + .btn { - margin-bottom: 0; margin-left: 5px; + margin-bottom: 0; } .modal-footer .btn-group .btn + .btn { margin-left: -1px; @@ -5677,41 +5560,41 @@ button.close { position: absolute; z-index: 1070; display: block; + visibility: visible; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.4; - visibility: visible; - filter: alpha(opacity=0); opacity: 0; + filter: alpha(opacity=0); } .tooltip.in { + opacity: 0.9; filter: alpha(opacity=90); - opacity: .9; } .tooltip.top { - padding: 5px 0; margin-top: -3px; + padding: 5px 0; } .tooltip.right { - padding: 0 5px; margin-left: 3px; + padding: 0 5px; } .tooltip.bottom { - padding: 5px 0; margin-top: 3px; + padding: 5px 0; } .tooltip.left { - padding: 0 5px; margin-left: -3px; + padding: 0 5px; } .tooltip-inner { max-width: 200px; padding: 3px 8px; - color: #fff; + color: #ffffff; text-align: center; text-decoration: none; - background-color: #000; + background-color: #000000; border-radius: 4px; } .tooltip-arrow { @@ -5726,56 +5609,56 @@ button.close { left: 50%; margin-left: -5px; border-width: 5px 5px 0; - border-top-color: #000; + border-top-color: #000000; } .tooltip.top-left .tooltip-arrow { - right: 5px; bottom: 0; + right: 5px; margin-bottom: -5px; border-width: 5px 5px 0; - border-top-color: #000; + border-top-color: #000000; } .tooltip.top-right .tooltip-arrow { bottom: 0; left: 5px; margin-bottom: -5px; border-width: 5px 5px 0; - border-top-color: #000; + border-top-color: #000000; } .tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; border-width: 5px 5px 5px 0; - border-right-color: #000; + border-right-color: #000000; } .tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; border-width: 5px 0 5px 5px; - border-left-color: #000; + border-left-color: #000000; } .tooltip.bottom .tooltip-arrow { top: 0; left: 50%; margin-left: -5px; border-width: 0 5px 5px; - border-bottom-color: #000; + border-bottom-color: #000000; } .tooltip.bottom-left .tooltip-arrow { top: 0; right: 5px; margin-top: -5px; border-width: 0 5px 5px; - border-bottom-color: #000; + border-bottom-color: #000000; } .tooltip.bottom-right .tooltip-arrow { top: 0; left: 5px; margin-top: -5px; border-width: 0 5px 5px; - border-bottom-color: #000; + border-bottom-color: #000000; } .popover { position: absolute; @@ -5790,15 +5673,14 @@ button.close { font-weight: normal; line-height: 1.42857143; text-align: left; - white-space: normal; - background-color: #fff; - -webkit-background-clip: padding-box; + background-color: #ffffff; background-clip: padding-box; - border: 1px solid #ccc; + border: 1px solid #cccccc; 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; } .popover.top { margin-top: -10px; @@ -5813,8 +5695,8 @@ button.close { margin-left: -10px; } .popover-title { - padding: 8px 14px; margin: 0; + padding: 8px 14px; font-size: 14px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; @@ -5836,80 +5718,80 @@ button.close { border-width: 11px; } .popover > .arrow:after { - content: ""; border-width: 10px; + content: ""; } .popover.top > .arrow { - bottom: -11px; left: 50%; margin-left: -11px; - border-top-color: #999; - border-top-color: rgba(0, 0, 0, 0.25); border-bottom-width: 0; + border-top-color: #999999; + border-top-color: rgba(0, 0, 0, 0.25); + bottom: -11px; } .popover.top > .arrow:after { + content: " "; bottom: 1px; margin-left: -10px; - content: " "; - border-top-color: #fff; border-bottom-width: 0; + border-top-color: #ffffff; } .popover.right > .arrow { top: 50%; left: -11px; margin-top: -11px; - border-right-color: #999; - border-right-color: rgba(0, 0, 0, 0.25); border-left-width: 0; + border-right-color: #999999; + border-right-color: rgba(0, 0, 0, 0.25); } .popover.right > .arrow:after { - bottom: -10px; - left: 1px; content: " "; - border-right-color: #fff; + left: 1px; + bottom: -10px; border-left-width: 0; + border-right-color: #ffffff; } .popover.bottom > .arrow { - top: -11px; left: 50%; margin-left: -11px; border-top-width: 0; - border-bottom-color: #999; + border-bottom-color: #999999; border-bottom-color: rgba(0, 0, 0, 0.25); + top: -11px; } .popover.bottom > .arrow:after { + content: " "; top: 1px; margin-left: -10px; - content: " "; border-top-width: 0; - border-bottom-color: #fff; + border-bottom-color: #ffffff; } .popover.left > .arrow { top: 50%; right: -11px; margin-top: -11px; border-right-width: 0; - border-left-color: #999; + border-left-color: #999999; border-left-color: rgba(0, 0, 0, 0.25); } .popover.left > .arrow:after { - right: 1px; - bottom: -10px; content: " "; + right: 1px; border-right-width: 0; - border-left-color: #fff; + border-left-color: #ffffff; + bottom: -10px; } .carousel { position: relative; } .carousel-inner { position: relative; - width: 100%; overflow: hidden; + width: 100%; } .carousel-inner > .item { - position: relative; display: none; + position: relative; -webkit-transition: 0.6s ease-in-out left; -o-transition: 0.6s ease-in-out left; transition: 0.6s ease-in-out left; @@ -5920,32 +5802,25 @@ button.close { } @media all and (transform-3d), (-webkit-transform-3d) { .carousel-inner > .item { - -webkit-transition: -webkit-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; backface-visibility: hidden; - -webkit-perspective: 1000; perspective: 1000; } .carousel-inner > .item.next, .carousel-inner > .item.active.right { - left: 0; - -webkit-transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0); + left: 0; } .carousel-inner > .item.prev, .carousel-inner > .item.active.left { - left: 0; - -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 { - left: 0; - -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); + left: 0; } } .carousel-inner > .active, @@ -5981,41 +5856,39 @@ button.close { .carousel-control { position: absolute; top: 0; - bottom: 0; left: 0; + bottom: 0; width: 15%; + opacity: 0.5; + filter: alpha(opacity=50); font-size: 20px; - color: #fff; + color: #ffffff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); - filter: alpha(opacity=50); - opacity: .5; } .carousel-control.left { background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); - background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); } .carousel-control.right { - right: 0; left: auto; + right: 0; background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); - background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); } .carousel-control:hover, .carousel-control:focus { - color: #fff; + outline: 0; + color: #ffffff; text-decoration: none; + opacity: 0.9; filter: alpha(opacity=90); - outline: 0; - opacity: .9; } .carousel-control .icon-prev, .carousel-control .icon-next, @@ -6055,10 +5928,10 @@ button.close { left: 50%; z-index: 15; width: 60%; - padding-left: 0; margin-left: -30%; - text-align: center; + padding-left: 0; list-style: none; + text-align: center; } .carousel-indicators li { display: inline-block; @@ -6066,27 +5939,27 @@ button.close { height: 10px; margin: 1px; text-indent: -999px; + border: 1px solid #ffffff; + border-radius: 10px; cursor: pointer; background-color: #000 \9; background-color: rgba(0, 0, 0, 0); - border: 1px solid #fff; - border-radius: 10px; } .carousel-indicators .active { + margin: 0; width: 12px; height: 12px; - margin: 0; - background-color: #fff; + background-color: #ffffff; } .carousel-caption { position: absolute; + left: 15%; right: 15%; bottom: 20px; - left: 15%; z-index: 10; padding-top: 20px; padding-bottom: 20px; - color: #fff; + color: #ffffff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } @@ -6112,8 +5985,8 @@ button.close { margin-right: -15px; } .carousel-caption { - right: 20%; left: 20%; + right: 20%; padding-bottom: 30px; } .carousel-indicators { @@ -6150,8 +6023,8 @@ button.close { .panel-body:after, .modal-footer:before, .modal-footer:after { - display: table; content: " "; + display: table; } .clearfix:after, .dl-horizontal dd:after, @@ -6172,8 +6045,8 @@ button.close { } .center-block { display: block; - margin-right: auto; margin-left: auto; + margin-right: auto; } .pull-right { float: right !important; @@ -6422,8 +6295,8 @@ button.close { * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../fonts/fontawesome-webfont.eot?v=4.2.0'); - src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg'); + src: url('fonts/fontawesome-webfont.eot?v=4.2.0'); + src: url('fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } @@ -6437,7 +6310,7 @@ button.close { } /* makes the font 33% larger relative to the icon container */ .fa-lg { - font-size: 1.33333333em; + font-size: 1.3333333333333333em; line-height: 0.75em; vertical-align: -15%; } @@ -6454,12 +6327,12 @@ button.close { font-size: 5em; } .fa-fw { - width: 1.28571429em; + width: 1.2857142857142858em; text-align: center; } .fa-ul { padding-left: 0; - margin-left: 2.14285714em; + margin-left: 2.142857142857143em; list-style-type: none; } .fa-ul > li { @@ -6468,8 +6341,8 @@ button.close { .fa-li { position: absolute; left: -2.14285714em; - width: 2.14285714em; - top: 0.14285714em; + width: 2.142857142857143em; + top: 0.14285714285714285em; text-align: center; } .fa-li.fa-lg { diff --git a/libmproxy/webfonts/fontawesome-webfont.eot b/libmproxy/webfonts/fontawesome-webfont.eot new file mode 100644 index 00000000..84677bc0 Binary files /dev/null and b/libmproxy/webfonts/fontawesome-webfont.eot differ diff --git a/libmproxy/webfonts/fontawesome-webfont.svg b/libmproxy/webfonts/fontawesome-webfont.svg new file mode 100644 index 00000000..d907b25a --- /dev/null +++ b/libmproxy/webfonts/fontawesome-webfont.svg @@ -0,0 +1,520 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libmproxy/webfonts/fontawesome-webfont.ttf b/libmproxy/webfonts/fontawesome-webfont.ttf new file mode 100644 index 00000000..96a3639c Binary files /dev/null and b/libmproxy/webfonts/fontawesome-webfont.ttf differ diff --git a/libmproxy/webfonts/fontawesome-webfont.woff b/libmproxy/webfonts/fontawesome-webfont.woff new file mode 100644 index 00000000..628b6a52 Binary files /dev/null and b/libmproxy/webfonts/fontawesome-webfont.woff differ -- cgit v1.2.3