- tor-commits - lists.torproject.org

[webwml/staging] updating donate.wml
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit d2e0a34c3c83338c6371109a1991692f6a4273ea Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Dec 8 18:54:31 2015 +0000 updating donate.wml introducing donation page two-point-O'h-fancy --- donate/en/donate.wml | 268 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 183 insertions(+), 85 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index e3381b6..1a1e92e 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -5,102 +5,200 @@ #include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8" <div class="donation"> - <div class="container"> - <div class="row"> - <div class="col-md-6"> - - <h2 style="padding:2px; margin-bottom:10px;" class="text-justify">This is what a Tor supporter looks like:</h2> - <div class="row col-md-offset-0"> - <div class="col-md-4" style="padding:10px;"> - <img src="$(IMGROOT)/laura_poitras.jpg" class="class=img-rounded img-responsive" alt="Laura Poitras"> - </div> - <div class="col-md-8 col-md-offset-0"> - <h1><small>Laura Poitras</small></h1> - <blockquote style="padding:5px;">"Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Journalists need Tor to protect their sources and to research freely. It is an essential tool, and it needs our support."</blockquote> + + <div class="quote-section"> + <div class="container"> + <div class="row"> + <div class="col-sm-3 img-section"> + <img src="$(IMGROOT)/roger.png" class="img-thumbnail img-responsive champion" alt="Roger Dingledine"> </div> + + <div class="col-sm-9 col-xs-offset-0"> + <blockquote> + Tor has millions of users around the globe, and many people making donations can create a sustainable Tor. + Your contributions in our first ever fundraising campaign will form a strong foundation and inspire others to give to Tor. + <footer class="pull-right source-quote"><cite title="Source Title">Roger Dingledine</cite></footer> + </blockquote> </div> - </div> - <div class="col-md-6"> - <div style="margin-left:20px;"> - <h2 class="text-justify">Donate!</h2> + + </div> </div> + </div> + + + <div class="container"> + + <div class="row"> + <div class="col-sm-7"> + <h2 class="main-text">Your support is critical to our success</h2> + <hr> + <p style="text-align:left;">Donate $23+, get one of this swags, take a picture with it and share it with us via <code><a href="https://twitter.com/search?q=%23SupportTor" target="_blank">#supportTor</a></code> hashtag.</p> + + <noscript class="perks"> + <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4> + <p style="text-align:left;">Donate $23+ to get a <b>pack of stickers</b></p> + <p style="text-align:left;">Donate $100+ to get a <b>Tor supporter tshirt</b></p> + <p style="text-align:left;">Donate $500+ to get a <b>hoodie</b></p> + </noscript> + + <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4> + <div class="col-sm-4 no-padding"><img id="stickers" class="img-responsive half-opacity" src="$(IMGROOT)/swag-stickers-lg.png" alt="stickers"></div> + <div class="col-sm-4 no-padding"><img id="tshirt" class="img-responsive half-opacity" src="$(IMGROOT)/swag-tees-lg.png" alt="tshirt"></div> + <div class="col-sm-4 no-padding"><img id="hoody" class="img-responsive half-opacity" src="$(IMGROOT)/swag-hoody-lg.png" alt="hoody"></div> - <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - - <div style="margin-top:20px;" class="btn-group btn-group-lg" role="group"> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount1" name="amnt" type="button" class="btn btn-default btn-lg btn-block">10</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount2" name="amnt" type="button" class="btn btn-default btn-lg btn-block active" data-toggle="tooltip" data-placement="bottom" title="You get a tshirt!">100</button></div> - <div style="padding-bottom:5px;" class="col-md-4" ><button id="amount3" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="You get a tshirt!">256</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount4" name="amnt" type="button" class="btn btn-default btn-lg btn-block" title="You get a sticker!">23</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount5" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="You get a hoody!">500</button></div> - <div class="row form-group-lg"> - <label class="sr-only" for="exampleInputAmount">1</label> - <div class="input-group"> - <div class="input-group-addon">$</div> - <input type="text" name="custom_amnt" class="form-control" id="exampleInputAmount"> - </div> - </div> </div> - <div style="padding:10px;" class="row col-md-offset-0"> - <label> - <input type="radio" name="cmd" id="blankRadio1" value="_donations" aria-label="one_time"> One-time Donation - </label> - - <label> - <input type="radio" name="cmd" id="blankRadio2" value="_xclick-subscriptions" aria-label="monthly" checked> Monthly Donation - </label> - </div> - <div class="row col-md-offset-0"> - <button class="btn btn-primary btn-lg btn-block" style="padding:10px; margin:5px;">Donate</button> - <h4><a href="<page donate/donate-options>">other ways to donate</a></h4> + <div class="donate-section col-sm-5"> + <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <div class="row col-md-offset-0 combined-input"> + <div class="left col-xs-6 btn btn-default btn-lg active"> + <label class="choiceLabel"> + <input class="sr-only" name="cmd" id="blankRadio1" type="radio" value="_donations" aria-label="one_time"checked > + <span>One-time</span> + </label> + </div> + <div class="right col-xs-6 btn btn-default btn-lg "> + <label class="choiceLabel"> + <input class="sr-only" name="cmd" id="blankRadio2" type="radio" value="_xclick-subscriptions" aria-label="monthly"> + <span>Monthly</span> + </label> + </div> + </div> + + <div class="btn-group btn-group-lg" role="group" style="margin-bottom: 30px;"> + <div style="padding-bottom:5px;" class="col-xs-6"> + <button value="10" id="amount10" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn">$10</button> + </div> + <div style="padding-bottom:5px;" class="col-xs-6"> + <button value="23" id="amount23" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a sticker!">$23</button> + </div> + <div style="padding-bottom:5px;" class="col-xs-6"> + <button value="100" id="amount100" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$100</button> + </div> + <div style="padding-bottom:5px;" class="col-xs-6"> + <button value="256" id="amount256" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$256</button> + </div> + <div style="padding-bottom:5px;" class="col-xs-6"> + <button value="500" id="amount500" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a hoody!">$500</button> + </div> + <div class="col-xs-6 form-group-lg"> + <label class="sr-only" for="exampleInputAmount">1</label> + <div class="input-group"> + <div class="input-group-addon">$</div> + <input type="number" min="5" step="1" name="custom_amnt" class="form-control" id="exampleInputAmount" placeholder="other (minimum $5)"> + </div> + </div> + </div> + <div style="padding: 0 15px;"> + <button id="donate-btn" class="btn btn-primary btn-lg btn-block" style="padding:10px;">Donate</button> + <h5 class="error-msg">Please enter an amount above $5</h5> + <h5>via PayPal (doesn't require an account)</h5> + <h4><a href="../donate/donate-options.html.en">Other Ways to Donate</a></h4> + </div> + <input type="hidden" id="amount" name="amount" value=""> + <input type="hidden" id="a3" name="a3" value="0"> + <input type="hidden" id="p3" name="p3" value="1"> + <input type="hidden" id="t3" name="t3" value="M"> + <input type="hidden" name="sra" value="1"> + <input type="hidden" name="src" value="1"> + <input type="hidden" name="no_shipping" value="1"> + <input type="hidden" name="no_note" value="1"> + <input type="hidden" name="business" value="donations(a)torproject.org"> + <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer"> + + + </form> </div> -  - <div class="clearfix visible-xs-block"></div> </div> - <input type="hidden" id="amount" name="amount" value="100"> - <input type="hidden" id="a3" name="a3" value="0"> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" id="t3" name="t3" value="M"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer"> - </form> </div> -</div> + + + + </div> - -<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> -<script type="text/javascript"> -function displayVals() { - var amount = $( this ).filter(":button").html(); + +  + <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> + <script type="text/javascript"> + function displayVals() { + var amount = $( this ).filter(".amnt-btn").val(); if (amount == null) { - amount = $( this ).filter("input").val(); - if (amount == null) { - amount = 100; - } else if (this.id == "exampleInputAmount") { - $( "button" ).removeClass('active'); - $( this ).addClass('active'); - } - } else { + amount = $("#exampleInputAmount").val(); + if ($('#amount').val() == "") { + amount = 23 + $( "#amount23" ).addClass('active'); + } else if (this.id == "exampleInputAmount") { $( "button" ).removeClass('active'); $( this ).addClass('active'); - jQuery('#amount').val(amount); + } + } else { + $( ".amnt-btn" ).removeClass('active'); + $( this ).addClass('active'); + $('#amount').val(amount); + } + $('#amount').val(amount); + $('#a3').val(amount); + + $("button[name='amnt']").click(function () { + $(".form-control").val(null); + $(".error-msg").css("display","none"); + }); + + if (23 <= parseInt($("#amount").val()) && parseInt($("#amount").val()) < 100) { + $("#stickers").css("opacity","1"); + $("#tshirt").css("opacity","0.5"); + $("#hoody").css("opacity","0.5"); + }else if (100 <= parseInt($("#amount").val()) && parseInt($("#amount").val()) < 500) { + $("#tshirt").css("opacity","1"); + $("#stickers").css("opacity","0.5"); + $("#hoody").css("opacity","0.5"); + }else if (500 <= parseInt($("#amount").val())) { + $("#hoody").css("opacity","1"); + $("#stickers").css("opacity","0.5"); + $("#tshirt").css("opacity","0.5"); + }else{ + $("#hoody").css("opacity","0.5"); + $("#stickers").css("opacity","0.5"); + $("#tshirt").css("opacity","0.5"); } - jQuery('#amount').val(amount); - jQuery('#a3').val(amount); -} - -jQuery(function(){ - jQuery("button[name='amnt']").click(displayVals); - //jQuery("input[name='cmd']").click(displayVals); - jQuery("#exampleInputAmount").click(displayVals); - jQuery("#exampleInputAmount").change(displayVals); - displayVals(); -}); -</script> + + } + $( document ).ready(function() { + $("button[name='amnt']").click(displayVals); + $("#exampleInputAmount").click(displayVals); + $("#exampleInputAmount").change(displayVals); + displayVals(); + + $("#exampleInputAmount").change(function(){ + if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) { + $(".error-msg").css("display","block"); + } else{ + $(".error-msg").css("display","none"); + } + }); + + $("#donate-btn").click(function(event){ + if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) { + event.preventDefault(); + $(".error-msg").css("display","block"); + } else{ + $(".error-msg").css("display","none"); + } + }); + + $(".left").click(function(){ + $(".left").addClass('active'); + $(".right").removeClass('active'); + }); + $(".right").click(function(){ + $(".right").addClass('active'); + $(".left").removeClass('active'); + }); + + }); + + + </script> + #include <donatefoot.wmi>

1 0

[webwml/staging] add arma's image
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit 3f82a9fb0028a195c7a1894575abb6ff60dd14dd Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Dec 8 19:15:03 2015 +0000 add arma's image --- images/roger.png | Bin 0 -> 89076 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/roger.png b/images/roger.png new file mode 100644 index 0000000..6d22a64 Binary files /dev/null and b/images/roger.png differ

1 0

[webwml/staging] fix min donation message
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit 7cc673368a88f8beddccda4ba8c70e35241cfd1a Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Dec 8 19:04:43 2015 +0000 fix min donation message --- donate/en/donate.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 174ba37..02356bf 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -84,13 +84,13 @@ <label class="sr-only" for="exampleInputAmount">1</label> <div class="input-group"> <div class="input-group-addon">$</div> - <input type="number" min="5" step="1" name="custom_amnt" class="form-control" id="exampleInputAmount" placeholder="other (minimum $5)"> + <input type="number" min="5" step="1" name="custom_amnt" class="form-control" id="exampleInputAmount" placeholder="other amount"> </div> </div> </div> <div style="padding: 0 15px;"> + <h5 class="error-msg">The minimum donation amount is $5</h5> <button id="donate-btn" class="btn btn-primary btn-lg btn-block" style="padding:10px;">Donate</button> - <h5 class="error-msg">Please enter an amount above $5</h5> <h5>via PayPal (doesn't require an account)</h5> <h4><a href="<page donate/donate-options>">Other Ways to Donate</a></h4> </div>

1 0

[webwml/staging] update donate footer
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit 987cb378d413e008e9e08c4be0343df0bfbbea38 Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Dec 8 18:36:20 2015 +0000 update donate footer --- include/donatefoot.wmi | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/donatefoot.wmi b/include/donatefoot.wmi index 8955182..5d0a24f 100644 --- a/include/donatefoot.wmi +++ b/include/donatefoot.wmi @@ -1,10 +1,7 @@ - </div> <footer class="container footer"> - <div class="col-md-12"> - <p class="text-center">The Tor Project is a 501(c)(3) US non-profit organization dedicated to research, development, and education about online anonymity and privacy.<br /> - <a href="<page donate/donor-privacy-policy>">Privacy Policy</a> & <a href="<page donate/donor-faq>">Donor FAQ</a></p> - </div> + <p class="text-center">The Tor Project is a 501(c)(3) US non-profit organization dedicated to research, development, and education about online anonymity and privacy.<br> + <a href="<page donate/donor-privacy-policy>">Privacy Policy</a> & <a href="<page donate/donor-faq>">Donor FAQ</a></p> </footer> </body> -</html> +</html> \ No newline at end of file

1 0

[webwml/staging] fixing other ways to donate link
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit 41f1a11b1d8788d49ec5e4b4d0abc5e0b20830c4 Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Dec 8 18:57:28 2015 +0000 fixing other ways to donate link --- donate/en/donate.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 1a1e92e..174ba37 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -92,7 +92,7 @@ <button id="donate-btn" class="btn btn-primary btn-lg btn-block" style="padding:10px;">Donate</button> <h5 class="error-msg">Please enter an amount above $5</h5> <h5>via PayPal (doesn't require an account)</h5> - <h4><a href="../donate/donate-options.html.en">Other Ways to Donate</a></h4> + <h4><a href="<page donate/donate-options>">Other Ways to Donate</a></h4> </div> <input type="hidden" id="amount" name="amount" value=""> <input type="hidden" id="a3" name="a3" value="0">

1 0

[webwml/staging] fix bootstrap chmod
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit 5f85d019e2e52d0f4aff56a2ea8e2c772c8e8a92 Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Dec 8 18:12:53 2015 +0000 fix bootstrap chmod --- 0 files changed diff --git a/css/bootstrap.css b/css/bootstrap.css old mode 100755 new mode 100644

1 0

[webwml/staging] donatehead updates:
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit 14eb84cb9fd181446b07ed9383da2b8d433499a7 Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Dec 8 18:33:15 2015 +0000 donatehead updates: - adding donate-style.css - updating <head> and <nav> --- css/donate-style.css | 357 ++++++++++++++++++++++++++++++++++++++++++++++++ include/donatehead.wmi | 81 ++++------- 2 files changed, 381 insertions(+), 57 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css new file mode 100644 index 0000000..bca9514 --- /dev/null +++ b/css/donate-style.css @@ -0,0 +1,357 @@ +/* Some primery changes for bootstrap */ +.btn:focus, +.btn:active:focus, +.btn.active:focus, +.btn.focus, +.btn:active.focus, +.btn.active.focus, +a:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + outline: none; +} +.form-control:focus { + border-color: #875ca4; + outline: 0; + -webkit-box-shadow: none; + box-shadow: none; +} +.btn-default:active, +.btn-default.active, +.btn-default.active:hover, +.btn-default.active:focus, +.btn-default.active.focus, +.open > .dropdown-toggle.btn-default:hover, +.open > .dropdown-toggle.btn-default:focus, +.open > .dropdown-toggle.btn-default.focus, +.open > .dropdown-toggle.btn-default { + color: #fff; + background: #875ca4; + border-color: #875ca4; +} +.btn:active, .btn.active { + background-image: none; + outline: 0; + -webkit-box-shadow: none; + box-shadow: none; +} +a { + color: #875ca4; +} +a:hover, a:focus { + color: #663987; + text-decoration: none; +} +.btn-primary:hover { + background-color: #784B96; + border-color: #784B96; +} +.btn-primary { + background-color: #875ca4; + border-color: #875ca4; +} +.btn-primary:focus, +.btn-primary.focus, +.btn-primary:active, +.btn-primary.active, +.open > .dropdown-toggle.btn-primary, +.btn-primary:active:hover, +.btn-primary.active:hover, +.open > .dropdown-toggle.btn-primary:hover, +.btn-primary:active:focus, +.btn-primary.active:focus, +.open > .dropdown-toggle.btn-primary:focus, +.btn-primary:active.focus, +.btn-primary.active.focus, +.open > .dropdown-toggle.btn-primary.focus{ + background-color: #663987; + border-color: #663987; +} +.navbar-brand { + height: auto; + padding: 0; +} +.navbar-default { + background: white; + border: none; +} +.navbar { + margin-bottom: 0; +} +.navbar-collapse.collapse { +display: block!important; +} + +.navbar-nav>li, .navbar-nav { +float: left !important; +} + + +.navbar-nav.navbar-right:last-child { +margin-right: -15px !important; +} + +.navbar-right { +float: right!important; +} + + +.navbar-header { +float: left; +} +.navbar-nav > li > a { + padding-top: 15px; + padding-bottom: 15px; +} +.navbar-nav{ + margin: 0; +} +.img-thumbnail { + padding: 1px; + background-color: #794d9a; + border: 1px solid #794d9a; + -webkit-transition: none; + -o-transition: none; + transition: none; +} + + + +/* Sticky footer styles +-------------------------------------------------- */ +html { + position: relative; + min-height: 100%; +} +#navbar { + margin-top: 28px; +} +.logo{ + width: 120px; +} +.donation{ + text-align: center; + margin-bottom: 125px; +} +.main-text{ + margin-top: 50px; +} +.nav > li > a:hover, .nav > li > a:focus { + text-decoration: none; + border-bottom: 3px solid #794d9a; +} +.donate-section{ + margin-top: 50px; + margin-bottom: 30px; +} +.no-padding{ + padding: 0; +} +.half-opacity{ + opacity: 0.5; +} +.combined-input{ + margin: 0 15px 35px 15px; +} +.left.btn-lg, .btn-group-lg > .btn{ + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} +.right.btn-lg, .btn-group-lg > .btn{ + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} +.right{ + border-left-width: 0px !important; +} +.choiceLabel{ + cursor: pointer !important; + margin: 0px !important; + width: 100%; + height: 100%; + font-weight: normal; +} +.combined-input > .btn-lg, +.combined-input > .btn { + padding: 0; + min-height: 44px; + line-height: 44px; +} + +input[type=number]::-webkit-inner-spin-button, +input[type=number]::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; +} +input[type=number] { + -moz-appearance: textfield; +} +.error-msg{ + color: red; + display: none; +} +.quote-section{ + background-color:#663987; + padding: 20px 0; +} +.champion{ + width: 100%; +} +.source-quote{ + margin-top: 30px; + color: white; +} +blockquote { + text-align: justify; + display: block; + padding: 5px 0px 5px 45px; + margin: 20px 0 0 0; + position: relative; + font-size: 20px; + border-left: 5px solid #794d9a; + color: #ffffff; +} +blockquote::before { + content: "\201C"; + position: absolute; + left: 10px; + top: -20px; + font-size: 80px; +} +blockquote footer{ + color: rgb(240,240,240); +} +footer.footer{ + margin-top: 20px; + position: absolute; + bottom: 0; + width: 100%; + /* Set the height of the footer here */ + /*height: 65px;*/ + padding-top: 20px; + padding-bottom: 10px; + background-color: #f5f5f5; +} +@media (max-width: 991px) { + blockquote { + margin: 30px 0 0 0; + font-size: 18px; + } + .champion{ + width: 140px; + } + .source-quote{ + margin-top: 20px; + } +} +@media (max-width: 767px) { + .main-text{ + font-size: 28px; + } + blockquote { + margin: 2% 0 0 0; + font-size: 16px; + border: none; + } + .img-section{ + width: 20%; + float: left; + } + blockquote::before { + display: none; + } + +} +@media (max-width: 659px) { + .main-text{ + font-size: 26px; + } + blockquote { + font-size: 17px; + margin: 0; + } + .img-section{ + width: 30%; + } + .champion{ + width: 100%; + } +} +@media (max-width: 549px) { + .main-text{ + font-size: 24px; + } + blockquote { + font-size: 15px; + } +} +@media (max-width: 449px) { + .main-text{ + font-size: 22px; + } + blockquote { + font-size: 14px; + padding: 0; + } + +} + +@media (max-width: 399px) { + .logo { + text-align: center; + width: 25%; + float: none; + } + .navbar-header{ + width: 100%; + text-align: center; + } + .navbar-brand > img { + display: initial; + } + .navbar-brand { + float: initial; + } + .container > .navbar-header, + .container-fluid > .navbar-header, + .container > .navbar-collapse, + .container-fluid > .navbar-collapse { + margin-right: 0; + margin-left: 0; + } + .navbar-nav.navbar-right:last-child { + margin-right: 0 !important; + } + #navbar{ + width: 100%; + margin: 0; + height: 53px; + } + #navbar > li { + width: 33.3%; + text-align: center; + } + .main-text{ + font-size: 20px; + } + #donate > .btn-group > .col-xs-6 { + width: 100%; + } + blockquote { + font-size: 14px; + padding: 0; + } + .img-section{ + width: 35%; + } + footer.footer { + margin-top: 10px; + margin-bottom: 0px; + } + footer.footer > p { + font-size: 12px; + } + +} + diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 0091888..c318388 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -10,65 +10,32 @@ <html> <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width,initial-scale=1"> - <meta name="author" content="The Tor Project, Inc."> - <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> - <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width,initial-scale=1"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> + <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> - <title>$(TITLE)</title> - <link href="$(DOCROOT)/css/bootstrap.css" rel="stylesheet"> + <title>$(TITLE)</title> + <link href="$(DOCROOT)/css/bootstrap.css" rel="stylesheet"> + <link href="$(DOCROOT)/css/donate-style.css" rel="stylesheet"> + <link rel="icon" href="$(IMGROOT)/favicon.ico"> - <link rel="icon" href="$(IMGROOT)/favicon.ico"> + </head> - <style> - - /* Sticky footer styles - -------------------------------------------------- */ - html { - position: relative; - min-height: 100%; - } - - body { - margin-bottom: 65px; - } - - .footer { - position: absolute; - bottom: 0; - width: 100%; - /* Set the height of the footer here */ - height: 65px; - padding-top: 10px; - padding-bottom: 10px; - background-color: #f5f5f5; - } - - .donation{ - text-align: center; - padding-bottom: 65px; - } - - h6{ - font-weight: normal; - } - </style> - - -</head> <body> - <div class="container"> - <a href="<page index>"><img src="$(IMGROOT)/tor-logo.jpg" alt="Tor Project Home"></a> - - <hr style="margin-top:0;"> - </div> - <br> - + </div> + </nav> \ No newline at end of file

1 0

[webwml/staging] update bootstrap.css file
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit ccc79ec320bae674a155a80d7dfc370a32d474ff Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Dec 8 18:08:39 2015 +0000 update bootstrap.css file --- css/bootstrap.css | 1689 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 1211 insertions(+), 478 deletions(-) diff --git a/css/bootstrap.css b/css/bootstrap.css index 90512be..42c79d6 100755 --- a/css/bootstrap.css +++ b/css/bootstrap.css @@ -1,23 +1,13 @@ /*! - * Bootstrap v3.3.5 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ - -/*! - * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=936a2b51755cf76adb07) - * Config saved to config.json and https://gist.github.com/936a2b51755cf76adb07 - */ -/*! - * Bootstrap v3.3.5 (http://getbootstrap.com) + * Bootstrap v3.3.6 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; - -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; } body { margin: 0; @@ -70,28 +60,28 @@ dfn { font-style: italic; } h1 { + margin: .67em 0; font-size: 2em; - margin: 0.67em 0; } mark { - background: #ff0; color: #000; + background: #ff0; } small { font-size: 80%; } sub, sup { + position: relative; font-size: 75%; line-height: 0; - position: relative; vertical-align: baseline; } sup { - top: -0.5em; + top: -.5em; } sub { - bottom: -0.25em; + bottom: -.25em; } img { border: 0; @@ -103,10 +93,10 @@ figure { margin: 1em 40px; } hr { + height: 0; -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; - height: 0; } pre { overflow: auto; @@ -123,9 +113,9 @@ input, optgroup, select, textarea { - color: inherit; - font: inherit; margin: 0; + font: inherit; + color: inherit; } button { overflow: visible; @@ -147,8 +137,8 @@ html input[disabled] { } button::-moz-focus-inner, input::-moz-focus-inner { - border: 0; padding: 0; + border: 0; } input { line-height: normal; @@ -165,23 +155,23 @@ input[type="number"]::-webkit-outer-spin-button { height: auto; } input[type="search"] { - -webkit-appearance: textfield; -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; + -webkit-appearance: textfield; } input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } fieldset { - border: 1px solid #c0c0c0; + padding: .35em .625em .75em; margin: 0 2px; - padding: 0.35em 0.625em 0.75em; + border: 1px solid #c0c0c0; } legend { - border: 0; padding: 0; + border: 0; } textarea { overflow: auto; @@ -190,8 +180,8 @@ optgroup { font-weight: bold; } table { - border-collapse: collapse; border-spacing: 0; + border-collapse: collapse; } td, th { @@ -202,11 +192,11 @@ th { *, *:before, *:after { - background: transparent !important; color: #000 !important; + text-shadow: none !important; + background: transparent !important; -webkit-box-shadow: none !important; box-shadow: none !important; - text-shadow: none !important; } a, a:visited { @@ -225,6 +215,7 @@ th { pre, blockquote { border: 1px solid #999; + page-break-inside: avoid; } thead { @@ -271,6 +262,7 @@ th { } @font-face { font-family: 'Glyphicons Halflings'; + src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } @@ -282,14 +274,15 @@ th { font-style: normal; font-weight: normal; line-height: 1; + -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } .glyphicon-asterisk:before { - content: "\2a"; + content: "\002a"; } .glyphicon-plus:before { - content: "\2b"; + content: "\002b"; } .glyphicon-euro:before, .glyphicon-eur:before { @@ -1074,25 +1067,26 @@ th { } * { -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } *:before, *:after { -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } html { font-size: 10px; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.42857143; - color: #333333; - background-color: #ffffff; + color: #333; + background-color: #fff; } input, button, @@ -1101,7 +1095,6 @@ textarea { font-family: inherit; font-size: inherit; line-height: inherit; - color:#23527c; } a { color: #337ab7; @@ -1125,7 +1118,9 @@ img { } .img-responsive, .thumbnail > img, -.thumbnail a > img { +.thumbnail a > img, +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; max-width: 100%; height: auto; @@ -1134,17 +1129,17 @@ img { border-radius: 6px; } .img-thumbnail { - padding: 4px; - line-height: 1.42857143; - background-color: #ffffff; - border: 1px solid #dddddd; - border-radius: 4px; - -webkit-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; display: inline-block; max-width: 100%; height: auto; + padding: 4px; + line-height: 1.42857143; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 4px; + -webkit-transition: all .2s ease-in-out; + -o-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; } .img-circle { border-radius: 50%; @@ -1153,14 +1148,14 @@ hr { margin-top: 20px; margin-bottom: 20px; border: 0; - border-top: 1px solid #eeeeee; + border-top: 1px solid #eee; } .sr-only { position: absolute; width: 1px; height: 1px; - margin: -1px; padding: 0; + margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); border: 0; @@ -1220,7 +1215,7 @@ h6 .small, .h6 .small { font-weight: normal; line-height: 1; - color: #777777; + color: #777; } h1, .h1, @@ -1312,8 +1307,8 @@ small, } mark, .mark { - background-color: #fcf8e3; padding: .2em; + background-color: #fcf8e3; } .text-left { text-align: left; @@ -1340,7 +1335,7 @@ mark, text-transform: capitalize; } .text-muted { - color: #777777; + color: #777; } .text-primary { color: #337ab7; @@ -1416,7 +1411,7 @@ a.bg-danger:focus { .page-header { padding-bottom: 9px; margin: 40px 0 20px; - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid #eee; } ul, ol { @@ -1435,13 +1430,13 @@ ol ol { } .list-inline { padding-left: 0; - list-style: none; margin-left: -5px; + list-style: none; } .list-inline > li { display: inline-block; - padding-left: 5px; padding-right: 5px; + padding-left: 5px; } dl { margin-top: 0; @@ -1461,9 +1456,9 @@ dd { .dl-horizontal dt { float: left; width: 160px; + overflow: hidden; clear: left; text-align: right; - overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } @@ -1474,7 +1469,7 @@ dd { abbr[title], abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #777777; + border-bottom: 1px dotted #777; } .initialism { font-size: 90%; @@ -1482,8 +1477,9 @@ abbr[data-original-title] { } blockquote { padding: 10px 20px; + margin: 0 0 20px; font-size: 17.5px; - border-left: 5px solid #eeeeee; + border-left: 5px solid #eee; } blockquote p:last-child, blockquote ul:last-child, @@ -1496,7 +1492,7 @@ blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; - color: #777777; + color: #777; } blockquote footer:before, blockquote small:before, @@ -1507,9 +1503,9 @@ blockquote .small:before { blockquote.pull-right { padding-right: 15px; padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; text-align: right; + border-right: 5px solid #eee; + border-left: 0; } .blockquote-reverse footer:before, blockquote.pull-right footer:before, @@ -1548,11 +1544,11 @@ code { kbd { padding: 2px 4px; font-size: 90%; - color: #ffffff; - background-color: #333333; + color: #fff; + background-color: #333; border-radius: 3px; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); } kbd kbd { padding: 0; @@ -1567,11 +1563,11 @@ pre { margin: 0 0 10px; font-size: 13px; line-height: 1.42857143; + color: #333; word-break: break-all; word-wrap: break-word; - color: #333333; background-color: #f5f5f5; - border: 1px solid #cccccc; + border: 1px solid #ccc; border-radius: 4px; } pre code { @@ -1587,10 +1583,10 @@ pre code { overflow-y: scroll; } .container { + padding-right: 15px; + padding-left: 15px; margin-right: auto; margin-left: auto; - padding-left: 15px; - padding-right: 15px; } @media (min-width: 768px) { .container { @@ -1608,20 +1604,20 @@ pre code { } } .container-fluid { + padding-right: 15px; + padding-left: 15px; margin-right: auto; margin-left: auto; - padding-left: 15px; - padding-right: 15px; } .row { - margin-left: -15px; margin-right: -15px; + margin-left: -15px; } .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { float: left; @@ -1777,7 +1773,7 @@ pre code { margin-left: 8.33333333%; } .col-xs-offset-0 { - margin-left: 0%; + margin-left: 0; } @media (min-width: 768px) { .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { @@ -1934,7 +1930,7 @@ pre code { margin-left: 8.33333333%; } .col-sm-offset-0 { - margin-left: 0%; + margin-left: 0; } } @media (min-width: 992px) { @@ -2092,7 +2088,7 @@ pre code { margin-left: 8.33333333%; } .col-md-offset-0 { - margin-left: 0%; + margin-left: 0; } } @media (min-width: 1200px) { @@ -2250,7 +2246,7 @@ pre code { margin-left: 8.33333333%; } .col-lg-offset-0 { - margin-left: 0%; + margin-left: 0; } } table { @@ -2259,7 +2255,7 @@ table { caption { padding-top: 8px; padding-bottom: 8px; - color: #777777; + color: #777; text-align: left; } th { @@ -2279,11 +2275,11 @@ th { padding: 8px; line-height: 1.42857143; vertical-align: top; - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; } .table > thead > tr > th { vertical-align: bottom; - border-bottom: 2px solid #dddddd; + border-bottom: 2px solid #ddd; } .table > caption + thead > tr:first-child > th, .table > colgroup + thead > tr:first-child > th, @@ -2294,10 +2290,10 @@ th { border-top: 0; } .table > tbody + tbody { - border-top: 2px solid #dddddd; + border-top: 2px solid #ddd; } .table .table { - background-color: #ffffff; + background-color: #fff; } .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, @@ -2308,7 +2304,7 @@ th { padding: 5px; } .table-bordered { - border: 1px solid #dddddd; + border: 1px solid #ddd; } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, @@ -2316,7 +2312,7 @@ th { .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { - border: 1px solid #dddddd; + border: 1px solid #ddd; } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { @@ -2330,14 +2326,14 @@ th { } table col[class*="col-"] { position: static; - float: none; display: table-column; + float: none; } table td[class*="col-"], table th[class*="col-"] { position: static; - float: none; display: table-cell; + float: none; } .table > thead > tr > td.active, .table > tbody > tr > td.active, @@ -2445,8 +2441,8 @@ table th[class*="col-"] { background-color: #ebcccc; } .table-responsive { + min-height: .01%; overflow-x: auto; - min-height: 0.01%; } @media screen and (max-width: 767px) { .table-responsive { @@ -2454,7 +2450,7 @@ table th[class*="col-"] { margin-bottom: 15px; overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; - border: 1px solid #dddddd; + border: 1px solid #ddd; } .table-responsive > .table { margin-bottom: 0; @@ -2494,10 +2490,10 @@ table th[class*="col-"] { } } fieldset { + min-width: 0; padding: 0; margin: 0; border: 0; - min-width: 0; } legend { display: block; @@ -2506,7 +2502,7 @@ legend { margin-bottom: 20px; font-size: 21px; line-height: inherit; - color: #333333; + color: #333; border: 0; border-bottom: 1px solid #e5e5e5; } @@ -2518,8 +2514,8 @@ label { } input[type="search"] { -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } input[type="radio"], input[type="checkbox"] { @@ -2550,7 +2546,7 @@ output { padding-top: 7px; font-size: 14px; line-height: 1.42857143; - color: #555555; + color: #555; } .form-control { display: block; @@ -2559,37 +2555,41 @@ output { padding: 6px 12px; font-size: 14px; line-height: 1.42857143; - color: #555555; - background-color: #ffffff; + color: #555; + background-color: #fff; background-image: none; - border: 1px solid #cccccc; + border: 1px solid #ccc; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; - -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; - transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } .form-control:focus { border-color: #66afe9; outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); } .form-control::-moz-placeholder { - color: #999999; + color: #999; opacity: 1; } .form-control:-ms-input-placeholder { - color: #999999; + color: #999; } .form-control::-webkit-input-placeholder { - color: #999999; + color: #999; +} +.form-control::-ms-expand { + background-color: transparent; + border: 0; } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { - background-color: #eeeeee; + background-color: #eee; opacity: 1; } .form-control[disabled], @@ -2653,8 +2653,8 @@ input[type="search"] { .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { position: absolute; - margin-left: -20px; margin-top: 4px \9; + margin-left: -20px; } .radio + .radio, .checkbox + .checkbox { @@ -2666,8 +2666,8 @@ input[type="search"] { display: inline-block; padding-left: 20px; margin-bottom: 0; - vertical-align: middle; font-weight: normal; + vertical-align: middle; cursor: pointer; } .radio-inline + .radio-inline, @@ -2696,15 +2696,15 @@ fieldset[disabled] .checkbox label { cursor: not-allowed; } .form-control-static { + min-height: 34px; padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; - min-height: 34px; } .form-control-static.input-lg, .form-control-static.input-sm { - padding-left: 0; padding-right: 0; + padding-left: 0; } .input-sm { height: 30px; @@ -2826,18 +2826,18 @@ select[multiple].input-lg { } .has-success .form-control { border-color: #3c763d; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); } .has-success .form-control:focus { border-color: #2b542c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168; } .has-success .input-group-addon { color: #3c763d; - border-color: #3c763d; background-color: #dff0d8; + border-color: #3c763d; } .has-success .form-control-feedback { color: #3c763d; @@ -2856,18 +2856,18 @@ select[multiple].input-lg { } .has-warning .form-control { border-color: #8a6d3b; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); } .has-warning .form-control:focus { border-color: #66512c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b; } .has-warning .input-group-addon { color: #8a6d3b; - border-color: #8a6d3b; background-color: #fcf8e3; + border-color: #8a6d3b; } .has-warning .form-control-feedback { color: #8a6d3b; @@ -2886,18 +2886,18 @@ select[multiple].input-lg { } .has-error .form-control { border-color: #a94442; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); } .has-error .form-control:focus { border-color: #843534; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483; } .has-error .input-group-addon { color: #a94442; - border-color: #a94442; background-color: #f2dede; + border-color: #a94442; } .has-error .form-control-feedback { color: #a94442; @@ -2968,23 +2968,23 @@ select[multiple].input-lg { .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { + padding-top: 7px; margin-top: 0; margin-bottom: 0; - padding-top: 7px; } .form-horizontal .radio, .form-horizontal .checkbox { min-height: 27px; } .form-horizontal .form-group { - margin-left: -15px; margin-right: -15px; + margin-left: -15px; } @media (min-width: 768px) { .form-horizontal .control-label { - text-align: right; - margin-bottom: 0; padding-top: 7px; + margin-bottom: 0; + text-align: right; } } .form-horizontal .has-feedback .form-control-feedback { @@ -2992,7 +2992,7 @@ select[multiple].input-lg { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 14.333333px; + padding-top: 11px; font-size: 18px; } } @@ -3004,24 +3004,24 @@ select[multiple].input-lg { } .btn { display: inline-block; + padding: 6px 12px; margin-bottom: 0; + font-size: 14px; font-weight: normal; + line-height: 1.42857143; text-align: center; + white-space: nowrap; vertical-align: middle; -ms-touch-action: manipulation; touch-action: manipulation; cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; background-image: none; border: 1px solid transparent; - white-space: nowrap; - padding: 6px 12px; - font-size: 14px; - line-height: 1.42857143; border-radius: 4px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; } .btn:focus, .btn:active:focus, @@ -3036,51 +3036,51 @@ select[multiple].input-lg { .btn:hover, .btn:focus, .btn.focus { - color: #333333; + color: #333; text-decoration: none; } .btn:active, .btn.active { - outline: 0; background-image: none; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + outline: 0; + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); } .btn.disabled, .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; - opacity: 0.65; filter: alpha(opacity=65); -webkit-box-shadow: none; - box-shadow: none; + box-shadow: none; + opacity: .65; } a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none; } .btn-default { - color: #333333; - background-color: #ffffff; - border-color: #cccccc; + color: #333; + background-color: #fff; + border-color: #ccc; } .btn-default:focus, .btn-default.focus { - color: #ffffff; - background-color: #31b0d5; - border-color: #269abc; + color: #333; + background-color: #e6e6e6; + border-color: #8c8c8c; } .btn-default:hover { - color: #ffffff; - background-color: #31b0d5; - border-color: #269abc; + color: #333; + background-color: #e6e6e6; + border-color: #adadad; } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { - color: #ffffff; - background-color: #31b0d5; - border-color: #269abc; + color: #333; + background-color: #e6e6e6; + border-color: #adadad; } .btn-default:active:hover, .btn-default.active:hover, @@ -3091,18 +3091,15 @@ fieldset[disabled] a.btn { .btn-default:active.focus, .btn-default.active.focus, .open > .dropdown-toggle.btn-default.focus { - color: #ffffff; - background-color: #31b0d5; - border-color: #269abc; + color: #333; + background-color: #d4d4d4; + border-color: #8c8c8c; } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { background-image: none; } -.btn-default.disabled, -.btn-default[disabled], -fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, @@ -3111,40 +3108,34 @@ fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, .btn-default.disabled.focus, .btn-default[disabled].focus, -fieldset[disabled] .btn-default.focus, -.btn-default.disabled:active, -.btn-default[disabled]:active, -fieldset[disabled] .btn-default:active, -.btn-default.disabled.active, -.btn-default[disabled].active, -fieldset[disabled] .btn-default.active { - background-color: #ffffff; - border-color: #cccccc; +fieldset[disabled] .btn-default.focus { + background-color: #fff; + border-color: #ccc; } .btn-default .badge { - color: #ffffff; - background-color: #333333; + color: #fff; + background-color: #333; } .btn-primary { - color: #ffffff; + color: #fff; background-color: #337ab7; border-color: #2e6da4; } .btn-primary:focus, .btn-primary.focus { - color: #ffffff; + color: #fff; background-color: #286090; border-color: #122b40; } .btn-primary:hover { - color: #ffffff; + color: #fff; background-color: #286090; border-color: #204d74; } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { - color: #ffffff; + color: #fff; background-color: #286090; border-color: #204d74; } @@ -3157,7 +3148,7 @@ fieldset[disabled] .btn-default.active { .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus { - color: #ffffff; + color: #fff; background-color: #204d74; border-color: #122b40; } @@ -3166,9 +3157,6 @@ fieldset[disabled] .btn-default.active { .open > .dropdown-toggle.btn-primary { background-image: none; } -.btn-primary.disabled, -.btn-primary[disabled], -fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, @@ -3177,40 +3165,34 @@ fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled.focus, .btn-primary[disabled].focus, -fieldset[disabled] .btn-primary.focus, -.btn-primary.disabled:active, -.btn-primary[disabled]:active, -fieldset[disabled] .btn-primary:active, -.btn-primary.disabled.active, -.btn-primary[disabled].active, -fieldset[disabled] .btn-primary.active { +fieldset[disabled] .btn-primary.focus { background-color: #337ab7; border-color: #2e6da4; } .btn-primary .badge { color: #337ab7; - background-color: #ffffff; + background-color: #fff; } .btn-success { - color: #ffffff; + color: #fff; background-color: #5cb85c; border-color: #4cae4c; } .btn-success:focus, .btn-success.focus { - color: #ffffff; + color: #fff; background-color: #449d44; border-color: #255625; } .btn-success:hover { - color: #ffffff; + color: #fff; background-color: #449d44; border-color: #398439; } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { - color: #ffffff; + color: #fff; background-color: #449d44; border-color: #398439; } @@ -3223,7 +3205,7 @@ fieldset[disabled] .btn-primary.active { .btn-success:active.focus, .btn-success.active.focus, .open > .dropdown-toggle.btn-success.focus { - color: #ffffff; + color: #fff; background-color: #398439; border-color: #255625; } @@ -3232,9 +3214,6 @@ fieldset[disabled] .btn-primary.active { .open > .dropdown-toggle.btn-success { background-image: none; } -.btn-success.disabled, -.btn-success[disabled], -fieldset[disabled] .btn-success, .btn-success.disabled:hover, .btn-success[disabled]:hover, fieldset[disabled] .btn-success:hover, @@ -3243,40 +3222,34 @@ fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:focus, .btn-success.disabled.focus, .btn-success[disabled].focus, -fieldset[disabled] .btn-success.focus, -.btn-success.disabled:active, -.btn-success[disabled]:active, -fieldset[disabled] .btn-success:active, -.btn-success.disabled.active, -.btn-success[disabled].active, -fieldset[disabled] .btn-success.active { +fieldset[disabled] .btn-success.focus { background-color: #5cb85c; border-color: #4cae4c; } .btn-success .badge { color: #5cb85c; - background-color: #ffffff; + background-color: #fff; } .btn-info { - color: #333333; - background-color: #ffffff; - border-color: #cccccc; + color: #fff; + background-color: #5bc0de; + border-color: #46b8da; } .btn-info:focus, .btn-info.focus { - color: #ffffff; + color: #fff; background-color: #31b0d5; border-color: #1b6d85; } .btn-info:hover { - color: #ffffff; + color: #fff; background-color: #31b0d5; border-color: #269abc; } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { - color: #ffffff; + color: #fff; background-color: #31b0d5; border-color: #269abc; } @@ -3289,7 +3262,7 @@ fieldset[disabled] .btn-success.active { .btn-info:active.focus, .btn-info.active.focus, .open > .dropdown-toggle.btn-info.focus { - color: #ffffff; + color: #fff; background-color: #269abc; border-color: #1b6d85; } @@ -3298,9 +3271,6 @@ fieldset[disabled] .btn-success.active { .open > .dropdown-toggle.btn-info { background-image: none; } -.btn-info.disabled, -.btn-info[disabled], -fieldset[disabled] .btn-info, .btn-info.disabled:hover, .btn-info[disabled]:hover, fieldset[disabled] .btn-info:hover, @@ -3309,40 +3279,34 @@ fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:focus, .btn-info.disabled.focus, .btn-info[disabled].focus, -fieldset[disabled] .btn-info.focus, -.btn-info.disabled:active, -.btn-info[disabled]:active, -fieldset[disabled] .btn-info:active, -.btn-info.disabled.active, -.btn-info[disabled].active, -fieldset[disabled] .btn-info.active { +fieldset[disabled] .btn-info.focus { background-color: #5bc0de; border-color: #46b8da; } .btn-info .badge { color: #5bc0de; - background-color: #ffffff; + background-color: #fff; } .btn-warning { - color: #ffffff; + color: #fff; background-color: #f0ad4e; border-color: #eea236; } .btn-warning:focus, .btn-warning.focus { - color: #ffffff; + color: #fff; background-color: #ec971f; border-color: #985f0d; } .btn-warning:hover { - color: #ffffff; + color: #fff; background-color: #ec971f; border-color: #d58512; } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { - color: #ffffff; + color: #fff; background-color: #ec971f; border-color: #d58512; } @@ -3355,7 +3319,7 @@ fieldset[disabled] .btn-info.active { .btn-warning:active.focus, .btn-warning.active.focus, .open > .dropdown-toggle.btn-warning.focus { - color: #ffffff; + color: #fff; background-color: #d58512; border-color: #985f0d; } @@ -3364,9 +3328,6 @@ fieldset[disabled] .btn-info.active { .open > .dropdown-toggle.btn-warning { background-image: none; } -.btn-warning.disabled, -.btn-warning[disabled], -fieldset[disabled] .btn-warning, .btn-warning.disabled:hover, .btn-warning[disabled]:hover, fieldset[disabled] .btn-warning:hover, @@ -3375,40 +3336,34 @@ fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:focus, .btn-warning.disabled.focus, .btn-warning[disabled].focus, -fieldset[disabled] .btn-warning.focus, -.btn-warning.disabled:active, -.btn-warning[disabled]:active, -fieldset[disabled] .btn-warning:active, -.btn-warning.disabled.active, -.btn-warning[disabled].active, -fieldset[disabled] .btn-warning.active { +fieldset[disabled] .btn-warning.focus { background-color: #f0ad4e; border-color: #eea236; } .btn-warning .badge { color: #f0ad4e; - background-color: #ffffff; + background-color: #fff; } .btn-danger { - color: #ffffff; + color: #fff; background-color: #d9534f; border-color: #d43f3a; } .btn-danger:focus, .btn-danger.focus { - color: #ffffff; + color: #fff; background-color: #c9302c; border-color: #761c19; } .btn-danger:hover { - color: #ffffff; + color: #fff; background-color: #c9302c; border-color: #ac2925; } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { - color: #ffffff; + color: #fff; background-color: #c9302c; border-color: #ac2925; } @@ -3421,7 +3376,7 @@ fieldset[disabled] .btn-warning.active { .btn-danger:active.focus, .btn-danger.active.focus, .open > .dropdown-toggle.btn-danger.focus { - color: #ffffff; + color: #fff; background-color: #ac2925; border-color: #761c19; } @@ -3430,9 +3385,6 @@ fieldset[disabled] .btn-warning.active { .open > .dropdown-toggle.btn-danger { background-image: none; } -.btn-danger.disabled, -.btn-danger[disabled], -fieldset[disabled] .btn-danger, .btn-danger.disabled:hover, .btn-danger[disabled]:hover, fieldset[disabled] .btn-danger:hover, @@ -3441,23 +3393,17 @@ fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:focus, .btn-danger.disabled.focus, .btn-danger[disabled].focus, -fieldset[disabled] .btn-danger.focus, -.btn-danger.disabled:active, -.btn-danger[disabled]:active, -fieldset[disabled] .btn-danger:active, -.btn-danger.disabled.active, -.btn-danger[disabled].active, -fieldset[disabled] .btn-danger.active { +fieldset[disabled] .btn-danger.focus { background-color: #d9534f; border-color: #d43f3a; } .btn-danger .badge { color: #d9534f; - background-color: #ffffff; + background-color: #fff; } .btn-link { - color: #337ab7; font-weight: normal; + color: #337ab7; border-radius: 0; } .btn-link, @@ -3467,7 +3413,7 @@ fieldset[disabled] .btn-danger.active { fieldset[disabled] .btn-link { background-color: transparent; -webkit-box-shadow: none; - box-shadow: none; + box-shadow: none; } .btn-link, .btn-link:hover, @@ -3485,7 +3431,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #777777; + color: #777; text-decoration: none; } .btn-lg, @@ -3521,6 +3467,184 @@ input[type="reset"].btn-block, input[type="button"].btn-block { width: 100%; } +.fade { + opacity: 0; + -webkit-transition: opacity .15s linear; + -o-transition: opacity .15s linear; + transition: opacity .15s linear; +} +.fade.in { + opacity: 1; +} +.collapse { + display: none; +} +.collapse.in { + display: block; +} +tr.collapse.in { + display: table-row; +} +tbody.collapse.in { + display: table-row-group; +} +.collapsing { + position: relative; + height: 0; + overflow: hidden; + -webkit-transition-timing-function: ease; + -o-transition-timing-function: ease; + transition-timing-function: ease; + -webkit-transition-duration: .35s; + -o-transition-duration: .35s; + transition-duration: .35s; + -webkit-transition-property: height, visibility; + -o-transition-property: height, visibility; + transition-property: height, visibility; +} +.caret { + display: inline-block; + width: 0; + height: 0; + margin-left: 2px; + vertical-align: middle; + border-top: 4px dashed; + border-top: 4px solid \9; + border-right: 4px solid transparent; + border-left: 4px solid transparent; +} +.dropup, +.dropdown { + position: relative; +} +.dropdown-toggle:focus { + outline: 0; +} +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, .15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); + box-shadow: 0 6px 12px rgba(0, 0, 0, .175); +} +.dropdown-menu.pull-right { + right: 0; + left: auto; +} +.dropdown-menu .divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; +} +.dropdown-menu > li > a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: 1.42857143; + color: #333; + white-space: nowrap; +} +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus { + color: #262626; + text-decoration: none; + background-color: #f5f5f5; +} +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { + color: #fff; + text-decoration: none; + background-color: #337ab7; + outline: 0; +} +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #777; +} +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + cursor: not-allowed; + background-color: transparent; + background-image: none; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.open > .dropdown-menu { + display: block; +} +.open > a { + outline: 0; +} +.dropdown-menu-right { + right: 0; + left: auto; +} +.dropdown-menu-left { + right: auto; + left: 0; +} +.dropdown-header { + display: block; + padding: 3px 20px; + font-size: 12px; + line-height: 1.42857143; + color: #777; + white-space: nowrap; +} +.dropdown-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 990; +} +.pull-right > .dropdown-menu { + right: 0; + left: auto; +} +.dropup .caret, +.navbar-fixed-bottom .dropdown .caret { + content: ""; + border-top: 0; + border-bottom: 4px dashed; + border-bottom: 4px solid \9; +} +.dropup .dropdown-menu, +.navbar-fixed-bottom .dropdown .dropdown-menu { + top: auto; + bottom: 100%; + margin-bottom: 2px; +} +@media (min-width: 768px) { + .navbar-right .dropdown-menu { + right: 0; + left: auto; + } + .navbar-right .dropdown-menu-left { + right: auto; + left: 0; + } +} .btn-group, .btn-group-vertical { position: relative; @@ -3568,13 +3692,13 @@ input[type="button"].btn-block { margin-left: 0; } .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { - border-bottom-right-radius: 0; border-top-right-radius: 0; + border-bottom-right-radius: 0; } .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { - border-bottom-left-radius: 0; border-top-left-radius: 0; + border-bottom-left-radius: 0; } .btn-group > .btn-group { float: left; @@ -3584,32 +3708,32 @@ input[type="button"].btn-block { } .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { - border-bottom-right-radius: 0; border-top-right-radius: 0; + border-bottom-right-radius: 0; } .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { - border-bottom-left-radius: 0; border-top-left-radius: 0; + border-bottom-left-radius: 0; } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0; } .btn-group > .btn + .dropdown-toggle { - padding-left: 8px; padding-right: 8px; + padding-left: 8px; } .btn-group > .btn-lg + .dropdown-toggle { - padding-left: 12px; padding-right: 12px; + padding-left: 12px; } .btn-group.open .dropdown-toggle { - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); } .btn-group.open .dropdown-toggle.btn-link { -webkit-box-shadow: none; - box-shadow: none; + box-shadow: none; } .btn .caret { margin-left: 0; @@ -3643,14 +3767,16 @@ input[type="button"].btn-block { border-radius: 0; } .btn-group-vertical > .btn:first-child:not(:last-child) { + border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } .btn-group-vertical > .btn:last-child:not(:first-child) { - border-bottom-left-radius: 4px; - border-top-right-radius: 0; border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; @@ -3661,8 +3787,8 @@ input[type="button"].btn-block { border-bottom-left-radius: 0; } .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { - border-top-right-radius: 0; border-top-left-radius: 0; + border-top-right-radius: 0; } .btn-group-justified { display: table; @@ -3672,8 +3798,8 @@ input[type="button"].btn-block { } .btn-group-justified > .btn, .btn-group-justified > .btn-group { - float: none; display: table-cell; + float: none; width: 1%; } .btn-group-justified > .btn-group .btn { @@ -3697,8 +3823,8 @@ input[type="button"].btn-block { } .input-group[class*="col-"] { float: none; - padding-left: 0; padding-right: 0; + padding-left: 0; } .input-group .form-control { position: relative; @@ -3707,6 +3833,9 @@ input[type="button"].btn-block { width: 100%; margin-bottom: 0; } +.input-group .form-control:focus { + z-index: 3; +} .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { @@ -3774,10 +3903,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn { font-size: 14px; font-weight: normal; line-height: 1; - color: #555555; + color: #555; text-align: center; - background-color: #eeeeee; - border: 1px solid #cccccc; + background-color: #eee; + border: 1px solid #ccc; border-radius: 4px; } .input-group-addon.input-sm { @@ -3801,8 +3930,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { - border-bottom-right-radius: 0; border-top-right-radius: 0; + border-bottom-right-radius: 0; } .input-group-addon:first-child { border-right: 0; @@ -3814,8 +3943,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { - border-bottom-left-radius: 0; border-top-left-radius: 0; + border-bottom-left-radius: 0; } .input-group-addon:last-child { border-left: 0; @@ -3846,8 +3975,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-left: -1px; } .nav { - margin-bottom: 0; padding-left: 0; + margin-bottom: 0; list-style: none; } .nav > li { @@ -3862,22 +3991,22 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; - background-color: #eeeeee; + background-color: #eee; } .nav > li.disabled > a { - color: #777777; + color: #777; } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { - color: #777777; + color: #777; text-decoration: none; - background-color: transparent; cursor: not-allowed; + background-color: transparent; } .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { - background-color: #eeeeee; + background-color: #eee; border-color: #337ab7; } .nav .nav-divider { @@ -3890,7 +4019,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { max-width: none; } .nav-tabs { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; } .nav-tabs > li { float: left; @@ -3903,16 +4032,16 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; + border-color: #eee #eee #ddd; } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { - color: #555555; - background-color: #ffffff; - border: 1px solid #dddddd; - border-bottom-color: transparent; + color: #555; cursor: default; + background-color: #fff; + border: 1px solid #ddd; + border-bottom-color: transparent; } .nav-tabs.nav-justified { width: 100%; @@ -3922,8 +4051,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: none; } .nav-tabs.nav-justified > li > a { - text-align: center; margin-bottom: 5px; + text-align: center; } .nav-tabs.nav-justified > .dropdown .dropdown-menu { top: auto; @@ -3945,17 +4074,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { - border: 1px solid #dddddd; + border: 1px solid #ddd; } @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0; } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { - border-bottom-color: #ffffff; + border-bottom-color: #fff; } } .nav-pills > li { @@ -3970,7 +4099,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { - color: #ffffff; + color: #fff; background-color: #337ab7; } .nav-stacked > li { @@ -3987,8 +4116,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: none; } .nav-justified > li > a { - text-align: center; margin-bottom: 5px; + text-align: center; } .nav-justified > .dropdown .dropdown-menu { top: auto; @@ -4013,17 +4142,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { - border: 1px solid #dddddd; + border: 1px solid #ddd; } @media (min-width: 768px) { .nav-tabs-justified > li > a { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0; } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { - border-bottom-color: #ffffff; + border-bottom-color: #fff; } } .tab-content > .tab-pane { @@ -4034,8 +4163,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .nav-tabs .dropdown-menu { margin-top: -1px; - border-top-right-radius: 0; border-top-left-radius: 0; + border-top-right-radius: 0; } .navbar { position: relative; @@ -4054,13 +4183,13 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-collapse { - overflow-x: visible; padding-right: 15px; padding-left: 15px; - border-top: 1px solid transparent; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); + overflow-x: visible; -webkit-overflow-scrolling: touch; + border-top: 1px solid transparent; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1); } .navbar-collapse.in { overflow-y: auto; @@ -4084,8 +4213,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { - padding-left: 0; padding-right: 0; + padding-left: 0; } } .navbar-fixed-top .navbar-collapse, @@ -4147,10 +4276,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-brand { float: left; + height: 50px; padding: 15px 15px; font-size: 18px; line-height: 20px; - height: 50px; } .navbar-brand:hover, .navbar-brand:focus { @@ -4168,9 +4297,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-toggle { position: relative; float: right; - margin-right: 15px; padding: 9px 10px; margin-top: 8px; + margin-right: 15px; margin-bottom: 8px; background-color: transparent; background-image: none; @@ -4239,15 +4368,15 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-form { - margin-left: -15px; - margin-right: -15px; padding: 10px 15px; - border-top: 1px solid transparent; - border-bottom: 1px solid transparent; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); margin-top: 8px; + margin-right: -15px; margin-bottom: 8px; + margin-left: -15px; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); } @media (min-width: 768px) { .navbar-form .form-group { @@ -4310,24 +4439,24 @@ select[multiple].input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .navbar-form { width: auto; - border: 0; - margin-left: 0; - margin-right: 0; padding-top: 0; padding-bottom: 0; + margin-right: 0; + margin-left: 0; + border: 0; -webkit-box-shadow: none; - box-shadow: none; + box-shadow: none; } } .navbar-nav > li > .dropdown-menu { margin-top: 0; - border-top-right-radius: 0; border-top-left-radius: 0; + border-top-right-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { margin-bottom: 0; - border-top-right-radius: 4px; border-top-left-radius: 4px; + border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } @@ -4350,8 +4479,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .navbar-text { float: left; - margin-left: 15px; margin-right: 15px; + margin-left: 15px; } } @media (min-width: 768px) { @@ -4371,7 +4500,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-color: #e7e7e7; } .navbar-default .navbar-brand { - color: #777777; + color: #777; } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { @@ -4379,37 +4508,37 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-color: transparent; } .navbar-default .navbar-text { - color: #777777; + color: #777; } .navbar-default .navbar-nav > li > a { - color: #777777; + color: #777; } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: #333333; + color: #333; background-color: transparent; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { - color: #555555; + color: #555; background-color: #e7e7e7; } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { - color: #cccccc; + color: #ccc; background-color: transparent; } .navbar-default .navbar-toggle { - border-color: #dddddd; + border-color: #ddd; } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { - background-color: #dddddd; + background-color: #ddd; } .navbar-default .navbar-toggle .icon-bar { - background-color: #888888; + background-color: #888; } .navbar-default .navbar-collapse, .navbar-default .navbar-form { @@ -4418,52 +4547,52 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { + color: #555; background-color: #e7e7e7; - color: #555555; } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { - color: #777777; + color: #777; } .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { - color: #333333; + color: #333; background-color: transparent; } .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #555555; + color: #555; background-color: #e7e7e7; } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #cccccc; + color: #ccc; background-color: transparent; } } .navbar-default .navbar-link { - color: #777777; + color: #777; } .navbar-default .navbar-link:hover { - color: #333333; + color: #333; } .navbar-default .btn-link { - color: #777777; + color: #777; } .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { - color: #333333; + color: #333; } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { - color: #cccccc; + color: #ccc; } .navbar-inverse { - background-color: #222222; + background-color: #222; border-color: #080808; } .navbar-inverse .navbar-brand { @@ -4471,7 +4600,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-inverse .navbar-text { @@ -4482,30 +4611,30 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - color: #ffffff; + color: #fff; background-color: #080808; } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { - color: #444444; + color: #444; background-color: transparent; } .navbar-inverse .navbar-toggle { - border-color: #333333; + border-color: #333; } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: #333333; + background-color: #333; } .navbar-inverse .navbar-toggle .icon-bar { - background-color: #ffffff; + background-color: #fff; } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { @@ -4514,8 +4643,8 @@ fieldset[disabled] .navbar-default .btn-link:focus { .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { + color: #fff; background-color: #080808; - color: #ffffff; } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { @@ -4529,19 +4658,19 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { - color: #ffffff; + color: #fff; background-color: transparent; } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #ffffff; + color: #fff; background-color: #080808; } .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #444444; + color: #444; background-color: transparent; } } @@ -4549,20 +4678,20 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #9d9d9d; } .navbar-inverse .navbar-link:hover { - color: #ffffff; + color: #fff; } .navbar-inverse .btn-link { color: #9d9d9d; } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { - color: #ffffff; + color: #fff; } .navbar-inverse .btn-link[disabled]:hover, fieldset[disabled] .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:focus { - color: #444444; + color: #444; } .breadcrumb { padding: 8px 15px; @@ -4575,12 +4704,12 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { display: inline-block; } .breadcrumb > li + li:before { - content: "/\00a0"; padding: 0 5px; - color: #cccccc; + color: #ccc; + content: "/\00a0"; } .breadcrumb > .active { - color: #777777; + color: #777; } .pagination { display: inline-block; @@ -4596,32 +4725,32 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { position: relative; float: left; padding: 6px 12px; + margin-left: -1px; line-height: 1.42857143; - text-decoration: none; color: #337ab7; - background-color: #ffffff; - border: 1px solid #dddddd; - margin-left: -1px; + text-decoration: none; + background-color: #fff; + border: 1px solid #ddd; } .pagination > li:first-child > a, .pagination > li:first-child > span { margin-left: 0; - border-bottom-left-radius: 4px; border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } .pagination > li:last-child > a, .pagination > li:last-child > span { - border-bottom-right-radius: 4px; border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } .pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { - z-index: 3; + z-index: 2; color: #23527c; - background-color: #eeeeee; - border-color: #dddddd; + background-color: #eee; + border-color: #ddd; } .pagination > .active > a, .pagination > .active > span, @@ -4629,11 +4758,11 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus { - z-index: 2; - color: #ffffff; + z-index: 3; + color: #fff; + cursor: default; background-color: #337ab7; border-color: #337ab7; - cursor: default; } .pagination > .disabled > span, .pagination > .disabled > span:hover, @@ -4641,10 +4770,10 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { - color: #777777; - background-color: #ffffff; - border-color: #dddddd; + color: #777; cursor: not-allowed; + background-color: #fff; + border-color: #ddd; } .pagination-lg > li > a, .pagination-lg > li > span { @@ -4654,13 +4783,13 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { - border-bottom-left-radius: 6px; border-top-left-radius: 6px; + border-bottom-left-radius: 6px; } .pagination-lg > li:last-child > a, .pagination-lg > li:last-child > span { - border-bottom-right-radius: 6px; border-top-right-radius: 6px; + border-bottom-right-radius: 6px; } .pagination-sm > li > a, .pagination-sm > li > span { @@ -4670,19 +4799,19 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { - border-bottom-left-radius: 3px; border-top-left-radius: 3px; + border-bottom-left-radius: 3px; } .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span { - border-bottom-right-radius: 3px; border-top-right-radius: 3px; + border-bottom-right-radius: 3px; } .pager { padding-left: 0; margin: 20px 0; - list-style: none; text-align: center; + list-style: none; } .pager li { display: inline; @@ -4691,14 +4820,14 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager li > span { display: inline-block; padding: 5px 14px; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; border-radius: 15px; } .pager li > a:hover, .pager li > a:focus { text-decoration: none; - background-color: #eeeeee; + background-color: #eee; } .pager .next > a, .pager .next > span { @@ -4712,9 +4841,9 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { - color: #777777; - background-color: #ffffff; + color: #777; cursor: not-allowed; + background-color: #fff; } .label { display: inline; @@ -4722,7 +4851,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { font-size: 75%; font-weight: bold; line-height: 1; - color: #ffffff; + color: #fff; text-align: center; white-space: nowrap; vertical-align: baseline; @@ -4730,7 +4859,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } a.label:hover, a.label:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } @@ -4742,7 +4871,7 @@ a.label:focus { top: -1px; } .label-default { - background-color: #777777; + background-color: #777; } .label-default[href]:hover, .label-default[href]:focus { @@ -4789,12 +4918,12 @@ a.label:focus { padding: 3px 7px; font-size: 12px; font-weight: bold; - color: #ffffff; line-height: 1; - vertical-align: middle; - white-space: nowrap; + color: #fff; text-align: center; - background-color: #777777; + white-space: nowrap; + vertical-align: middle; + background-color: #777; border-radius: 10px; } .badge:empty { @@ -4811,14 +4940,14 @@ a.label:focus { } a.badge:hover, a.badge:focus { - color: #ffffff; + color: #fff; text-decoration: none; cursor: pointer; } .list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #337ab7; - background-color: #ffffff; + background-color: #fff; } .list-group-item > .badge { float: right; @@ -4834,7 +4963,7 @@ a.badge:focus { padding-bottom: 30px; margin-bottom: 30px; color: inherit; - background-color: #eeeeee; + background-color: #eee; } .jumbotron h1, .jumbotron .h1 { @@ -4850,6 +4979,8 @@ a.badge:focus { } .container .jumbotron, .container-fluid .jumbotron { + padding-right: 15px; + padding-left: 15px; border-radius: 6px; } .jumbotron .container { @@ -4862,8 +4993,8 @@ a.badge:focus { } .container .jumbotron, .container-fluid .jumbotron { - padding-left: 60px; padding-right: 60px; + padding-left: 60px; } .jumbotron h1, .jumbotron .h1 { @@ -4875,17 +5006,17 @@ a.badge:focus { padding: 4px; margin-bottom: 20px; line-height: 1.42857143; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; border-radius: 4px; - -webkit-transition: border 0.2s ease-in-out; - -o-transition: border 0.2s ease-in-out; - transition: border 0.2s ease-in-out; + -webkit-transition: border .2s ease-in-out; + -o-transition: border .2s ease-in-out; + transition: border .2s ease-in-out; } .thumbnail > img, .thumbnail a > img { - margin-left: auto; margin-right: auto; + margin-left: auto; } a.thumbnail:hover, a.thumbnail:focus, @@ -4894,7 +5025,7 @@ a.thumbnail.active { } .thumbnail .caption { padding: 9px; - color: #333333; + color: #333; } .alert { padding: 15px; @@ -4928,9 +5059,9 @@ a.thumbnail.active { color: inherit; } .alert-success { + color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6; - color: #3c763d; } .alert-success hr { border-top-color: #c9e2b3; @@ -4939,9 +5070,9 @@ a.thumbnail.active { color: #2b542c; } .alert-info { + color: #31708f; background-color: #d9edf7; border-color: #bce8f1; - color: #31708f; } .alert-info hr { border-top-color: #a6e1ec; @@ -4950,9 +5081,9 @@ a.thumbnail.active { color: #245269; } .alert-warning { + color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc; - color: #8a6d3b; } .alert-warning hr { border-top-color: #f7e1b5; @@ -4961,9 +5092,9 @@ a.thumbnail.active { color: #66512c; } .alert-danger { + color: #a94442; background-color: #f2dede; border-color: #ebccd1; - color: #a94442; } .alert-danger hr { border-top-color: #e4b9c0; @@ -4996,74 +5127,74 @@ a.thumbnail.active { } } .progress { - overflow: hidden; height: 20px; margin-bottom: 20px; + overflow: hidden; background-color: #f5f5f5; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); } .progress-bar { float: left; - width: 0%; + width: 0; height: 100%; font-size: 12px; line-height: 20px; - color: #ffffff; + color: #fff; text-align: center; background-color: #337ab7; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); + -webkit-transition: width .6s ease; + -o-transition: width .6s ease; + transition: width .6s ease; } .progress-striped .progress-bar, .progress-bar-striped { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px; } .progress.active .progress-bar, .progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; } .progress-bar-success { background-color: #5cb85c; } .progress-striped .progress-bar-success { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); } .progress-bar-info { background-color: #5bc0de; } .progress-striped .progress-bar-info { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); } .progress-bar-warning { background-color: #f0ad4e; } .progress-striped .progress-bar-warning { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); } .progress-bar-danger { background-color: #d9534f; } .progress-striped .progress-bar-danger { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); } .media { margin-top: 15px; @@ -5073,8 +5204,8 @@ a.thumbnail.active { } .media, .media-body { - zoom: 1; overflow: hidden; + zoom: 1; } .media-body { width: 10000px; @@ -5114,20 +5245,20 @@ a.thumbnail.active { list-style: none; } .list-group { - margin-bottom: 20px; padding-left: 0; + margin-bottom: 20px; } .list-group-item { position: relative; display: block; padding: 10px 15px; margin-bottom: -1px; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #fff; + border: 1px solid #ddd; } .list-group-item:first-child { - border-top-right-radius: 4px; border-top-left-radius: 4px; + border-top-right-radius: 4px; } .list-group-item:last-child { margin-bottom: 0; @@ -5136,18 +5267,18 @@ a.thumbnail.active { } a.list-group-item, button.list-group-item { - color: #555555; + color: #555; } a.list-group-item .list-group-item-heading, button.list-group-item .list-group-item-heading { - color: #333333; + color: #333; } a.list-group-item:hover, button.list-group-item:hover, a.list-group-item:focus, button.list-group-item:focus { + color: #555; text-decoration: none; - color: #555555; background-color: #f5f5f5; } button.list-group-item { @@ -5157,9 +5288,9 @@ button.list-group-item { .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { - background-color: #eeeeee; - color: #777777; + color: #777; cursor: not-allowed; + background-color: #eee; } .list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, @@ -5169,13 +5300,13 @@ button.list-group-item { .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { - color: #777777; + color: #777; } .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; - color: #ffffff; + color: #fff; background-color: #337ab7; border-color: #337ab7; } @@ -5321,11 +5452,11 @@ button.list-group-item-danger.active:focus { } .panel { margin-bottom: 20px; - background-color: #ffffff; + background-color: #fff; border: 1px solid transparent; border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: 0 1px 1px rgba(0, 0, 0, .05); } .panel-body { padding: 15px; @@ -5333,8 +5464,8 @@ button.list-group-item-danger.active:focus { .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; - border-top-right-radius: 3px; border-top-left-radius: 3px; + border-top-right-radius: 3px; } .panel-heading > .dropdown .dropdown-toggle { color: inherit; @@ -5355,7 +5486,7 @@ button.list-group-item-danger.active:focus { .panel-footer { padding: 10px 15px; background-color: #f5f5f5; - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; } @@ -5371,8 +5502,8 @@ button.list-group-item-danger.active:focus { .panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { border-top: 0; - border-top-right-radius: 3px; border-top-left-radius: 3px; + border-top-right-radius: 3px; } .panel > .list-group:last-child .list-group-item:last-child, .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child { @@ -5381,8 +5512,8 @@ button.list-group-item-danger.active:focus { border-bottom-left-radius: 3px; } .panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { - border-top-right-radius: 0; border-top-left-radius: 0; + border-top-right-radius: 0; } .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0; @@ -5398,13 +5529,13 @@ button.list-group-item-danger.active:focus { .panel > .table caption, .panel > .table-responsive > .table caption, .panel > .panel-collapse > .table caption { - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } .panel > .table:first-child, .panel > .table-responsive:first-child > .table:first-child { - border-top-right-radius: 3px; border-top-left-radius: 3px; + border-top-right-radius: 3px; } .panel > .table:first-child > thead:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child, @@ -5442,8 +5573,8 @@ button.list-group-item-danger.active:focus { .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child { - border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; } .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, @@ -5469,7 +5600,7 @@ button.list-group-item-danger.active:focus { .panel > .panel-body + .table-responsive, .panel > .table + .panel-body, .panel > .table-responsive + .panel-body { - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; } .panel > .table > tbody:first-child > tr:first-child th, .panel > .table > tbody:first-child > tr:first-child td { @@ -5528,8 +5659,8 @@ button.list-group-item-danger.active:focus { border-bottom: 0; } .panel > .table-responsive { - border: 0; margin-bottom: 0; + border: 0; } .panel-group { margin-bottom: 20px; @@ -5546,37 +5677,37 @@ button.list-group-item-danger.active:focus { } .panel-group .panel-heading + .panel-collapse > .panel-body, .panel-group .panel-heading + .panel-collapse > .list-group { - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; } .panel-group .panel-footer { border-top: 0; } .panel-group .panel-footer + .panel-collapse .panel-body { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; } .panel-default { - border-color: #dddddd; + border-color: #ddd; } .panel-default > .panel-heading { - color: #333333; + color: #333; background-color: #f5f5f5; - border-color: #dddddd; + border-color: #ddd; } .panel-default > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #dddddd; + border-top-color: #ddd; } .panel-default > .panel-heading .badge { color: #f5f5f5; - background-color: #333333; + background-color: #333; } .panel-default > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #dddddd; + border-bottom-color: #ddd; } .panel-primary { border-color: #337ab7; } .panel-primary > .panel-heading { - color: #ffffff; + color: #fff; background-color: #337ab7; border-color: #337ab7; } @@ -5585,7 +5716,7 @@ button.list-group-item-danger.active:focus { } .panel-primary > .panel-heading .badge { color: #337ab7; - background-color: #ffffff; + background-color: #fff; } .panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #337ab7; @@ -5676,10 +5807,10 @@ button.list-group-item-danger.active:focus { .embed-responsive video { position: absolute; top: 0; - left: 0; bottom: 0; - height: 100%; + left: 0; width: 100%; + height: 100%; border: 0; } .embed-responsive-16by9 { @@ -5695,12 +5826,12 @@ button.list-group-item-danger.active:focus { background-color: #f5f5f5; border: 1px solid #e3e3e3; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); } .well blockquote { border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); + border-color: rgba(0, 0, 0, .15); } .well-lg { padding: 24px; @@ -5715,25 +5846,620 @@ button.list-group-item-danger.active:focus { font-size: 21px; font-weight: bold; line-height: 1; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; + color: #000; + text-shadow: 0 1px 0 #fff; filter: alpha(opacity=20); + opacity: .2; } .close:hover, .close:focus { - color: #000000; + color: #000; text-decoration: none; cursor: pointer; - opacity: 0.5; filter: alpha(opacity=50); + opacity: .5; } button.close { + -webkit-appearance: none; padding: 0; cursor: pointer; background: transparent; border: 0; - -webkit-appearance: none; +} +.modal-open { + overflow: hidden; +} +.modal { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1050; + display: none; + overflow: hidden; + -webkit-overflow-scrolling: touch; + outline: 0; +} +.modal.fade .modal-dialog { + -webkit-transition: -webkit-transform .3s ease-out; + -o-transition: -o-transform .3s ease-out; + transition: transform .3s ease-out; + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + -o-transform: translate(0, -25%); + transform: translate(0, -25%); +} +.modal.in .modal-dialog { + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + -o-transform: translate(0, 0); + transform: translate(0, 0); +} +.modal-open .modal { + overflow-x: hidden; + overflow-y: auto; +} +.modal-dialog { + position: relative; + width: auto; + margin: 10px; +} +.modal-content { + position: relative; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, .2); + border-radius: 6px; + outline: 0; + -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5); + box-shadow: 0 3px 9px rgba(0, 0, 0, .5); +} +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 1040; + background-color: #000; +} +.modal-backdrop.fade { + filter: alpha(opacity=0); + opacity: 0; +} +.modal-backdrop.in { + filter: alpha(opacity=50); + opacity: .5; +} +.modal-header { + padding: 15px; + border-bottom: 1px solid #e5e5e5; +} +.modal-header .close { + margin-top: -2px; +} +.modal-title { + margin: 0; + line-height: 1.42857143; +} +.modal-body { + position: relative; + padding: 15px; +} +.modal-footer { + padding: 15px; + text-align: right; + border-top: 1px solid #e5e5e5; +} +.modal-footer .btn + .btn { + margin-bottom: 0; + margin-left: 5px; +} +.modal-footer .btn-group .btn + .btn { + margin-left: -1px; +} +.modal-footer .btn-block + .btn-block { + margin-left: 0; +} +.modal-scrollbar-measure { + position: absolute; + top: -9999px; + width: 50px; + height: 50px; + overflow: scroll; +} +@media (min-width: 768px) { + .modal-dialog { + width: 600px; + margin: 30px auto; + } + .modal-content { + -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5); + box-shadow: 0 5px 15px rgba(0, 0, 0, .5); + } + .modal-sm { + width: 300px; + } +} +@media (min-width: 992px) { + .modal-lg { + width: 900px; + } +} +.tooltip { + position: absolute; + z-index: 1070; + display: block; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12px; + font-style: normal; + font-weight: normal; + line-height: 1.42857143; + text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + letter-spacing: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; + white-space: normal; + filter: alpha(opacity=0); + opacity: 0; + + line-break: auto; +} +.tooltip.in { + filter: alpha(opacity=90); + opacity: .9; +} +.tooltip.top { + padding: 5px 0; + margin-top: -3px; +} +.tooltip.right { + padding: 0 5px; + margin-left: 3px; +} +.tooltip.bottom { + padding: 5px 0; + margin-top: 3px; +} +.tooltip.left { + padding: 0 5px; + margin-left: -3px; +} +.tooltip-inner { + max-width: 200px; + padding: 3px 8px; + color: #fff; + text-align: center; + background-color: #000; + border-radius: 4px; +} +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.tooltip.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -5px; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.top-left .tooltip-arrow { + right: 5px; + bottom: 0; + margin-bottom: -5px; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.top-right .tooltip-arrow { + bottom: 0; + left: 5px; + margin-bottom: -5px; + border-width: 5px 5px 0; + border-top-color: #000; +} +.tooltip.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -5px; + border-width: 5px 5px 5px 0; + border-right-color: #000; +} +.tooltip.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -5px; + border-width: 5px 0 5px 5px; + border-left-color: #000; +} +.tooltip.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.tooltip.bottom-left .tooltip-arrow { + top: 0; + right: 5px; + margin-top: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.tooltip.bottom-right .tooltip-arrow { + top: 0; + left: 5px; + margin-top: -5px; + border-width: 0 5px 5px; + border-bottom-color: #000; +} +.popover { + position: absolute; + top: 0; + left: 0; + z-index: 1060; + display: none; + max-width: 276px; + padding: 1px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + font-style: normal; + font-weight: normal; + line-height: 1.42857143; + text-align: left; + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + letter-spacing: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; + white-space: normal; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, .2); + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); + box-shadow: 0 5px 10px rgba(0, 0, 0, .2); + + line-break: auto; +} +.popover.top { + margin-top: -10px; +} +.popover.right { + margin-left: 10px; +} +.popover.bottom { + margin-top: 10px; +} +.popover.left { + margin-left: -10px; +} +.popover-title { + padding: 8px 14px; + margin: 0; + font-size: 14px; + background-color: #f7f7f7; + border-bottom: 1px solid #ebebeb; + border-radius: 5px 5px 0 0; +} +.popover-content { + padding: 9px 14px; +} +.popover > .arrow, +.popover > .arrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.popover > .arrow { + border-width: 11px; +} +.popover > .arrow:after { + content: ""; + border-width: 10px; +} +.popover.top > .arrow { + bottom: -11px; + left: 50%; + margin-left: -11px; + border-top-color: #999; + border-top-color: rgba(0, 0, 0, .25); + border-bottom-width: 0; +} +.popover.top > .arrow:after { + bottom: 1px; + margin-left: -10px; + content: " "; + border-top-color: #fff; + border-bottom-width: 0; +} +.popover.right > .arrow { + top: 50%; + left: -11px; + margin-top: -11px; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, .25); + border-left-width: 0; +} +.popover.right > .arrow:after { + bottom: -10px; + left: 1px; + content: " "; + border-right-color: #fff; + border-left-width: 0; +} +.popover.bottom > .arrow { + top: -11px; + left: 50%; + margin-left: -11px; + border-top-width: 0; + border-bottom-color: #999; + border-bottom-color: rgba(0, 0, 0, .25); +} +.popover.bottom > .arrow:after { + top: 1px; + margin-left: -10px; + content: " "; + border-top-width: 0; + border-bottom-color: #fff; +} +.popover.left > .arrow { + top: 50%; + right: -11px; + margin-top: -11px; + border-right-width: 0; + border-left-color: #999; + border-left-color: rgba(0, 0, 0, .25); +} +.popover.left > .arrow:after { + right: 1px; + bottom: -10px; + content: " "; + border-right-width: 0; + border-left-color: #fff; +} +.carousel { + position: relative; +} +.carousel-inner { + position: relative; + width: 100%; + overflow: hidden; +} +.carousel-inner > .item { + position: relative; + display: none; + -webkit-transition: .6s ease-in-out left; + -o-transition: .6s ease-in-out left; + transition: .6s ease-in-out left; +} +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { + line-height: 1; +} +@media all and (transform-3d), (-webkit-transform-3d) { + .carousel-inner > .item { + -webkit-transition: -webkit-transform .6s ease-in-out; + -o-transition: -o-transform .6s ease-in-out; + transition: transform .6s ease-in-out; + + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + -webkit-perspective: 1000px; + perspective: 1000px; + } + .carousel-inner > .item.next, + .carousel-inner > .item.active.right { + left: 0; + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } + .carousel-inner > .item.prev, + .carousel-inner > .item.active.left { + left: 0; + -webkit-transform: translate3d(-100%, 0, 0); + transform: translate3d(-100%, 0, 0); + } + .carousel-inner > .item.next.left, + .carousel-inner > .item.prev.right, + .carousel-inner > .item.active { + left: 0; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + } +} +.carousel-inner > .active, +.carousel-inner > .next, +.carousel-inner > .prev { + display: block; +} +.carousel-inner > .active { + left: 0; +} +.carousel-inner > .next, +.carousel-inner > .prev { + position: absolute; + top: 0; + width: 100%; +} +.carousel-inner > .next { + left: 100%; +} +.carousel-inner > .prev { + left: -100%; +} +.carousel-inner > .next.left, +.carousel-inner > .prev.right { + left: 0; +} +.carousel-inner > .active.left { + left: -100%; +} +.carousel-inner > .active.right { + left: 100%; +} +.carousel-control { + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 15%; + font-size: 20px; + color: #fff; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, .6); + background-color: rgba(0, 0, 0, 0); + filter: alpha(opacity=50); + opacity: .5; +} +.carousel-control.left { + background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); + background-image: -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); + background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001))); + background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); + background-repeat: repeat-x; +} +.carousel-control.right { + right: 0; + left: auto; + background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); + background-image: -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); + background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5))); + background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); + background-repeat: repeat-x; +} +.carousel-control:hover, +.carousel-control:focus { + color: #fff; + text-decoration: none; + filter: alpha(opacity=90); + outline: 0; + opacity: .9; +} +.carousel-control .icon-prev, +.carousel-control .icon-next, +.carousel-control .glyphicon-chevron-left, +.carousel-control .glyphicon-chevron-right { + position: absolute; + top: 50%; + z-index: 5; + display: inline-block; + margin-top: -10px; +} +.carousel-control .icon-prev, +.carousel-control .glyphicon-chevron-left { + left: 50%; + margin-left: -10px; +} +.carousel-control .icon-next, +.carousel-control .glyphicon-chevron-right { + right: 50%; + margin-right: -10px; +} +.carousel-control .icon-prev, +.carousel-control .icon-next { + width: 20px; + height: 20px; + font-family: serif; + line-height: 1; +} +.carousel-control .icon-prev:before { + content: '\2039'; +} +.carousel-control .icon-next:before { + content: '\203a'; +} +.carousel-indicators { + position: absolute; + bottom: 10px; + left: 50%; + z-index: 15; + width: 60%; + padding-left: 0; + margin-left: -30%; + text-align: center; + list-style: none; +} +.carousel-indicators li { + display: inline-block; + width: 10px; + height: 10px; + margin: 1px; + text-indent: -999px; + cursor: pointer; + background-color: #000 \9; + background-color: rgba(0, 0, 0, 0); + border: 1px solid #fff; + border-radius: 10px; +} +.carousel-indicators .active { + width: 12px; + height: 12px; + margin: 0; + background-color: #fff; +} +.carousel-caption { + position: absolute; + right: 15%; + bottom: 20px; + left: 15%; + z-index: 10; + padding-top: 20px; + padding-bottom: 20px; + color: #fff; + text-align: center; + text-shadow: 0 1px 2px rgba(0, 0, 0, .6); +} +.carousel-caption .btn { + text-shadow: none; +} +@media screen and (min-width: 768px) { + .carousel-control .glyphicon-chevron-left, + .carousel-control .glyphicon-chevron-right, + .carousel-control .icon-prev, + .carousel-control .icon-next { + width: 30px; + height: 30px; + margin-top: -10px; + font-size: 30px; + } + .carousel-control .glyphicon-chevron-left, + .carousel-control .icon-prev { + margin-left: -10px; + } + .carousel-control .glyphicon-chevron-right, + .carousel-control .icon-next { + margin-right: -10px; + } + .carousel-caption { + right: 20%; + left: 20%; + padding-bottom: 30px; + } + .carousel-indicators { + bottom: 20px; + } } .clearfix:before, .clearfix:after, @@ -5762,9 +6488,13 @@ button.close { .pager:before, .pager:after, .panel-body:before, -.panel-body:after { - content: " "; +.panel-body:after, +.modal-header:before, +.modal-header:after, +.modal-footer:before, +.modal-footer:after { display: table; + content: " "; } .clearfix:after, .dl-horizontal dd:after, @@ -5779,13 +6509,15 @@ button.close { .navbar-header:after, .navbar-collapse:after, .pager:after, -.panel-body:after { +.panel-body:after, +.modal-header:after, +.modal-footer:after { clear: both; } .center-block { display: block; - margin-left: auto; margin-right: auto; + margin-left: auto; } .pull-right { float: right !important; @@ -6025,3 +6757,4 @@ button.close { display: none !important; } } +/*# sourceMappingURL=bootstrap.css.map */

1 0

[webwml/staging] the RFF donate option, unlike the others, does not get money to us
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit 246395d69d1ce8d0499a975dac71d88bab37a393 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Dec 1 19:26:10 2015 -0500 the RFF donate option, unlike the others, does not get money to us hopefully this is now clearer on the page --- donate/en/donate-options.wml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 99f9a2b..942bf21 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -160,8 +160,9 @@ exchange money quickly, safely, at a lower cost.</p> <p>For European bank transfers, we have an arrangement with the Renewable Freedom Foundation to provide <a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreig…">tax-deductible</a> - donations for - Europeans. They will issue a donation receipt <a + donations for Europeans. (They don't actually pass the money + through to us, but rather we trust them to spend it in Tor's + interest.) They will issue a donation receipt <a href="https://renewablefreedom.org/contact/">upon request</a>. The account information is as follows:</p>

1 0

[webwml/staging] add a new redirect from donate-roger to donate
by sebastian＠torproject.org 08 Dec '15

08 Dec '15

commit 13df8c1d7fccd7ca02bdacb49b2ed374666de716 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Dec 1 17:27:55 2015 -0500 add a new redirect from donate-roger to donate --- .htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.htaccess b/.htaccess index 83a4453..b91115f 100644 --- a/.htaccess +++ b/.htaccess @@ -59,3 +59,5 @@ RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] + diff --git a/donate/en/donate-roger.wml b/donate/en/donate-roger.wml new file mode 100644 index 0000000..e69de29

1 0