diff --git a/.gitignore b/.gitignore index 8b137891791f..ef9fbafed08f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +README.md + +.phptidy-cache diff --git a/404.php b/404.php index 7f0dc66ea83d..80a36875071b 100755 --- a/404.php +++ b/404.php @@ -5,8 +5,6 @@ * @package WordPress * @subpackage WP-Bootstrap * @since WP-Bootstrap 0.7 - * - * Last Revised: January 22, 2012 */ get_header(); ?>
@@ -16,17 +14,14 @@
- -

- +
- +
@@ -40,12 +35,12 @@
- +

    'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
- +
diff --git a/README.md b/README.md index 0ee96f15c61d..2e27cd77c52d 100755 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ Demo ---- You can view a demo of this WordPress theme running the latest development branch code at: [http://bootstrapwp.rachelbaker.me/](http://bootstrapwp.rachelbaker.me/) -View the theme style guide at: [http://bootstrapwp.rachelbaker.me/style-guide/](http://bootstrapwp.rachelbaker.me/style-guide/) +View the theme's base CSS elements at: [http://bootstrapwp.rachelbaker.me/base-css/](http://bootstrapwp.rachelbaker.me/base-css/) -View the javascript guide at: [http://bootstrapwp.rachelbaker.me/javascript-guide/](http://bootstrapwp.rachelbaker.me/javascript-guide/) +View the theme's JavaScript guide at: [http://bootstrapwp.rachelbaker.me/javascript/](http://bootstrapwp.rachelbaker.me/javascript/) Usage diff --git a/archive.php b/archive.php index 046ad2c2dcfe..e2df191ba9ee 100755 --- a/archive.php +++ b/archive.php @@ -10,16 +10,17 @@ * @package WordPress * @subpackage WP-Bootstrap * @since WP-Bootstrap 0.6 + * */ - get_header(); if (have_posts() ) ;?> -
-
- -
-
-
+
+
+
+ +
+
+

-
diff --git a/author.php b/author.php index d8cd20b94073..8b57227b500d 100755 --- a/author.php +++ b/author.php @@ -5,8 +5,8 @@ * @package WordPress * @subpackage WP-Bootstrap * @since WP-Bootstrap 0.1 + * */ - get_header(); ?> @@ -20,12 +20,13 @@ */ the_post(); ?> -
-
- -
-
-
+
+
+
+ +
+
+

' . get_the_author() . '' ); ?>

diff --git a/css/bootstrapwp.css b/css/bootstrapwp.css index 23be4f44602a..41c4526c93ff 100644 --- a/css/bootstrapwp.css +++ b/css/bootstrapwp.css @@ -4,7 +4,7 @@ Theme URI: http://bootstrapwp.rachelbaker.me Author: Rachel Baker Author URI: http://www.rachelbaker.me Description: A semantic HTML/CSS framework base theme for WordPress Developers ported from Twitter Bootstrap -Version: .90 +Version: .91 ======= License: GNU General Public License License URI: license.txt @@ -12,7 +12,7 @@ License URI: license.txt 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. */ -/* Loading Standard Bootstrap 2.1 LESS Files +/* Loading Standard Bootstrap 2.2.1 LESS Files ----------------------------------------------------------------------------------------*/ article, aside, @@ -79,7 +79,8 @@ img { border: 0; -ms-interpolation-mode: bicubic; } -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; } button, @@ -101,11 +102,21 @@ input::-moz-focus-inner { border: 0; } button, -input[type="button"], +html input[type="button"], input[type="reset"], input[type="submit"] { - cursor: pointer; -webkit-appearance: button; + cursor: pointer; +} +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; } input[type="search"] { -webkit-box-sizing: content-box; @@ -121,6 +132,57 @@ textarea { overflow: auto; vertical-align: top; } +@media print { + * { + text-shadow: none !important; + color: #000 !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + @page { + margin: 0.5cm; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } +} .clearfix { *zoom: 1; } @@ -306,6 +368,9 @@ a:hover { .row-fluid [class*="span"]:first-child { margin-left: 0; } +.row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.127659574468085%; +} .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; @@ -510,18 +575,33 @@ cite { .muted { color: #999999; } +a.muted:hover { + color: #808080; +} .text-warning { color: #c09853; } +a.text-warning:hover { + color: #a47e3c; +} .text-error { color: #b94a48; } +a.text-error:hover { + color: #953b39; +} .text-info { color: #3a87ad; } +a.text-info:hover { + color: #2d6987; +} .text-success { color: #468847; } +a.text-success:hover { + color: #356635; +} h1, h2, h3, @@ -531,7 +611,7 @@ h6 { margin: 10px 0; font-family: inherit; font-weight: bold; - line-height: 1; + line-height: 20px; color: inherit; text-rendering: optimizelegibility; } @@ -545,35 +625,34 @@ h6 small { line-height: 1; color: #999999; } -h1 { - font-size: 36px; +h1, +h2, +h3 { line-height: 40px; } +h1 { + font-size: 38.5px; +} h2 { - font-size: 30px; - line-height: 40px; + font-size: 31.5px; } h3 { - font-size: 24px; - line-height: 40px; + font-size: 24.5px; } h4 { - font-size: 18px; - line-height: 20px; + font-size: 17.5px; } h5 { font-size: 14px; - line-height: 20px; } h6 { - font-size: 12px; - line-height: 20px; + font-size: 11.9px; } h1 small { - font-size: 24px; + font-size: 24.5px; } h2 small { - font-size: 18px; + font-size: 17.5px; } h3 small { font-size: 14px; @@ -605,6 +684,17 @@ ol.unstyled { margin-left: 0; list-style: none; } +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; +} +ul.inline > li, +ol.inline > li { + display: inline-block; + padding-left: 5px; + padding-right: 5px; +} dl { margin-bottom: 20px; } @@ -648,7 +738,8 @@ hr { border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } -abbr[title] { +abbr[title], +abbr[data-original-title] { cursor: help; border-bottom: 1px dotted #999999; } @@ -719,6 +810,7 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } pre { display: block; @@ -812,13 +904,14 @@ input[type="color"], display: inline-block; height: 20px; padding: 4px 6px; - margin-bottom: 9px; + margin-bottom: 10px; font-size: 14px; line-height: 20px; color: #555555; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + vertical-align: middle; } input, textarea, @@ -875,9 +968,9 @@ input[type="color"]:focus, outline: thin dotted \9; /* IE6-9 */ - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } input[type="radio"], input[type="checkbox"] { @@ -889,7 +982,6 @@ input[type="checkbox"] { /* IE8-9 */ line-height: normal; - cursor: pointer; } input[type="file"], input[type="image"], @@ -959,13 +1051,13 @@ textarea::-webkit-input-placeholder { } .radio, .checkbox { - min-height: 18px; - padding-left: 18px; + min-height: 20px; + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; - margin-left: -18px; + margin-left: -20px; } .controls > .radio:first-child, .controls > .checkbox:first-child { @@ -1079,9 +1171,14 @@ input.span1, textarea.span1, .uneditable-input.span1 { .controls-row:after { clear: both; } -.controls-row [class*="span"] { +.controls-row [class*="span"], +.row-fluid .controls-row [class*="span"] { float: left; } +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; +} input[disabled], select[disabled], textarea[disabled], @@ -1233,15 +1330,15 @@ input[type="checkbox"][readonly] { background-color: #d9edf7; border-color: #3a87ad; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; @@ -1292,15 +1389,24 @@ select:focus:required:invalid:focus { .input-append select, .input-prepend select, .input-append .uneditable-input, +.input-prepend .uneditable-input, +.input-append .dropdown-menu, +.input-prepend .dropdown-menu { + font-size: 14px; +} +.input-append input, +.input-prepend input, +.input-append select, +.input-prepend select, +.input-append .uneditable-input, .input-prepend .uneditable-input { position: relative; margin-bottom: 0; *margin-left: 0; - font-size: 14px; vertical-align: top; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-append input:focus, .input-prepend input:focus, @@ -1328,7 +1434,9 @@ select:focus:required:invalid:focus { .input-append .add-on, .input-prepend .add-on, .input-append .btn, -.input-prepend .btn { +.input-prepend .btn, +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -1345,26 +1453,35 @@ select:focus:required:invalid:focus { } .input-prepend .add-on:first-child, .input-prepend .btn:first-child { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-append input, .input-append select, .input-append .uneditable-input { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} +.input-append input + .btn-group .btn:last-child, +.input-append select + .btn-group .btn:last-child, +.input-append .uneditable-input + .btn-group .btn:last-child { + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-append .add-on, -.input-append .btn { +.input-append .btn, +.input-append .btn-group { margin-left: -1px; } .input-append .add-on:last-child, -.input-append .btn:last-child { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; } .input-prepend.input-append input, .input-prepend.input-append select, @@ -1373,19 +1490,29 @@ select:focus:required:invalid:focus { -moz-border-radius: 0; border-radius: 0; } +.input-prepend.input-append input + .btn-group .btn, +.input-prepend.input-append select + .btn-group .btn, +.input-prepend.input-append .uneditable-input + .btn-group .btn { + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} .input-prepend.input-append .add-on:first-child, .input-prepend.input-append .btn:first-child { margin-right: -1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; } .input-prepend.input-append .add-on:last-child, .input-prepend.input-append .btn:last-child { margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} +.input-prepend.input-append .btn-group:first-child { + margin-left: 0; } input.search-query { padding-right: 14px; @@ -1600,47 +1727,44 @@ table { .table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } .table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child, .table-bordered tfoot:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } .table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child, .table-bordered tfoot:last-child tr:last-child td:last-child { -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .table-bordered caption + thead tr:first-child th:first-child, .table-bordered caption + tbody tr:first-child td:first-child, .table-bordered colgroup + thead tr:first-child th:first-child, .table-bordered colgroup + tbody tr:first-child td:first-child { -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .table-bordered caption + thead tr:first-child th:last-child, .table-bordered caption + tbody tr:first-child td:last-child, .table-bordered colgroup + thead tr:first-child th:last-child, .table-bordered colgroup + tbody tr:first-child td:last-child { -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { @@ -1650,132 +1774,86 @@ table { .table-hover tbody tr:hover th { background-color: #f5f5f5; } -table [class*=span], -.row-fluid table [class*=span] { +table td[class*="span"], +table th[class*="span"], +.row-fluid table td[class*="span"], +.row-fluid table th[class*="span"] { display: table-cell; float: none; margin-left: 0; } -.table .span1 { +.table td.span1, +.table th.span1 { float: none; width: 44px; margin-left: 0; } -.table .span2 { +.table td.span2, +.table th.span2 { float: none; width: 124px; margin-left: 0; } -.table .span3 { +.table td.span3, +.table th.span3 { float: none; width: 204px; margin-left: 0; } -.table .span4 { +.table td.span4, +.table th.span4 { float: none; width: 284px; margin-left: 0; } -.table .span5 { +.table td.span5, +.table th.span5 { float: none; width: 364px; margin-left: 0; } -.table .span6 { +.table td.span6, +.table th.span6 { float: none; width: 444px; margin-left: 0; } -.table .span7 { +.table td.span7, +.table th.span7 { float: none; width: 524px; margin-left: 0; } -.table .span8 { +.table td.span8, +.table th.span8 { float: none; width: 604px; margin-left: 0; } -.table .span9 { +.table td.span9, +.table th.span9 { float: none; width: 684px; margin-left: 0; } -.table .span10 { +.table td.span10, +.table th.span10 { float: none; width: 764px; margin-left: 0; } -.table .span11 { +.table td.span11, +.table th.span11 { float: none; width: 844px; margin-left: 0; } -.table .span12 { +.table td.span12, +.table th.span12 { float: none; width: 924px; margin-left: 0; } -.table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} -.table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} -.table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} -.table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} -.table .span17 { - float: none; - width: 1324px; - margin-left: 0; -} -.table .span18 { - float: none; - width: 1404px; - margin-left: 0; -} -.table .span19 { - float: none; - width: 1484px; - margin-left: 0; -} -.table .span20 { - float: none; - width: 1564px; - margin-left: 0; -} -.table .span21 { - float: none; - width: 1644px; - margin-left: 0; -} -.table .span22 { - float: none; - width: 1724px; - margin-left: 0; -} -.table .span23 { - float: none; - width: 1804px; - margin-left: 0; -} -.table .span24 { - float: none; - width: 1884px; - margin-left: 0; -} .table tbody tr.success td { background-color: #dff0d8; } @@ -1800,454 +1878,498 @@ table [class*=span], .table-hover tbody tr.info:hover td { background-color: #c4e3f3; } -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; - margin-top: 1px; +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('../fonts/glyphiconshalflings-regular.eot'); + src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphiconshalflings-regular.woff') format('woff'), url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); + font-style: normal; + font-weight: normal; +} +[class^="icon-"]:before, +[class*="icon-"]:before { + font-family: 'Glyphicons Halflings'; + font-style: normal; + line-height: 1; +} +.icon-glass:before { + content: "\e001"; +} +.icon-music:before { + content: "\e002"; +} +.icon-search:before { + content: "\e003"; +} +.icon-envelope:before { + content: "\2709"; +} +.icon-heart:before { + content: "\e005"; +} +.icon-star:before { + content: "\e006"; +} +.icon-star-empty:before { + content: "\e007"; +} +.icon-user:before { + content: "\e008"; +} +.icon-film:before { + content: "\e009"; } -/* White icons with optional class, or on hover/active states of certain elements */ -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); +.icon-th-large:before { + content: "\e010"; } -.icon-glass { - background-position: 0 0; +.icon-th:before { + content: "\e011"; } -.icon-music { - background-position: -24px 0; +.icon-th-list:before { + content: "\e012"; } -.icon-search { - background-position: -48px 0; +.icon-ok:before { + content: "\e013"; } -.icon-envelope { - background-position: -72px 0; +.icon-remove:before { + content: "\e014"; } -.icon-heart { - background-position: -96px 0; +.icon-zoom-in:before { + content: "\e015"; } -.icon-star { - background-position: -120px 0; +.icon-zoom-out:before { + content: "\e016"; } -.icon-star-empty { - background-position: -144px 0; +.icon-off:before { + content: "\e017"; } -.icon-user { - background-position: -168px 0; +.icon-signal:before { + content: "\e018"; } -.icon-film { - background-position: -192px 0; +.icon-cog:before { + content: "\e019"; } -.icon-th-large { - background-position: -216px 0; +.icon-trash:before { + content: "\e020"; } -.icon-th { - background-position: -240px 0; +.icon-home:before { + content: "\e021"; } -.icon-th-list { - background-position: -264px 0; +.icon-file:before { + content: "\e022"; } -.icon-ok { - background-position: -288px 0; +.icon-time:before { + content: "\e023"; } -.icon-remove { - background-position: -312px 0; +.icon-road:before { + content: "\e024"; } -.icon-zoom-in { - background-position: -336px 0; +.icon-download-alt:before { + content: "\e025"; } -.icon-zoom-out { - background-position: -360px 0; +.icon-download:before { + content: "\e026"; } -.icon-off { - background-position: -384px 0; +.icon-upload:before { + content: "\e027"; } -.icon-signal { - background-position: -408px 0; +.icon-inbox:before { + content: "\e028"; } -.icon-cog { - background-position: -432px 0; +.icon-play-circle:before { + content: "\e029"; } -.icon-trash { - background-position: -456px 0; +.icon-repeat:before { + content: "\e030"; } -.icon-home { - background-position: 0 -24px; +.icon-refresh:before { + content: "\e031"; } -.icon-file { - background-position: -24px -24px; +.icon-list-alt:before { + content: "\e032"; } -.icon-time { - background-position: -48px -24px; +.icon-lock:before { + content: "\e033"; } -.icon-road { - background-position: -72px -24px; +.icon-flag:before { + content: "\e034"; } -.icon-download-alt { - background-position: -96px -24px; +.icon-headphones:before { + content: "\e035"; } -.icon-download { - background-position: -120px -24px; +.icon-volume-off:before { + content: "\e036"; } -.icon-upload { - background-position: -144px -24px; +.icon-volume-down:before { + content: "\e037"; } -.icon-inbox { - background-position: -168px -24px; +.icon-volume-up:before { + content: "\e038"; } -.icon-play-circle { - background-position: -192px -24px; +.icon-qrcode:before { + content: "\e039"; } -.icon-repeat { - background-position: -216px -24px; +.icon-barcode:before { + content: "\e040"; } -.icon-refresh { - background-position: -240px -24px; +.icon-tag:before { + content: "\e041"; } -.icon-list-alt { - background-position: -264px -24px; +.icon-tags:before { + content: "\e042"; } -.icon-lock { - background-position: -287px -24px; +.icon-book:before { + content: "\e043"; } -.icon-flag { - background-position: -312px -24px; +.icon-bookmark:before { + content: "\e044"; } -.icon-headphones { - background-position: -336px -24px; +.icon-print:before { + content: "\e045"; } -.icon-volume-off { - background-position: -360px -24px; +.icon-camera:before { + content: "\e046"; } -.icon-volume-down { - background-position: -384px -24px; +.icon-font:before { + content: "\e047"; } -.icon-volume-up { - background-position: -408px -24px; +.icon-bold:before { + content: "\e048"; } -.icon-qrcode { - background-position: -432px -24px; +.icon-italic:before { + content: "\e049"; } -.icon-barcode { - background-position: -456px -24px; +.icon-text-height:before { + content: "\e050"; } -.icon-tag { - background-position: 0 -48px; +.icon-text-width:before { + content: "\e051"; } -.icon-tags { - background-position: -25px -48px; +.icon-align-left:before { + content: "\e052"; } -.icon-book { - background-position: -48px -48px; +.icon-align-center:before { + content: "\e053"; } -.icon-bookmark { - background-position: -72px -48px; +.icon-align-right:before { + content: "\e054"; } -.icon-print { - background-position: -96px -48px; +.icon-align-justify:before { + content: "\e055"; } -.icon-camera { - background-position: -120px -48px; +.icon-list:before { + content: "\e056"; } -.icon-font { - background-position: -144px -48px; +.icon-indent-left:before { + content: "\e057"; } -.icon-bold { - background-position: -167px -48px; +.icon-indent-right:before { + content: "\e058"; } -.icon-italic { - background-position: -192px -48px; +.icon-facetime-video:before { + content: "\e059"; } -.icon-text-height { - background-position: -216px -48px; +.icon-picture:before { + content: "\e060"; } -.icon-text-width { - background-position: -240px -48px; +.icon-pencil:before { + content: "\270f"; } -.icon-align-left { - background-position: -264px -48px; +.icon-map-marker:before { + content: "\e062"; } -.icon-align-center { - background-position: -288px -48px; +.icon-adjust:before { + content: "\e063"; } -.icon-align-right { - background-position: -312px -48px; +.icon-tint:before { + content: "\e064"; } -.icon-align-justify { - background-position: -336px -48px; +.icon-edit:before { + content: "\e065"; } -.icon-list { - background-position: -360px -48px; +.icon-share:before { + content: "\e066"; } -.icon-indent-left { - background-position: -384px -48px; +.icon-check:before { + content: "\e067"; } -.icon-indent-right { - background-position: -408px -48px; +.icon-move:before { + content: "\e068"; } -.icon-facetime-video { - background-position: -432px -48px; +.icon-step-backward:before { + content: "\e069"; } -.icon-picture { - background-position: -456px -48px; +.icon-fast-backward:before { + content: "\e070"; } -.icon-pencil { - background-position: 0 -72px; +.icon-backward:before { + content: "\e071"; } -.icon-map-marker { - background-position: -24px -72px; +.icon-play:before { + content: "\e072"; } -.icon-adjust { - background-position: -48px -72px; +.icon-pause:before { + content: "\e073"; } -.icon-tint { - background-position: -72px -72px; +.icon-stop:before { + content: "\e074"; } -.icon-edit { - background-position: -96px -72px; +.icon-forward:before { + content: "\e075"; } -.icon-share { - background-position: -120px -72px; +.icon-fast-forward:before { + content: "\e076"; } -.icon-check { - background-position: -144px -72px; +.icon-step-forward:before { + content: "\e077"; } -.icon-move { - background-position: -168px -72px; +.icon-eject:before { + content: "\e078"; } -.icon-step-backward { - background-position: -192px -72px; +.icon-chevron-left:before { + content: "\e079"; } -.icon-fast-backward { - background-position: -216px -72px; +.icon-chevron-right:before { + content: "\e080"; } -.icon-backward { - background-position: -240px -72px; +.icon-plus-sign:before { + content: "\e081"; } -.icon-play { - background-position: -264px -72px; +.icon-minus-sign:before { + content: "\e082"; } -.icon-pause { - background-position: -288px -72px; +.icon-remove-sign:before { + content: "\e083"; } -.icon-stop { - background-position: -312px -72px; +.icon-ok-sign:before { + content: "\e084"; } -.icon-forward { - background-position: -336px -72px; +.icon-question-sign:before { + content: "\e085"; } -.icon-fast-forward { - background-position: -360px -72px; +.icon-info-sign:before { + content: "\e086"; } -.icon-step-forward { - background-position: -384px -72px; +.icon-screenshot:before { + content: "\e087"; } -.icon-eject { - background-position: -408px -72px; +.icon-remove-circle:before { + content: "\e088"; } -.icon-chevron-left { - background-position: -432px -72px; +.icon-ok-circle:before { + content: "\e089"; } -.icon-chevron-right { - background-position: -456px -72px; +.icon-ban-circle:before { + content: "\e090"; } -.icon-plus-sign { - background-position: 0 -96px; +.icon-arrow-left:before { + content: "\e091"; } -.icon-minus-sign { - background-position: -24px -96px; +.icon-arrow-right:before { + content: "\e092"; } -.icon-remove-sign { - background-position: -48px -96px; +.icon-arrow-up:before { + content: "\e093"; } -.icon-ok-sign { - background-position: -72px -96px; +.icon-arrow-down:before { + content: "\e094"; } -.icon-question-sign { - background-position: -96px -96px; +.icon-share-alt:before { + content: "\e095"; } -.icon-info-sign { - background-position: -120px -96px; +.icon-resize-full:before { + content: "\e096"; } -.icon-screenshot { - background-position: -144px -96px; +.icon-resize-small:before { + content: "\e097"; } -.icon-remove-circle { - background-position: -168px -96px; +.icon-plus:before { + content: "\002b"; } -.icon-ok-circle { - background-position: -192px -96px; +.icon-minus:before { + content: "\2212"; } -.icon-ban-circle { - background-position: -216px -96px; +.icon-asterisk:before { + content: "\002a"; } -.icon-arrow-left { - background-position: -240px -96px; +.icon-exclamation-sign:before { + content: "\e101"; } -.icon-arrow-right { - background-position: -264px -96px; +.icon-gift:before { + content: "\e102"; } -.icon-arrow-up { - background-position: -289px -96px; +.icon-leaf:before { + content: "\e103"; } -.icon-arrow-down { - background-position: -312px -96px; +.icon-fire:before { + content: "\e104"; } -.icon-share-alt { - background-position: -336px -96px; +.icon-eye-open:before { + content: "\e105"; } -.icon-resize-full { - background-position: -360px -96px; +.icon-eye-close:before { + content: "\e106"; } -.icon-resize-small { - background-position: -384px -96px; +.icon-warning-sign:before { + content: "\e107"; } -.icon-plus { - background-position: -408px -96px; +.icon-plane:before { + content: "\e108"; } -.icon-minus { - background-position: -433px -96px; +.icon-calendar:before { + content: "\e109"; } -.icon-asterisk { - background-position: -456px -96px; +.icon-random:before { + content: "\e110"; } -.icon-exclamation-sign { - background-position: 0 -120px; +.icon-comment:before { + content: "\e111"; } -.icon-gift { - background-position: -24px -120px; +.icon-magnet:before { + content: "\e112"; } -.icon-leaf { - background-position: -48px -120px; +.icon-chevron-up:before { + content: "\e113"; } -.icon-fire { - background-position: -72px -120px; +.icon-chevron-down:before { + content: "\e114"; } -.icon-eye-open { - background-position: -96px -120px; +.icon-retweet:before { + content: "\e115"; } -.icon-eye-close { - background-position: -120px -120px; +.icon-shopping-cart:before { + content: "\e116"; } -.icon-warning-sign { - background-position: -144px -120px; +.icon-folder-close:before { + content: "\e117"; } -.icon-plane { - background-position: -168px -120px; +.icon-folder-open:before { + content: "\e118"; } -.icon-calendar { - background-position: -192px -120px; +.icon-resize-vertical:before { + content: "\e119"; } -.icon-random { - background-position: -216px -120px; - width: 16px; +.icon-resize-horizontal:before { + content: "\e120"; } -.icon-comment { - background-position: -240px -120px; +.icon-hdd:before { + content: "\e121"; } -.icon-magnet { - background-position: -264px -120px; +.icon-bullhorn:before { + content: "\e122"; } -.icon-chevron-up { - background-position: -288px -120px; +.icon-bell:before { + content: "\e123"; } -.icon-chevron-down { - background-position: -313px -119px; +.icon-certificate:before { + content: "\e124"; } -.icon-retweet { - background-position: -336px -120px; +.icon-thumbs-up:before { + content: "\e125"; } -.icon-shopping-cart { - background-position: -360px -120px; +.icon-thumbs-down:before { + content: "\e126"; } -.icon-folder-close { - background-position: -384px -120px; +.icon-hand-right:before { + content: "\e127"; } -.icon-folder-open { - background-position: -408px -120px; - width: 16px; +.icon-hand-left:before { + content: "\e128"; } -.icon-resize-vertical { - background-position: -432px -119px; +.icon-hand-up:before { + content: "\e129"; } -.icon-resize-horizontal { - background-position: -456px -118px; +.icon-hand-down:before { + content: "\e130"; } -.icon-hdd { - background-position: 0 -144px; +.icon-circle-arrow-right:before { + content: "\e131"; } -.icon-bullhorn { - background-position: -24px -144px; +.icon-circle-arrow-left:before { + content: "\e132"; } -.icon-bell { - background-position: -48px -144px; +.icon-circle-arrow-up:before { + content: "\e133"; } -.icon-certificate { - background-position: -72px -144px; +.icon-circle-arrow-down:before { + content: "\e134"; } -.icon-thumbs-up { - background-position: -96px -144px; +.icon-globe:before { + content: "\e135"; } -.icon-thumbs-down { - background-position: -120px -144px; +.icon-wrench:before { + content: "\e136"; } -.icon-hand-right { - background-position: -144px -144px; +.icon-tasks:before { + content: "\e137"; } -.icon-hand-left { - background-position: -168px -144px; +.icon-filter:before { + content: "\e138"; } -.icon-hand-up { - background-position: -192px -144px; +.icon-briefcase:before { + content: "\e139"; } -.icon-hand-down { - background-position: -216px -144px; +.icon-fullscreen:before { + content: "\e140"; } -.icon-circle-arrow-right { - background-position: -240px -144px; +.icon-dashboard:before { + content: "\e141"; } -.icon-circle-arrow-left { - background-position: -264px -144px; +.icon-paperclip:before { + content: "\e142"; } -.icon-circle-arrow-up { - background-position: -288px -144px; +.icon-heart-empty:before { + content: "\e143"; } -.icon-circle-arrow-down { - background-position: -312px -144px; +.icon-link:before { + content: "\e144"; } -.icon-globe { - background-position: -336px -144px; +.icon-phone:before { + content: "\e145"; } -.icon-wrench { - background-position: -360px -144px; +.icon-pushpin:before { + content: "\e146"; } -.icon-tasks { - background-position: -384px -144px; +.icon-euro:before { + content: "\20ac"; } -.icon-filter { - background-position: -408px -144px; +.icon-usd:before { + content: "\e148"; } -.icon-briefcase { - background-position: -432px -144px; +.icon-gbp:before { + content: "\e149"; } -.icon-fullscreen { - background-position: -456px -144px; +.icon-sort:before { + content: "\e150"; +} +.icon-sort-by-alphabet:before { + content: "\e151"; +} +.icon-sort-by-alphabet-alt:before { + content: "\e152"; +} +.icon-sort-by-order:before { + content: "\e153"; +} +.icon-sort-by-order-alt:before { + content: "\e154"; +} +.icon-sort-by-attributes:before { + content: "\e155"; +} +.icon-sort-by-attributes-alt:before { + content: "\e156"; +} +.icon-unchecked:before { + content: "\e157"; +} +.icon-expand:before { + content: "\e158"; +} +.icon-collapse:before { + content: "\e159"; +} +.icon-collapse-top:before { + content: "\e160"; } .dropup, .dropdown { @@ -2313,7 +2435,7 @@ table [class*=span], background-color: #e5e5e5; border-bottom: 1px solid #ffffff; } -.dropdown-menu a { +.dropdown-menu li > a { display: block; padding: 3px 20px; clear: both; @@ -2327,7 +2449,6 @@ table [class*=span], .dropdown-submenu:hover > a { text-decoration: none; color: #ffffff; - background-color: #0088cc; background-color: #0081c2; background-image: -moz-linear-gradient(top, #0088cc, #0077b3); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); @@ -2342,7 +2463,6 @@ table [class*=span], color: #ffffff; text-decoration: none; outline: 0; - background-color: #0088cc; background-color: #0081c2; background-image: -moz-linear-gradient(top, #0088cc, #0077b3); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); @@ -2359,6 +2479,7 @@ table [class*=span], .dropdown-menu .disabled > a:hover { text-decoration: none; background-color: transparent; + background-image: none; cursor: default; } .open { @@ -2423,11 +2544,22 @@ table [class*=span], .dropdown-submenu:hover > a:after { border-left-color: #ffffff; } +.dropdown-submenu.pull-left { + float: none; +} +.dropdown-submenu.pull-left > .dropdown-menu { + left: -100%; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} .dropdown .dropdown-menu .nav-header { padding-left: 20px; padding-right: 20px; } .typeahead { + z-index: 1051; margin-top: 2px; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -2514,11 +2646,10 @@ button.close { /* IE7 inline-block hack */ *zoom: 1; - padding: 4px 14px; + padding: 4px 12px; margin-bottom: 0; font-size: 14px; line-height: 20px; - *line-height: 20px; text-align: center; vertical-align: middle; cursor: pointer; @@ -2545,9 +2676,9 @@ button.close { -moz-border-radius: 4px; border-radius: 4px; *margin-left: .3em; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } .btn:hover, .btn:active, @@ -2568,10 +2699,6 @@ button.close { .btn:hover { color: #333333; text-decoration: none; - background-color: #e6e6e6; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; @@ -2585,18 +2712,15 @@ button.close { } .btn.active, .btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; background-image: none; outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); } .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); @@ -2605,28 +2729,32 @@ button.close { box-shadow: none; } .btn-large { - padding: 9px 14px; - font-size: 16px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-large [class^="icon-"] { - margin-top: 2px; + padding: 11px 19px; + font-size: 17.5px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } .btn-small { - padding: 3px 9px; - font-size: 12px; - line-height: 18px; -} -.btn-small [class^="icon-"] { - margin-top: 0; + padding: 2px 10px; + font-size: 11.9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 17px; + padding: 0 6px; + font-size: 10.5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.btn [class^="icon-"]:before { + vertical-align: -2px; +} +.btn-small [class^="icon-"]:before, +.btn-mini [class^="icon-"]:before { + vertical-align: -1px; } .btn-block { display: block; @@ -2896,6 +3024,11 @@ input[type="submit"].btn.btn-mini { } .btn-group { position: relative; + display: inline-block; + *display: inline; + /* IE7 inline-block hack */ + + *zoom: 1; font-size: 0; vertical-align: middle; white-space: nowrap; @@ -2912,13 +3045,6 @@ input[type="submit"].btn.btn-mini { margin-top: 10px; margin-bottom: 10px; } -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} .btn-toolbar .btn + .btn, .btn-toolbar .btn-group + .btn, .btn-toolbar .btn + .btn-group { @@ -2995,9 +3121,9 @@ input[type="submit"].btn.btn-mini { .btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); *padding-top: 5px; *padding-bottom: 5px; } @@ -3019,9 +3145,9 @@ input[type="submit"].btn.btn-mini { } .btn-group.open .dropdown-toggle { background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); } .btn-group.open .btn.dropdown-toggle { background-color: #e6e6e6; @@ -3059,8 +3185,7 @@ input[type="submit"].btn.btn-mini { border-top-width: 5px; } .dropup .btn-large .caret { - border-bottom: 5px solid #000000; - border-top: 0; + border-bottom-width: 5px; } .btn-primary .caret, .btn-warning .caret, @@ -3205,7 +3330,8 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #0088cc; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } .nav-list .divider { @@ -3484,7 +3610,6 @@ input[type="submit"].btn.btn-mini { .navbar { overflow: visible; margin-bottom: 20px; - color: #777777; *position: relative; *z-index: 2; } @@ -3523,6 +3648,7 @@ input[type="submit"].btn.btn-mini { } .nav-collapse.collapse { height: auto; + overflow: visible; } .navbar .brand { float: left; @@ -3540,6 +3666,7 @@ input[type="submit"].btn.btn-mini { .navbar-text { margin-bottom: 0; line-height: 40px; + color: #777777; } .navbar-link { color: #777777; @@ -3620,7 +3747,6 @@ input[type="submit"].btn.btn-mini { } .navbar-static-top { position: static; - width: 100%; margin-bottom: 0; } .navbar-static-top .navbar-inner { @@ -3661,17 +3787,17 @@ input[type="submit"].btn.btn-mini { } .navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); } .navbar-fixed-bottom { bottom: 0; } .navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1); + box-shadow: 0 -1px 10px rgba(0,0,0,.1); } .navbar .nav { position: relative; @@ -3735,9 +3861,9 @@ input[type="submit"].btn.btn-mini { /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .navbar .btn-navbar:hover, .navbar .btn-navbar:active, @@ -3842,9 +3968,6 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 6px 0 6px 6px; border-radius: 6px 0 6px 6px; } -.navbar-inverse { - color: #999999; -} .navbar-inverse .navbar-inner { background-color: #1b1b1b; background-image: -moz-linear-gradient(top, #222222, #111111); @@ -3865,6 +3988,9 @@ input[type="submit"].btn.btn-mini { .navbar-inverse .nav > li > a:hover { color: #ffffff; } +.navbar-inverse .navbar-text { + color: #999999; +} .navbar-inverse .nav > li > a:focus, .navbar-inverse .nav > li > a:hover { background-color: transparent; @@ -3906,9 +4032,9 @@ input[type="submit"].btn.btn-mini { color: #ffffff; background-color: #515151; border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); -webkit-transition: none; -moz-transition: none; -o-transition: none; @@ -3991,7 +4117,6 @@ input[type="submit"].btn.btn-mini { color: #999999; } .pagination { - height: 40px; margin: 20px 0; } .pagination ul { @@ -4002,11 +4127,11 @@ input[type="submit"].btn.btn-mini { *zoom: 1; margin-left: 0; margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } .pagination ul > li { @@ -4015,8 +4140,8 @@ input[type="submit"].btn.btn-mini { .pagination ul > li > a, .pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 38px; + padding: 4px 12px; + line-height: 20px; text-decoration: none; background-color: #ffffff; border: 1px solid #dddddd; @@ -4042,15 +4167,21 @@ input[type="submit"].btn.btn-mini { .pagination ul > li:first-child > a, .pagination ul > li:first-child > span { border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } .pagination ul > li:last-child > a, .pagination ul > li:last-child > span { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .pagination-centered { text-align: center; @@ -4058,6 +4189,61 @@ input[type="submit"].btn.btn-mini { .pagination-right { text-align: right; } +.pagination-large ul > li > a, +.pagination-large ul > li > span { + padding: 11px 19px; + font-size: 17.5px; +} +.pagination-large ul > li:first-child > a, +.pagination-large ul > li:first-child > span { + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.pagination-large ul > li:last-child > a, +.pagination-large ul > li:last-child > span { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} +.pagination-mini ul > li:first-child > a, +.pagination-small ul > li:first-child > a, +.pagination-mini ul > li:first-child > span, +.pagination-small ul > li:first-child > span { + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; +} +.pagination-mini ul > li:last-child > a, +.pagination-small ul > li:last-child > a, +.pagination-mini ul > li:last-child > span, +.pagination-small ul > li:last-child > span { + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; +} +.pagination-small ul > li > a, +.pagination-small ul > li > span { + padding: 2px 10px; + font-size: 11.9px; +} +.pagination-mini ul > li > a, +.pagination-mini ul > li > span { + padding: 0 6px; + font-size: 10.5px; +} .pager { margin: 20px 0; list-style: none; @@ -4105,18 +4291,6 @@ input[type="submit"].btn.btn-mini { background-color: #fff; cursor: default; } -.modal-open .modal .dropdown-menu { - z-index: 2050; -} -.modal-open .modal .dropdown.open { - *z-index: 2050; -} -.modal-open .modal .popover { - z-index: 2060; -} -.modal-open .modal .tooltip { - z-index: 2080; -} .modal-backdrop { position: fixed; top: 0; @@ -4136,12 +4310,11 @@ input[type="submit"].btn.btn-mini { } .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: 1050; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); @@ -4157,6 +4330,7 @@ input[type="submit"].btn.btn-mini { -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; + outline: none; } .modal.fade { -webkit-transition: opacity .3s linear, top .3s ease-out; @@ -4166,7 +4340,7 @@ input[type="submit"].btn.btn-mini { top: -25%; } .modal.fade.in { - top: 50%; + top: 10%; } .modal-header { padding: 9px 15px; @@ -4312,9 +4486,10 @@ input[type="submit"].btn.btn-mini { -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-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-bottom: 10px; + margin-top: -10px; } .popover.right { margin-left: 10px; @@ -4323,7 +4498,7 @@ input[type="submit"].btn.btn-mini { margin-top: 10px; } .popover.left { - margin-right: 10px; + margin-left: -10px; } .popover-title { margin: 0; @@ -4464,8 +4639,39 @@ a.thumbnail:hover { padding: 9px; color: #555555; } +.media, +.media-body { + overflow: hidden; + *overflow: visible; + zoom: 1; +} +.media, +.media .media { + margin-top: 15px; +} +.media:first-child { + margin-top: 0; +} +.media-object { + display: block; +} +.media-heading { + margin: 0 0 5px; +} +.media .pull-left { + margin-right: 10px; +} +.media .pull-right { + margin-left: 10px; +} +.media-list { + margin-left: 0; + list-style: none; +} .label, .badge { + display: inline-block; + padding: 2px 4px; font-size: 11.844px; font-weight: bold; line-height: 14px; @@ -4476,17 +4682,21 @@ a.thumbnail:hover { background-color: #999999; } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; } +.label:empty, +.badge:empty { + display: none; +} a.label:hover, a.badge:hover { color: #ffffff; @@ -4629,9 +4839,9 @@ a.badge:hover { transition: width 0.6s ease; } .progress .bar + .bar { - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15); } .progress-striped .bar { background-color: #149bdf; @@ -4861,6 +5071,10 @@ a.badge:hover { .hero-unit { padding: 60px; margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: 30px; + color: inherit; background-color: #eeeeee; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -4873,11 +5087,8 @@ a.badge:hover { color: inherit; letter-spacing: -1px; } -.hero-unit p { - font-size: 18px; - font-weight: 200; +.hero-unit li { line-height: 30px; - color: inherit; } .pull-right { float: right; @@ -5067,6 +5278,9 @@ a.badge:hover { .row-fluid [class*="span"]:first-child { margin-left: 0; } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.564102564102564%; + } .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; @@ -5389,6 +5603,9 @@ a.badge:hover { .row-fluid [class*="span"]:first-child { margin-left: 0; } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.7624309392265194%; + } .row-fluid .span12 { width: 100%; *width: 99.94680851063829%; @@ -5616,6 +5833,7 @@ a.badge:hover { margin-left: 0; } [class*="span"], + .uneditable-input[class*="span"], .row-fluid [class*="span"] { float: none; display: block; @@ -5667,8 +5885,11 @@ a.badge:hover { width: auto; margin: 0; } + .modal.fade { + top: -100px; + } .modal.fade.in { - top: auto; + top: 20px; } } @media (max-width: 480px) { @@ -5699,6 +5920,16 @@ a.badge:hover { padding-left: 10px; padding-right: 10px; } + .media .pull-left, + .media .pull-right { + float: none; + display: block; + margin-bottom: 10px; + } + .media-object { + margin-right: 0; + margin-left: 0; + } .modal { top: 10px; left: 10px; @@ -5782,6 +6013,10 @@ a.badge:hover { .nav-collapse .dropdown-menu a:hover { background-color: #f2f2f2; } + .navbar-inverse .nav-collapse .nav > li > a, + .navbar-inverse .nav-collapse .dropdown-menu a { + color: #999999; + } .navbar-inverse .nav-collapse .nav > li > a:hover, .navbar-inverse .nav-collapse .dropdown-menu a:hover { background-color: #111111; @@ -5795,7 +6030,7 @@ a.badge:hover { top: auto; left: auto; float: none; - display: block; + display: none; max-width: none; margin: 0 15px; padding: 0; @@ -5808,6 +6043,9 @@ a.badge:hover { -moz-box-shadow: none; box-shadow: none; } + .nav-collapse .open > .dropdown-menu { + display: block; + } .nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:after { display: none; @@ -5826,9 +6064,9 @@ a.badge:hover { margin: 10px 0; border-top: 1px solid #f2f2f2; border-bottom: 1px solid #f2f2f2; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-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); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); } .navbar-inverse .nav-collapse .navbar-form, .navbar-inverse .nav-collapse .navbar-search { @@ -5861,971 +6099,131 @@ a.badge:hover { /* Custom BootstrapWP Overrides and Styles ----------------------------------------------------------------------------------------*/ /******************************************************** - Bootstrap's documentation styles - Special styles for presenting Bootstrap's documentation and examples --------------------------------------------------- */ -/* Body and structure --------------------------------------------------- */ -/* Code in headings */ -h3 code { - font-size: 14px; - font-weight: normal; -} -/* Tweak navbar brand link to be super sleek +Overriding some defaults from the Bootstrap defaults to improve/fix integration with WordPress -------------------------------------------------- */ -body > .navbar-fixed-top, -body > .navbar-fixed-relative { - font-size: 13px; +#content-wrapper { + padding: 40px 0 20px 0; } -/* Change the docs' brand */ -body > .navbar-fixed-top .brand, -body > .navbar-fixed-relative .brand { - padding-right: 0; - padding-left: 0; - margin-left: 20px; - float: right; - font-weight: bold; - color: #000; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.1), 0 0 30px rgba(255, 255, 255, 0.125); - -webkit-transition: all .2s linear; - -moz-transition: all .2s linear; - transition: all .2s linear; -} -body > .navbar-fixed-top .brand:hover, -body > .navbar-fixed-relative .brand:hover { - text-decoration: none; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.1), 0 0 30px rgba(255, 255, 255, 0.4); +.widget h2 img { + display: inline; } -/* Sections --------------------------------------------------- */ -/* padding for in-page bookmarks and fixed navbar */ -section { - padding-top: 30px; +/* Navigation +----------------------------------------------------------------------------------------*/ +.navbar-relative-top { + margin-bottom: 0; + position: relative; } -section > .page-header, -section > .lead { - color: #5a5a5a; +.navbar-relative-top .navbar-inner { + border-width: 0 0 1px; + padding-left: 0; + padding-right: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); + box-shadow: 0 1px 10px rgba(0,0,0,.1); } -section > ul li { - margin-bottom: 5px; +.navbar-relative-top .container { + max-width: 1170px; } -/* Separators (hr) */ -.bs-docs-separator { - margin: 40px 0 39px; +@media (max-width: 979px) { + .navbar-relative-top { + position: static; + margin-left: -20px; + margin-right: -20px; + padding: 0; + } + .navbar-relative-top { + margin-bottom: 20px; + } + .navbar-relative-top .navbar-inner { + padding: 10px; + } } -/* Faded out hr */ -hr.soften { - height: 1px; - margin: 70px 0; - background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0)); - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0)); - background-image: -ms-linear-gradient(left, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0)); - background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0)); - border: 0; +@media (max-width: 767px) { + } -/* Jumbotrons --------------------------------------------------- */ -/* Base class -------------------------- */ -.jumbotron { +.navbar div.nav { position: relative; - padding: 40px 0; - color: #fff; - text-align: center; - text-shadow: 0 1px 5px rgba(0, 0, 0, 0.25), 0 0 30px rgba(0, 0, 0, 0.075); - background: #020031; - /* Old browsers */ - - background: -moz-linear-gradient(45deg, #020031 0%, #6d3353 100%); - /* FF3.6+ */ - - background: -webkit-gradient(linear, left bottom, right top, color-stop(0%, #020031), color-stop(100%, #6d3353)); - /* Chrome,Safari4+ */ - - background: -webkit-linear-gradient(45deg, #020031 0%, #6d3353 100%); - /* Chrome10+,Safari5.1+ */ - - background: -o-linear-gradient(45deg, #020031 0%, #6d3353 100%); - /* Opera 11.10+ */ - - background: -ms-linear-gradient(45deg, #020031 0%, #6d3353 100%); - /* IE10+ */ - - background: linear-gradient(45deg, #020031 0%, #6d3353 100%); - /* W3C */ - - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#020031', endColorstr='#6d3353', GradientType=1); - /* IE6-9 fallback on horizontal gradient */ - - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15), inset 0 -3px 7px rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15), inset 0 -3px 7px rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15), inset 0 -3px 7px rgba(0, 0, 0, 0.15); -} -.jumbotron h1 { - font-size: 80px; - font-weight: bold; - letter-spacing: -1px; - line-height: 1; -} -.jumbotron p { - font-size: 24px; - font-weight: 300; - line-height: 30px; - margin-bottom: 30px; -} -/* Link styles (used on .masthead-links as well) */ -.jumbotron a { - color: #fff; - color: rgba(255, 255, 255, 0.5); - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; + left: 0; + display: block; + float: left; + margin-top: 8px; } -.jumbotron a:hover { - color: #fff; - text-shadow: 0 0 10px rgba(255, 255, 255, 0.25); +.navbar .navbar-inner div.nav ul { + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; } -/* Download button */ -.masthead .btn { - padding: 14px 24px; - font-size: 24px; - font-weight: 200; - color: #fff; - /* redeclare to override the `.jumbotron a` */ - - border: 0; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 5px rgba(0, 0, 0, 0.25); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 5px rgba(0, 0, 0, 0.25); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 5px rgba(0, 0, 0, 0.25); - -webkit-transition: none; - -moz-transition: none; - transition: none; +.navbar .navbar-inner div.nav ul li { + float: left; + list-style: none; + display: block; + line-height: 18px; + color: #777777; } -.masthead .btn:hover { - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 5px rgba(0, 0, 0, 0.25); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 5px rgba(0, 0, 0, 0.25); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 5px rgba(0, 0, 0, 0.25); +.navbar .navbar-inner div.nav ul li a { + color: #777777; + float: none; + padding: 9px 10px 11px; + line-height: 19px; } -.masthead .btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); +.navbar .navbar-inner div.nav ul li a:hover { + color: #333333; + text-decoration: none; } -/* Pattern overlay -------------------------- */ -.jumbotron .container { - position: relative; - z-index: 2; +.navbar .navbar-inner div.nav ul li.current_page_item a { + color: #333333; + text-decoration: none; + background-color: #e5e5e5; } -.jumbotron:after { - content: ''; - display: block; - position: absolute; +/* Scrollspy Subnav Position Fix +----------------------------------------------------------------------------------------*/ +.subnav-fixed { + position: fixed; top: 0; - right: 0; - bottom: 0; left: 0; - background: url(../img/bs-docs-masthead-pattern.png) repeat center center; - opacity: .4; + right: 0; } -/* Masthead (docs home) -------------------------- */ -.masthead { - padding: 70px 0 80px; - margin-bottom: 0; - color: #fff; +/* Blog Post Specific Items +----------------------------------------------------------------------------------------*/ +p.meta { + font-size: 11px; + line-height: 18px; + color: #999; } -.masthead h1 { - font-size: 120px; - line-height: 1; - letter-spacing: -2px; +/* Sidebar +----------------------------------------------------------------------------------------*/ +div.widget { + margin-bottom: 18px; } -.masthead p { - font-size: 40px; - font-weight: 200; - line-height: 1.25; +h4.widget-title { + font-weight: bold; + line-height: 18px; + color: #999; + text-transform: uppercase; + margin-top: 9px; } -/* Textual links in masthead */ -.masthead-links { - margin: 0; +.widget ul { + margin: 0 0 9px 0; +} +.widget ul li { list-style: none; } -.masthead-links li { - display: inline; - padding: 0 10px; - color: rgba(255, 255, 255, 0.25); +.widget ul > li > a { + display: block; + padding: 3px 15px; + margin-left: -15px; + margin-right: -15px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -/* Social proof buttons from GitHub & Twitter */ -.bs-docs-social { - padding: 15px 0; - text-align: center; - background-color: #f5f5f5; - border-top: 1px solid #fff; - border-bottom: 1px solid #ddd; -} -/* Quick links on Home */ -.bs-docs-social-buttons { - margin-left: 0; - margin-bottom: 0; - padding-left: 0; - list-style: none; -} -.bs-docs-social-buttons li { - display: inline-block; - padding: 5px 8px; - line-height: 1; - *display: inline; - *zoom: 1; -} -/* Subhead (other pages) -------------------------- */ -.subhead { - text-align: left; - border-bottom: 1px solid #ddd; -} -.subhead h1 { - font-size: 60px; -} -.subhead p { - margin-bottom: 20px; -} -.subhead .navbar { - display: none; -} -/* Marketing section of Overview --------------------------------------------------- */ -.marketing { - text-align: center; - color: #5a5a5a; -} -.marketing h1 { - margin: 60px 0 10px; - font-size: 60px; - font-weight: 200; - line-height: 1; - letter-spacing: -1px; -} -.marketing h2 { - font-weight: 200; - margin-bottom: 5px; -} -.marketing p { - font-size: 16px; - line-height: 1.5; -} -.marketing .marketing-byline { - margin-bottom: 40px; - font-size: 20px; - font-weight: 300; - line-height: 25px; - color: #999; -} -.marketing img { - display: block; - margin: 0 auto 30px; -} -/* Footer --------------------------------------------------- */ -.footer { - padding: 70px 0; - margin-top: 70px; - border-top: 1px solid #e5e5e5; - background-color: #f5f5f5; -} -.footer p { - margin-bottom: 0; - color: #777; -} -.footer-links { - margin: 10px 0; -} -.footer-links li { - display: inline; - margin-right: 10px; -} -/* Special grid styles --------------------------------------------------- */ -.show-grid { - margin-top: 10px; - margin-bottom: 20px; -} -.show-grid [class*="span"] { - background-color: #eee; - text-align: center; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - min-height: 40px; - line-height: 40px; -} -.show-grid:hover [class*="span"] { - background: #ddd; -} -.show-grid .show-grid { - margin-top: 0; - margin-bottom: 0; -} -.show-grid .show-grid [class*="span"] { - background-color: #ccc; -} -/* Mini layout previews --------------------------------------------------- */ -.mini-layout { - border: 1px solid #ddd; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); -} -.mini-layout, -.mini-layout .mini-layout-body, -.mini-layout.fluid .mini-layout-sidebar { - height: 300px; -} -.mini-layout { - margin-bottom: 20px; - padding: 9px; -} -.mini-layout div { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.mini-layout .mini-layout-body { - background-color: #dceaf4; - margin: 0 auto; - width: 70%; -} -.mini-layout.fluid .mini-layout-sidebar, -.mini-layout.fluid .mini-layout-header, -.mini-layout.fluid .mini-layout-body { - float: left; -} -.mini-layout.fluid .mini-layout-sidebar { - background-color: #bbd8e9; - width: 20%; -} -.mini-layout.fluid .mini-layout-body { - width: 77.5%; - margin-left: 2.5%; -} -/* Misc --------------------------------------------------- */ -/* Make tables spaced out a bit more */ -h2 + table, -h3 + table, -h4 + table, -h2 + .row { - margin-top: 5px; -} -/* Example sites showcase */ -.example-sites { - xmargin-left: 20px; -} -.example-sites img { - max-width: 100%; - margin: 0 auto; -} -.scrollspy-example { - height: 200px; - overflow: auto; - position: relative; -} -/* Fake the :focus state to demo it */ -.focused { - border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - outline: 0; -} -/* For input sizes, make them display block */ -.docs-input-sizes select, -.docs-input-sizes input[type=text] { - display: block; - margin-bottom: 9px; -} -/* Icons -------------------------- */ -.the-icons { - margin-left: 0; - list-style: none; -} -.the-icons li { - float: left; - width: 25%; - line-height: 25px; -} -.the-icons i:hover { - background-color: rgba(255, 0, 0, 0.25); -} -/* Example page -------------------------- */ -.bootstrap-examples p { - font-size: 13px; - line-height: 18px; -} -.bootstrap-examples .thumbnail { - margin-bottom: 9px; - background-color: #fff; -} -/* Bootstrap code examples --------------------------------------------------- */ -/* Base class */ -.bs-docs-example { - position: relative; - margin: 15px 0; - padding: 39px 19px 14px; - *padding-top: 19px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -/* Echo out a label for the example */ -.bs-docs-example:after { - content: "Example"; - position: absolute; - top: -1px; - left: -1px; - padding: 3px 7px; - font-size: 12px; - font-weight: bold; - background-color: #f5f5f5; - border: 1px solid #ddd; - color: #9da0a4; - -webkit-border-radius: 4px 0 4px 0; - -moz-border-radius: 4px 0 4px 0; - border-radius: 4px 0 4px 0; -} -/* Remove spacing between an example and it's code */ -.bs-docs-example + .prettyprint { - margin-top: -20px; - padding-top: 15px; -} -/* Tweak examples -------------------------- */ -.bs-docs-example > p:last-child { - margin-bottom: 0; -} -.bs-docs-example .table, -.bs-docs-example .progress, -.bs-docs-example .well, -.bs-docs-example .alert, -.bs-docs-example .hero-unit, -.bs-docs-example .pagination, -.bs-docs-example .navbar, -.bs-docs-example > .nav, -.bs-docs-example blockquote { - margin-bottom: 5px; -} -.bs-docs-example .pagination { - margin-top: 0; -} -.bs-navbar-top-example, -.bs-navbar-bottom-example { - z-index: 1; - padding: 0; - height: 90px; - overflow: hidden; - /* cut the drop shadows off */ - -} -.bs-navbar-top-example .navbar-fixed-top, -.bs-navbar-bottom-example .navbar-fixed-bottom { - margin-left: 0; - margin-right: 0; -} -.bs-navbar-top-example { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.bs-navbar-top-example:after { - top: auto; - bottom: -1px; - -webkit-border-radius: 0 4px 0 4px; - -moz-border-radius: 0 4px 0 4px; - border-radius: 0 4px 0 4px; -} -.bs-navbar-bottom-example { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.bs-navbar-bottom-example .navbar { - margin-bottom: 0; -} -form.bs-docs-example { - padding-bottom: 19px; -} -/* Images */ -.bs-docs-example-images img { - margin: 10px; - display: inline-block; -} -/* Tooltips */ -.bs-docs-tooltip-examples { - text-align: center; - margin: 0 0 10px; - list-style: none; -} -.bs-docs-tooltip-examples li { - display: inline; - padding: 0 10px; -} -/* Popovers */ -.bs-docs-example-popover { - padding-bottom: 24px; - background-color: #f9f9f9; -} -.bs-docs-example-popover .popover { - position: relative; - display: block; - float: left; - width: 260px; - margin: 20px; -} -/* Responsive docs --------------------------------------------------- */ -/* Utility classes table -------------------------- */ -.responsive-utilities th small { - display: block; - font-weight: normal; - color: #999; -} -.responsive-utilities tbody th { - font-weight: normal; -} -.responsive-utilities td { - text-align: center; -} -.responsive-utilities td.is-visible { - color: #468847; - background-color: #dff0d8 !important; -} -.responsive-utilities td.is-hidden { - color: #ccc; - background-color: #f9f9f9 !important; -} -/* Responsive tests -------------------------- */ -.responsive-utilities-test { - margin-top: 5px; - margin-left: 0; - list-style: none; - overflow: hidden; - /* clear floats */ - -} -.responsive-utilities-test li { - position: relative; - float: left; - width: 25%; - height: 43px; - font-size: 14px; - font-weight: bold; - line-height: 43px; - color: #999; - text-align: center; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.responsive-utilities-test li + li { - margin-left: 10px; -} -.responsive-utilities-test span { - position: absolute; - top: -1px; - left: -1px; - right: -1px; - bottom: -1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.responsive-utilities-test span { - color: #468847; - background-color: #dff0d8; - border: 1px solid #d6e9c6; -} -/* Sidenav for Docs --------------------------------------------------- */ -.bs-docs-sidenav { - width: 228px; - margin: 30px 0 0; - padding: 0; - background-color: #fff; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -} -.bs-docs-sidenav > li > a { - display: block; - *width: 190px; - margin: 0 0 -1px; - padding: 8px 14px; - border: 1px solid #e5e5e5; -} -.bs-docs-sidenav > li:first-child > a { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} -.bs-docs-sidenav > li:last-child > a { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} -.bs-docs-sidenav > .active > a { - position: relative; - z-index: 2; - padding: 9px 15px; - border: 0; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.1), inset -1px 0 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.1), inset -1px 0 0 rgba(0, 0, 0, 0.1); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.1), inset -1px 0 0 rgba(0, 0, 0, 0.1); -} -/* Chevrons */ -.bs-docs-sidenav .icon-chevron-right { - float: right; - margin-top: 2px; - margin-right: -6px; - opacity: .25; -} -.bs-docs-sidenav > li > a:hover { - background-color: #f5f5f5; -} -.bs-docs-sidenav a:hover .icon-chevron-right { - opacity: .5; -} -.bs-docs-sidenav .active .icon-chevron-right, -.bs-docs-sidenav .active a:hover .icon-chevron-right { - background-image: url(../img/glyphicons-halflings-white.png); - opacity: 1; -} -.bs-docs-sidenav.affix { - top: 40px; -} -.bs-docs-sidenav.affix-bottom { - position: absolute; - top: auto; - bottom: 270px; -} -/* Responsive --------------------------------------------------- */ -/* Desktop large -------------------------- */ -@media (min-width: 1200px) { - .bs-docs-container { - max-width: 970px; - } - .bs-docs-sidenav { - width: 258px; - } -} -/* Desktop -------------------------- */ -@media (max-width: 980px) { - /* Unfloat brand */ - body > .navbar-fixed-top .brand { - float: left; - margin-left: 0; - padding-left: 10px; - padding-right: 10px; - } - /* Inline-block quick links for more spacing */ - .quick-links li { - display: inline-block; - margin: 5px; - } - /* When affixed, space properly */ - .bs-docs-sidenav { - top: 0; - margin-top: 30px; - margin-right: 0; - } -} -/* Tablet to desktop -------------------------- */ -@media (min-width: 768px) and (max-width: 980px) { - /* Remove any padding from the body */ - body { - padding-top: 0; - } - /* Widen masthead and social buttons to fill body padding */ - .jumbotron { - margin-top: -20px; - /* Offset bottom margin on .navbar */ - - } - /* Adjust sidenav width */ - .bs-docs-sidenav { - width: 166px; - margin-top: 20px; - } - .bs-docs-sidenav.affix { - top: 0; - } -} -/* Tablet -------------------------- */ -@media (max-width: 767px) { - /* Remove any padding from the body */ - body { - padding-top: 0; - } - /* Widen masthead and social buttons to fill body padding */ - .jumbotron { - padding: 40px 20px; - margin-top: -20px; - /* Offset bottom margin on .navbar */ - - margin-right: -20px; - margin-left: -20px; - } - .masthead h1 { - font-size: 90px; - } - .masthead p, - .masthead .btn { - font-size: 24px; - } - .marketing .span4 { - margin-bottom: 40px; - } - .bs-docs-social { - margin: 0 -20px; - } - /* Space out the show-grid examples */ - .show-grid [class*="span"] { - margin-bottom: 5px; - } - /* Sidenav */ - .bs-docs-sidenav { - width: auto; - margin-bottom: 20px; - } - .bs-docs-sidenav.affix { - position: static; - width: auto; - top: 0; - } - /* Unfloat the back to top link in footer */ - .footer { - margin-left: -20px; - margin-right: -20px; - padding-left: 20px; - padding-right: 20px; - } - .footer p { - margin-bottom: 9px; - } -} -/* Landscape phones -------------------------- */ -@media (max-width: 480px) { - /* Remove padding above jumbotron */ - body { - padding-top: 0; - } - /* Change up some type stuff */ - h2 small { - display: block; - } - /* Downsize the jumbotrons */ - .jumbotron h1 { - font-size: 60px; - } - .jumbotron p, - .jumbotron .btn { - font-size: 20px; - } - .jumbotron .btn { - display: block; - margin: 0 auto; - } - /* center align subhead text like the masthead */ - .subhead h1, - .subhead p { - text-align: center; - } - /* Marketing on home */ - .marketing h1 { - font-size: 40px; - } - /* center example sites */ - .example-sites { - margin-left: 0; - } - .example-sites > li { - float: none; - display: block; - max-width: 280px; - margin: 0 auto 18px; - text-align: center; - } - .example-sites .thumbnail > img { - max-width: 270px; - } - /* Do our best to make tables work in narrow viewports */ - table code { - white-space: normal; - word-wrap: break-word; - word-break: break-all; - } - /* Modal example */ - .modal-example .modal { - position: relative; - top: auto; - right: auto; - bottom: auto; - left: auto; - } - /* Unfloat the back to top in footer to prevent odd text wrapping */ - .footer .pull-right { - float: none; - } -} -/******************************************************** -Overriding some defaults from the Bootstrap defaults to improve/fix integration with WordPress --------------------------------------------------- */ -#content-wrapper { - padding: 40px 0 20px 0; -} -.widget h2 img { - display: inline; -} -/* Navigation -----------------------------------------------------------------------------------------*/ -.navbar-relative-top { - margin-bottom: 0; - position: relative; -} -.navbar-relative-top .navbar-inner { - min-height: 40px; - padding-right: 0; - padding-left: 0; - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.navbar-relative-top .container { - max-width: 1170px; -} -@media (max-width: 979px) { - .navbar-relative-top { - position: static; - margin-left: -20px; - margin-right: -20px; - padding: 0; - } - .navbar-relative-top { - margin-bottom: 20px; - } - .navbar-relative-top .navbar-inner { - padding: 10px; - } -} -@media (max-width: 767px) { - -} -.navbar div.nav { - position: relative; - left: 0; - display: block; - float: left; - margin-top: 8px; -} -.navbar .navbar-inner div.nav ul { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .navbar-inner div.nav ul li { - float: left; - list-style: none; - display: block; - line-height: 18px; - color: #777777; -} -.navbar .navbar-inner div.nav ul li a { - color: #777777; - float: none; - padding: 9px 10px 11px; - line-height: 19px; -} -.navbar .navbar-inner div.nav ul li a:hover { - color: #333333; - text-decoration: none; -} -.navbar .navbar-inner div.nav ul li.current_page_item a { - color: #333333; - text-decoration: none; - background-color: #e5e5e5; -} -/* Scrollspy Subnav Position Fix -----------------------------------------------------------------------------------------*/ -.subnav-fixed { - position: fixed; - top: 0; - left: 0; - right: 0; -} -/* Blog Post Specific Items -----------------------------------------------------------------------------------------*/ -p.meta { - font-size: 11px; - line-height: 18px; - color: #999; -} -/* Sidebar -----------------------------------------------------------------------------------------*/ -div.widget { - margin-bottom: 18px; -} -h4.widget-title { - font-weight: bold; - line-height: 18px; - color: #999; - text-transform: uppercase; - margin-top: 9px; -} -.widget ul { - margin: 0 0 9px 0; -} -.widget ul li { - list-style: none; -} -.widget ul > li > a { - display: block; - padding: 3px 15px; - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.widget ul > li > a:hover { - color: white; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #08C; +.widget ul > li > a:hover { + color: white; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); + background-color: #08C; } /* Post Styles ----------------------------------------------------------------------------------------*/ @@ -6862,6 +6260,7 @@ h4.widget-title { font-size: 14px; line-height: normal; color: #333; + float: left; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #E6E6E6; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); @@ -7112,3 +6511,4 @@ img.aligncenter { text-align: center; margin-bottom: 9px; } +/* Enter your custom styles here */ \ No newline at end of file diff --git a/css/less/accordion.less b/css/less/accordion.less index c13c7be26090..d63523bc8c13 100644 --- a/css/less/accordion.less +++ b/css/less/accordion.less @@ -12,7 +12,7 @@ .accordion-group { margin-bottom: 2px; border: 1px solid #e5e5e5; - .border-radius(4px); + .border-radius(@baseBorderRadius); } .accordion-heading { border-bottom: 0; diff --git a/css/less/alerts.less b/css/less/alerts.less index 6df5fd72d0c0..9abb226d6bc6 100644 --- a/css/less/alerts.less +++ b/css/less/alerts.less @@ -12,7 +12,7 @@ text-shadow: 0 1px 0 rgba(255,255,255,.5); background-color: @warningBackground; border: 1px solid @warningBorder; - .border-radius(4px); + .border-radius(@baseBorderRadius); color: @warningText; } .alert h4 { diff --git a/css/less/bootstrap.less b/css/less/bootstrap.less index 3055c5cc4eef..bc6ea19316fd 100644 --- a/css/less/bootstrap.less +++ b/css/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.1.2 + * Bootstrap v2.2.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -52,6 +52,7 @@ // Components: Misc @import "thumbnails.less"; +@import "media.less"; @import "labels-badges.less"; @import "progress-bars.less"; @import "accordion.less"; diff --git a/css/less/bootstrapwp.less b/css/less/bootstrapwp.less index 602c973bd39d..4106aa76837f 100644 --- a/css/less/bootstrapwp.less +++ b/css/less/bootstrapwp.less @@ -4,7 +4,7 @@ Theme URI: http://bootstrapwp.rachelbaker.me Author: Rachel Baker Author URI: http://www.rachelbaker.me Description: A semantic HTML/CSS framework base theme for WordPress Developers ported from Twitter Bootstrap -Version: .90 +Version: .91 ======= License: GNU General Public License License URI: license.txt @@ -17,7 +17,7 @@ Use it to make something cool, have fun, and share what you've learned with othe //////// to safely retain the ability to update the less files with future //////// versions of Bootstrap or BootstrapWP -/* Loading Standard Bootstrap 2.1 LESS Files +/* Loading Standard Bootstrap 2.2.1 LESS Files ----------------------------------------------------------------------------------------*/ // CSS Reset @import "reset.less"; @@ -63,6 +63,7 @@ Use it to make something cool, have fun, and share what you've learned with othe // Components: Misc @import "thumbnails.less"; +@import "media.less"; @import "labels-badges.less"; @import "progress-bars.less"; @import "accordion.less"; @@ -103,10 +104,6 @@ Use it to make something cool, have fun, and share what you've learned with othe /* Custom BootstrapWP Overrides and Styles ----------------------------------------------------------------------------------------*/ -// BSWP DOCS -// ------------------ -// Special styles for presenting Bootstrap's documentation and examples -@import "bswp-docs.less"; // BSWP OVERRIDES // ------------------ // Style changes/additions for WordPress theme compability diff --git a/css/less/breadcrumbs.less b/css/less/breadcrumbs.less index fd269b31a075..76fbe30ffda8 100644 --- a/css/less/breadcrumbs.less +++ b/css/less/breadcrumbs.less @@ -8,7 +8,7 @@ margin: 0 0 @baseLineHeight; list-style: none; background-color: #f5f5f5; - .border-radius(4px); + .border-radius(@baseBorderRadius); li { display: inline-block; .ie7-inline-block(); diff --git a/css/less/bswp-custom.less b/css/less/bswp-custom.less index e69de29bb2d1..f280a0e7718d 100644 --- a/css/less/bswp-custom.less +++ b/css/less/bswp-custom.less @@ -0,0 +1 @@ +/* Enter your custom styles here */ \ No newline at end of file diff --git a/css/less/bswp-docs.less b/css/less/bswp-docs.less index 993e478cfd87..f9a37b008e6d 100644 --- a/css/less/bswp-docs.less +++ b/css/less/bswp-docs.less @@ -1,4 +1,4 @@ -// BSWP DOCS v0.90 +// BSWP DOCS v0.91 /******************************************************** Bootstrap's documentation styles Special styles for presenting Bootstrap's documentation and examples @@ -17,13 +17,12 @@ h3 code { /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ - -body > .navbar-fixed-top, body > .navbar-fixed-relative { +body > .navbar { font-size: 13px; } /* Change the docs' brand */ -body > .navbar-fixed-top .brand, body > .navbar-fixed-relative .brand { +body > .navbar .brand { padding-right: 0; padding-left: 0; margin-left: 20px; @@ -35,7 +34,7 @@ body > .navbar-fixed-top .brand, body > .navbar-fixed-relative .brand { -moz-transition: all .2s linear; transition: all .2s linear; } -body > .navbar-fixed-top .brand:hover, body > .navbar-fixed-relative .brand:hover { +body > .navbar .brand:hover { text-decoration: none; text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.4); } @@ -76,7 +75,6 @@ hr.soften { /* Jumbotrons -------------------------------------------------- */ - /* Base class ------------------------- */ .jumbotron { @@ -84,7 +82,7 @@ hr.soften { padding: 40px 0; color: #fff; text-align: center; - text-shadow: 0 1px 5px rgba(0,0,0,.25), 0 0 30px rgba(0,0,0,.075); + text-shadow: 0 1px 3px rgba(0,0,0,.4), 0 0 30px rgba(0,0,0,.075); background: #020031; /* Old browsers */ background: -moz-linear-gradient(45deg, #020031 0%, #6d3353 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#6d3353)); /* Chrome,Safari4+ */ @@ -93,10 +91,9 @@ hr.soften { background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */ background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ - -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15); - box-shadow: inset 0 -1px 0 rgba(0,0,0,.15), inset 0 -3px 7px rgba(0,0,0,.15); - + -webkit-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); + -moz-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); + box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); } .jumbotron h1 { font-size: 80px; @@ -107,7 +104,7 @@ hr.soften { .jumbotron p { font-size: 24px; font-weight: 300; - line-height: 30px; + line-height: 1.25; margin-bottom: 30px; } @@ -126,7 +123,7 @@ hr.soften { /* Download button */ .masthead .btn { - padding: 14px 24px; + padding: 19px 24px; font-size: 24px; font-weight: 200; color: #fff; /* redeclare to override the `.jumbotron a` */ @@ -152,6 +149,7 @@ hr.soften { box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); } + /* Pattern overlay ------------------------- */ .jumbotron .container { @@ -170,7 +168,6 @@ hr.soften { opacity: .4; } - /* Masthead (docs home) ------------------------- */ .masthead { @@ -241,6 +238,7 @@ hr.soften { } + /* Marketing section of Overview -------------------------------------------------- */ @@ -267,7 +265,7 @@ hr.soften { margin-bottom: 40px; font-size: 20px; font-weight: 300; - line-height: 25px; + line-height: 1.25; color: #999; } .marketing img { @@ -295,7 +293,10 @@ hr.soften { } .footer-links li { display: inline; - margin-right: 10px; + padding: 0 2px; +} +.footer-links li:first-child { + padding-left: 0; } @@ -375,6 +376,94 @@ hr.soften { +/* Download page +-------------------------------------------------- */ + +.download .page-header { + margin-top: 36px; +} +.page-header .toggle-all { + margin-top: 5px; +} + +/* Space out h3s when following a section */ +.download h3 { + margin-bottom: 5px; +} +.download-builder input + h3, +.download-builder .checkbox + h3 { + margin-top: 9px; +} + +/* Fields for variables */ +.download-builder input[type=text] { + margin-bottom: 9px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 12px; + color: #d14; +} +.download-builder input[type=text]:focus { + background-color: #fff; +} + +/* Custom, larger checkbox labels */ +.download .checkbox { + padding: 6px 10px 6px 25px; + font-size: 13px; + line-height: 18px; + color: #555; + background-color: #f9f9f9; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + cursor: pointer; +} +.download .checkbox:hover { + color: #333; + background-color: #f5f5f5; +} +.download .checkbox small { + font-size: 12px; + color: #777; +} + +/* Variables section */ +#variables label { + margin-bottom: 0; +} + +/* Giant download button */ +.download-btn { + margin: 36px 0 108px; +} +#download p, +#download h4 { + max-width: 50%; + margin: 0 auto; + color: #999; + text-align: center; +} +#download h4 { + margin-bottom: 0; +} +#download p { + margin-bottom: 18px; +} +.download-btn .btn { + display: block; + width: auto; + padding: 19px 24px; + margin-bottom: 27px; + font-size: 30px; + line-height: 1; + text-align: center; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} + + + /* Misc -------------------------------------------------- */ @@ -658,7 +747,7 @@ form.bs-docs-example { } .bs-docs-sidenav > li > a { display: block; - *width: 190px; + width: 190px \9; margin: 0 0 -1px; padding: 8px 14px; border: 1px solid #e5e5e5; @@ -725,6 +814,9 @@ form.bs-docs-example { .bs-docs-sidenav { width: 258px; } + .bs-docs-sidenav > li > a { + width: 230px \9; /* Override the previous IE8-9 hack */ + } } /* Desktop @@ -845,11 +937,11 @@ form.bs-docs-example { /* Downsize the jumbotrons */ .jumbotron h1 { - font-size: 60px; + font-size: 45px; } .jumbotron p, .jumbotron .btn { - font-size: 20px; + font-size: 18px; } .jumbotron .btn { display: block; @@ -864,7 +956,10 @@ form.bs-docs-example { /* Marketing on home */ .marketing h1 { - font-size: 40px; + font-size: 30px; + } + .marketing-byline { + font-size: 18px; } /* center example sites */ @@ -898,6 +993,11 @@ form.bs-docs-example { left: auto; } + /* Tighten up footer */ + .footer { + padding-top: 20px; + padding-bottom: 20px; + } /* Unfloat the back to top in footer to prevent odd text wrapping */ .footer .pull-right { float: none; diff --git a/css/less/bswp-overrides.less b/css/less/bswp-overrides.less index 390b2a74e321..b1c59fe59f5c 100644 --- a/css/less/bswp-overrides.less +++ b/css/less/bswp-overrides.less @@ -16,18 +16,14 @@ Overriding some defaults from the Bootstrap defaults to improve/fix integration margin-bottom: 0; position: relative; .navbar-inner { - min-height: @navbarHeight; - padding-right: 0; - padding-left: 0; - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + border-width: 0 0 1px; + padding-left: 0; + padding-right: 0; + .border-radius(0); + .box-shadow(~"0 1px 10px rgba(0,0,0,.1)"); } .container { - max-width: 1170px; + max-width: 1170px; } } @@ -182,6 +178,7 @@ h4.widget-title { font-size: 14px; line-height: normal; color: #333; + float: left; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #E6E6E6; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(white), color-stop(25%, white), to(#E6E6E6)); diff --git a/css/less/button-groups.less b/css/less/button-groups.less index 62e53f373a13..ca8a770d4167 100644 --- a/css/less/button-groups.less +++ b/css/less/button-groups.less @@ -6,6 +6,8 @@ // Make the div behave like a button .btn-group { position: relative; + display: inline-block; + .ie7-inline-block(); font-size: 0; // remove as part 1 of font-size inline-block hack vertical-align: middle; // match .btn alignment given font-size hack above white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page) @@ -22,10 +24,6 @@ font-size: 0; // Hack to remove whitespace that results from using inline-block margin-top: @baseLineHeight / 2; margin-bottom: @baseLineHeight / 2; - .btn-group { - display: inline-block; - .ie7-inline-block(); - } .btn + .btn, .btn-group + .btn, .btn + .btn-group { @@ -60,41 +58,25 @@ // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match .btn-group > .btn:first-child { margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; + .border-top-left-radius(4px); + .border-bottom-left-radius(4px); } // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; + .border-top-right-radius(4px); + .border-bottom-right-radius(4px); } // Reset corners for large buttons .btn-group > .btn.large:first-child { margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; + .border-top-left-radius(6px); + .border-bottom-left-radius(6px); } .btn-group > .btn.large:last-child, .btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; + .border-top-right-radius(6px); + .border-bottom-right-radius(6px); } // On hover/focus/active, bring the proper btn to front @@ -120,7 +102,7 @@ .btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; - .box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); + .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); *padding-top: 5px; *padding-bottom: 5px; } @@ -147,7 +129,7 @@ // Remove the gradient and set the same inset shadow as the :active state .dropdown-toggle { background-image: none; - .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); + .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); } // Keep the hover's background when dropdown is open @@ -193,8 +175,7 @@ } // Upside down carets for .dropup .dropup .btn-large .caret { - border-bottom: 5px solid @black; - border-top: 0; + border-bottom-width: 5px; } diff --git a/css/less/buttons.less b/css/less/buttons.less index 3fd1e95f5fba..76b0db240a93 100644 --- a/css/less/buttons.less +++ b/css/less/buttons.less @@ -10,11 +10,10 @@ .btn { display: inline-block; .ie7-inline-block(); - padding: 4px 14px; + padding: 4px 12px; margin-bottom: 0; // For input.btn font-size: @baseFontSize; line-height: @baseLineHeight; - *line-height: @baseLineHeight; text-align: center; vertical-align: middle; cursor: pointer; @@ -22,16 +21,14 @@ border: 1px solid @btnBorder; *border: 0; // Remove the border to prevent IE7's black border on input:focus border-bottom-color: darken(@btnBorder, 10%); - .border-radius(4px); + .border-radius(@baseBorderRadius); .ie7-restore-left-whitespace(); // Give IE7 some love - .box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); + .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); // Hover state &:hover { color: @grayDark; text-decoration: none; - background-color: darken(@white, 10%); - *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */ background-position: 0 -15px; // transition is only when going to hover, otherwise the background @@ -47,18 +44,15 @@ // Active state &.active, &:active { - background-color: darken(@white, 10%); - background-color: darken(@white, 15%) e("\9"); background-image: none; outline: 0; - .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); + .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); } // Disabled state &.disabled, &[disabled] { cursor: default; - background-color: darken(@white, 10%); background-image: none; .opacity(65); .box-shadow(none); @@ -73,33 +67,34 @@ // Large .btn-large { - padding: 9px 14px; - font-size: @baseFontSize + 2px; - line-height: normal; - .border-radius(5px); -} -.btn-large [class^="icon-"] { - margin-top: 2px; + padding: @paddingLarge; + font-size: @fontSizeLarge; + .border-radius(@borderRadiusLarge); } // Small .btn-small { - padding: 3px 9px; - font-size: @baseFontSize - 2px; - line-height: @baseLineHeight - 2px; -} -.btn-small [class^="icon-"] { - margin-top: 0; + padding: @paddingSmall; + font-size: @fontSizeSmall; + .border-radius(@borderRadiusSmall); } // Mini .btn-mini { - padding: 2px 6px; - font-size: @baseFontSize - 3px; - line-height: @baseLineHeight - 3px; + padding: @paddingMini; + font-size: @fontSizeMini; + .border-radius(@borderRadiusSmall); } +// Icons in buttons +// ------------------------- + +.btn [class^="icon-"]:before { vertical-align: -2px; } +.btn-small [class^="icon-"]:before, +.btn-mini [class^="icon-"]:before { vertical-align: -1px; } + + // Block button // ------------------------- diff --git a/css/less/code.less b/css/less/code.less index f1851a074c5d..ea1e749ae219 100644 --- a/css/less/code.less +++ b/css/less/code.less @@ -19,6 +19,7 @@ code { color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; + white-space: nowrap; } // Blocks of code @@ -35,7 +36,7 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; // fallback for IE7-8 border: 1px solid rgba(0,0,0,.15); - .border-radius(4px); + .border-radius(@baseBorderRadius); // Make prettyprint styles more spaced out for readability &.prettyprint { diff --git a/css/less/dropdowns.less b/css/less/dropdowns.less index bed158612fff..90f3741e85c2 100644 --- a/css/less/dropdowns.less +++ b/css/less/dropdowns.less @@ -72,7 +72,7 @@ } // Links within the dropdown menu - a { + li > a { display: block; padding: 3px 20px; clear: both; @@ -90,7 +90,6 @@ .dropdown-submenu:hover > a { text-decoration: none; color: @dropdownLinkColorHover; - background-color: @dropdownLinkBackgroundHover; #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%)); } @@ -98,10 +97,9 @@ // ------------ .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: @dropdownLinkColorHover; + color: @dropdownLinkColorActive; text-decoration: none; outline: 0; - background-color: @dropdownLinkBackgroundActive; #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%)); } @@ -116,6 +114,7 @@ .dropdown-menu .disabled > a:hover { text-decoration: none; background-color: transparent; + background-image: none; // Remove CSS gradient cursor: default; } @@ -163,16 +162,13 @@ .dropdown-submenu { position: relative; } - // Default dropdowns .dropdown-submenu > .dropdown-menu { top: 0; left: 100%; margin-top: -6px; margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; + .border-radius(0 6px 6px 6px); } .dropdown-submenu:hover > .dropdown-menu { display: block; @@ -184,9 +180,7 @@ bottom: 0; margin-top: 0; margin-bottom: -2px; - -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; + .border-radius(5px 5px 5px 0); } // Caret to indicate there is a submenu @@ -207,6 +201,19 @@ border-left-color: @dropdownLinkColorHover; } +// Left aligned submenus +.dropdown-submenu.pull-left { + // Undo the float + // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere. + float: none; + + // Positioning the submenu + > .dropdown-menu { + left: -100%; + margin-left: 10px; + .border-radius(6px 0 6px 6px); + } +} // Tweak nav headers // ----------------- @@ -219,6 +226,7 @@ // Typeahead // --------- .typeahead { + z-index: 1051; margin-top: 2px; // give it some space to breathe - .border-radius(4px); + .border-radius(@baseBorderRadius); } diff --git a/css/less/forms.less b/css/less/forms.less index f8d8562b6069..172ed027dcae 100644 --- a/css/less/forms.less +++ b/css/less/forms.less @@ -81,11 +81,12 @@ input[type="color"], display: inline-block; height: @baseLineHeight; padding: 4px 6px; - margin-bottom: 9px; + margin-bottom: @baseLineHeight / 2; font-size: @baseFontSize; line-height: @baseLineHeight; color: @gray; .border-radius(@inputBorderRadius); + vertical-align: middle; } // Reset appearance properties for textual inputs and textarea @@ -126,7 +127,7 @@ input[type="color"], border-color: rgba(82,168,236,.8); outline: 0; outline: thin dotted \9; /* IE6-9 */ - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)); + .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); } } @@ -137,7 +138,6 @@ input[type="checkbox"] { *margin-top: 0; /* IE7 */ margin-top: 1px \9; /* IE8-9 */ line-height: normal; - cursor: pointer; } // Reset width of input images, buttons, radios, checkboxes @@ -154,9 +154,9 @@ input[type="checkbox"] { // Set the height of select and file controls to match text inputs select, input[type="file"] { - height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ + height: @inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 30px; + line-height: @inputHeight; } // Make select elements obey height by applying a border @@ -210,7 +210,7 @@ input[type="checkbox"]:focus { // Placeholder // ------------------------- -// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector +// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector input, textarea { .placeholder(); @@ -223,13 +223,13 @@ textarea { // Indent the labels to position radios/checkboxes as hanging .radio, .checkbox { - min-height: 18px; // clear the floating input if there is no label text - padding-left: 18px; + min-height: @baseLineHeight; // clear the floating input if there is no label text + padding-left: 20px; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: left; - margin-left: -18px; + margin-left: -20px; } // Move the options list down to align with labels @@ -304,8 +304,17 @@ textarea[class*="span"], .controls-row { .clearfix(); // Clear the float from controls } -.controls-row [class*="span"] { - float: left; // Float to collapse white-space for proper grid alignment + +// Float to collapse white-space for proper grid alignment +.controls-row [class*="span"], +// Redeclare the fluid grid collapse since we undo the float for inputs +.row-fluid .controls-row [class*="span"] { + float: left; +} +// Explicity set top padding on all checkboxes/radios, not just first-child +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; } @@ -357,14 +366,15 @@ input[type="checkbox"][readonly] { // HTML5 invalid states // Shares styles with the .control-group.error above -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; &:focus { border-color: darken(#ee5f5b, 10%); - .box-shadow(0 0 6px lighten(#ee5f5b, 20%)); + @shadow: 0 0 6px lighten(#ee5f5b, 20%); + .box-shadow(@shadow); } } @@ -413,16 +423,23 @@ select:focus:required:invalid { .input-append, .input-prepend { margin-bottom: 5px; - font-size: 0; + font-size: 0; // white space collapse hack white-space: nowrap; // Prevent span and input from separating + // Reset the white space collapse hack + input, + select, + .uneditable-input, + .dropdown-menu { + font-size: @baseFontSize; + } + input, select, .uneditable-input { position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms *margin-left: 0; - font-size: @baseFontSize; vertical-align: top; .border-radius(0 @inputBorderRadius @inputBorderRadius 0); // Make input on top when focused so blue border and shadow always show @@ -445,7 +462,8 @@ select:focus:required:invalid { border: 1px solid #ccc; } .add-on, - .btn { + .btn, + .btn-group > .dropdown-toggle { vertical-align: top; .border-radius(0); } @@ -454,6 +472,7 @@ select:focus:required:invalid { border-color: @green; } } + .input-prepend { .add-on, .btn { @@ -461,30 +480,41 @@ select:focus:required:invalid { } .add-on:first-child, .btn:first-child { + // FYI, `.btn:first-child` accounts for a button group that's prepended .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); } } + .input-append { input, select, .uneditable-input { .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); + + .btn-group .btn:last-child { + .border-radius(0 @inputBorderRadius @inputBorderRadius 0); + } } .add-on, - .btn { + .btn, + .btn-group { margin-left: -1px; } .add-on:last-child, - .btn:last-child { + .btn:last-child, + .btn-group:last-child > .dropdown-toggle { .border-radius(0 @inputBorderRadius @inputBorderRadius 0); } } + // Remove all border-radius for inputs with both prepend and append .input-prepend.input-append { input, select, .uneditable-input { .border-radius(0); + + .btn-group .btn { + .border-radius(0 @inputBorderRadius @inputBorderRadius 0); + } } .add-on:first-child, .btn:first-child { @@ -496,10 +526,14 @@ select:focus:required:invalid { margin-left: -1px; .border-radius(0 @inputBorderRadius @inputBorderRadius 0); } + .btn-group:first-child { + margin-left: 0; + } } + // SEARCH FORM // ----------- diff --git a/css/less/hero-unit.less b/css/less/hero-unit.less index 672b7d7c7489..763d86aeee5d 100644 --- a/css/less/hero-unit.less +++ b/css/less/hero-unit.less @@ -6,6 +6,10 @@ .hero-unit { padding: 60px; margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: @baseLineHeight * 1.5; + color: @heroUnitLeadColor; background-color: @heroUnitBackground; .border-radius(6px); h1 { @@ -15,10 +19,7 @@ color: @heroUnitHeadingColor; letter-spacing: -1px; } - p { - font-size: 18px; - font-weight: 200; - line-height: @baseLineHeight * 1.5; - color: @heroUnitLeadColor; + li { + line-height: @baseLineHeight * 1.5; // Reset since we specify in type.less } } diff --git a/css/less/labels-badges.less b/css/less/labels-badges.less index 2f15fec05fd1..9c3a40bfbf82 100644 --- a/css/less/labels-badges.less +++ b/css/less/labels-badges.less @@ -6,6 +6,8 @@ // Base classes .label, .badge { + display: inline-block; + padding: 2px 4px; font-size: @baseFontSize * .846; font-weight: bold; line-height: 14px; // ensure proper line-height if floated @@ -17,14 +19,22 @@ } // Set unique padding and border-radii .label { - padding: 1px 4px 2px; .border-radius(3px); } .badge { - padding: 1px 9px 2px; + padding-left: 9px; + padding-right: 9px; .border-radius(9px); } +// Empty labels/badges collapse +.label, +.badge { + &:empty { + display: none; + } +} + // Hover state, but only for links a { &.label:hover, diff --git a/css/less/media.less b/css/less/media.less new file mode 100644 index 000000000000..1decab71dec9 --- /dev/null +++ b/css/less/media.less @@ -0,0 +1,55 @@ +// Media objects +// Source: http://stubbornella.org/content/?p=497 +// -------------------------------------------------- + + +// Common styles +// ------------------------- + +// Clear the floats +.media, +.media-body { + overflow: hidden; + *overflow: visible; + zoom: 1; +} + +// Proper spacing between instances of .media +.media, +.media .media { + margin-top: 15px; +} +.media:first-child { + margin-top: 0; +} + +// For images and videos, set to block +.media-object { + display: block; +} + +// Reset margins on headings for tighter default spacing +.media-heading { + margin: 0 0 5px; +} + + +// Media image alignment +// ------------------------- + +.media .pull-left { + margin-right: 10px; +} +.media .pull-right { + margin-left: 10px; +} + + +// Media list variation +// ------------------------- + +// Undo default ul/ol styles +.media-list { + margin-left: 0; + list-style: none; +} diff --git a/css/less/mixins.less b/css/less/mixins.less index 67f1c0af7233..98aa2b8a5838 100644 --- a/css/less/mixins.less +++ b/css/less/mixins.less @@ -154,7 +154,7 @@ .input-block-level { display: block; width: 100%; - min-height: 30px; // Make inputs at least the height of their button counterpart + min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border) .box-sizing(border-box); // Makes inputs behave like true block-level elements } @@ -183,7 +183,8 @@ .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work &:focus { border-color: darken(@borderColor, 10%); - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%)); + @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); + .box-shadow(@shadow); } } // Give a small background color for input-prepend/-append @@ -248,12 +249,10 @@ } // Drop shadows -.box-shadow(@shadowA, @shadowB:X, ...){ - // Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/ - @props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`; - -webkit-box-shadow: @props; - -moz-box-shadow: @props; - box-shadow: @props; +.box-shadow(@shadow) { + -webkit-box-shadow: @shadow; + -moz-box-shadow: @shadow; + box-shadow: @shadow; } // Transitions @@ -298,6 +297,7 @@ -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 -o-transform: skew(@x, @y); transform: skew(@x, @y); + -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319 } .translate3d(@x, @y, @z) { -webkit-transform: translate3d(@x, @y, @z); @@ -325,7 +325,7 @@ } // Background sizing -.background-size(@size){ +.background-size(@size) { -webkit-background-size: @size; -moz-background-size: @size; -o-background-size: @size; @@ -447,7 +447,7 @@ background-repeat: no-repeat; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback } - .radial(@innerColor: #555, @outerColor: #333) { + .radial(@innerColor: #555, @outerColor: #333) { background-color: @outerColor; background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); @@ -643,6 +643,11 @@ margin-left: 0; } + // Space grid-sized controls properly if multiple per line + .controls-row [class*="span"] + [class*="span"] { + margin-left: @fluidGridGutterWidth; + } + // generate .spanX and .offsetX .spanX (@gridColumns); .offsetX (@gridColumns); diff --git a/css/less/modals.less b/css/less/modals.less index a0401c4d11f5..fbc48590883f 100644 --- a/css/less/modals.less +++ b/css/less/modals.less @@ -2,16 +2,6 @@ // Modals // -------------------------------------------------- - -// Recalculate z-index where appropriate, -// but only apply to elements within modal -.modal-open .modal { - .dropdown-menu { z-index: @zindexDropdown + @zindexModal; } - .dropdown.open { *z-index: @zindexDropdown + @zindexModal; } - .popover { z-index: @zindexPopover + @zindexModal; } - .tooltip { z-index: @zindexTooltip + @zindexModal; } -} - // Background .modal-backdrop { position: fixed; @@ -33,12 +23,11 @@ // Base modal .modal { position: fixed; - top: 50%; + top: 10%; left: 50%; z-index: @zindexModal; - overflow: auto; width: 560px; - margin: -250px 0 0 -280px; + margin-left: -280px; background-color: @white; border: 1px solid #999; border: 1px solid rgba(0,0,0,.3); @@ -46,11 +35,14 @@ .border-radius(6px); .box-shadow(0 3px 7px rgba(0,0,0,0.3)); .background-clip(padding-box); + // Remove focus outline from opened modal + outline: none; + &.fade { .transition(e('opacity .3s linear, top .3s ease-out')); top: -25%; } - &.fade.in { top: 50%; } + &.fade.in { top: 10%; } } .modal-header { padding: 9px 15px; diff --git a/css/less/navbar.less b/css/less/navbar.less index 3514c40e0fe9..532c5926b81d 100644 --- a/css/less/navbar.less +++ b/css/less/navbar.less @@ -10,7 +10,6 @@ .navbar { overflow: visible; margin-bottom: @baseLineHeight; - color: @navbarText; // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar *position: relative; @@ -25,7 +24,7 @@ padding-right: 20px; #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); border: 1px solid @navbarBorder; - .border-radius(4px); + .border-radius(@baseBorderRadius); .box-shadow(0 1px 4px rgba(0,0,0,.065)); // Prevent floats from breaking the navbar @@ -41,6 +40,7 @@ // Override the default collapsed state .nav-collapse.collapse { height: auto; + overflow: visible; } @@ -66,6 +66,7 @@ .navbar-text { margin-bottom: 0; line-height: @navbarHeight; + color: @navbarText; } // Janky solution for now to account for links outside the .nav @@ -152,7 +153,6 @@ .navbar-static-top { position: static; - width: 100%; margin-bottom: 0; // remove 18px margin for default navbar .navbar-inner { .border-radius(0); @@ -202,7 +202,7 @@ .navbar-fixed-top, .navbar-static-top { .navbar-inner { - .box-shadow(inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)); + .box-shadow(~"0 1px 10px rgba(0,0,0,.1)"); } } @@ -210,7 +210,7 @@ .navbar-fixed-bottom { bottom: 0; .navbar-inner { - .box-shadow(inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)); + .box-shadow(~"0 -1px 10px rgba(0,0,0,.1)"); } } @@ -274,7 +274,7 @@ margin-left: 5px; margin-right: 5px; .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%)); - .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)); + .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)"); } .navbar .btn-navbar .icon-bar { display: block; @@ -379,7 +379,6 @@ // ------------------------- .navbar-inverse { - color: @navbarInverseText; .navbar-inner { #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground); @@ -395,6 +394,10 @@ } } + .navbar-text { + color: @navbarInverseText; + } + .nav > li > a:focus, .nav > li > a:hover { background-color: @navbarInverseLinkBackgroundHover; @@ -446,7 +449,7 @@ color: @white; background-color: @navbarInverseSearchBackground; border-color: @navbarInverseSearchBorder; - .box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)); + .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)"); .transition(none); .placeholder(@navbarInverseSearchPlaceholderColor); @@ -470,6 +473,3 @@ } } - - - diff --git a/css/less/navs.less b/css/less/navs.less index 4c38f7dbf2c8..1944f8441549 100644 --- a/css/less/navs.less +++ b/css/less/navs.less @@ -67,7 +67,8 @@ text-shadow: 0 -1px 0 rgba(0,0,0,.2); background-color: @linkColor; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } // Dividers (basically an hr) within the dropdown @@ -123,7 +124,7 @@ .nav-tabs > .active > a, .nav-tabs > .active > a:hover { color: @gray; - background-color: @white; + background-color: @bodyBackground; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; diff --git a/css/less/pagination.less b/css/less/pagination.less index 61a760be58cc..e35d3f4a8e85 100644 --- a/css/less/pagination.less +++ b/css/less/pagination.less @@ -2,27 +2,30 @@ // Pagination (multiple pages) // -------------------------------------------------- - +// Space out pagination from surrounding content .pagination { - height: @baseLineHeight * 2; margin: @baseLineHeight 0; - } +} + .pagination ul { + // Allow for text-based alignment display: inline-block; .ie7-inline-block(); + // Reset default ul styles margin-left: 0; margin-bottom: 0; - .border-radius(3px); + // Visuals + .border-radius(@baseBorderRadius); .box-shadow(0 1px 2px rgba(0,0,0,.05)); } .pagination ul > li { - display: inline; + display: inline; // Remove list-style and block-level defaults } .pagination ul > li > a, .pagination ul > li > span { - float: left; - padding: 0 14px; - line-height: (@baseLineHeight * 2) - 2; + float: left; // Collapse white-space + padding: 4px 12px; + line-height: @baseLineHeight; text-decoration: none; background-color: @paginationBackground; border: 1px solid @paginationBorder; @@ -31,7 +34,7 @@ .pagination ul > li > a:hover, .pagination ul > .active > a, .pagination ul > .active > span { - background-color: #f5f5f5; + background-color: @paginationActiveBackground; } .pagination ul > .active > a, .pagination ul > .active > span { @@ -48,17 +51,71 @@ .pagination ul > li:first-child > a, .pagination ul > li:first-child > span { border-left-width: 1px; - .border-radius(3px 0 0 3px); + .border-left-radius(@baseBorderRadius); } .pagination ul > li:last-child > a, .pagination ul > li:last-child > span { - .border-radius(0 3px 3px 0); + .border-right-radius(@baseBorderRadius); } -// Centered + +// Alignment +// -------------------------------------------------- + .pagination-centered { text-align: center; } .pagination-right { text-align: right; } + + +// Sizing +// -------------------------------------------------- + +// Large +.pagination-large { + ul > li > a, + ul > li > span { + padding: @paddingLarge; + font-size: @fontSizeLarge; + } + ul > li:first-child > a, + ul > li:first-child > span { + .border-left-radius(@borderRadiusLarge); + } + ul > li:last-child > a, + ul > li:last-child > span { + .border-right-radius(@borderRadiusLarge); + } +} + +// Small and mini +.pagination-mini, +.pagination-small { + ul > li:first-child > a, + ul > li:first-child > span { + .border-left-radius(@borderRadiusSmall); + } + ul > li:last-child > a, + ul > li:last-child > span { + .border-right-radius(@borderRadiusSmall); + } +} + +// Small +.pagination-small { + ul > li > a, + ul > li > span { + padding: @paddingSmall; + font-size: @fontSizeSmall; + } +} +// Mini +.pagination-mini { + ul > li > a, + ul > li > span { + padding: @paddingMini; + font-size: @fontSizeMini; + } +} diff --git a/css/less/popovers.less b/css/less/popovers.less index 2b3f1b059956..4a36db4e8de6 100644 --- a/css/less/popovers.less +++ b/css/less/popovers.less @@ -20,12 +20,14 @@ .border-radius(6px); .box-shadow(0 5px 10px rgba(0,0,0,.2)); + // Overrides for proper insertion + white-space: normal; + // Offset the popover to account for the popover arrow - &.top { margin-bottom: 10px; } + &.top { margin-top: -10px; } &.right { margin-left: 10px; } &.bottom { margin-top: 10px; } - &.left { margin-right: 10px; } - + &.left { margin-left: -10px; } } .popover-title { diff --git a/css/less/progress-bars.less b/css/less/progress-bars.less index 0486371aa89f..5e0c3dda0180 100644 --- a/css/less/progress-bars.less +++ b/css/less/progress-bars.less @@ -48,7 +48,7 @@ margin-bottom: @baseLineHeight; #gradient > .vertical(#f5f5f5, #f9f9f9); .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); - .border-radius(4px); + .border-radius(@baseBorderRadius); } // Bar of progress @@ -66,7 +66,7 @@ .transition(width .6s ease); } .progress .bar + .bar { - .box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)); + .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)"); } // Striped bars diff --git a/css/less/reset.less b/css/less/reset.less index 2901a85c80dd..aec468763861 100644 --- a/css/less/reset.less +++ b/css/less/reset.less @@ -88,7 +88,8 @@ img { } // Prevent max-width from affecting Google Maps -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; } @@ -115,16 +116,24 @@ input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 border: 0; } button, -input[type="button"], +html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. input[type="reset"], input[type="submit"] { - cursor: pointer; // Cursors on all buttons applied consistently - -webkit-appearance: button; // Style clickable inputs in iOS + -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +label, +select, +button, +input[type="button"], +input[type="reset"], +input[type="submit"], +input[type="radio"], +input[type="checkbox"] { + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. } input[type="search"] { // Appearance in Safari/Chrome - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; + .box-sizing(content-box); -webkit-appearance: textfield; } input[type="search"]::-webkit-search-decoration, @@ -135,3 +144,73 @@ textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } + + +// Printing +// ------------------------- +// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css + +@media print { + + * { + text-shadow: none !important; + color: #000 !important; // Black prints faster: h5bp.com/s + background: transparent !important; + box-shadow: none !important; + } + + a, + a:visited { + text-decoration: underline; + } + + a[href]:after { + content: " (" attr(href) ")"; + } + + abbr[title]:after { + content: " (" attr(title) ")"; + } + + // Don't show links for images, or javascript/internal links + .ir a:after, + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + + thead { + display: table-header-group; // h5bp.com/t + } + + tr, + img { + page-break-inside: avoid; + } + + img { + max-width: 100% !important; + } + + @page { + margin: 0.5cm; + } + + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + + h2, + h3 { + page-break-after: avoid; + } +} \ No newline at end of file diff --git a/css/less/responsive-767px-max.less b/css/less/responsive-767px-max.less index 6e4261047508..1d5c1239c99f 100644 --- a/css/less/responsive-767px-max.less +++ b/css/less/responsive-767px-max.less @@ -58,6 +58,7 @@ } // Make all grid-sized elements block level again [class*="span"], + .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing .row-fluid [class*="span"] { float: none; display: block; @@ -106,7 +107,8 @@ right: 20px; width: auto; margin: 0; - &.fade.in { top: auto; } + &.fade { top: -100px; } + &.fade.in { top: 20px; } } } @@ -158,6 +160,20 @@ } } + // Medias + // Reset float and spacing to stack + .media .pull-left, + .media .pull-right { + float: none; + display: block; + margin-bottom: 10px; + } + // Remove side margins since we stack instead of indent + .media-object { + margin-right: 0; + margin-left: 0; + } + // Modals .modal { top: 10px; diff --git a/css/less/responsive-navbar.less b/css/less/responsive-navbar.less index c454dd5e398c..2a0b0c057f50 100644 --- a/css/less/responsive-navbar.less +++ b/css/less/responsive-navbar.less @@ -75,7 +75,7 @@ .nav-collapse .btn { padding: 4px 10px 4px; font-weight: normal; - .border-radius(4px); + .border-radius(@baseBorderRadius); } .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; @@ -84,6 +84,10 @@ .nav-collapse .dropdown-menu a:hover { background-color: @navbarBackground; } + .navbar-inverse .nav-collapse .nav > li > a, + .navbar-inverse .nav-collapse .dropdown-menu a { + color: @navbarInverseLinkColor; + } .navbar-inverse .nav-collapse .nav > li > a:hover, .navbar-inverse .nav-collapse .dropdown-menu a:hover { background-color: @navbarInverseBackground; @@ -99,7 +103,7 @@ top: auto; left: auto; float: none; - display: block; + display: none; max-width: none; margin: 0 15px; padding: 0; @@ -108,6 +112,10 @@ .border-radius(0); .box-shadow(none); } + .nav-collapse .open > .dropdown-menu { + display: block; + } + .nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:after { display: none; @@ -129,7 +137,7 @@ margin: (@baseLineHeight / 2) 0; border-top: 1px solid @navbarBackground; border-bottom: 1px solid @navbarBackground; - .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)); + .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)"); } .navbar-inverse .nav-collapse .navbar-form, .navbar-inverse .nav-collapse .navbar-search { @@ -166,7 +174,7 @@ // DEFAULT DESKTOP // --------------- -@media (min-width: 980px) { +@media (min-width: @navbarCollapseDesktopWidth) { // Required to make the collapsing navbar work on regular desktops .nav-collapse.collapse { diff --git a/css/less/responsive.less b/css/less/responsive.less index e56042e4e27d..b511b7882b38 100644 --- a/css/less/responsive.less +++ b/css/less/responsive.less @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.1.2 + * Bootstrap Responsive v2.2.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/css/less/sprites.less b/css/less/sprites.less index 6d3aaef323ed..785c841ab239 100644 --- a/css/less/sprites.less +++ b/css/less/sprites.less @@ -1,191 +1,190 @@ // -// Sprites +// Icon sprites // -------------------------------------------------- - -// ICONS -// ----- - // All icons receive the styles of the tag with a base class // of .i and are then given a unique class to add width, height, // and background-position. Your resulting HTML will look like // . -// For the white version of the icons, just add the .icon-white class: -// - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - .ie7-restore-right-whitespace(); - line-height: 14px; - vertical-align: text-top; - background-image: url("@{iconSpritePath}"); - background-position: 14px 14px; - background-repeat: no-repeat; - margin-top: 1px; +// Import the fonts +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('../fonts/glyphiconshalflings-regular.eot'); + src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), + url('../fonts/glyphiconshalflings-regular.woff') format('woff'), + url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), + url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); + font-style: normal; + font-weight: normal; } -/* White icons with optional class, or on hover/active states of certain elements */ -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"] { - background-image: url("@{iconWhiteSpritePath}"); +// Catchall baseclass +[class^="icon-"]:before, +[class*="icon-"]:before { + font-family: 'Glyphicons Halflings'; + font-style: normal; + line-height: 1; } -.icon-glass { background-position: 0 0; } -.icon-music { background-position: -24px 0; } -.icon-search { background-position: -48px 0; } -.icon-envelope { background-position: -72px 0; } -.icon-heart { background-position: -96px 0; } -.icon-star { background-position: -120px 0; } -.icon-star-empty { background-position: -144px 0; } -.icon-user { background-position: -168px 0; } -.icon-film { background-position: -192px 0; } -.icon-th-large { background-position: -216px 0; } -.icon-th { background-position: -240px 0; } -.icon-th-list { background-position: -264px 0; } -.icon-ok { background-position: -288px 0; } -.icon-remove { background-position: -312px 0; } -.icon-zoom-in { background-position: -336px 0; } -.icon-zoom-out { background-position: -360px 0; } -.icon-off { background-position: -384px 0; } -.icon-signal { background-position: -408px 0; } -.icon-cog { background-position: -432px 0; } -.icon-trash { background-position: -456px 0; } - -.icon-home { background-position: 0 -24px; } -.icon-file { background-position: -24px -24px; } -.icon-time { background-position: -48px -24px; } -.icon-road { background-position: -72px -24px; } -.icon-download-alt { background-position: -96px -24px; } -.icon-download { background-position: -120px -24px; } -.icon-upload { background-position: -144px -24px; } -.icon-inbox { background-position: -168px -24px; } -.icon-play-circle { background-position: -192px -24px; } -.icon-repeat { background-position: -216px -24px; } -.icon-refresh { background-position: -240px -24px; } -.icon-list-alt { background-position: -264px -24px; } -.icon-lock { background-position: -287px -24px; } // 1px off -.icon-flag { background-position: -312px -24px; } -.icon-headphones { background-position: -336px -24px; } -.icon-volume-off { background-position: -360px -24px; } -.icon-volume-down { background-position: -384px -24px; } -.icon-volume-up { background-position: -408px -24px; } -.icon-qrcode { background-position: -432px -24px; } -.icon-barcode { background-position: -456px -24px; } - -.icon-tag { background-position: 0 -48px; } -.icon-tags { background-position: -25px -48px; } // 1px off -.icon-book { background-position: -48px -48px; } -.icon-bookmark { background-position: -72px -48px; } -.icon-print { background-position: -96px -48px; } -.icon-camera { background-position: -120px -48px; } -.icon-font { background-position: -144px -48px; } -.icon-bold { background-position: -167px -48px; } // 1px off -.icon-italic { background-position: -192px -48px; } -.icon-text-height { background-position: -216px -48px; } -.icon-text-width { background-position: -240px -48px; } -.icon-align-left { background-position: -264px -48px; } -.icon-align-center { background-position: -288px -48px; } -.icon-align-right { background-position: -312px -48px; } -.icon-align-justify { background-position: -336px -48px; } -.icon-list { background-position: -360px -48px; } -.icon-indent-left { background-position: -384px -48px; } -.icon-indent-right { background-position: -408px -48px; } -.icon-facetime-video { background-position: -432px -48px; } -.icon-picture { background-position: -456px -48px; } - -.icon-pencil { background-position: 0 -72px; } -.icon-map-marker { background-position: -24px -72px; } -.icon-adjust { background-position: -48px -72px; } -.icon-tint { background-position: -72px -72px; } -.icon-edit { background-position: -96px -72px; } -.icon-share { background-position: -120px -72px; } -.icon-check { background-position: -144px -72px; } -.icon-move { background-position: -168px -72px; } -.icon-step-backward { background-position: -192px -72px; } -.icon-fast-backward { background-position: -216px -72px; } -.icon-backward { background-position: -240px -72px; } -.icon-play { background-position: -264px -72px; } -.icon-pause { background-position: -288px -72px; } -.icon-stop { background-position: -312px -72px; } -.icon-forward { background-position: -336px -72px; } -.icon-fast-forward { background-position: -360px -72px; } -.icon-step-forward { background-position: -384px -72px; } -.icon-eject { background-position: -408px -72px; } -.icon-chevron-left { background-position: -432px -72px; } -.icon-chevron-right { background-position: -456px -72px; } - -.icon-plus-sign { background-position: 0 -96px; } -.icon-minus-sign { background-position: -24px -96px; } -.icon-remove-sign { background-position: -48px -96px; } -.icon-ok-sign { background-position: -72px -96px; } -.icon-question-sign { background-position: -96px -96px; } -.icon-info-sign { background-position: -120px -96px; } -.icon-screenshot { background-position: -144px -96px; } -.icon-remove-circle { background-position: -168px -96px; } -.icon-ok-circle { background-position: -192px -96px; } -.icon-ban-circle { background-position: -216px -96px; } -.icon-arrow-left { background-position: -240px -96px; } -.icon-arrow-right { background-position: -264px -96px; } -.icon-arrow-up { background-position: -289px -96px; } // 1px off -.icon-arrow-down { background-position: -312px -96px; } -.icon-share-alt { background-position: -336px -96px; } -.icon-resize-full { background-position: -360px -96px; } -.icon-resize-small { background-position: -384px -96px; } -.icon-plus { background-position: -408px -96px; } -.icon-minus { background-position: -433px -96px; } -.icon-asterisk { background-position: -456px -96px; } - -.icon-exclamation-sign { background-position: 0 -120px; } -.icon-gift { background-position: -24px -120px; } -.icon-leaf { background-position: -48px -120px; } -.icon-fire { background-position: -72px -120px; } -.icon-eye-open { background-position: -96px -120px; } -.icon-eye-close { background-position: -120px -120px; } -.icon-warning-sign { background-position: -144px -120px; } -.icon-plane { background-position: -168px -120px; } -.icon-calendar { background-position: -192px -120px; } -.icon-random { background-position: -216px -120px; width: 16px; } -.icon-comment { background-position: -240px -120px; } -.icon-magnet { background-position: -264px -120px; } -.icon-chevron-up { background-position: -288px -120px; } -.icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off -.icon-retweet { background-position: -336px -120px; } -.icon-shopping-cart { background-position: -360px -120px; } -.icon-folder-close { background-position: -384px -120px; } -.icon-folder-open { background-position: -408px -120px; width: 16px; } -.icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off -.icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off - -.icon-hdd { background-position: 0 -144px; } -.icon-bullhorn { background-position: -24px -144px; } -.icon-bell { background-position: -48px -144px; } -.icon-certificate { background-position: -72px -144px; } -.icon-thumbs-up { background-position: -96px -144px; } -.icon-thumbs-down { background-position: -120px -144px; } -.icon-hand-right { background-position: -144px -144px; } -.icon-hand-left { background-position: -168px -144px; } -.icon-hand-up { background-position: -192px -144px; } -.icon-hand-down { background-position: -216px -144px; } -.icon-circle-arrow-right { background-position: -240px -144px; } -.icon-circle-arrow-left { background-position: -264px -144px; } -.icon-circle-arrow-up { background-position: -288px -144px; } -.icon-circle-arrow-down { background-position: -312px -144px; } -.icon-globe { background-position: -336px -144px; } -.icon-wrench { background-position: -360px -144px; } -.icon-tasks { background-position: -384px -144px; } -.icon-filter { background-position: -408px -144px; } -.icon-briefcase { background-position: -432px -144px; } -.icon-fullscreen { background-position: -456px -144px; } +// Individual icons +.icon-glass:before { content: "\e001"; } +.icon-music:before { content: "\e002"; } +.icon-search:before { content: "\e003"; } +.icon-envelope:before { content: "\2709"; } +.icon-heart:before { content: "\e005"; } +.icon-star:before { content: "\e006"; } +.icon-star-empty:before { content: "\e007"; } +.icon-user:before { content: "\e008"; } +.icon-film:before { content: "\e009"; } +.icon-th-large:before { content: "\e010"; } +.icon-th:before { content: "\e011"; } +.icon-th-list:before { content: "\e012"; } +.icon-ok:before { content: "\e013"; } +.icon-remove:before { content: "\e014"; } +.icon-zoom-in:before { content: "\e015"; } +.icon-zoom-out:before { content: "\e016"; } +.icon-off:before { content: "\e017"; } +.icon-signal:before { content: "\e018"; } +.icon-cog:before { content: "\e019"; } +.icon-trash:before { content: "\e020"; } +.icon-home:before { content: "\e021"; } +.icon-file:before { content: "\e022"; } +.icon-time:before { content: "\e023"; } +.icon-road:before { content: "\e024"; } +.icon-download-alt:before { content: "\e025"; } +.icon-download:before { content: "\e026"; } +.icon-upload:before { content: "\e027"; } +.icon-inbox:before { content: "\e028"; } +.icon-play-circle:before { content: "\e029"; } +.icon-repeat:before { content: "\e030"; } +.icon-refresh:before { content: "\e031"; } +.icon-list-alt:before { content: "\e032"; } +.icon-lock:before { content: "\e033"; } +.icon-flag:before { content: "\e034"; } +.icon-headphones:before { content: "\e035"; } +.icon-volume-off:before { content: "\e036"; } +.icon-volume-down:before { content: "\e037"; } +.icon-volume-up:before { content: "\e038"; } +.icon-qrcode:before { content: "\e039"; } +.icon-barcode:before { content: "\e040"; } +.icon-tag:before { content: "\e041"; } +.icon-tags:before { content: "\e042"; } +.icon-book:before { content: "\e043"; } +.icon-bookmark:before { content: "\e044"; } +.icon-print:before { content: "\e045"; } +.icon-camera:before { content: "\e046"; } +.icon-font:before { content: "\e047"; } +.icon-bold:before { content: "\e048"; } +.icon-italic:before { content: "\e049"; } +.icon-text-height:before { content: "\e050"; } +.icon-text-width:before { content: "\e051"; } +.icon-align-left:before { content: "\e052"; } +.icon-align-center:before { content: "\e053"; } +.icon-align-right:before { content: "\e054"; } +.icon-align-justify:before { content: "\e055"; } +.icon-list:before { content: "\e056"; } +.icon-indent-left:before { content: "\e057"; } +.icon-indent-right:before { content: "\e058"; } +.icon-facetime-video:before { content: "\e059"; } +.icon-picture:before { content: "\e060"; } +.icon-pencil:before { content: "\270f"; } +.icon-map-marker:before { content: "\e062"; } +.icon-adjust:before { content: "\e063"; } +.icon-tint:before { content: "\e064"; } +.icon-edit:before { content: "\e065"; } +.icon-share:before { content: "\e066"; } +.icon-check:before { content: "\e067"; } +.icon-move:before { content: "\e068"; } +.icon-step-backward:before { content: "\e069"; } +.icon-fast-backward:before { content: "\e070"; } +.icon-backward:before { content: "\e071"; } +.icon-play:before { content: "\e072"; } +.icon-pause:before { content: "\e073"; } +.icon-stop:before { content: "\e074"; } +.icon-forward:before { content: "\e075"; } +.icon-fast-forward:before { content: "\e076"; } +.icon-step-forward:before { content: "\e077"; } +.icon-eject:before { content: "\e078"; } +.icon-chevron-left:before { content: "\e079"; } +.icon-chevron-right:before { content: "\e080"; } +.icon-plus-sign:before { content: "\e081"; } +.icon-minus-sign:before { content: "\e082"; } +.icon-remove-sign:before { content: "\e083"; } +.icon-ok-sign:before { content: "\e084"; } +.icon-question-sign:before { content: "\e085"; } +.icon-info-sign:before { content: "\e086"; } +.icon-screenshot:before { content: "\e087"; } +.icon-remove-circle:before { content: "\e088"; } +.icon-ok-circle:before { content: "\e089"; } +.icon-ban-circle:before { content: "\e090"; } +.icon-arrow-left:before { content: "\e091"; } +.icon-arrow-right:before { content: "\e092"; } +.icon-arrow-up:before { content: "\e093"; } +.icon-arrow-down:before { content: "\e094"; } +.icon-share-alt:before { content: "\e095"; } +.icon-resize-full:before { content: "\e096"; } +.icon-resize-small:before { content: "\e097"; } +.icon-plus:before { content: "\002b"; } +.icon-minus:before { content: "\2212"; } +.icon-asterisk:before { content: "\002a"; } +.icon-exclamation-sign:before { content: "\e101"; } +.icon-gift:before { content: "\e102"; } +.icon-leaf:before { content: "\e103"; } +.icon-fire:before { content: "\e104"; } +.icon-eye-open:before { content: "\e105"; } +.icon-eye-close:before { content: "\e106"; } +.icon-warning-sign:before { content: "\e107"; } +.icon-plane:before { content: "\e108"; } +.icon-calendar:before { content: "\e109"; } +.icon-random:before { content: "\e110"; } +.icon-comment:before { content: "\e111"; } +.icon-magnet:before { content: "\e112"; } +.icon-chevron-up:before { content: "\e113"; } +.icon-chevron-down:before { content: "\e114"; } +.icon-retweet:before { content: "\e115"; } +.icon-shopping-cart:before { content: "\e116"; } +.icon-folder-close:before { content: "\e117"; } +.icon-folder-open:before { content: "\e118"; } +.icon-resize-vertical:before { content: "\e119"; } +.icon-resize-horizontal:before { content: "\e120"; } +.icon-hdd:before { content: "\e121"; } +.icon-bullhorn:before { content: "\e122"; } +.icon-bell:before { content: "\e123"; } +.icon-certificate:before { content: "\e124"; } +.icon-thumbs-up:before { content: "\e125"; } +.icon-thumbs-down:before { content: "\e126"; } +.icon-hand-right:before { content: "\e127"; } +.icon-hand-left:before { content: "\e128"; } +.icon-hand-up:before { content: "\e129"; } +.icon-hand-down:before { content: "\e130"; } +.icon-circle-arrow-right:before { content: "\e131"; } +.icon-circle-arrow-left:before { content: "\e132"; } +.icon-circle-arrow-up:before { content: "\e133"; } +.icon-circle-arrow-down:before { content: "\e134"; } +.icon-globe:before { content: "\e135"; } +.icon-wrench:before { content: "\e136"; } +.icon-tasks:before { content: "\e137"; } +.icon-filter:before { content: "\e138"; } +.icon-briefcase:before { content: "\e139"; } +.icon-fullscreen:before { content: "\e140"; } +.icon-dashboard:before { content: "\e141"; } +.icon-paperclip:before { content: "\e142"; } +.icon-heart-empty:before { content: "\e143"; } +.icon-link:before { content: "\e144"; } +.icon-phone:before { content: "\e145"; } +.icon-pushpin:before { content: "\e146"; } +.icon-euro:before { content: "\20ac"; } +.icon-usd:before { content: "\e148"; } +.icon-gbp:before { content: "\e149"; } +.icon-sort:before { content: "\e150"; } +.icon-sort-by-alphabet:before { content: "\e151"; } +.icon-sort-by-alphabet-alt:before { content: "\e152"; } +.icon-sort-by-order:before { content: "\e153"; } +.icon-sort-by-order-alt:before { content: "\e154"; } +.icon-sort-by-attributes:before { content: "\e155"; } +.icon-sort-by-attributes-alt:before { content: "\e156"; } +.icon-unchecked:before { content: "\e157"; } +.icon-expand:before { content: "\e158"; } +.icon-collapse:before { content: "\e159"; } +.icon-collapse-top:before { content: "\e160"; } diff --git a/css/less/tables.less b/css/less/tables.less index e5b3f397997b..fc8750f97c59 100644 --- a/css/less/tables.less +++ b/css/less/tables.less @@ -71,7 +71,7 @@ table { border-collapse: separate; // Done so we can round those corners! *border-collapse: collapse; // IE7 can't round corners anyway border-left: 0; - .border-radius(4px); + .border-radius(@baseBorderRadius); th, td { border-left: 1px solid @tableBorder; @@ -91,31 +91,22 @@ table { // For first th or td in the first row in the first thead or tbody thead:first-child tr:first-child th:first-child, tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; + .border-top-left-radius(4px); } thead:first-child tr:first-child th:last-child, tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; + .border-top-right-radius(4px); } // For first th or td in the first row in the first thead or tbody thead:last-child tr:last-child th:first-child, tbody:last-child tr:last-child td:first-child, tfoot:last-child tr:last-child td:first-child { - .border-radius(0 0 0 4px); - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; + .border-bottom-left-radius(4px); } thead:last-child tr:last-child th:last-child, tbody:last-child tr:last-child td:last-child, tfoot:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; + .border-bottom-right-radius(4px); } // Special fixes to round the left border on the first td/th @@ -123,17 +114,13 @@ table { caption + tbody tr:first-child td:first-child, colgroup + thead tr:first-child th:first-child, colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; + .border-top-left-radius(4px); } caption + thead tr:first-child th:last-child, caption + tbody tr:first-child td:last-child, colgroup + thead tr:first-child th:last-child, colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; + .border-top-right-radius(4px); } } @@ -172,39 +159,30 @@ table { // ----------------- // Reset default grid behavior -table [class*=span], -.row-fluid table [class*=span] { +table td[class*="span"], +table th[class*="span"], +.row-fluid table td[class*="span"], +.row-fluid table th[class*="span"] { display: table-cell; float: none; // undo default grid column styles margin-left: 0; // undo default grid column styles } // Change the column widths to account for td/th padding -.table { - .span1 { .tableColumns(1); } - .span2 { .tableColumns(2); } - .span3 { .tableColumns(3); } - .span4 { .tableColumns(4); } - .span5 { .tableColumns(5); } - .span6 { .tableColumns(6); } - .span7 { .tableColumns(7); } - .span8 { .tableColumns(8); } - .span9 { .tableColumns(9); } - .span10 { .tableColumns(10); } - .span11 { .tableColumns(11); } - .span12 { .tableColumns(12); } - .span13 { .tableColumns(13); } - .span14 { .tableColumns(14); } - .span15 { .tableColumns(15); } - .span16 { .tableColumns(16); } - .span17 { .tableColumns(17); } - .span18 { .tableColumns(18); } - .span19 { .tableColumns(19); } - .span20 { .tableColumns(20); } - .span21 { .tableColumns(21); } - .span22 { .tableColumns(22); } - .span23 { .tableColumns(23); } - .span24 { .tableColumns(24); } +.table td, +.table th { + &.span1 { .tableColumns(1); } + &.span2 { .tableColumns(2); } + &.span3 { .tableColumns(3); } + &.span4 { .tableColumns(4); } + &.span5 { .tableColumns(5); } + &.span6 { .tableColumns(6); } + &.span7 { .tableColumns(7); } + &.span8 { .tableColumns(8); } + &.span9 { .tableColumns(9); } + &.span10 { .tableColumns(10); } + &.span11 { .tableColumns(11); } + &.span12 { .tableColumns(12); } } diff --git a/css/less/thumbnails.less b/css/less/thumbnails.less index 91b75f785bd3..a84a7d37d921 100644 --- a/css/less/thumbnails.less +++ b/css/less/thumbnails.less @@ -29,7 +29,7 @@ padding: 4px; line-height: @baseLineHeight; border: 1px solid #ddd; - .border-radius(4px); + .border-radius(@baseBorderRadius); .box-shadow(0 1px 3px rgba(0,0,0,.055)); .transition(all .2s ease-in-out); } diff --git a/css/less/tooltip.less b/css/less/tooltip.less index fba1856f581d..93fac8d6b2eb 100644 --- a/css/less/tooltip.less +++ b/css/less/tooltip.less @@ -27,7 +27,7 @@ text-align: center; text-decoration: none; background-color: @tooltipBackground; - .border-radius(4px); + .border-radius(@baseBorderRadius); } // Arrows diff --git a/css/less/type.less b/css/less/type.less index 2e0f386eef6b..683a30772614 100644 --- a/css/less/type.less +++ b/css/less/type.less @@ -20,35 +20,28 @@ p { // Emphasis & misc // ------------------------- -small { - font-size: 85%; // Ex: 14px base font * 85% = about 12px -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -cite { - font-style: normal; -} +// Ex: 14px base font * 85% = about 12px +small { font-size: 85%; } + +strong { font-weight: bold; } +em { font-style: italic; } +cite { font-style: normal; } // Utility classes -.muted { - color: @grayLight; -} -.text-warning { - color: @warningText; -} -.text-error { - color: @errorText; -} -.text-info { - color: @infoText; -} -.text-success { - color: @successText; -} +.muted { color: @grayLight; } +a.muted:hover { color: darken(@grayLight, 10%); } + +.text-warning { color: @warningText; } +a.text-warning:hover { color: darken(@warningText, 10%); } + +.text-error { color: @errorText; } +a.text-error:hover { color: darken(@errorText, 10%); } + +.text-info { color: @infoText; } +a.text-info:hover { color: darken(@infoText, 10%); } + +.text-success { color: @successText; } +a.text-success:hover { color: darken(@successText, 10%); } // Headings @@ -58,7 +51,7 @@ h1, h2, h3, h4, h5, h6 { margin: (@baseLineHeight / 2) 0; font-family: @headingsFontFamily; font-weight: @headingsFontWeight; - line-height: 1; + line-height: @baseLineHeight; color: @headingsColor; text-rendering: optimizelegibility; // Fix the character spacing for headings small { @@ -67,17 +60,22 @@ h1, h2, h3, h4, h5, h6 { color: @grayLight; } } -h1 { font-size: 36px; line-height: 40px; } -h2 { font-size: 30px; line-height: 40px; } -h3 { font-size: 24px; line-height: 40px; } -h4 { font-size: 18px; line-height: 20px; } -h5 { font-size: 14px; line-height: 20px; } -h6 { font-size: 12px; line-height: 20px; } -h1 small { font-size: 24px; } -h2 small { font-size: 18px; } -h3 small { font-size: 14px; } -h4 small { font-size: 14px; } +h1, +h2, +h3 { line-height: @baseLineHeight * 2; } + +h1 { font-size: @baseFontSize * 2.75; } // ~38px +h2 { font-size: @baseFontSize * 2.25; } // ~32px +h3 { font-size: @baseFontSize * 1.75; } // ~24px +h4 { font-size: @baseFontSize * 1.25; } // ~18px +h5 { font-size: @baseFontSize; } +h6 { font-size: @baseFontSize * 0.85; } // ~12px + +h1 small { font-size: @baseFontSize * 1.75; } // ~24px +h2 small { font-size: @baseFontSize * 1.25; } // ~18px +h3 small { font-size: @baseFontSize; } +h4 small { font-size: @baseFontSize; } // Page header @@ -108,12 +106,26 @@ ol ul { li { line-height: @baseLineHeight; } + +// Remove default list styles ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } +// Single-line list items +ul.inline, +ol.inline { + margin-left: 0; + list-style: none; + & > li { + display: inline-block; + padding-left: 5px; + padding-right: 5px; + } +} + // Description Lists dl { margin-bottom: @baseLineHeight; @@ -155,7 +167,9 @@ hr { } // Abbreviations and acronyms -abbr[title] { +abbr[title], +// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257 +abbr[data-original-title] { cursor: help; border-bottom: 1px dotted @grayLight; } diff --git a/css/less/variables.less b/css/less/variables.less index 7d6efe00506a..de36074fd9f4 100644 --- a/css/less/variables.less +++ b/css/less/variables.less @@ -57,6 +57,24 @@ @headingsFontWeight: bold; // instead of browser default, bold @headingsColor: inherit; // empty to use BS default, @textColor + +// Component sizing +// ------------------------- +// Based on 14px font-size and 20px line-height + +@fontSizeLarge: @baseFontSize * 1.25; // ~18px +@fontSizeSmall: @baseFontSize * 0.85; // ~12px +@fontSizeMini: @baseFontSize * 0.75; // ~11px + +@paddingLarge: 11px 19px; // 44px +@paddingSmall: 2px 10px; // 26px +@paddingMini: 0 6px; // 22px + +@baseBorderRadius: 4px; +@borderRadiusLarge: 6px; +@borderRadiusSmall: 3px; + + // Tables // ------------------------- @tableBackground: transparent; // overall background-color @@ -93,9 +111,11 @@ // ------------------------- @inputBackground: @white; @inputBorder: #ccc; -@inputBorderRadius: 3px; +@inputBorderRadius: @baseBorderRadius; @inputDisabledBackground: @grayLighter; @formActionsBackground: #f5f5f5; +@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border + // Dropdowns // ------------------------- @@ -106,7 +126,7 @@ @dropdownLinkColor: @grayDark; @dropdownLinkColorHover: @white; -@dropdownLinkColorActive: @dropdownLinkColor; +@dropdownLinkColorActive: @white; @dropdownLinkBackgroundActive: @linkColor; @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; @@ -116,6 +136,7 @@ // COMPONENT VARIABLES // -------------------------------------------------- + // Z-index master list // ------------------------- // Used for a bird's eye view of components dependent on the z-axis @@ -157,6 +178,7 @@ // Navbar // ------------------------- @navbarCollapseWidth: 979px; +@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1; @navbarHeight: 40px; @navbarBackgroundHighlight: #ffffff; diff --git a/css/less/wells.less b/css/less/wells.less index e4e0a9bebe48..84a744b1c5c8 100644 --- a/css/less/wells.less +++ b/css/less/wells.less @@ -10,7 +10,7 @@ margin-bottom: 20px; background-color: @wellBackground; border: 1px solid darken(@wellBackground, 7%); - .border-radius(4px); + .border-radius(@baseBorderRadius); .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); blockquote { border-color: #ddd; @@ -21,9 +21,9 @@ // Sizes .well-large { padding: 24px; - .border-radius(6px); + .border-radius(@borderRadiusLarge); } .well-small { padding: 9px; - .border-radius(3px); + .border-radius(@borderRadiusSmall); } diff --git a/fonts/glyphiconshalflings-regular.eot b/fonts/glyphiconshalflings-regular.eot new file mode 100755 index 000000000000..bd59ccd2d679 Binary files /dev/null and b/fonts/glyphiconshalflings-regular.eot differ diff --git a/fonts/glyphiconshalflings-regular.otf b/fonts/glyphiconshalflings-regular.otf new file mode 100644 index 000000000000..b058f1cd1b99 Binary files /dev/null and b/fonts/glyphiconshalflings-regular.otf differ diff --git a/fonts/glyphiconshalflings-regular.svg b/fonts/glyphiconshalflings-regular.svg new file mode 100755 index 000000000000..e704fab15ea0 --- /dev/null +++ b/fonts/glyphiconshalflings-regular.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/glyphiconshalflings-regular.ttf b/fonts/glyphiconshalflings-regular.ttf new file mode 100755 index 000000000000..c63c068feb1a Binary files /dev/null and b/fonts/glyphiconshalflings-regular.ttf differ diff --git a/fonts/glyphiconshalflings-regular.woff b/fonts/glyphiconshalflings-regular.woff new file mode 100755 index 000000000000..4c778ffdc5fa Binary files /dev/null and b/fonts/glyphiconshalflings-regular.woff differ diff --git a/functions.php b/functions.php index f88a026b669c..812b2635a84d 100755 --- a/functions.php +++ b/functions.php @@ -11,61 +11,73 @@ * @subpackage WP-Bootstrap * @since WP-Bootstrap 0.1 * - * Last Updated: September 9, 2012 */ -if (!defined('BOOTSTRAPWP_VERSION')) -define('BOOTSTRAPWP_VERSION', '.90'); +if ( !defined( 'BOOTSTRAPWP_VERSION' ) ) + define( 'BOOTSTRAPWP_VERSION', '.90' ); - /** - * Declaring the content width based on the theme's design and stylesheet. - */ if ( ! isset( $content_width ) ) $content_width = 770; /* pixels */ -/* -| ------------------------------------------------------------------- -| Setup Theme -| ------------------------------------------------------------------- -| -| */ +/** + * Setup Theme Functions + * Loads theme's textdomain for translation + * Adds theme support for post-formats, post-thumbnails & automatic-feed-links + * Uses register_nav_menus to register theme's custom menu + */ add_action( 'after_setup_theme', 'bootstrapwp_theme_setup' ); if ( ! function_exists( 'bootstrapwp_theme_setup' ) ): -function bootstrapwp_theme_setup() { - add_theme_support( 'automatic-feed-links' ); - /** - * Adds custom menu with wp_page_menu fallback - */ - register_nav_menus( array( - 'main-menu' => __( 'Main Menu', 'bootstrapwp' ), - ) ); - add_theme_support( 'post-formats', array( 'aside', 'image', 'gallery', 'link', 'quote', 'status', 'video', 'audio', 'chat' ) ); - /** - * Declaring the theme language domain - */ - load_theme_textdomain('bootstrapwp', get_template_directory() . '/lang'); -} + function bootstrapwp_theme_setup() { + load_theme_textdomain( 'bootstrapwp' ); + add_theme_support( 'automatic-feed-links' ); + add_theme_support( 'post-thumbnails' ); + add_theme_support( 'post-formats', + array( 'aside', + 'image', + 'gallery', + 'link', + 'quote', + 'status', + 'video', + 'audio', + 'chat' ) ); + register_nav_menus( array( + 'main-menu' => __( 'Main Menu', 'bootstrapwp' ), + ) ); + } endif; -################################################################################ -// Loading All CSS Stylesheets -################################################################################ - function bootstrapwp_css_loader() { - wp_enqueue_style('bootstrapwp', get_template_directory_uri().'/css/bootstrapwp.css', false ,'0.90', 'all' ); - wp_enqueue_style('prettify', get_template_directory_uri().'/js/google-code-prettify/prettify.css', false ,'1.0', 'all' ); - } -add_action('wp_enqueue_scripts', 'bootstrapwp_css_loader'); +/** + * Setup image sizes + * Declares size of post thumbnails + * Adds two additional image sizes + */ +function bootstrapwp_images() { + set_post_thumbnail_size( 160, 120 ); // 160 pixels wide by 120 pixels high + add_image_size( 'bootstrap-small', 260, 180 ); // 260 pixels wide by 180 pixels high + add_image_size( 'bootstrap-medium', 360, 270 ); // 360 pixels wide by 270 pixels high +} +/** + * Load CSS Styles & JavaScript Files + * Uses wp_enqueue_script() + */ +function bootstrapwp_scripts_styles_loader() { + if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { + wp_enqueue_script( 'comment-reply' ); + } + wp_enqueue_script( 'bootstrapjs', get_template_directory_uri().'/js/bootstrap.min.js', array( 'jquery' ), '0.90', true ); + wp_enqueue_script( 'demojs', get_template_directory_uri().'/js/bootstrapwp.demo.js', array( 'jquery' ), '0.90', true ); -################################################################################ -// Loading all JS Script Files. Remove any files you are not using! -################################################################################ - function bootstrapwp_js_loader() { - wp_enqueue_script('bootstrapjs', get_template_directory_uri().'/js/bootstrap.min.js', array('jquery'),'0.90', true ); - wp_enqueue_script('prettifyjs', get_template_directory_uri().'/js/google-code-prettify/prettify.js', array('jquery'),'1.0', true ); - wp_enqueue_script('demojs', get_template_directory_uri().'/js/bootstrapwp.demo.js', array('jquery'),'0.90', true ); - } -add_action('wp_enqueue_scripts', 'bootstrapwp_js_loader'); + wp_enqueue_style( 'bootstrapwp-style', get_template_directory_uri().'/css/bootstrapwp.css', false , '0.90', 'all' ); + wp_enqueue_style( 'bootstrapwp-default', get_stylesheet_uri() ); + + // registering scripts and styles for documentation templates + wp_register_script( 'prettify-js', get_template_directory_uri().'/templates-documentation/assets/google-code-prettify/prettify.js', array( 'jquery' ), '1.0', true ); + wp_register_style( 'prettify-css', get_template_directory_uri().'/templates-documentation/assets/google-code-prettify/prettify.css', false , '1.0', 'all' ); + wp_register_style( 'docs-css', get_template_directory_uri().'/templates-documentation/assets/css/docs.css', false , '2.2.1', 'all' ); +} +add_action( 'wp_enqueue_scripts', 'bootstrapwp_scripts_styles_loader' ); /* @@ -95,202 +107,189 @@ function bootstrapwp_page_menu_args( $args ) { | */ function bootstrapwp_widgets_init() { register_sidebar( array( - 'name' => 'Page Sidebar', - 'id' => 'sidebar-page', - 'before_widget' => '
', - 'after_widget' => "
", - 'before_title' => '

', - 'after_title' => '

', - ) ); + 'name' => 'Page Sidebar', + 'id' => 'sidebar-page', + 'before_widget' => '
', + 'after_widget' => "
", + 'before_title' => '

', + 'after_title' => '

', + ) ); register_sidebar( array( - 'name' => 'Posts Sidebar', - 'id' => 'sidebar-posts', - 'before_widget' => '
', - 'after_widget' => "
", - 'before_title' => '

', - 'after_title' => '

', - ) ); - - register_sidebar(array( - 'name' => 'Home Left', - 'id' => 'home-left', - 'description' => 'Left textbox on homepage', - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

' - )); - - register_sidebar(array( - 'name' => 'Home Middle', - 'id' => 'home-middle', - 'description' => 'Middle textbox on homepage', - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

' - )); - - register_sidebar(array( - 'name' => 'Home Right', - 'id' => 'home-right', - 'description' => 'Right textbox on homepage', - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

' - )); - - register_sidebar(array( - 'name' => 'Footer Content', - 'id' => 'footer-content', - 'description' => 'Footer text or acknowledgements', - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

' - )); + 'name' => 'Posts Sidebar', + 'id' => 'sidebar-posts', + 'before_widget' => '
', + 'after_widget' => "
", + 'before_title' => '

', + 'after_title' => '

', + ) ); + + register_sidebar( array( + 'name' => 'Home Left', + 'id' => 'home-left', + 'description' => 'Left textbox on homepage', + 'before_widget' => '
', + 'after_widget' => '
', + 'before_title' => '

', + 'after_title' => '

' + ) ); + + register_sidebar( array( + 'name' => 'Home Middle', + 'id' => 'home-middle', + 'description' => 'Middle textbox on homepage', + 'before_widget' => '
', + 'after_widget' => '
', + 'before_title' => '

', + 'after_title' => '

' + ) ); + + register_sidebar( array( + 'name' => 'Home Right', + 'id' => 'home-right', + 'description' => 'Right textbox on homepage', + 'before_widget' => '
', + 'after_widget' => '
', + 'before_title' => '

', + 'after_title' => '

' + ) ); + + register_sidebar( array( + 'name' => 'Footer Content', + 'id' => 'footer-content', + 'description' => 'Footer text or acknowledgements', + 'before_widget' => '
', + 'after_widget' => '
', + 'before_title' => '

', + 'after_title' => '

' + ) ); } add_action( 'init', 'bootstrapwp_widgets_init' ); -/* -| ------------------------------------------------------------------- -| Adding Post Thumbnails and Image Sizes -| ------------------------------------------------------------------- -| */ -if ( function_exists( 'add_theme_support' ) ) { - add_theme_support( 'post-thumbnails' ); - set_post_thumbnail_size( 160, 120 ); // 160 pixels wide by 120 pixels high -} -if ( function_exists( 'add_image_size' ) ) { - add_image_size( 'bootstrap-small', 260, 180 ); // 260 pixels wide by 180 pixels high - add_image_size( 'bootstrap-medium', 360, 268 ); // 360 pixels wide by 268 pixels high -} /* | ------------------------------------------------------------------- | Revising Default Excerpt | ------------------------------------------------------------------- | Adding filter to post excerpts to contain ...Continue Reading link | */ -function bootstrapwp_excerpt($more) { - global $post; - return '   ...Continue Reading'; +function bootstrapwp_excerpt( $more ) { + global $post; + return '   ...Continue Reading'; } -add_filter('excerpt_more', 'bootstrapwp_excerpt'); +add_filter( 'excerpt_more', 'bootstrapwp_excerpt' ); if ( ! function_exists( 'bootstrapwp_content_nav' ) ): -/** - * Display navigation to next/previous pages when applicable - */ -function bootstrapwp_content_nav( $nav_id ) { - global $wp_query; + /** + * Display navigation to next/previous pages when applicable + */ + function bootstrapwp_content_nav( $nav_id ) { + global $wp_query; - ?> +?> - +
    - %link', '' . _x( '←', 'Previous post link', 'bootstrapwp' ) . ' %title' ); ?> - %link', '%title ' . _x( '→', 'Next post link', 'bootstrapwp' ) . '' ); ?> + %link', '' . _x( '←', 'Previous post link', 'bootstrapwp' ) . ' %title' ); ?> + %link', '%title ' . _x( '→', 'Next post link', 'bootstrapwp' ) . '' ); ?>
- max_num_pages > 1 && ( is_home() || is_archive() || is_search() ) ) : // navigation links for home, archive, and search pages ?> + max_num_pages > 1 && ( is_home() || is_archive() || is_search() ) ) : // navigation links for home, archive, and search pages ?>
    - - - + + + - - - + + +
- + - comment_type ) : - case 'pingback' : - case 'trackback' : - ?> -
  • -

    - -
  • id="li-comment-"> -
    -
    -
    - - says:', 'bootstrap' ), sprintf( '%s', get_comment_author_link() ) ); ?> -
    - comment_approved == '0' ) : ?> - -
    - - -
    - - -
    -
    - -
    - -
    - $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> -
    -
    - - comment_type ) : + case 'pingback' : + case 'trackback' : +?> +
  • +

    + +
  • id="li-comment-"> +
    +
    +
    + + says:', 'bootstrap' ), sprintf( '%s', get_comment_author_link() ) ); ?> +
    + comment_approved == '0' ) : ?> + +
    + + +
    + + +
    +
    + +
    + +
    + $depth, 'max_depth' => $args['max_depth'] ) ) ); ?> +
    +
    + + Posted on by ', 'bootstrap' ), - esc_url( get_permalink() ), - esc_attr( get_the_time() ), - esc_attr( get_the_date( 'c' ) ), - esc_html( get_the_date() ), - esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), - esc_attr( sprintf( __( 'View all posts by %s', 'bootstrap' ), get_the_author() ) ), - esc_html( get_the_author() ) - ); -} + /** + * Prints HTML with meta information for the current post-date/time and author. + * Create your own bootstrap_posted_on to override in a child theme + * + * @since WP-Bootstrap .5 + */ + function bootstrapwp_posted_on() { + printf( __( 'Posted on by ', 'bootstrap' ), + esc_url( get_permalink() ), + esc_attr( get_the_time() ), + esc_attr( get_the_date( 'c' ) ), + esc_html( get_the_date() ), + esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), + esc_attr( sprintf( __( 'View all posts by %s', 'bootstrap' ), get_the_author() ) ), + esc_html( get_the_author() ) + ); + } endif; /** @@ -299,12 +298,12 @@ function bootstrapwp_posted_on() { * @since WP-Bootstrap .5 */ function bootstrapwp_body_classes( $classes ) { - // Adds a class of single-author to blogs with only 1 published author - if ( ! is_multi_author() ) { - $classes[] = 'single-author'; - } + // Adds a class of single-author to blogs with only 1 published author + if ( ! is_multi_author() ) { + $classes[] = 'single-author'; + } - return $classes; + return $classes; } add_filter( 'body_class', 'bootstrapwp_body_classes' ); @@ -314,25 +313,25 @@ function bootstrapwp_body_classes( $classes ) { * @since WP-Bootstrap .5 */ function bootstrapwp_categorized_blog() { - if ( false === ( $all_the_cool_cats = get_transient( 'all_the_cool_cats' ) ) ) { - // Create an array of all the categories that are attached to posts - $all_the_cool_cats = get_categories( array( - 'hide_empty' => 1, - ) ); - - // Count the number of categories that are attached to the posts - $all_the_cool_cats = count( $all_the_cool_cats ); - - set_transient( 'all_the_cool_cats', $all_the_cool_cats ); - } - - if ( '1' != $all_the_cool_cats ) { - // This blog has more than 1 category so bootstrap_categorized_blog should return true - return true; - } else { - // This blog has only 1 category so bootstrap_categorized_blog should return false - return false; - } + if ( false === ( $all_the_cool_cats = get_transient( 'all_the_cool_cats' ) ) ) { + // Create an array of all the categories that are attached to posts + $all_the_cool_cats = get_categories( array( + 'hide_empty' => 1, + ) ); + + // Count the number of categories that are attached to the posts + $all_the_cool_cats = count( $all_the_cool_cats ); + + set_transient( 'all_the_cool_cats', $all_the_cool_cats ); + } + + if ( '1' != $all_the_cool_cats ) { + // This blog has more than 1 category so bootstrap_categorized_blog should return true + return true; + } else { + // This blog has only 1 category so bootstrap_categorized_blog should return false + return false; + } } /** @@ -351,12 +350,12 @@ function bootstrapwp_category_transient_flusher() { * Filter in a link to a content ID attribute for the next/previous image links on image attachment pages */ function bootstrapwp_enhanced_image_navigation( $url ) { - global $post; + global $post; - if ( wp_attachment_is_image( $post->ID ) ) - $url = $url . '#main'; + if ( wp_attachment_is_image( $post->ID ) ) + $url = $url . '#main'; - return $url; + return $url; } add_filter( 'attachment_link', 'bootstrapwp_enhanced_image_navigation' ); @@ -368,10 +367,10 @@ function bootstrapwp_enhanced_image_navigation( $url ) { | | */ function bootstrapwp_post_thumbnail_check() { - global $post; - if (get_the_post_thumbnail()) { - return true; } - else { return false; } + global $post; + if ( get_the_post_thumbnail() ) { + return true; } + else { return false; } } /* @@ -383,26 +382,26 @@ function bootstrapwp_post_thumbnail_check() { function bootstrapwp_autoset_featured_img() { $post_thumbnail = bootstrapwp_post_thumbnail_check(); - if ($post_thumbnail == true ){ + if ( $post_thumbnail == true ) { return the_post_thumbnail(); } - if ($post_thumbnail == false ){ - $image_args = array( - 'post_type' => 'attachment', - 'numberposts' => 1, - 'post_mime_type' => 'image', - 'post_parent' => $post->ID, - 'order' => 'desc' - ); - $attached_image = get_children( $image_args ); - if ($attached_image) { - foreach ($attached_image as $attachment_id => $attachment) { - set_post_thumbnail($post->ID, $attachment_id); - } - return the_post_thumbnail(); - } else { return " ";} - } - } //end function + if ( $post_thumbnail == false ) { + $image_args = array( + 'post_type' => 'attachment', + 'numberposts' => 1, + 'post_mime_type' => 'image', + 'post_parent' => $post->ID, + 'order' => 'desc' + ); + $attached_image = get_children( $image_args ); + if ( $attached_image ) { + foreach ( $attached_image as $attachment_id => $attachment ) { + set_post_thumbnail( $post->ID, $attachment_id ); + } + return the_post_thumbnail(); + } else { return " ";} + } +} //end function /* @@ -411,7 +410,7 @@ function bootstrapwp_autoset_featured_img() { | ------------------------------------------------------------------- | | */ - function bootstrapwp_breadcrumbs() { +function bootstrapwp_breadcrumbs() { $delimiter = '/'; $home = 'Home'; // text for the 'Home' link @@ -430,44 +429,44 @@ function bootstrapwp_breadcrumbs() { global $wp_query; $cat_obj = $wp_query->get_queried_object(); $thisCat = $cat_obj->term_id; - $thisCat = get_category($thisCat); - $parentCat = get_category($thisCat->parent); - if ($thisCat->parent != 0) echo(get_category_parents($parentCat, TRUE, ' ' . $delimiter . ' ')); - echo $before . 'Archive by category "' . single_cat_title('', false) . '"' . $after; + $thisCat = get_category( $thisCat ); + $parentCat = get_category( $thisCat->parent ); + if ( $thisCat->parent != 0 ) echo get_category_parents( $parentCat, TRUE, ' ' . $delimiter . ' ' ); + echo $before . 'Archive by category "' . single_cat_title( '', false ) . '"' . $after; } elseif ( is_day() ) { - echo '
  • ' . get_the_time('Y') . '
    • ' . $delimiter . ' '; - echo '
  • ' . get_the_time('F') . '
    • ' . $delimiter . ' '; - echo $before . get_the_time('d') . $after; + echo '
  • ' . get_the_time( 'Y' ) . '
    • ' . $delimiter . ' '; + echo '
  • ' . get_the_time( 'F' ) . '
    • ' . $delimiter . ' '; + echo $before . get_the_time( 'd' ) . $after; } elseif ( is_month() ) { - echo '
  • ' . get_the_time('Y') . '
    • ' . $delimiter . ' '; - echo $before . get_the_time('F') . $after; + echo '
  • ' . get_the_time( 'Y' ) . '
    • ' . $delimiter . ' '; + echo $before . get_the_time( 'F' ) . $after; } elseif ( is_year() ) { - echo $before . get_the_time('Y') . $after; + echo $before . get_the_time( 'Y' ) . $after; } elseif ( is_single() && !is_attachment() ) { if ( get_post_type() != 'post' ) { - $post_type = get_post_type_object(get_post_type()); + $post_type = get_post_type_object( get_post_type() ); $slug = $post_type->rewrite; echo '
  • ' . $post_type->labels->singular_name . '
    • ' . $delimiter . ' '; echo $before . get_the_title() . $after; } else { $cat = get_the_category(); $cat = $cat[0]; - echo get_category_parents($cat, TRUE, ' ' . $delimiter . ' '); + echo get_category_parents( $cat, TRUE, ' ' . $delimiter . ' ' ); echo $before . get_the_title() . $after; } } elseif ( !is_single() && !is_page() && get_post_type() != 'post' && !is_404() ) { - $post_type = get_post_type_object(get_post_type()); + $post_type = get_post_type_object( get_post_type() ); echo $before . $post_type->labels->singular_name . $after; } elseif ( is_attachment() ) { - $parent = get_post($post->post_parent); - $cat = get_the_category($parent->ID); $cat = $cat[0]; - echo get_category_parents($cat, TRUE, ' ' . $delimiter . ' '); - echo '
  • ' . $parent->post_title . '
    • ' . $delimiter . ' '; + $parent = get_post( $post->post_parent ); + $cat = get_the_category( $parent->ID ); $cat = $cat[0]; + echo get_category_parents( $cat, TRUE, ' ' . $delimiter . ' ' ); + echo '
  • ' . $parent->post_title . '
    • ' . $delimiter . ' '; echo $before . get_the_title() . $after; } elseif ( is_page() && !$post->post_parent ) { @@ -476,33 +475,33 @@ function bootstrapwp_breadcrumbs() { } elseif ( is_page() && $post->post_parent ) { $parent_id = $post->post_parent; $breadcrumbs = array(); - while ($parent_id) { - $page = get_page($parent_id); - $breadcrumbs[] = '
  • ' . get_the_title($page->ID) . '
    • '; + while ( $parent_id ) { + $page = get_page( $parent_id ); + $breadcrumbs[] = '
  • ' . get_the_title( $page->ID ) . '
    • '; $parent_id = $page->post_parent; } - $breadcrumbs = array_reverse($breadcrumbs); - foreach ($breadcrumbs as $crumb) echo $crumb . ' ' . $delimiter . ' '; + $breadcrumbs = array_reverse( $breadcrumbs ); + foreach ( $breadcrumbs as $crumb ) echo $crumb . ' ' . $delimiter . ' '; echo $before . get_the_title() . $after; } elseif ( is_search() ) { echo $before . 'Search results for "' . get_search_query() . '"' . $after; } elseif ( is_tag() ) { - echo $before . 'Posts tagged "' . single_tag_title('', false) . '"' . $after; + echo $before . 'Posts tagged "' . single_tag_title( '', false ) . '"' . $after; } elseif ( is_author() ) { - global $author; - $userdata = get_userdata($author); + global $author; + $userdata = get_userdata( $author ); echo $before . 'Articles posted by ' . $userdata->display_name . $after; } elseif ( is_404() ) { echo $before . 'Error 404' . $after; } - if ( get_query_var('paged') ) { + if ( get_query_var( 'paged' ) ) { if ( is_category() || is_day() || is_month() || is_year() || is_search() || is_tag() || is_author() ) echo ' ('; - echo __('Page', 'bootstrapwp') . ' ' . get_query_var('paged'); + echo __( 'Page', 'bootstrapwp' ) . ' ' . get_query_var( 'paged' ); if ( is_category() || is_day() || is_month() || is_year() || is_search() || is_tag() || is_author() ) echo ')'; } diff --git a/header.php b/header.php index a63f381f8fc9..9331df673cd2 100755 --- a/header.php +++ b/header.php @@ -7,64 +7,43 @@ * @subpackage Default_Theme * @since WP-Bootstrap 0.1 * - * Last Revised: August 15, 2012 */ ?> > - <?php - /* - * Print the <title> tag based on what is being viewed. - */ - global $page, $paged; - wp_title( '|', true, 'right' ); - - // Add the blog name. - bloginfo( 'name' ); - - // Add the blog description for the home/front page. - $site_description = get_bloginfo( 'description', 'display' ); - if ( $site_description && ( is_home() || is_front_page() ) ) - echo " | $site_description"; - - // Add a page number if necessary: - if ( $paged >= 2 || $page >= 2 ) - echo ' | ' . sprintf( __( 'Page %s', 'bootstrapwp' ), max( $paged, $page ) ); - - ?> - + + <?php wp_title( '|', true, 'right' ); ?> + + - - - - - - + + + + + - + data-spy="scroll" data-target=".bs-docs-sidebar" data-offset="10">
    -
    -
    - + 'main-menu', - 'container_class' => 'nav-collapse', + 'container_class' => 'nav-collapse collapse', 'menu_class' => 'nav', 'fallback_cb' => '', 'menu_id' => 'main-menu', @@ -73,5 +52,4 @@
    - - \ No newline at end of file + \ No newline at end of file diff --git a/ico/apple-touch-icon-114-precomposed.png b/ico/apple-touch-icon-114-precomposed.png index f1c93e6fd97d..790a64f758bf 100644 Binary files a/ico/apple-touch-icon-114-precomposed.png and b/ico/apple-touch-icon-114-precomposed.png differ diff --git a/ico/apple-touch-icon-144-precomposed.png b/ico/apple-touch-icon-144-precomposed.png new file mode 100644 index 000000000000..6d0e463fd36d Binary files /dev/null and b/ico/apple-touch-icon-144-precomposed.png differ diff --git a/ico/apple-touch-icon-57-precomposed.png b/ico/apple-touch-icon-57-precomposed.png index 34b8dd6bdaa3..4936cca83cfe 100644 Binary files a/ico/apple-touch-icon-57-precomposed.png and b/ico/apple-touch-icon-57-precomposed.png differ diff --git a/ico/apple-touch-icon-72-precomposed.png b/ico/apple-touch-icon-72-precomposed.png index 7ec5ff2386e6..b1165bdbddb1 100644 Binary files a/ico/apple-touch-icon-72-precomposed.png and b/ico/apple-touch-icon-72-precomposed.png differ diff --git a/ico/favicon.ico b/ico/favicon.ico index e1c310e416b7..cb8dbdfc429d 100644 Binary files a/ico/favicon.ico and b/ico/favicon.ico differ diff --git a/ico/favicon.png b/ico/favicon.png new file mode 100644 index 000000000000..073c13c0f6e9 Binary files /dev/null and b/ico/favicon.png differ diff --git a/js/bootstrap.js b/js/bootstrap.js index 4baf3759c092..bc2f43f68209 100644 --- a/js/bootstrap.js +++ b/js/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.1.2 + * bootstrap-transition.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -20,13 +20,13 @@ !function ($) { - $(function () { + "use strict"; // jshint ;_; - "use strict"; // jshint ;_; + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) + * ======================================================= */ - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ + $(function () { $.support.transition = (function () { @@ -58,7 +58,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.1.2 + * bootstrap-alert.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -142,12 +142,10 @@ /* ALERT DATA-API * ============== */ - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) + $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) }(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.1.2 + * bootstrap-button.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -233,16 +231,14 @@ /* BUTTON DATA-API * =============== */ - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) + $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.1.2 + * bootstrap-carousel.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -337,9 +333,7 @@ , direction = type == 'next' ? 'left' : 'right' , fallback = type == 'next' ? 'first' : 'last' , that = this - , e = $.Event('slide', { - relatedTarget: $next[0] - }) + , e this.sliding = true @@ -347,6 +341,10 @@ $next = $next.length ? $next : this.$element.find('.item')[fallback]() + e = $.Event('slide', { + relatedTarget: $next[0] + }) + if ($next.hasClass('active')) return if ($.support.transition && this.$element.hasClass('slide')) { @@ -406,18 +404,16 @@ /* CAROUSEL DATA-API * ================= */ - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) + $(document).on('click.carousel.data-api', '[data-slide]', function (e) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , options = $.extend({}, $target.data(), $this.data()) + $target.carousel(options) + e.preventDefault() }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.1.2 + * bootstrap-collapse.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -561,20 +557,18 @@ /* COLLAPSIBLE DATA-API * ==================== */ - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) + $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + , target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + , option = $(target).data('collapse') ? 'toggle' : $this.data() + $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + $(target).collapse(option) }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.1.2 + * bootstrap-dropdown.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -675,8 +669,9 @@ } function clearMenus() { - getParent($(toggle)) - .removeClass('open') + $(toggle).each(function () { + getParent($(this)).removeClass('open') + }) } function getParent($this) { @@ -713,17 +708,14 @@ /* APPLY TO STANDARD DROPDOWN ELEMENTS * =================================== */ - $(function () { - $('html') - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - $('body') - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - }) + $(document) + .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) + .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(window.jQuery);/* ========================================================= - * bootstrap-modal.js v2.1.2 + * bootstrap-modal.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -773,8 +765,6 @@ if (this.isShown || e.isDefaultPrevented()) return - $('body').addClass('modal-open') - this.isShown = true this.escape() @@ -796,13 +786,12 @@ that.$element .addClass('in') .attr('aria-hidden', false) - .focus() that.enforceFocus() transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') + that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : + that.$element.focus().trigger('shown') }) } @@ -820,8 +809,6 @@ this.isShown = false - $('body').removeClass('modal-open') - this.escape() $(document).off('focusin.modal') @@ -891,9 +878,11 @@ this.$backdrop = $('
    ') .appendTo(document.body) - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } + this.$backdrop.click( + this.options.backdrop == 'static' ? + $.proxy(this.$element[0].focus, this.$element[0]) + : $.proxy(this.hide, this) + ) if (doAnimate) this.$backdrop[0].offsetWidth // force reflow @@ -943,25 +932,24 @@ /* MODAL DATA-API * ============== */ - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + , href = $this.attr('href') + , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) - e.preventDefault() + e.preventDefault() - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) + $target + .modal(option) + .one('hide', function () { + $this.focus() + }) }) -}(window.jQuery);/* =========================================================== - * bootstrap-tooltip.js v2.1.2 +}(window.jQuery); +/* =========================================================== + * bootstrap-tooltip.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -1081,9 +1069,9 @@ inside = /in/.test(placement) $tip - .remove() + .detach() .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) + .insertAfter(this.$element) pos = this.getPosition(inside) @@ -1106,7 +1094,7 @@ } $tip - .css(tp) + .offset(tp) .addClass(placement) .addClass('in') } @@ -1128,18 +1116,18 @@ function removeWithAnimation() { var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() + $tip.off($.support.transition.end).detach() }, 500) $tip.one($.support.transition.end, function () { clearTimeout(timeout) - $tip.remove() + $tip.detach() }) } $.support.transition && this.$tip.hasClass('fade') ? removeWithAnimation() : - $tip.remove() + $tip.detach() return this } @@ -1197,8 +1185,9 @@ this.enabled = !this.enabled } - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() + , toggle: function (e) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + self[self.tip().hasClass('in') ? 'hide' : 'show']() } , destroy: function () { @@ -1231,12 +1220,11 @@ , trigger: 'hover' , title: '' , delay: 0 - , html: true + , html: false } -}(window.jQuery); -/* =========================================================== - * bootstrap-popover.js v2.1.2 +}(window.jQuery);/* =========================================================== + * bootstrap-popover.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1338,7 +1326,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-scrollspy.js v2.1.2 + * bootstrap-scrollspy.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1488,7 +1476,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.1.2 + * bootstrap-tab.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1538,7 +1526,7 @@ if ( $this.parent('li').hasClass('active') ) return - previous = $ul.find('.active a').last()[0] + previous = $ul.find('.active:last a')[0] e = $.Event('show', { relatedTarget: previous @@ -1614,15 +1602,13 @@ /* TAB DATA-API * ============ */ - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) + $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.1.2 + * bootstrap-typeahead.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1797,7 +1783,7 @@ .on('keypress', $.proxy(this.keypress, this)) .on('keyup', $.proxy(this.keyup, this)) - if ($.browser.chrome || $.browser.webkit || $.browser.msie) { + if (this.eventSupported('keydown')) { this.$element.on('keydown', $.proxy(this.keydown, this)) } @@ -1806,6 +1792,15 @@ .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) } + , eventSupported: function(eventName) { + var isSupported = eventName in this.$element + if (!isSupported) { + this.$element.setAttribute(eventName, 'return;') + isSupported = typeof this.$element[eventName] === 'function' + } + return isSupported + } + , move: function (e) { if (!this.shown) return @@ -1844,6 +1839,9 @@ switch(e.keyCode) { case 40: // down arrow case 38: // up arrow + case 16: // shift + case 17: // ctrl + case 18: // alt break case 9: // tab @@ -1911,18 +1909,16 @@ /* TYPEAHEAD DATA-API * ================== */ - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) + $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { + var $this = $(this) + if ($this.data('typeahead')) return + e.preventDefault() + $this.typeahead($this.data()) }) }(window.jQuery); /* ========================================================== - * bootstrap-affix.js v2.1.2 + * bootstrap-affix.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc. @@ -1951,7 +1947,9 @@ var Affix = function (element, options) { this.options = $.extend({}, $.fn.affix.defaults, options) - this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) + this.$window = $(window) + .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) this.$element = $(element) this.checkPosition() } diff --git a/js/bootstrap.min.js b/js/bootstrap.min.js index c1cc4a7fc9fd..502b1d6c87d2 100644 --- a/js/bootstrap.min.js +++ b/js/bootstrap.min.js @@ -1,6 +1,6 @@ /** -* Bootstrap.js v2.1.2 by @fat & @mdo +* Bootstrap.js v2.2.2 by @fat & @mdo * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ -!function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

    '})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
      ',item:'
      • ',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file +!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0]});if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(document).on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.detach().css({top:0,left:0,display:"block"}).insertAfter(this.$element),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.offset(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.detach(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);n[n.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
      ',trigger:"hover",title:"",delay:0,html:!1}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

      '})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
        ',item:'
        • ',minLength:1},e.fn.typeahead.Constructor=t,e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/js/bootstrapwp.demo.js b/js/bootstrapwp.demo.js index 0d25a8ba94df..a43a3ea593d8 100644 --- a/js/bootstrapwp.demo.js +++ b/js/bootstrapwp.demo.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrapwp.demo.js v.90 + * bootstrapwp.demo.js v.91 * =================================================== // NOTICE!! This JS file is included for reference. diff --git a/page.php b/page.php index 5fc8d7e7ee26..26c9c3d9ad17 100755 --- a/page.php +++ b/page.php @@ -9,17 +9,16 @@ * @subpackage WP-Bootstrap * @since WP-Bootstrap 0.1 * - * Last Revised: July 16, 2012 */ - get_header(); ?> -
        -
        - -
        +
        +
        +
        + +
        -
        +

        diff --git a/single.php b/single.php index f1422fd1fa8e..7d1cc8e47a13 100755 --- a/single.php +++ b/single.php @@ -13,12 +13,12 @@ get_header(); ?> -
        -
        - -
        +
        +
        +
        + +
        -

        diff --git a/templates-documentation/assets/css/docs.css b/templates-documentation/assets/css/docs.css new file mode 100644 index 000000000000..2c8e2055769a --- /dev/null +++ b/templates-documentation/assets/css/docs.css @@ -0,0 +1,1034 @@ +/* Add additional stylesheets below +-------------------------------------------------- */ +/* + Bootstrap's documentation styles + Special styles for presenting Bootstrap's documentation and examples +*/ + + + +/* Body and structure +-------------------------------------------------- */ + +body { + position: relative; +} + +/* Code in headings */ +h3 code { + font-size: 14px; + font-weight: normal; +} + + + +/* Tweak navbar brand link to be super sleek +-------------------------------------------------- */ + +body > .navbar { + font-size: 13px; +} + +/* Change the docs' brand */ +body > .navbar .brand { + padding-right: 0; + padding-left: 0; + margin-left: 20px; + float: right; + font-weight: bold; + color: #000; + text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); + -webkit-transition: all .2s linear; + -moz-transition: all .2s linear; + transition: all .2s linear; +} +body > .navbar .brand:hover { + text-decoration: none; + text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.4); +} + + +/* Sections +-------------------------------------------------- */ + +/* padding for in-page bookmarks and fixed navbar */ +section { + padding-top: 30px; +} +section > .page-header, +section > .lead { + color: #5a5a5a; +} +section > ul li { + margin-bottom: 5px; +} + +/* Separators (hr) */ +.bs-docs-separator { + margin: 40px 0 39px; +} + +/* Faded out hr */ +hr.soften { + height: 1px; + margin: 70px 0; + background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0)); + border: 0; +} + + + +/* Jumbotrons +-------------------------------------------------- */ + +/* Base class +------------------------- */ +.jumbotron { + position: relative; + padding: 40px 0; + color: #fff; + text-align: center; + text-shadow: 0 1px 3px rgba(0,0,0,.4), 0 0 30px rgba(0,0,0,.075); + background: #020031; /* Old browsers */ + background: -moz-linear-gradient(45deg, #020031 0%, #6d3353 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#6d3353)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */ + background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ + -webkit-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); + -moz-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); + box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2); +} +.jumbotron h1 { + font-size: 80px; + font-weight: bold; + letter-spacing: -1px; + line-height: 1; +} +.jumbotron p { + font-size: 24px; + font-weight: 300; + line-height: 1.25; + margin-bottom: 30px; +} + +/* Link styles (used on .masthead-links as well) */ +.jumbotron a { + color: #fff; + color: rgba(255,255,255,.5); + -webkit-transition: all .2s ease-in-out; + -moz-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; +} +.jumbotron a:hover { + color: #fff; + text-shadow: 0 0 10px rgba(255,255,255,.25); +} + +/* Download button */ +.masthead .btn { + padding: 19px 24px; + font-size: 24px; + font-weight: 200; + color: #fff; /* redeclare to override the `.jumbotron a` */ + border: 0; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + -webkit-transition: none; + -moz-transition: none; + transition: none; +} +.masthead .btn:hover { + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); +} +.masthead .btn:active { + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); + box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); +} + + +/* Pattern overlay +------------------------- */ +.jumbotron .container { + position: relative; + z-index: 2; +} +.jumbotron:after { + content: ''; + display: block; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: url(../img/bs-docs-masthead-pattern.png) repeat center center; + opacity: .4; +} +@media +only screen and (-webkit-min-device-pixel-ratio: 2), +only screen and ( min--moz-device-pixel-ratio: 2), +only screen and ( -o-min-device-pixel-ratio: 2/1) { + + .jumbotron:after { + background-size: 150px 150px; + } + +} + +/* Masthead (docs home) +------------------------- */ +.masthead { + padding: 70px 0 80px; + margin-bottom: 0; + color: #fff; +} +.masthead h1 { + font-size: 120px; + line-height: 1; + letter-spacing: -2px; +} +.masthead p { + font-size: 40px; + font-weight: 200; + line-height: 1.25; +} + +/* Textual links in masthead */ +.masthead-links { + margin: 0; + list-style: none; +} +.masthead-links li { + display: inline; + padding: 0 10px; + color: rgba(255,255,255,.25); +} + +/* Social proof buttons from GitHub & Twitter */ +.bs-docs-social { + padding: 15px 0; + text-align: center; + background-color: #f5f5f5; + border-top: 1px solid #fff; + border-bottom: 1px solid #ddd; +} + +/* Quick links on Home */ +.bs-docs-social-buttons { + margin-left: 0; + margin-bottom: 0; + padding-left: 0; + list-style: none; +} +.bs-docs-social-buttons li { + display: inline-block; + padding: 5px 8px; + line-height: 1; + *display: inline; + *zoom: 1; +} + +/* Subhead (other pages) +------------------------- */ +.subhead { + text-align: left; + border-bottom: 1px solid #ddd; +} +.subhead h1 { + font-size: 60px; +} +.subhead p { + margin-bottom: 20px; +} +.subhead .navbar { + display: none; +} + + + +/* Marketing section of Overview +-------------------------------------------------- */ + +.marketing { + text-align: center; + color: #5a5a5a; +} +.marketing h1 { + margin: 60px 0 10px; + font-size: 60px; + font-weight: 200; + line-height: 1; + letter-spacing: -1px; +} +.marketing h2 { + font-weight: 200; + margin-bottom: 5px; +} +.marketing p { + font-size: 16px; + line-height: 1.5; +} +.marketing .marketing-byline { + margin-bottom: 40px; + font-size: 20px; + font-weight: 300; + line-height: 1.25; + color: #999; +} +.marketing img { + display: block; + margin: 0 auto 30px; +} + + + +/* Footer +-------------------------------------------------- */ + +.footer { + padding: 70px 0; + margin-top: 70px; + border-top: 1px solid #e5e5e5; + background-color: #f5f5f5; +} +.footer p { + margin-bottom: 0; + color: #777; +} +.footer-links { + margin: 10px 0; +} +.footer-links li { + display: inline; + padding: 0 2px; +} +.footer-links li:first-child { + padding-left: 0; +} + + + +/* Special grid styles +-------------------------------------------------- */ + +.show-grid { + margin-top: 10px; + margin-bottom: 20px; +} +.show-grid [class*="span"] { + background-color: #eee; + text-align: center; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + min-height: 40px; + line-height: 40px; +} +.show-grid:hover [class*="span"] { + background: #ddd; +} +.show-grid .show-grid { + margin-top: 0; + margin-bottom: 0; +} +.show-grid .show-grid [class*="span"] { + margin-top: 5px; +} +.show-grid [class*="span"] [class*="span"] { + background-color: #ccc; +} +.show-grid [class*="span"] [class*="span"] [class*="span"] { + background-color: #999; +} + + + +/* Mini layout previews +-------------------------------------------------- */ +.mini-layout { + border: 1px solid #ddd; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.075); + -moz-box-shadow: 0 1px 2px rgba(0,0,0,.075); + box-shadow: 0 1px 2px rgba(0,0,0,.075); +} +.mini-layout, +.mini-layout .mini-layout-body, +.mini-layout.fluid .mini-layout-sidebar { + height: 300px; +} +.mini-layout { + margin-bottom: 20px; + padding: 9px; +} +.mini-layout div { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.mini-layout .mini-layout-body { + background-color: #dceaf4; + margin: 0 auto; + width: 70%; +} +.mini-layout.fluid .mini-layout-sidebar, +.mini-layout.fluid .mini-layout-header, +.mini-layout.fluid .mini-layout-body { + float: left; +} +.mini-layout.fluid .mini-layout-sidebar { + background-color: #bbd8e9; + width: 20%; +} +.mini-layout.fluid .mini-layout-body { + width: 77.5%; + margin-left: 2.5%; +} + + + +/* Download page +-------------------------------------------------- */ + +.download .page-header { + margin-top: 36px; +} +.page-header .toggle-all { + margin-top: 5px; +} + +/* Space out h3s when following a section */ +.download h3 { + margin-bottom: 5px; +} +.download-builder input + h3, +.download-builder .checkbox + h3 { + margin-top: 9px; +} + +/* Fields for variables */ +.download-builder input[type=text] { + margin-bottom: 9px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 12px; + color: #d14; +} +.download-builder input[type=text]:focus { + background-color: #fff; +} + +/* Custom, larger checkbox labels */ +.download .checkbox { + padding: 6px 10px 6px 25px; + font-size: 13px; + line-height: 18px; + color: #555; + background-color: #f9f9f9; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + cursor: pointer; +} +.download .checkbox:hover { + color: #333; + background-color: #f5f5f5; +} +.download .checkbox small { + font-size: 12px; + color: #777; +} + +/* Variables section */ +#variables label { + margin-bottom: 0; +} + +/* Giant download button */ +.download-btn { + margin: 36px 0 108px; +} +#download p, +#download h4 { + max-width: 50%; + margin: 0 auto; + color: #999; + text-align: center; +} +#download h4 { + margin-bottom: 0; +} +#download p { + margin-bottom: 18px; +} +.download-btn .btn { + display: block; + width: auto; + padding: 19px 24px; + margin-bottom: 27px; + font-size: 30px; + line-height: 1; + text-align: center; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} + + + +/* Misc +-------------------------------------------------- */ + +/* Make tables spaced out a bit more */ +h2 + table, +h3 + table, +h4 + table, +h2 + .row { + margin-top: 5px; +} + +/* Example sites showcase */ +.example-sites { + xmargin-left: 20px; +} +.example-sites img { + max-width: 100%; + margin: 0 auto; +} + +.scrollspy-example { + height: 200px; + overflow: auto; + position: relative; +} + + +/* Fake the :focus state to demo it */ +.focused { + border-color: rgba(82,168,236,.8); + -webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + outline: 0; +} + +/* For input sizes, make them display block */ +.docs-input-sizes select, +.docs-input-sizes input[type=text] { + display: block; + margin-bottom: 9px; +} + +/* Icons +------------------------- */ +.the-icons { + margin-left: 0; + list-style: none; +} +.the-icons li { + float: left; + width: 25%; + line-height: 25px; +} +.the-icons [class^="icon-"] { + vertical-align: middle; + margin-right: 3px; +} +.the-icons li:hover [class^="icon-"] { + background-color: rgba(255,0,0,.25); +} + +/* Example page +------------------------- */ +.bootstrap-examples p { + font-size: 13px; + line-height: 18px; +} +.bootstrap-examples .thumbnail { + margin-bottom: 9px; + background-color: #fff; +} + + + +/* Bootstrap code examples +-------------------------------------------------- */ + +/* Base class */ +.bs-docs-example { + position: relative; + margin: 15px 0; + padding: 39px 19px 14px; + *padding-top: 19px; + background-color: #fff; + border: 1px solid #ddd; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + +/* Echo out a label for the example */ +.bs-docs-example:after { + content: "Example"; + position: absolute; + top: -1px; + left: -1px; + padding: 3px 7px; + font-size: 12px; + font-weight: bold; + background-color: #f5f5f5; + border: 1px solid #ddd; + color: #9da0a4; + -webkit-border-radius: 4px 0 4px 0; + -moz-border-radius: 4px 0 4px 0; + border-radius: 4px 0 4px 0; +} + +/* Remove spacing between an example and it's code */ +.bs-docs-example + .prettyprint { + margin-top: -20px; + padding-top: 15px; +} + +/* Tweak examples +------------------------- */ +.bs-docs-example > p:last-child { + margin-bottom: 0; +} +.bs-docs-example .table, +.bs-docs-example .progress, +.bs-docs-example .well, +.bs-docs-example .alert, +.bs-docs-example .hero-unit, +.bs-docs-example .pagination, +.bs-docs-example .navbar, +.bs-docs-example > .nav, +.bs-docs-example blockquote { + margin-bottom: 5px; +} +.bs-docs-example .pagination { + margin-top: 0; +} +.bs-navbar-top-example, +.bs-navbar-bottom-example { + z-index: 1; + padding: 0; + height: 90px; + overflow: hidden; /* cut the drop shadows off */ +} +.bs-navbar-top-example .navbar-fixed-top, +.bs-navbar-bottom-example .navbar-fixed-bottom { + margin-left: 0; + margin-right: 0; +} +.bs-navbar-top-example { + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-radius: 0 0 4px 4px; +} +.bs-navbar-top-example:after { + top: auto; + bottom: -1px; + -webkit-border-radius: 0 4px 0 4px; + -moz-border-radius: 0 4px 0 4px; + border-radius: 0 4px 0 4px; +} +.bs-navbar-bottom-example { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.bs-navbar-bottom-example .navbar { + margin-bottom: 0; +} +form.bs-docs-example { + padding-bottom: 19px; +} + +/* Images */ +.bs-docs-example-images img { + margin: 10px; + display: inline-block; +} + +/* Tooltips */ +.bs-docs-tooltip-examples { + text-align: center; + margin: 0 0 10px; + list-style: none; +} +.bs-docs-tooltip-examples li { + display: inline; + padding: 0 10px; +} + +/* Popovers */ +.bs-docs-example-popover { + padding-bottom: 24px; + background-color: #f9f9f9; +} +.bs-docs-example-popover .popover { + position: relative; + display: block; + float: left; + width: 260px; + margin: 20px; +} + + + +/* Responsive docs +-------------------------------------------------- */ + +/* Utility classes table +------------------------- */ +.responsive-utilities th small { + display: block; + font-weight: normal; + color: #999; +} +.responsive-utilities tbody th { + font-weight: normal; +} +.responsive-utilities td { + text-align: center; +} +.responsive-utilities td.is-visible { + color: #468847; + background-color: #dff0d8 !important; +} +.responsive-utilities td.is-hidden { + color: #ccc; + background-color: #f9f9f9 !important; +} + +/* Responsive tests +------------------------- */ +.responsive-utilities-test { + margin-top: 5px; + margin-left: 0; + list-style: none; + overflow: hidden; /* clear floats */ +} +.responsive-utilities-test li { + position: relative; + float: left; + width: 25%; + height: 43px; + font-size: 14px; + font-weight: bold; + line-height: 43px; + color: #999; + text-align: center; + border: 1px solid #ddd; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.responsive-utilities-test li + li { + margin-left: 10px; +} +.responsive-utilities-test span { + position: absolute; + top: -1px; + left: -1px; + right: -1px; + bottom: -1px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.responsive-utilities-test span { + color: #468847; + background-color: #dff0d8; + border: 1px solid #d6e9c6; +} + + + +/* Sidenav for Docs +-------------------------------------------------- */ + +.bs-docs-sidenav { + width: 228px; + margin: 30px 0 0; + padding: 0; + background-color: #fff; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065); + -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065); + box-shadow: 0 1px 4px rgba(0,0,0,.065); +} +.bs-docs-sidenav > li > a { + display: block; + width: 190px \9; + margin: 0 0 -1px; + padding: 8px 14px; + border: 1px solid #e5e5e5; +} +.bs-docs-sidenav > li:first-child > a { + -webkit-border-radius: 6px 6px 0 0; + -moz-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; +} +.bs-docs-sidenav > li:last-child > a { + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; +} +.bs-docs-sidenav > .active > a { + position: relative; + z-index: 2; + padding: 9px 15px; + border: 0; + text-shadow: 0 1px 0 rgba(0,0,0,.15); + -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1); + -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1); + box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1); +} +/* Chevrons */ +.bs-docs-sidenav .icon-chevron-right { + float: right; + margin-top: 2px; + margin-right: -6px; + opacity: .25; +} +.bs-docs-sidenav > li > a:hover { + background-color: #f5f5f5; +} +.bs-docs-sidenav a:hover .icon-chevron-right { + opacity: .5; +} +.bs-docs-sidenav .active .icon-chevron-right, +.bs-docs-sidenav .active a:hover .icon-chevron-right { + background-image: url(../img/glyphicons-halflings-white.png); + opacity: 1; +} +.bs-docs-sidenav.affix { + top: 40px; +} +.bs-docs-sidenav.affix-bottom { + position: absolute; + top: auto; + bottom: 270px; +} + + + + +/* Responsive +-------------------------------------------------- */ + +/* Desktop large +------------------------- */ +@media (min-width: 1200px) { + .bs-docs-container { + max-width: 970px; + } + .bs-docs-sidenav { + width: 258px; + } + .bs-docs-sidenav > li > a { + width: 230px \9; /* Override the previous IE8-9 hack */ + } +} + +/* Desktop +------------------------- */ +@media (max-width: 980px) { + /* Unfloat brand */ + body > .navbar-fixed-top .brand { + float: left; + margin-left: 0; + padding-left: 10px; + padding-right: 10px; + } + + /* Inline-block quick links for more spacing */ + .quick-links li { + display: inline-block; + margin: 5px; + } + + /* When affixed, space properly */ + .bs-docs-sidenav { + top: 0; + margin-top: 30px; + margin-right: 0; + } +} + +/* Tablet to desktop +------------------------- */ +@media (min-width: 768px) and (max-width: 980px) { + /* Remove any padding from the body */ + body { + padding-top: 0; + } + /* Widen masthead and social buttons to fill body padding */ + .jumbotron { + margin-top: -20px; /* Offset bottom margin on .navbar */ + } + /* Adjust sidenav width */ + .bs-docs-sidenav { + width: 166px; + margin-top: 20px; + } + .bs-docs-sidenav.affix { + top: 0; + } +} + +/* Tablet +------------------------- */ +@media (max-width: 767px) { + /* Remove any padding from the body */ + body { + padding-top: 0; + } + + /* Widen masthead and social buttons to fill body padding */ + .jumbotron { + padding: 40px 20px; + margin-top: -20px; /* Offset bottom margin on .navbar */ + margin-right: -20px; + margin-left: -20px; + } + .masthead h1 { + font-size: 90px; + } + .masthead p, + .masthead .btn { + font-size: 24px; + } + .marketing .span4 { + margin-bottom: 40px; + } + .bs-docs-social { + margin: 0 -20px; + } + + /* Space out the show-grid examples */ + .show-grid [class*="span"] { + margin-bottom: 5px; + } + + /* Sidenav */ + .bs-docs-sidenav { + width: auto; + margin-bottom: 20px; + } + .bs-docs-sidenav.affix { + position: static; + width: auto; + top: 0; + } + + /* Unfloat the back to top link in footer */ + .footer { + margin-left: -20px; + margin-right: -20px; + padding-left: 20px; + padding-right: 20px; + } + .footer p { + margin-bottom: 9px; + } +} + +/* Landscape phones +------------------------- */ +@media (max-width: 480px) { + /* Remove padding above jumbotron */ + body { + padding-top: 0; + } + + /* Change up some type stuff */ + h2 small { + display: block; + } + + /* Downsize the jumbotrons */ + .jumbotron h1 { + font-size: 45px; + } + .jumbotron p, + .jumbotron .btn { + font-size: 18px; + } + .jumbotron .btn { + display: block; + margin: 0 auto; + } + + /* center align subhead text like the masthead */ + .subhead h1, + .subhead p { + text-align: center; + } + + /* Marketing on home */ + .marketing h1 { + font-size: 30px; + } + .marketing-byline { + font-size: 18px; + } + + /* center example sites */ + .example-sites { + margin-left: 0; + } + .example-sites > li { + float: none; + display: block; + max-width: 280px; + margin: 0 auto 18px; + text-align: center; + } + .example-sites .thumbnail > img { + max-width: 270px; + } + + /* Do our best to make tables work in narrow viewports */ + table code { + white-space: normal; + word-wrap: break-word; + word-break: break-all; + } + + /* Modal example */ + .modal-example .modal { + position: relative; + top: auto; + right: auto; + bottom: auto; + left: auto; + } + + /* Tighten up footer */ + .footer { + padding-top: 20px; + padding-bottom: 20px; + } + /* Unfloat the back to top in footer to prevent odd text wrapping */ + .footer .pull-right { + float: none; + } +} diff --git a/js/google-code-prettify/prettify.css b/templates-documentation/assets/google-code-prettify/prettify.css similarity index 100% rename from js/google-code-prettify/prettify.css rename to templates-documentation/assets/google-code-prettify/prettify.css diff --git a/js/google-code-prettify/prettify.js b/templates-documentation/assets/google-code-prettify/prettify.js similarity index 100% rename from js/google-code-prettify/prettify.js rename to templates-documentation/assets/google-code-prettify/prettify.js diff --git a/page-styleguide.php b/templates-documentation/page-base-css.php similarity index 85% rename from page-styleguide.php rename to templates-documentation/page-base-css.php index f42edc5894cd..3ece07137db6 100644 --- a/page-styleguide.php +++ b/templates-documentation/page-base-css.php @@ -1,17 +1,18 @@ +get_header(); +wp_enqueue_script('prettify-js'); +wp_enqueue_style('prettify-css'); +wp_enqueue_style('docs-css'); +?> - +

        Base CSS

        @@ -19,8 +20,9 @@
        -
        -
        @@ -94,14 +96,14 @@

        Bold

        -

        For emphasizing a snippet of text with important

        +

        For emphasizing a snippet of text with a heavier font-weight.

        The following snippet of text is rendered as bold text.

        <strong>rendered as bold text</strong>

        Italics

        -

        For emphasizing a snippet of text with stress

        +

        For emphasizing a snippet of text with italics.

        The following snippet of text is rendered as italicized text.

        @@ -131,7 +133,7 @@

        Abbreviations

        -

        Stylized implemenation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.

        +

        Stylized implementation of HTML's <abbr> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.

        <abbr>

        For expanded text on long hover of an abbreviation, include the title attribute.

        @@ -165,7 +167,7 @@
        Full Name
        - first.last@gmail.com + first.last@example.com 
        @@ -178,7 +180,7 @@
 
 <address>
   <strong>Full Name</strong><br>
-  <a href="mailto:#">first.last@gmail.com</a>
+  <a href="mailto:#">first.last@example.com</a>
 </address>
        @@ -289,7 +291,7 @@

        Unstyled

        -

        A list of items with no list-style or additional left padding.

        +

        Remove the default list-style and left padding on list items (immediate children only).

        • Lorem ipsum dolor sit amet
          • @@ -313,6 +315,21 @@ <ul class="unstyled"> <li>...</li> </ul> + + +

          Inline

          +

          Place all list items on a single line with inline-block and some light padding.

          +
          +
            +
          • Lorem ipsum
            • +
          • Phasellus iaculis
            • +
          • Nulla volutpat
            • +
          +
          +
          +<ul class="inline">
+  <li>...</li>
+</ul>

          Description

          @@ -448,7 +465,7 @@

          Optional classes

          -

          Add any of the follow classes to the .table base class.

          +

          Add any of the following classes to the .table base class.

          .table-striped

          Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE7-IE8).

          @@ -814,25 +831,29 @@

          Default styles

          Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.

          - Legend - - - Example block-level help text here. - - +
          + Legend + + + Example block-level help text here. + + + 
           <form>
-  <legend>Legend</legend>
-  <label>Label name</label>
-  <input type="text" placeholder="Type something…">
-  <span class="help-block">Example block-level help text here.</span>
-  <label class="checkbox">
-    <input type="checkbox"> Check me out
-  </label>
-  <button type="submit" class="btn">Submit</button>
+  <fieldset>
+    <legend>Legend</legend>
+    <label>Label name</label>
+    <input type="text" placeholder="Type something…">
+    <span class="help-block">Example block-level help text here.</span>
+    <label class="checkbox">
+      <input type="checkbox"> Check me out
+    </label>
+    <button type="submit" class="btn">Submit</button>
+  </fieldset>
 </form>
          @@ -886,7 +907,6 @@
        • Wrap any associated controls in .controls for proper alignment
        - Legend
        @@ -1070,20 +1090,22 @@
        @ - +

        - + .00 
         <div class="input-prepend">
-  <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text" placeholder="Username">
+  <span class="add-on">@</span>
+  <input class="span2" id="prependedInput" type="text" placeholder="Username">
 </div>
 <div class="input-append">
-  <input class="span2" id="appendedInput" size="16" type="text"><span class="add-on">.00</span>
+  <input class="span2" id="appendedInput" type="text">
+  <span class="add-on">.00</span>
 </div>
        @@ -1092,13 +1114,15 @@
        $ - + .00 
         <div class="input-prepend input-append">
-  <span class="add-on">$</span><input class="span2" id="appendedPrependedInput" size="16" type="text"><span class="add-on">.00</span>
+  <span class="add-on">$</span>
+  <input class="span2" id="appendedPrependedInput" type="text">
+  <span class="add-on">.00</span>
 </div>
        @@ -1106,24 +1130,188 @@

        Instead of a <span> with text, use a .btn to attach a button (or two) to an input.

        - +
        -
        +
        +
        +<div class="input-append">
+  <input class="span2" id="appendedInputButton" type="text">
+  <button class="btn" type="button">Go!</button>
+</div>
+
        +
        - + 
         <div class="input-append">
-  <input class="span2" id="appendedInputButton" size="16" type="text"><button class="btn" type="button">Go!</button>
+  <input class="span2" id="appendedInputButtons" type="text">
+  <button class="btn" type="button">Search</button>
+  <button class="btn" type="button">Options</button>
 </div>
+
        +

        Button dropdowns

        +

        +
        +
        + +
        + + +
        +
        +
        +
         <div class="input-append">
-  <input class="span2" id="appendedInputButtons" size="16" type="text"><button class="btn" type="button">Search</button><button class="btn" type="button">Options</button>
+  <input class="span2" id="appendedDropdownButton" type="text">
+  <div class="btn-group">
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      Action
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </div>
+</div>
+
        + +
        +
        +
        + + +
        + +
        +
        +
        +<div class="input-prepend">
+  <div class="btn-group">
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      Action
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </div>
+  <input class="span2" id="prependedDropdownButton" type="text">
+</div>
+
        + +
        +
        +
        + + +
        + +
        + + +
        +
        +
        +
        +<div class="input-prepend input-append">
+  <div class="btn-group">
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      Action
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </div>
+  <input class="span2" id="appendedPrependedDropdownButton" type="text">
+  <div class="btn-group">
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      Action
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </div>
 </div>
+
        + +

        Segmented dropdown groups

        +
        +
        +
        + + + +
        + +
        +
        + +
        + + + +
        +
        +
        +
        +<form>
+  <div class="input-prepend">
+    <div class="btn-group">...</div>
+    <input type="text">
+  </div>
+  <div class="input-append">
+    <input type="text">
+    <div class="btn-group">...</div>
+  </div>
+</form>

        Search form

        @@ -1153,6 +1341,17 @@

        Control sizing

        Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.

        +

        Block level inputs

        +

        Make any <input> or <textarea> element behave like a block level element.

        +
        +
        + +
        +
        +
        +<input class="input-block-level" type="text" placeholder=".input-block-level">
+
        +

        Relative sizing

        @@ -1311,6 +1510,15 @@ 
         <input class="input-xlarge" id="focusedInput" type="text" value="This is focused...">
+
        + +

        Invalid inputs

        +

        Style inputs via default browser functionality with :invalid. Specify a type and add the required attribute.

        +
        + +
        +
        +<input class="span3" type="email" required>

        Disabled inputs

        @@ -1341,9 +1549,9 @@
        - +
        - + Username is taken
        @@ -1578,11 +1786,12 @@ ================================================== -->
        -

        Icons by Glyphicons

        +

        Icons font by Glyphicons

        -

        Icon glyphs

        -

        140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.

        +

        Included glyphs

        +

        Bootstrap comes with all 160 of Glyphicons Halflings set, all available in font formats for easy coloring, sizing, and placement.

        +
        • icon-glass
        • icon-music
          • @@ -1728,27 +1937,46 @@
        • icon-filter
        • icon-briefcase
        • icon-fullscreen
          • + +
        • icon-dashboard
          • +
        • icon-paperclip
          • +
        • icon-heart-empty
          • +
        • icon-link
          • +
        • icon-phone
          • +
        • icon-pushpin
          • +
        • icon-euro
          • +
        • icon-usd
          • +
        • icon-gbp
          • +
        • icon-sort
          • +
        • icon-sort-by-alphabet
          • +
        • icon-sort-by-alphabet-alt
          • +
        • icon-sort-by-order
          • +
        • icon-sort-by-order-alt
          • +
        • icon-sort-by-attributes
          • +
        • icon-sort-by-attributes-alt
          • +
        • icon-unchecked
          • +
        • icon-expand
          • +
        • icon-collapse
          • +
        • icon-collapse-top
          • +

        Glyphicons attribution

        -

        Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

        +

        Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

        How to use

        -

        All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:

        +

        Add the appropriate class to any inline element. All icon classes are prefixed with icon- for easy styling. To use, place the following code just about anywhere:

         <i class="icon-search"></i>
        -

        There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.

        -
        -<i class="icon-search icon-white"></i>
-
        +

        Want to change the icon color? Just change the color of the parent element.

        Heads up! - When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing. + When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.

        @@ -1867,6 +2095,7 @@ +
        @@ -1875,4 +2104,4 @@ - \ No newline at end of file + diff --git a/page-componentsguide.php b/templates-documentation/page-components.php similarity index 87% rename from page-componentsguide.php rename to templates-documentation/page-components.php index 3c9b3f282ec8..75e2920b18b5 100644 --- a/page-componentsguide.php +++ b/templates-documentation/page-components.php @@ -1,20 +1,20 @@ +get_header(); +wp_enqueue_script('prettify-js'); +wp_enqueue_style('prettify-css'); +wp_enqueue_style('docs-css'); +?> -

        @@ -24,7 +24,6 @@
        -
        @@ -42,6 +41,7 @@
      • Thumbnails
      • Alerts
      • Progress bars
        • +
      • Media object
      • Misc
        • @@ -57,7 +57,7 @@

        Example

        -

        Toggleable, contextual menu for displaying lists of links. Made interactive with the dropdown javascript plugin.

        +

        Toggleable, contextual menu for displaying lists of links. Made interactive with the dropdown JavaScript plugin.

        -
        +
        -
        @@ -45,7 +47,6 @@
        -
        @@ -54,7 +55,7 @@

        Individual or compiled

        -

        If you have downloaded the latest version of Bootstrap, both bootstrap.js and bootstrap.min.js contain all of the plugins listed on this page.

        +

        Plugins can be included individually (though some have required dependencies), or all at once. Both bootstrap.js and bootstrap.min.js contain all plugins in a single file.

        Data attributes

        You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API and should be your first consideration when using a plugin.

        @@ -62,7 +63,7 @@

        That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this: 

        $('body').off('.data-api')
        -

        Alternatively, to target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this:

        +

        Alternatively, to target a specific plugin, just include the plugin's name as a namespace along with the data-api namespace like this:

        $('body').off('.alert.data-api')

        Programmatic API

        @@ -74,11 +75,11 @@ $("#myModal").modal({ keyboard: false }) // initialized with no keyboard $("#myModal").modal('show') // initializes and invokes show immediately

        -

        Each plugin also exposes it's raw constructor on a `Constructor` property: $.fn.popover.Constructor. If you'd like to get a particular plugin instance, retrieve it directly from an element: $('[rel=popover]').data('popover').

        +

        Each plugin also exposes its raw constructor on a `Constructor` property: $.fn.popover.Constructor. If you'd like to get a particular plugin instance, retrieve it directly from an element: $('[rel=popover]').data('popover').

        Events

        -

        Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and it's past participle form (ex. shown) is trigger on the completion of an action.

        -

        All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.

        +

        Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and its past participle form (ex. shown) is trigger on the completion of an action.

        +

        All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.

         $('#myModal').on('show', function (e) {
     if (!data) return e.preventDefault() // stops modal from being shown
@@ -123,13 +124,13 @@
           
        Static example
        
           
        A rendered modal with header, body, and set of actions in the footer.
        
           
        
-            
        
+            
        
               
        
                 
                 
        Modal header
        
               
        
               
        
-                
        One fine body…
        
+                
        One fine body…
        
               
        
               
        
                 Close
@@ -144,7 +145,7 @@
     <h3>Modal header</h3>
   </div>
   <div class="modal-body">
-    <p>One fine body…</p>
+    <p>One fine body…</p>
   </div>
   <div class="modal-footer">
     <a href="#" class="btn">Close</a>
@@ -166,7 +167,7 @@
               
        Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.
        
 
               
        Popover in a modal
        
-              
        This button should trigger a popover on hover.
        
+              
        This button should trigger a popover on click.
        
 
               
        Tooltips in a modal
        
               
        This link and that link should have tooltips on hover.
        
@@ -191,17 +192,17 @@
             Launch demo modal
           
        
 
        -<-- Button to trigger modal -->
+<!-- Button to trigger modal -->
 <a href="#myModal" role="button" class="btn" data-toggle="modal">Launch demo modal</a>
 
-<-- Modal -->
-<div class="modal" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<!-- Modal -->
+<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="myModalLabel">Modal header</h3>
   </div>
   <div class="modal-body">
-    <p>One fine body…</p>
+    <p>One fine body…</p>
   </div>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
@@ -448,8 +449,8 @@
           
        None
        
 
           
        Methods
        
-          
        $().dropdown()
        
-          
        A programatic api for activating menus for a given navbar or tabbed navigation.
        
+          
        $().dropdown('toggle')
        
+          
        A programmatic api for toggling menus for a given navbar or tabbed navigation.
        
         
 
 
@@ -578,7 +579,7 @@
 
 
           
        Example tabs
        
-          
        Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.
        
+          
        Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.
        
           
        
             
        
 
+        
        Four directions
        
+        
        
+          
+        
        
+
 
         
        
 
@@ -896,7 +907,7 @@
            
              html
              boolean
-             true
+             false
              Insert html into the popover. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks.
            
            
@@ -1348,21 +1359,21 @@
               
        
 
           
        Fluid nesting
        
-          
        Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.
        
+          
        Fluid grids utilize nesting differently: each nested level of columns should add up to 12 columns. This is because the fluid grid uses percentages, not pixels, for setting widths.
        
           
        
             
        
               Fluid 12
               
        
                 
        
                   Fluid 6
+                  
        
+                    
        
+                      Fluid 6
+                    
        
+                    
        
+                      Fluid 6
+                    
        
+                  
        
                 
        
                 
        
                   Fluid 6
@@ -263,7 +274,13 @@
   <div class="span12">
     Fluid 12
     <div class="row-fluid">
-      <div class="span6">Fluid 6</div>
+      <div class="span6">
+        Fluid 6
+        <div class="row-fluid">
+          <div class="span6">Fluid 6</div>
+          <div class="span6">Fluid 6</div>
+        </div>
+      </div>
       <div class="span6">Fluid 6</div>
     </div>
   </div>
@@ -452,7 +469,7 @@
           
 
           
        When to use
        
-          
        Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.
        
+          
        Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. Responsive utilities should not be used with tables, and as such are not supported.
        
 
           
        Responsive utilities test case
        
           
        Resize your browser or load on different devices to test the above classes.
        
@@ -479,5 +496,6 @@
     
        
 
   
        
-
+
+    
 
\ No newline at end of file
diff --git a/page-blog.php b/templates-pages/page-blog.php
similarity index 82%
rename from page-blog.php
rename to templates-pages/page-blog.php
index 493ccc928de0..ae407ce3f277 100644
--- a/page-blog.php
+++ b/templates-pages/page-blog.php
@@ -10,14 +10,14 @@
 
 get_header(); ?>
 
-  
        
+
     
        
-      
-    
        
-  
        
-  
        
- 
+        
        
+          
        
+             
+         
        
+   
        
+
  
        
   
        
 
        
@@ -31,9 +31,7 @@
           // resetting the loop
     ?>
     
        
-  
        
 
-  
        
     
 
-  
        
-  
        
-   
-   
        
+    
        
+        
        
+          
        
+             
+         
        
    
        
-   
        
 
-      
- 
+
       
        
         
        
       
        
-			
+
 				
        
 				  
 				
-		
+
 				
        
-		
+
 
 
\ No newline at end of file
diff --git a/page-home.php b/templates-pages/page-home.php
similarity index 100%
rename from page-home.php
rename to templates-pages/page-home.php