From: Marius Gavrilescu Date: Fri, 24 Apr 2015 07:47:01 +0000 (+0300) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=c88d927a55770792bb6fdebcae3504cfdec7dcca;hp=6f5debb62f9d49098b660b626890a46dbbf7346f;p=gruntmaster-page.git Merge branch 'master' into newmc --- diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css index fe829d6..4ba8625 100644 --- a/css/themes/cyborg.css +++ b/css/themes/cyborg.css @@ -95,9 +95,7 @@ figure { margin: 1em 40px; } hr { - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; - box-sizing: content-box; + box-sizing: content-box; height: 0; } pre { @@ -147,9 +145,7 @@ input { } input[type="checkbox"], input[type="radio"] { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; padding: 0; } input[type="number"]::-webkit-inner-spin-button, @@ -158,8 +154,6 @@ input[type="number"]::-webkit-outer-spin-button { } input[type="search"] { -webkit-appearance: textfield; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; box-sizing: content-box; } input[type="search"]::-webkit-search-cancel-button, @@ -196,8 +190,7 @@ th { *:after { background: transparent !important; color: #000 !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; + box-shadow: none !important; text-shadow: none !important; } a, @@ -265,14 +258,10 @@ th { } } * { - -webkit-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; } html { @@ -328,8 +317,6 @@ img { background-color: #282828; border: 1px solid #282828; 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%; @@ -731,15 +718,13 @@ kbd { color: #ffffff; background-color: #333333; border-radius: 3px; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); } kbd kbd { padding: 0; font-size: 100%; font-weight: bold; - -webkit-box-shadow: none; - box-shadow: none; + box-shadow: none; } pre { display: block; @@ -988,16 +973,12 @@ input[type="checkbox"]:focus { background-image: none; border: 1px solid #282828; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border-color ease-in-out .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; } .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); } .form-control::-moz-placeholder { @@ -1057,7 +1038,6 @@ textarea.form-control { .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); } .btn-default { @@ -1332,7 +1312,6 @@ fieldset[disabled] .btn-primary.active { background-color: #151515; border: 1px solid #030303; 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); } .well blockquote { diff --git a/css/themes/readable.css b/css/themes/readable.css index 51fd230..193cdfd 100644 --- a/css/themes/readable.css +++ b/css/themes/readable.css @@ -95,9 +95,7 @@ figure { margin: 1em 40px; } hr { - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; - box-sizing: content-box; + box-sizing: content-box; height: 0; } pre { @@ -147,9 +145,7 @@ input { } input[type="checkbox"], input[type="radio"] { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; padding: 0; } input[type="number"]::-webkit-inner-spin-button, @@ -158,8 +154,6 @@ input[type="number"]::-webkit-outer-spin-button { } input[type="search"] { -webkit-appearance: textfield; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; box-sizing: content-box; } input[type="search"]::-webkit-search-cancel-button, @@ -196,8 +190,7 @@ th { *:after { background: transparent !important; color: #000 !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; + box-shadow: none !important; text-shadow: none !important; } a, @@ -265,14 +258,10 @@ th { } } * { - -webkit-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; } html { @@ -328,8 +317,6 @@ img { 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%; @@ -731,15 +718,13 @@ kbd { color: #ffffff; background-color: #333333; border-radius: 3px; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); } kbd kbd { padding: 0; font-size: 100%; font-weight: bold; - -webkit-box-shadow: none; - box-shadow: none; + box-shadow: none; } pre { display: block; @@ -988,16 +973,12 @@ input[type="checkbox"]:focus { background-image: none; border: 1px solid #dddddd; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border-color ease-in-out .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; } .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); } .form-control::-moz-placeholder { @@ -1057,7 +1038,6 @@ textarea.form-control { .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); } .btn-default { @@ -1332,7 +1312,6 @@ fieldset[disabled] .btn-primary.active { background-color: #f7f7f7; border: 1px solid #e5e5e5; 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); } .well blockquote { @@ -1512,7 +1491,6 @@ legend { font-weight: normal; } .panel { - -webkit-box-shadow: none; box-shadow: none; } .panel-default .close { diff --git a/css/themes/slate.css b/css/themes/slate.css index 68e9656..34b535e 100644 --- a/css/themes/slate.css +++ b/css/themes/slate.css @@ -95,9 +95,7 @@ figure { margin: 1em 40px; } hr { - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; - box-sizing: content-box; + box-sizing: content-box; height: 0; } pre { @@ -147,9 +145,7 @@ input { } input[type="checkbox"], input[type="radio"] { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; padding: 0; } input[type="number"]::-webkit-inner-spin-button, @@ -158,8 +154,6 @@ input[type="number"]::-webkit-outer-spin-button { } input[type="search"] { -webkit-appearance: textfield; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; box-sizing: content-box; } input[type="search"]::-webkit-search-cancel-button, @@ -196,8 +190,7 @@ th { *:after { background: transparent !important; color: #000 !important; - -webkit-box-shadow: none !important; - box-shadow: none !important; + box-shadow: none !important; text-shadow: none !important; } a, @@ -265,14 +258,10 @@ th { } } * { - -webkit-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; } html { @@ -328,8 +317,6 @@ img { background-color: #1c1e22; border: 1px solid #0c0d0e; 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%; @@ -731,15 +718,13 @@ kbd { color: #ffffff; background-color: #333333; border-radius: 3px; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); } kbd kbd { padding: 0; font-size: 100%; font-weight: bold; - -webkit-box-shadow: none; - box-shadow: none; + box-shadow: none; } pre { display: block; @@ -988,16 +973,12 @@ input[type="checkbox"]:focus { background-image: none; border: 1px solid #cccccc; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border-color ease-in-out .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; } .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); } .form-control::-moz-placeholder { @@ -1057,7 +1038,6 @@ textarea.form-control { .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); } .btn-default { @@ -1332,7 +1312,6 @@ fieldset[disabled] .btn-primary.active { background-color: #1c1e22; border: 1px solid #0c0d0e; 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); } .well blockquote { @@ -1412,44 +1391,20 @@ fieldset[disabled] .btn-primary.active { text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); } .btn-default { - background-image: -webkit-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -o-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -webkit-gradient(linear, left top, left bottom, from(#484e55), color-stop(60%, #3a3f44), to(#313539)); background-image: linear-gradient(#484e55, #3a3f44 60%, #313539); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff484e55', endColorstr='#ff313539', GradientType=0); - -webkit-filter: none; - filter: none; } .btn-default:hover { - background-image: -webkit-linear-gradient(#020202, #101112 40%, #191b1d); - background-image: -o-linear-gradient(#020202, #101112 40%, #191b1d); - background-image: -webkit-gradient(linear, left top, left bottom, from(#020202), color-stop(40%, #101112), to(#191b1d)); background-image: linear-gradient(#020202, #101112 40%, #191b1d); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff020202', endColorstr='#ff191b1d', GradientType=0); - -webkit-filter: none; - filter: none; } .btn-primary { - background-image: -webkit-linear-gradient(#8a9196, #7a8288 60%, #70787d); - background-image: -o-linear-gradient(#8a9196, #7a8288 60%, #70787d); - background-image: -webkit-gradient(linear, left top, left bottom, from(#8a9196), color-stop(60%, #7a8288), to(#70787d)); background-image: linear-gradient(#8a9196, #7a8288 60%, #70787d); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8a9196', endColorstr='#ff70787d', GradientType=0); - -webkit-filter: none; - filter: none; } .btn-primary:hover { - background-image: -webkit-linear-gradient(#404448, #4e5458 40%, #585e62); - background-image: -o-linear-gradient(#404448, #4e5458 40%, #585e62); - background-image: -webkit-gradient(linear, left top, left bottom, from(#404448), color-stop(40%, #4e5458), to(#585e62)); background-image: linear-gradient(#404448, #4e5458 40%, #585e62); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff404448', endColorstr='#ff585e62', GradientType=0); - -webkit-filter: none; - filter: none; } h1, h2, @@ -1506,84 +1461,42 @@ textarea { border-color: rgba(0, 0, 0, 0.6); } .nav-pills > li > a { - background-image: -webkit-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -o-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -webkit-gradient(linear, left top, left bottom, from(#484e55), color-stop(60%, #3a3f44), to(#313539)); background-image: linear-gradient(#484e55, #3a3f44 60%, #313539); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff484e55', endColorstr='#ff313539', GradientType=0); - -webkit-filter: none; - filter: none; border: 1px solid rgba(0, 0, 0, 0.6); text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); } .nav-pills > li > a:hover { - background-image: -webkit-linear-gradient(#020202, #101112 40%, #191b1d); - background-image: -o-linear-gradient(#020202, #101112 40%, #191b1d); - background-image: -webkit-gradient(linear, left top, left bottom, from(#020202), color-stop(40%, #101112), to(#191b1d)); background-image: linear-gradient(#020202, #101112 40%, #191b1d); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff020202', endColorstr='#ff191b1d', GradientType=0); - -webkit-filter: none; - filter: none; border: 1px solid rgba(0, 0, 0, 0.6); } .nav-pills > li.active > a, .nav-pills > li.active > a:hover { background-color: none; - background-image: -webkit-linear-gradient(#020202, #101112 40%, #191b1d); - background-image: -o-linear-gradient(#020202, #101112 40%, #191b1d); - background-image: -webkit-gradient(linear, left top, left bottom, from(#020202), color-stop(40%, #101112), to(#191b1d)); background-image: linear-gradient(#020202, #101112 40%, #191b1d); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff020202', endColorstr='#ff191b1d', GradientType=0); - -webkit-filter: none; - filter: none; border: 1px solid rgba(0, 0, 0, 0.6); } .nav-pills > li.disabled > a, .nav-pills > li.disabled > a:hover { - background-image: -webkit-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -o-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -webkit-gradient(linear, left top, left bottom, from(#484e55), color-stop(60%, #3a3f44), to(#313539)); background-image: linear-gradient(#484e55, #3a3f44 60%, #313539); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff484e55', endColorstr='#ff313539', GradientType=0); - -webkit-filter: none; - filter: none; } .pager > li > a { - background-image: -webkit-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -o-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -webkit-gradient(linear, left top, left bottom, from(#484e55), color-stop(60%, #3a3f44), to(#313539)); background-image: linear-gradient(#484e55, #3a3f44 60%, #313539); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff484e55', endColorstr='#ff313539', GradientType=0); - -webkit-filter: none; - filter: none; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); } .pager > li > a:hover { - background-image: -webkit-linear-gradient(#020202, #101112 40%, #191b1d); - background-image: -o-linear-gradient(#020202, #101112 40%, #191b1d); - background-image: -webkit-gradient(linear, left top, left bottom, from(#020202), color-stop(40%, #101112), to(#191b1d)); background-image: linear-gradient(#020202, #101112 40%, #191b1d); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff020202', endColorstr='#ff191b1d', GradientType=0); - -webkit-filter: none; - filter: none; } .pager > li.disabled > a, .pager > li.disabled > a:hover { background-color: transparent; - background-image: -webkit-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -o-linear-gradient(#484e55, #3a3f44 60%, #313539); - background-image: -webkit-gradient(linear, left top, left bottom, from(#484e55), color-stop(60%, #3a3f44), to(#313539)); background-image: linear-gradient(#484e55, #3a3f44 60%, #313539); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff484e55', endColorstr='#ff313539', GradientType=0); - -webkit-filter: none; - filter: none; } .alert .alert-link, .alert a { diff --git a/js/10-modal.js b/js/10-modal.js index 9bf83ce..eea85d7 100644 --- a/js/10-modal.js +++ b/js/10-modal.js @@ -13,7 +13,7 @@ function hide_modal () { } $(function() { - if(window.innerWidth < 768) + if(document.documentElement.clientWidth) return; modal = $('.modal')[0]; backdrop = $('.backdrop')[0]; diff --git a/js/90-mobilenav.js b/js/90-mobilenav.js index f8c9628..8c1e38a 100644 --- a/js/90-mobilenav.js +++ b/js/90-mobilenav.js @@ -1,5 +1,5 @@ $(function(){ - if(window.innerWidth >= 768) + if(document.documentElement.clientWidth >= 768) return; $('#title')[0].insertAdjacentHTML('beforebegin', '
Tap title to toggle menu
'); $('nav')[0].classList.add('hidden');