From 3f2cbd46fedf08d4517654f52e15c720b205f042 Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 19 Jun 2015 23:28:00 +0200 Subject: [PATCH] :active movie styling --- .../core/media/_base/search/static/search.scss | 10 +- .../core/media/movie/_base/static/details.js | 4 +- .../core/media/movie/_base/static/movie.scss | 39 ++++--- couchpotato/static/scripts/couchpotato.js | 2 +- couchpotato/static/style/combined.min.css | 120 ++++++++++++++------- couchpotato/static/style/main.scss | 2 +- 6 files changed, 111 insertions(+), 66 deletions(-) diff --git a/couchpotato/core/media/_base/search/static/search.scss b/couchpotato/core/media/_base/search/static/search.scss index cfeab6d..5192df3 100644 --- a/couchpotato/core/media/_base/search/static/search.scss +++ b/couchpotato/core/media/_base/search/static/search.scss @@ -65,6 +65,10 @@ } } + &.filled .input input { + background: $theme_off; + } + &.focused, &.shown { border-color: #04bce6; @@ -74,7 +78,7 @@ width: 380px; @include media-phablet { - width: 250px; + width: 260px; } } @@ -120,6 +124,7 @@ @include media-phablet { left: 0; + padding: 10px 2px; } > .in_library_wanted { @@ -144,13 +149,16 @@ @include media-phablet { min-width: 0; + margin-right: 2px; } } .button { flex: 1 auto; + min-width: 36px; vertical-align: middle; display: inline-block; + margin: 0; } .message { diff --git a/couchpotato/core/media/movie/_base/static/details.js b/couchpotato/core/media/movie/_base/static/details.js index b7d7782..a937c55 100644 --- a/couchpotato/core/media/movie/_base/static/details.js +++ b/couchpotato/core/media/movie/_base/static/details.js @@ -95,9 +95,9 @@ var MovieDetails = new Class({ var ended = function() { self.el.dispose(); - self.el.removeEventListener('transitionend', ended); + self.overlay.removeEventListener('transitionend', ended); }; - self.el.addEventListener('transitionend', ended, false); + self.overlay.addEventListener('transitionend', ended, false); // animate out self.el.removeClass('show'); diff --git a/couchpotato/core/media/movie/_base/static/movie.scss b/couchpotato/core/media/movie/_base/static/movie.scss index a39a52c..9768643 100644 --- a/couchpotato/core/media/movie/_base/static/movie.scss +++ b/couchpotato/core/media/movie/_base/static/movie.scss @@ -1,5 +1,10 @@ @import "couchpotato/static/style/_mixins"; +.page.movies { + bottom: auto; + z-index: 21; +} + .page.movies_wanted, .page.movies_manage { top: $header_height; padding: 0; @@ -17,6 +22,12 @@ } .movie { + transition: transform 300ms $cubic; + + &:active { + transition-duration: 50ms; + transform: scale(.9); + } .check { position: absolute; @@ -32,25 +43,11 @@ border-radius: 1px; padding: 2px 4px; - &.failed { - background: #99563e; - } - - &.ignored { - background: rgba(0,0,0,.2); - } - - &.available { - background: #2f8199; - } - - &.snatched { - background: #41997f; - } - - &.downloaded { - background: #54994a; - } + &.failed { background: #99563e; } + &.ignored { background: rgba(0,0,0,.2); } + &.available { background: #578b99; } + &.snatched { background: #289973; } + &.downloaded { background: #309927; } } } @@ -402,7 +399,7 @@ opacity: 0; transform: translateZ(0); backface-visibility: hidden; - transition: opacity 800ms ease 200ms; + transition: opacity 300ms ease 400ms; z-index: 1; .ripple { @@ -607,6 +604,7 @@ .overlay { opacity: 1; + transition-delay: 0s; .close { opacity: 1; @@ -616,6 +614,7 @@ } .content { + transition-delay: 200ms; transform: translateX(0); } } diff --git a/couchpotato/static/scripts/couchpotato.js b/couchpotato/static/scripts/couchpotato.js index 5668f4b..be710f6 100644 --- a/couchpotato/static/scripts/couchpotato.js +++ b/couchpotato/static/scripts/couchpotato.js @@ -32,7 +32,7 @@ self.openPage(window.location.pathname); History.addEvent('change', self.openPage.bind(self)); - self.c.addEvent('click:relay(.navigation a, .movie_details a)', self.ripple.bind(self)); + self.c.addEvent('click:relay(.header a, .navigation a, .movie_details a, .list_list .movie)', self.ripple.bind(self)); self.c.addEvent('click:relay(a[href^=/]:not([target]))', self.pushState.bind(self)); self.c.addEvent('click:relay(a[href^=http])', self.openDerefered.bind(self)); diff --git a/couchpotato/static/style/combined.min.css b/couchpotato/static/style/combined.min.css index 4b3e2ea..3aeccaa 100644 --- a/couchpotato/static/style/combined.min.css +++ b/couchpotato/static/style/combined.min.css @@ -5,6 +5,7 @@ .search_form .input{background:#FFF;border-radius:3px 0 0 3px;position:relative;left:4px;height:44px;overflow:hidden;width:100%} .search_form .input input{position:absolute;top:0;left:0;height:100%;width:100%;z-index:1} .search_form .input input::-ms-clear{width:0;height:0} +.search_form.filled .input input{background:#eaeaea} .search_form.focused,.search_form.shown{border-color:#04bce6} .search_form.focused .wrapper,.search_form.shown .wrapper{display:block;width:380px} .search_form.focused .input input,.search_form.shown .input input{opacity:1} @@ -16,12 +17,12 @@ .search_form .results_container .results .media_result .options>div{border:0;display:-webkit-flex;display:-ms-flexbox;display:flex} .search_form .results_container .results .media_result .options .thumbnail{vertical-align:middle} .search_form .results_container .results .media_result .options select{vertical-align:middle;display:inline-block;margin-right:10px;min-width:70px;-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto} -@media (max-width:480px){.search_form.focused .wrapper,.search_form.shown .wrapper{width:250px} +@media (max-width:480px){.search_form.focused .wrapper,.search_form.shown .wrapper{width:260px} .search_form .results_container .results .media_result{font-size:12px} -.search_form .results_container .results .media_result .options{left:0} -.search_form .results_container .results .media_result .options select{min-width:0} +.search_form .results_container .results .media_result .options{left:0;padding:10px 2px} +.search_form .results_container .results .media_result .options select{min-width:0;margin-right:2px} } -.search_form .results_container .results .media_result .options .button{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;vertical-align:middle;display:inline-block} +.search_form .results_container .results .media_result .options .button{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;min-width:36px;vertical-align:middle;display:inline-block;margin:0} .search_form .results_container .results .media_result .options .message{height:100%;font-size:20px;color:#fff;line-height:20px} .search_form .results_container .results .media_result .thumbnail{width:30px;min-height:100%;display:block;margin:0;vertical-align:top} .search_form .results_container .results .media_result .data{position:absolute;height:100%;top:0;left:30px;right:0;cursor:pointer;border-top:1px solid rgba(255,255,255,.08);transition:all .4s cubic-bezier(.9,0,.1,1);-webkit-transform:translateX(0);transform:translateX(0);background:#FFF} @@ -38,17 +39,20 @@ .search_form .results_container .results .media_result:last-child .data{border-bottom:0} .search_form.focused.filled .results_container,.search_form.shown.filled .results_container{display:block} .search_form.focused.filled .input,.search_form.shown.filled .input{border-radius:0 0 0 3px} +.page.movies{bottom:auto;z-index:21} .page.movies_manage,.page.movies_wanted{top:80px;padding:0} @media (max-width:480px){.page.movies_manage,.page.movies_wanted{top:44px} } .page.movies_manage .load_more,.page.movies_wanted .load_more{text-align:center;padding:20px;font-size:2em;display:block} +.movie{transition:-webkit-transform 300ms cubic-bezier(.9,0,.1,1);transition:transform 300ms cubic-bezier(.9,0,.1,1)} +.movie:active{transition-duration:50ms;-webkit-transform:scale(.9);transform:scale(.9)} .movie .check{position:absolute;top:0;left:20px;display:none} .movie .quality span{background:rgba(0,0,0,.2);color:#FFF;border-radius:1px;padding:2px 4px} .movie .quality span.failed{background:#99563e} .movie .quality span.ignored{background:rgba(0,0,0,.2)} -.movie .quality span.available{background:#2f8199} -.movie .quality span.snatched{background:#41997f} -.movie .quality span.downloaded{background:#54994a} +.movie .quality span.available{background:#578b99} +.movie .quality span.snatched{background:#289973} +.movie .quality span.downloaded{background:#309927} .movie.status_suggested .quality{display:none} .movies{position:relative} .movies .no_movies{text-align:center;padding:20px} @@ -118,13 +122,13 @@ @media (max-width:480px){.thumb_list .movie:hover .actions{display:none} .page.movie_details{left:0} } -.page.movie_details .overlay{position:fixed;top:0;bottom:0;right:0;left:132px;background:rgba(0,0,0,.6);border-radius:3px 0 0 3px;opacity:0;-webkit-transform:translateZ(0);transform:translateZ(0);-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:opacity 800ms ease 200ms;z-index:1} +.page.movie_details .overlay{position:fixed;top:0;bottom:0;right:0;left:132px;background:rgba(0,0,0,.6);border-radius:3px 0 0 3px;opacity:0;-webkit-transform:translateZ(0);transform:translateZ(0);-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:opacity 300ms ease 400ms;z-index:1} .page.movie_details .overlay .ripple{background:#FFF} -.page.movie_details .overlay .close{display:inline-block;text-align:center;font-size:60px;line-height:80px;color:#FFF;width:44px;height:100%;opacity:0;-webkit-transform:translateX(100%) translateZ(0);transform:translateX(100%) translateZ(0);-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:opacity 300ms ease 200ms,-webkit-transform 300ms cubic-bezier(.9,0,.1,1) 200ms;transition:opacity 300ms ease 200ms,transform 300ms cubic-bezier(.9,0,.1,1) 200ms} +.page.movie_details .overlay .close{display:inline-block;text-align:center;font-size:60px;line-height:80px;color:#FFF;width:44px;height:100%;opacity:0;-webkit-transform:translateX(100%)translateZ(0);transform:translateX(100%)translateZ(0);-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:opacity 300ms ease 200ms,-webkit-transform 300ms cubic-bezier(.9,0,.1,1)200ms;transition:opacity 300ms ease 200ms,transform 300ms cubic-bezier(.9,0,.1,1)200ms} @media (max-width:480px){.page.movie_details .overlay{left:0;border-radius:0} .page.movie_details .overlay .close{width:44px} } -.page.movie_details .content{position:fixed;z-index:2;top:0;bottom:0;right:0;left:176px;background:#FFF;border-radius:3px 0 0 3px;overflow-y:auto;-webkit-transform:translateX(100%) translateZ(0);transform:translateX(100%) translateZ(0);transition:-webkit-transform 350ms cubic-bezier(.9,0,.1,1);transition:transform 350ms cubic-bezier(.9,0,.1,1)} +.page.movie_details .content{position:fixed;z-index:2;top:0;bottom:0;right:0;left:176px;background:#FFF;border-radius:3px 0 0 3px;overflow-y:auto;-webkit-transform:translateX(100%)translateZ(0);transform:translateX(100%)translateZ(0);transition:-webkit-transform 350ms cubic-bezier(.9,0,.1,1);transition:transform 350ms cubic-bezier(.9,0,.1,1)} .page.movie_details .content>.head{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;padding:0 20px;line-height:80px} @media (max-width:480px){.page.movie_details .content{left:44px} .page.movie_details .content>.head{-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 10px;line-height:1em} @@ -137,7 +141,7 @@ .page.movie_details .content>.head .more_menu>a{line-height:80px} .page.movie_details .content>.head .more_menu .icon-dropdown{position:relative;padding:0 20px 0 0} .page.movie_details .content>.head .more_menu .icon-dropdown:before{position:absolute;right:0;opacity:.2} -.page.movie_details .content>.head .more_menu .icon-dropdown:hover:before,.page.movie_details.show .overlay{opacity:1} +.page.movie_details .content>.head .more_menu .icon-dropdown:hover:before{opacity:1} .page.movie_details .content>.head .more_menu .wrapper{top:70px;padding-top:4px;border-radius:3px 3px 0 0;font-size:14px} @media (max-width:480px){.page.movie_details .content>.head .more_menu>a{line-height:1em} .page.movie_details .content>.head .more_menu .wrapper{top:25px} @@ -154,8 +158,9 @@ .page.movie_details .content>.head .buttons a:hover{color:#000} .page.movie_details .content .section{padding:20px;border-top:1px solid rgba(0,0,0,.1)} .page.movie_details.show{pointer-events:auto} +.page.movie_details.show .overlay{opacity:1;transition-delay:0s} .page.movie_details.show .overlay .close{opacity:1;transition-delay:300ms;-webkit-transform:translateX(0);transform:translateX(0)} -.page.movie_details.show .content{-webkit-transform:translateX(0);transform:translateX(0)} +.page.movie_details.show .content{transition-delay:200ms;-webkit-transform:translateX(0);transform:translateX(0)} .page.movie_details .section_add{background:#eaeaea} .page.movie_details .section_add .options>div{display:-webkit-flex;display:-ms-flexbox;display:flex} .page.movie_details .section_add .options>div select{vertical-align:middle;display:inline-block;margin-right:10px;min-width:70px;-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto} @@ -203,7 +208,7 @@ .page.movie_details .releases .actions{min-width:80px;max-width:80px} .page.movie_details .trailer_container{background:#000;position:relative;padding-bottom:56.25%;height:0;overflow:hidden;max-width:100%;cursor:pointer} .alph_nav .menus .button,.alph_nav .menus .counter{line-height:80px;padding:0 10px} -.page.movie_details .trailer_container .background{opacity:.6;transition:all 300ms;-webkit-filter:blur(10px);filter:blur(10px);-webkit-transform:scale(1.05) translateZ(0);transform:scale(1.05) translateZ(0);background:center no-repeat;background-size:cover;position:absolute;top:0;right:0;bottom:0;left:0;z-index:1} +.page.movie_details .trailer_container .background{opacity:.6;transition:all 300ms;-webkit-filter:blur(10px);filter:blur(10px);-webkit-transform:scale(1.05)translateZ(0);transform:scale(1.05)translateZ(0);background:center no-repeat;background-size:cover;position:absolute;top:0;right:0;bottom:0;left:0;z-index:1} .page.movie_details .trailer_container .icon-play{opacity:.9;position:absolute;z-index:2;text-align:center;width:100%;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);transition:all 300ms;color:#FFF;font-size:110px} @media (max-width:1024px){.page.movie_details .trailer_container .icon-play{font-size:55px} } @@ -278,15 +283,17 @@ .charts .chart .media_result .chart_number{color:#fff;position:absolute;top:0;padding:10px;font:700 2em/1em Helvetica,Sans-Serif;width:50px;height:100%;text-align:center;border-left:8px solid transparent} .charts .chart .media_result.chart_in_wanted .chart_number{border-color:rgba(0,255,40,.3)} .charts .chart .media_result.chart_in_library .chart_number{border-color:rgba(0,202,32,.3)} +.page.wizard .tabs li:hover a,.toggle_menu a:hover{border-color:#047792} .charts .chart .media_result .actions{position:absolute;top:10px;right:10px;display:none;width:90px} .charts .chart .media_result:hover .actions{display:block} .charts .chart .media_result:hover h2 .title{opacity:0} .charts .chart .media_result .data.open .actions{display:none} .charts .chart .media_result .actions a{margin-left:10px;vertical-align:middle} .toggle_menu{height:50px} -.toggle_menu a{display:block;width:50%;float:left;color:rgba(255,255,255,.6);border-bottom:1px solid rgba(255,255,255,.06667)} -.toggle_menu a:hover{border-color:#047792;border-width:4px;color:#fff} +.toggle_menu a{display:block;width:50%;float:left;color:rgba(255,255,255,.6);border-bottom:1px solid rgba(255,255,255,.0666667)} +.toggle_menu a:hover{border-width:4px;color:#fff} .toggle_menu a.active{border-bottom:4px solid #04bce6;color:#fff} +#category_ordering li,#profile_ordering li,.add_new_profile{border-bottom:1px solid #eaeaea} .toggle_menu a:last-child{float:right} .toggle_menu h2{height:40px} @media all and (max-width:480px){.toggle_menu h2{font-size:16px;text-align:center;height:30px} @@ -299,6 +306,7 @@ @media all and (max-width:600px){.suggestions .media_result{width:100%} } .suggestions .media_result .data{left:100px;background:#4e5969;border:none} +#category_ordering li:last-child,#profile_ordering li:last-child,.api_docs .api .params tr:last-child td,.api_docs .api .params tr:last-child th{border:0} .suggestions .media_result .data .info{top:10px;left:15px;right:15px;bottom:10px;overflow:hidden} .suggestions .media_result .data .info h2{white-space:normal;max-height:120px;font-size:18px;line-height:18px} .suggestions .media_result .data .info .genres,.suggestions .media_result .data .info .rating,.suggestions .media_result .data .info .year{position:static;display:block;padding:0;opacity:.6} @@ -328,8 +336,7 @@ .category .formHint{opacity:.1} .category:hover .formHint{opacity:1} #category_ordering ul{float:left;margin:0;width:275px;padding:0} -#category_ordering li{cursor:-webkit-grab;cursor:grab;border-bottom:1px solid #eaeaea;padding:5px;list-style:none} -#category_ordering li:last-child{border:0} +#category_ordering li{cursor:-webkit-grab;cursor:grab;padding:5px;list-style:none} #category_ordering li .check{margin:2px 10px 0 0;vertical-align:top} #category_ordering li>span{display:inline-block;height:20px;vertical-align:top;line-height:20px} #category_ordering li .handle{width:20px;float:right} @@ -357,7 +364,7 @@ .report_popup.report_popup .bug{width:80%;height:80%;max-height:800px;max-width:800px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column nowrap;-ms-flex-flow:column nowrap;flex-flow:column nowrap} .report_popup.report_popup .bug textarea{display:block;width:100%;background:#FFF;padding:20px;overflow:auto;color:#666;height:70%;font-size:12px} .do_report.do_report{z-index:10000;position:absolute;padding:10px;background:#ac0000;color:#FFF} -.add_new_profile{padding:20px;display:block;text-align:center;font-size:20px;border-bottom:1px solid #eaeaea} +.add_new_profile{padding:20px;display:block;text-align:center;font-size:20px} .profile{margin-bottom:20px} .profile .quality_label input{font-weight:700} .profile .ctrlHolder .types{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;min-width:360px} @@ -374,9 +381,8 @@ .profile .ctrlHolder.wait_for.wait_for .advanced{display:none;color:#ac0000} .show_advanced .profile .ctrlHolder.wait_for.wait_for .advanced{display:inline} #profile_ordering ul{list-style:none;margin:0;width:275px;padding:0} -#profile_ordering li{border-bottom:1px solid #eaeaea;padding:5px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center} +#profile_ordering li{padding:5px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center} #profile_ordering li:hover{background:#eaeaea} -#profile_ordering li:last-child{border:0} #profile_ordering li input[type=checkbox]{margin:2px 10px 0 0;vertical-align:top} #profile_ordering li>span{display:inline-block;height:20px;vertical-align:top;line-height:20px} #profile_ordering li>span.profile_label{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto} @@ -400,7 +406,6 @@ .page.wizard .tab_wrapper .tabs{padding:0;margin:0 auto;display:block;height:100%;width:100%;max-width:960px} .page.wizard .tabs li{display:inline-block;height:100%} .page.wizard .tabs li a{padding:20px 10px;height:100%;display:block;color:#FFF;font-weight:400;border-bottom:4px solid transparent} -.page.wizard .tabs li:hover a{border-color:#047792} .page.wizard .tabs li.done a{border-color:#04bce6} .page.wizard .tab_wrapper .pointer{border-right:10px solid transparent;border-left:10px solid transparent;border-top:10px solid #5c697b;display:block;position:absolute;top:44px} .page.wizard .tab_content{margin:20px 0 160px} @@ -416,7 +421,6 @@ .api_docs .api .params{background:#fafafa;width:100%} .api_docs .api .params h3{clear:both;float:left;width:100px} .api_docs .api .params td,.api_docs .api .params th{padding:3px 5px;border-bottom:1px solid #eee} -.api_docs .api .params tr:last-child td,.api_docs .api .params tr:last-child th{border:0} .api_docs .api .params .param{vertical-align:top} .api_docs .api .params .param th{text-align:left;width:100px} .api_docs .api .params .param .type{font-style:italic;margin-right:10px;width:100px;color:#666} @@ -434,6 +438,13 @@ .api_docs .database table ._rev,.api_docs .database table ._t{width:60px} .api_docs .database table .form,.api_docs .database table form{width:600px} .api_docs .database table textarea{font-size:12px;width:100%;height:200px} +@font-face{font-family:icons;src:url(../fonts/icons.eot?74719538);src:url(../fonts/icons.eot?74719538#iefix)format("embedded-opentype"),url(../fonts/icons.woff?74719538)format("woff"),url(../fonts/icons.ttf?74719538)format("truetype"),url(../fonts/icons.svg?74719538#icons)format("svg");font-weight:400;font-style:normal} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Light-webfont.eot);src:url(../fonts/OpenSans-Light-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Light-webfont.woff)format("woff"),url(../fonts/OpenSans-Light-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Light-webfont.svg#OpenSansRegular)format("svg");font-weight:200;font-style:normal} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Regular-webfont.eot);src:url(../fonts/OpenSans-Regular-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Regular-webfont.woff)format("woff"),url(../fonts/OpenSans-Regular-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular)format("svg");font-weight:400;font-style:normal} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Italic-webfont.eot);src:url(../fonts/OpenSans-Italic-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Italic-webfont.woff)format("woff"),url(../fonts/OpenSans-Italic-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic)format("svg");font-weight:400;font-style:italic} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Bold-webfont.eot);src:url(../fonts/OpenSans-Bold-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Bold-webfont.woff)format("woff"),url(../fonts/OpenSans-Bold-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Bold-webfont.svg#OpenSansBold)format("svg");font-weight:700;font-style:normal} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-BoldItalic-webfont.eot);src:url(../fonts/OpenSans-BoldItalic-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-BoldItalic-webfont.woff)format("woff"),url(../fonts/OpenSans-BoldItalic-webfont.ttf)format("truetype"),url(../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic)format("svg");font-weight:700;font-style:italic} +@font-face{font-family:Lobster;src:url(../fonts/Lobster-webfont.eot);src:url(../fonts/Lobster-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/Lobster-webfont.woff2)format("woff2"),url(../fonts/Lobster-webfont.woff)format("woff"),url(../fonts/Lobster-webfont.ttf)format("truetype"),url(../fonts/Lobster-webfont.svg#lobster_14regular)format("svg");font-weight:400;font-style:normal} .page.login{background:#ac0000} .page.login h1{padding:0 0 10px;font-size:60px;font-family:Lobster;font-weight:400;color:#FFF;text-align:center} .page.login form{padding:0;height:300px;width:400px;position:fixed;left:50%;top:50%;margin:-200px 0 0 -200px} @@ -444,7 +455,7 @@ .page.login .remember_me .check{margin:5px 5px 0 0} .page.login .button{font-size:25px;padding:20px;float:right} *,body,html{margin:0;padding:0} -@font-face{font-family:icons;src:url(../fonts/icons.eot?74719542);src:url(../fonts/icons.eot?74719542#iefix) format("embedded-opentype"),url(../fonts/icons.woff?747195412) format("woff"),url(../fonts/icons.ttf?74719542) format("truetype"),url(../fonts/icons.svg?74719542#icons) format("svg");font-weight:400;font-style:normal} +@font-face{font-family:icons;src:url(../fonts/icons.eot?74719542);src:url(../fonts/icons.eot?74719542#iefix)format("embedded-opentype"),url(../fonts/icons.woff?747195412)format("woff"),url(../fonts/icons.ttf?74719542)format("truetype"),url(../fonts/icons.svg?74719542#icons)format("svg");font-weight:400;font-style:normal} [class*=" icon-"]:before,[class^=icon-]:before{font-family:icons;font-style:normal;font-weight:400;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} .icon-left-arrow:before{content:'\e800'} .icon-settings:before{content:'\e801'} @@ -472,12 +483,12 @@ .icon-home:before{content:'\e817'} .icon-movie:before{content:'\e818'} .icon-handle:before,.icon-menu:before{content:'\e819'} -@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Light-webfont.eot);src:url(../fonts/OpenSans-Light-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Light-webfont.woff) format("woff"),url(../fonts/OpenSans-Light-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Light-webfont.svg#OpenSansRegular) format("svg");font-weight:200;font-style:normal} -@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Regular-webfont.eot);src:url(../fonts/OpenSans-Regular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Regular-webfont.woff) format("woff"),url(../fonts/OpenSans-Regular-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular) format("svg");font-weight:400;font-style:normal} -@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Italic-webfont.eot);src:url(../fonts/OpenSans-Italic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Italic-webfont.woff) format("woff"),url(../fonts/OpenSans-Italic-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic) format("svg");font-weight:400;font-style:italic} -@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Bold-webfont.eot);src:url(../fonts/OpenSans-Bold-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Bold-webfont.woff) format("woff"),url(../fonts/OpenSans-Bold-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Bold-webfont.svg#OpenSansBold) format("svg");font-weight:700;font-style:normal} -@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-BoldItalic-webfont.eot);src:url(../fonts/OpenSans-BoldItalic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-BoldItalic-webfont.woff) format("woff"),url(../fonts/OpenSans-BoldItalic-webfont.ttf) format("truetype"),url(../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic) format("svg");font-weight:700;font-style:italic} -@font-face{font-family:Lobster;src:url(../fonts/Lobster-webfont.eot);src:url(../fonts/Lobster-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/Lobster-webfont.woff2) format("woff2"),url(../fonts/Lobster-webfont.woff) format("woff"),url(../fonts/Lobster-webfont.ttf) format("truetype"),url(../fonts/Lobster-webfont.svg#lobster_14regular) format("svg");font-weight:400;font-style:normal} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Light-webfont.eot);src:url(../fonts/OpenSans-Light-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Light-webfont.woff)format("woff"),url(../fonts/OpenSans-Light-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Light-webfont.svg#OpenSansRegular)format("svg");font-weight:200;font-style:normal} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Regular-webfont.eot);src:url(../fonts/OpenSans-Regular-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Regular-webfont.woff)format("woff"),url(../fonts/OpenSans-Regular-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular)format("svg");font-weight:400;font-style:normal} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Italic-webfont.eot);src:url(../fonts/OpenSans-Italic-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Italic-webfont.woff)format("woff"),url(../fonts/OpenSans-Italic-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic)format("svg");font-weight:400;font-style:italic} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Bold-webfont.eot);src:url(../fonts/OpenSans-Bold-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-Bold-webfont.woff)format("woff"),url(../fonts/OpenSans-Bold-webfont.ttf)format("truetype"),url(../fonts/OpenSans-Bold-webfont.svg#OpenSansBold)format("svg");font-weight:700;font-style:normal} +@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-BoldItalic-webfont.eot);src:url(../fonts/OpenSans-BoldItalic-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/OpenSans-BoldItalic-webfont.woff)format("woff"),url(../fonts/OpenSans-BoldItalic-webfont.ttf)format("truetype"),url(../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic)format("svg");font-weight:700;font-style:italic} +@font-face{font-family:Lobster;src:url(../fonts/Lobster-webfont.eot);src:url(../fonts/Lobster-webfont.eot?#iefix)format("embedded-opentype"),url(../fonts/Lobster-webfont.woff2)format("woff2"),url(../fonts/Lobster-webfont.woff)format("woff"),url(../fonts/Lobster-webfont.ttf)format("truetype"),url(../fonts/Lobster-webfont.svg#lobster_14regular)format("svg");font-weight:400;font-style:normal} *{box-sizing:border-box;text-rendering:optimizeSpeed} body,html{font-size:14px;line-height:1.5;font-family:OpenSans,"Helvetica Neue",Helvetica,Arial,Geneva,sans-serif;font-weight:300;height:100%;background:#111;overflow:hidden} body{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap} @@ -485,8 +496,8 @@ a{display:inline-block;position:relative;overflow:hidden;text-decoration:none;cu input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#FFF;border:1px solid #b7b7b7} .button{color:#ac0000;font-weight:300;padding:5px;cursor:pointer;border:1px solid #ac0000;border-radius:3px;margin:0 5px;transition:all 150ms} .button:hover{background:#ac0000;color:#FFF} -.ripple{position:absolute;height:10px;width:10px;border-radius:50%;background:#ac0000;-webkit-transform:translate(-50%,-50%) scale(1);transform:translate(-50%,-50%) scale(1);opacity:.4;transition:all 2s ease} -.ripple.animate{-webkit-transform:translate(-50%,-50%) scale(100);transform:translate(-50%,-50%) scale(100);opacity:0} +.ripple{position:absolute;height:10px;width:10px;border-radius:50%;background:#ac0000;-webkit-transform:translate(-50%,-50%)scale(1);transform:translate(-50%,-50%)scale(1);opacity:.4;transition:all 2s ease} +.ripple.animate{-webkit-transform:translate(-50%,-50%)scale(100);transform:translate(-50%,-50%)scale(100);opacity:0} .header{width:132px;min-width:132px;position:relative;z-index:100} .header a{color:#FFF;letter-spacing:1px} .header .navigation .logo{background:#ac0000;display:block;text-align:center;position:relative;overflow:hidden;font-family:Lobster,serif;color:#FFF;font-size:38px;line-height:80px;height:80px;transition:background 200ms cubic-bezier(.9,0,.1,1)} @@ -552,7 +563,7 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F .page .navigation{height:44px;left:64px} } .page .navigation ul{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;list-style:none} -.page .navigation ul li a{font-size:24px;line-height:80px;padding:20px;color:rgba(0,0,0,.5)} +.page .navigation ul li a{font-size:24px;line-height:80px;padding:0 20px;color:rgba(0,0,0,.5)} @media (max-width:480px){.page .navigation ul li a{font-size:18px;line-height:44px;padding:10px} } .page .navigation ul .active a{color:#000} @@ -565,7 +576,7 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F .more_menu{line-height:1em} .more_menu .button{font-size:24px;cursor:pointer} .more_menu .wrapper{display:none;position:absolute;right:0;background:#ac0000;z-index:5000;border-radius:3px 0 0 3px} -.more_menu .wrapper:before{-webkit-transform:rotate(45deg) translateY(-60%);transform:rotate(45deg) translateY(-60%);content:'';display:block;position:absolute;background:#ac0000;height:10px;width:10px;left:-9px;bottom:11px;z-index:1;opacity:0;border-radius:3px} +.more_menu .wrapper:before{-webkit-transform:rotate(45deg)translateY(-60%);transform:rotate(45deg)translateY(-60%);content:'';display:block;position:absolute;background:#ac0000;height:10px;width:10px;left:-9px;bottom:11px;z-index:1;opacity:0;border-radius:3px} .more_menu.show .wrapper:before,.question.show{opacity:1} .mask,.messages{right:0;bottom:0} .more_menu .wrapper ul{background:#FFF;position:relative;z-index:2;overflow:hidden;border-radius:3px 0 0 3px} @@ -590,19 +601,19 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F .mask{background:rgba(0,0,0,.8);z-index:1000;text-align:center;position:absolute;top:0;left:0;opacity:0;transition:opacity 1000ms} .mask .message,.mask .spinner{position:absolute;top:50%;left:50%} .mask .message{color:#FFF;text-align:center;width:320px;margin:-49px 0 0 -160px;font-size:16px;opacity:.5} -.mask .spinner{width:22px;height:22px;display:block;background:#fff;margin-top:-11px;margin-left:-11px;outline:transparent solid 1px;-webkit-animation:rotating 2.5s cubic-bezier(.9,0,.1,1) infinite normal;animation:rotating 2.5s cubic-bezier(.9,0,.1,1) infinite normal;-webkit-transform:scale(0);transform:scale(0)} +.mask .spinner{width:22px;height:22px;display:block;background:#fff;margin-top:-11px;margin-left:-11px;outline:transparent solid 1px;-webkit-animation:rotating 2.5s cubic-bezier(.9,0,.1,1)infinite normal;animation:rotating 2.5s cubic-bezier(.9,0,.1,1)infinite normal;-webkit-transform:scale(0);transform:scale(0)} .page.settings.active,.table .item{display:-webkit-flex;display:-ms-flexbox} .mask.show{pointer-events:auto;opacity:1} .mask.show .spinner{-webkit-transform:scale(1);transform:scale(1)} .mask.hide{opacity:0} .mask.hide .spinner{-webkit-transform:scale(0);transform:scale(0)} -@-webkit-keyframes rotating{0%{-webkit-transform:rotate(0) scale(1.6);transform:rotate(0) scale(1.6);border-radius:1px} -48%{-webkit-transform:rotate(360deg) scale(1);transform:rotate(360deg) scale(1);border-radius:50%} -100%{-webkit-transform:rotate(720deg) scale(1.6);transform:rotate(720deg) scale(1.6);border-radius:1px} +@-webkit-keyframes rotating{0%{-webkit-transform:rotate(0)scale(1.6);transform:rotate(0)scale(1.6);border-radius:1px} +48%{-webkit-transform:rotate(360deg)scale(1);transform:rotate(360deg)scale(1);border-radius:50%} +100%{-webkit-transform:rotate(720deg)scale(1.6);transform:rotate(720deg)scale(1.6);border-radius:1px} } -@keyframes rotating{0%{-webkit-transform:rotate(0) scale(1.6);transform:rotate(0) scale(1.6);border-radius:1px} -48%{-webkit-transform:rotate(360deg) scale(1);transform:rotate(360deg) scale(1);border-radius:50%} -100%{-webkit-transform:rotate(720deg) scale(1.6);transform:rotate(720deg) scale(1.6);border-radius:1px} +@keyframes rotating{0%{-webkit-transform:rotate(0)scale(1.6);transform:rotate(0)scale(1.6);border-radius:1px} +48%{-webkit-transform:rotate(360deg)scale(1);transform:rotate(360deg)scale(1);border-radius:50%} +100%{-webkit-transform:rotate(720deg)scale(1.6);transform:rotate(720deg)scale(1.6);border-radius:1px} } .table .head{font-weight:700} .table .item{display:flex;border-bottom:1px solid rgba(0,0,0,.2)} @@ -729,4 +740,31 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F .page.settings .directory_list .actions:last-child>span{padding:0 5px;text-shadow:none} .page.settings .directory_list .actions:last-child>.clear{left:20px;position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);margin:0} .page.settings .directory_list .actions:last-child>.cancel{color:rgba(0,0,0,.4)} -.page.settings .directory_list .actions:last-child>.save{margin-right:0} \ No newline at end of file +.page.settings .directory_list .actions:last-child>.save{margin-right:0} +.uniForm legend{font-weight:700;font-size:100%;margin:0;padding:1.5em 0} +.uniForm .ctrlHolder{padding:1em;border-bottom:1px solid #efefef} +.uniForm .ctrlHolder.focused{background:#fffcdf} +.uniForm .buttonHolder{background:#efefef;text-align:right;margin:1.5em 0 0;padding:1.5em;border-radius:4px} +.uniForm .buttonHolder .primaryAction{padding:10px 22px;line-height:1;background:#254a86;border:1px solid #163362;font-size:12px;font-weight:700;color:#fff;border-radius:4px;box-shadow:1px 1px 0 #fff;text-shadow:-1px -1px 0 rgba(0,0,0,.25)} +.uniForm .buttonHolder .primaryAction:active{position:relative;top:1px} +.uniForm .secondaryAction{text-align:left} +.uniForm button.secondaryAction{background:0 0;border:none;color:#777;margin:1.25em 0 0;padding:0} +.uniForm .inlineLabels .label em,.uniForm .inlineLabels label em{font-style:normal;font-weight:700} +.uniForm label small{font-size:.75em;color:#777} +.uniForm .textInput,.uniForm textarea{padding:4px 2px;border:1px solid #aaa;background:#fff} +.uniForm textarea{height:12em} +.uniForm ul li label{font-size:.85em} +.uniForm .ctrlHolder .textInput:focus,.uniForm .ctrlHolder textarea:focus{outline:0} +.uniForm .formHint{font-size:.85em;color:#777} +.uniForm .inlineLabels .formHint{padding-top:.5em} +.uniForm .ctrlHolder.focused .formHint{color:#333} +.uniForm #errorMsg{background:#ffdfdf;border:1px solid #f3afb5;margin:0 0 1.5em;padding:0 1.5em;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px} +.uniForm #errorMsg ol{margin:0 0 1.5em;padding:0} +.uniForm #errorMsg ol li{margin:0 0 3px 1.5em;padding:7px;background:#f6bec1;position:relative;font-size:.85em;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px} +.uniForm .ctrlHolder.error,.uniForm .ctrlHolder.focused.error{background:#ffdfdf;border:1px solid #f3afb5;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px} +.uniForm .ctrlHolder.error input.error,.uniForm .ctrlHolder.error select.error,.uniForm .ctrlHolder.error textarea.error{color:#af4c4c;margin:0 0 6px;padding:4px} +.uniForm #okMsg{background:#c8ffbf;border:1px solid #a2ef95;margin:0 0 1.5em;padding:0 1.5em;text-align:center;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px} +.uniForm #OKMsg p{margin:0} +.uniForm .col{margin-bottom:1.5em} +.uniForm .col.first{width:49%;float:left;clear:none} +.uniForm .col.last{width:49%;float:right;clear:none;margin-right:0} \ No newline at end of file diff --git a/couchpotato/static/style/main.scss b/couchpotato/static/style/main.scss index 381fe95..edd1e60 100644 --- a/couchpotato/static/style/main.scss +++ b/couchpotato/static/style/main.scss @@ -442,7 +442,7 @@ input, textarea, select { a { font-size: 24px; line-height: $header_height; - padding: $padding; + padding: 0 $padding; color: rgba(0,0,0,.5); @include media-phablet {