diff --git a/Gruntfile.js b/Gruntfile.js index c0bccc8..4d7b1b5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -40,7 +40,8 @@ module.exports = function(grunt){ 'couchpotato/static/scripts/block/menu.js', 'couchpotato/static/scripts/page/home.js', 'couchpotato/static/scripts/page/settings.js', - 'couchpotato/static/scripts/page/about.js' + 'couchpotato/static/scripts/page/about.js', + 'couchpotato/static/scripts/page/login.js' ]; grunt.initConfig({ diff --git a/couchpotato/static/scripts/combined.base.min.js b/couchpotato/static/scripts/combined.base.min.js index 9e84ec4..2963332 100644 --- a/couchpotato/static/scripts/combined.base.min.js +++ b/couchpotato/static/scripts/combined.base.min.js @@ -2256,4 +2256,29 @@ var AboutSettingTab = new Class({ window.addEvent("domready", function() { new AboutSettingTab(); +}); + +window.addEvent("domready", function() { + var b = $(document.body), login_page = b.hasClass("login"); + if (login_page) { + var form = b.getElement("form"), els = b.getElements("h1, .username, .password, .remember_me, .button"); + els.each(function(el, nr) { + dynamics.css(el, { + opacity: 0, + translateY: 50 + }); + dynamics.animate(el, { + opacity: 1, + translateY: 0 + }, { + type: dynamics.spring, + frequency: 200, + friction: 300, + duration: 800, + anticipationSize: 175, + anticipationStrength: 400, + delay: nr * 100 + }); + }); + } }); \ No newline at end of file diff --git a/couchpotato/static/scripts/page/login.js b/couchpotato/static/scripts/page/login.js new file mode 100644 index 0000000..4e272c0 --- /dev/null +++ b/couchpotato/static/scripts/page/login.js @@ -0,0 +1,31 @@ +window.addEvent('domready', function(){ + var b = $(document.body), + login_page = b.hasClass('login'); + + if(login_page){ + + var form = b.getElement('form'), + els = b.getElements('h1, .username, .password, .remember_me, .button'); + els.each(function(el, nr){ + + dynamics.css(el, { + opacity: 0, + translateY: 50 + }); + + dynamics.animate(el, { + opacity: 1, + translateY: 0 + }, { + type: dynamics.spring, + frequency: 200, + friction: 300, + duration: 800, + anticipationSize: 175, + anticipationStrength: 400, + delay: nr * 100 + }); + + }); + } +}); diff --git a/couchpotato/static/style/combined.min.css b/couchpotato/static/style/combined.min.css index dde5262..406aa23 100644 --- a/couchpotato/static/style/combined.min.css +++ b/couchpotato/static/style/combined.min.css @@ -1,4 +1,4 @@ -.movies>.description a:hover,.page.movie_details .releases .buttons a:hover,.page.settings fieldset h2 .hint a{text-decoration:underline} +.movies>.description a:hover,.page.movie_details .releases .buttons a:hover{text-decoration:underline} .search_form{display:inline-block;z-index:11;width:44px;position:relative} .search_form .icon-search{position:absolute;z-index:2;top:50%;left:0;height:100%;text-align:center;color:#FFF;font-size:20px;-webkit-transform:translateY(-50%);transform:translateY(-50%)} .search_form .wrapper{position:absolute;left:44px;bottom:0;background:#ac0000;border-radius:3px 0 0 3px;display:none;box-shadow:0 0 15px 2px rgba(0,0,0,.15)} @@ -139,7 +139,7 @@ @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;position:relative;z-index:2} @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} @@ -173,7 +173,7 @@ .page.movie_details .content>.head .buttons{margin-left:auto} .page.movie_details .content .section{padding:10px} } -.page.movie_details .files span,.page.movie_details .releases .item span{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;padding:6.67px 0} +.page.movie_details .files span,.page.movie_details .releases .item span{white-space:nowrap;text-overflow:ellipsis;overflow:hidden;padding:6.67px 0} .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} @@ -230,7 +230,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:.3;transition:all 300ms;-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:.3;transition:all 300ms;-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} } @@ -291,7 +291,6 @@ @media all and (max-width:600px){.charts .chart{width:100%} } .charts .chart .media_result .data{left:150px;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} .charts .chart .media_result .data .info{top:10px;left:15px;right:15px;bottom:10px;overflow:hidden} .charts .chart .media_result .data .info h2{white-space:normal;max-height:120px;font-size:18px;line-height:18px} .charts .chart .media_result .data .info .genres,.charts .chart .media_result .data .info .rating,.charts .chart .media_result .data .info .year{position:static;display:block;padding:0;opacity:.6} @@ -310,21 +309,47 @@ .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,.0666667)} -.toggle_menu a:hover{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,.06667)} +.toggle_menu a:hover{border-color:#047792;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} } +.suggestions{clear:both;padding-top:10px;margin-bottom:30px} +.suggestions>h2{height:40px} +.suggestions .media_result{display:inline-block;width:33.333%;height:150px} +@media all and (max-width:960px){.suggestions .media_result{width:50%} +} +@media all and (max-width:600px){.suggestions .media_result{width:100%} +} +.suggestions .media_result .data{left:100px;background:#4e5969;border:none} +.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} +.suggestions .media_result .data .info .year{margin:10px 0 0} +.suggestions .media_result .data .info .rating{font-size:20px;float:right;margin-top:-20px} +.suggestions .media_result .data .info .rating:before{content:"\e031";font-family:Elusive-Icons;font-size:14px;margin:0 5px 0 0;vertical-align:bottom} +.suggestions .media_result .data .info .genres{font-size:11px;font-style:italic;text-align:right} +.suggestions .media_result .data .info .plot{display:block;font-size:11px;overflow:hidden;text-align:justify;height:100%;z-index:2;top:64px;position:absolute;background:#4e5969;cursor:pointer;transition:all .4s ease-in-out;padding:0 3px 10px 0} +.suggestions .media_result .data:before{content:'';display:block;height:10px;right:0;left:0;bottom:10px;position:absolute;background:linear-gradient(0deg,#4e5969 0,rgba(78,89,105,0) 100%);z-index:3;pointer-events:none} +.suggestions .media_result .data .info .plot.full{top:0;overflow:auto} +.suggestions .media_result .data{cursor:default} +.suggestions .media_result .options{left:100px} +.suggestions .media_result .options select[name=category],.suggestions .media_result .options select[name=profile],.suggestions .media_result .options select[name=title]{width:100%} +.suggestions .media_result .button{position:absolute;margin:2px 0 0;right:15px;bottom:15px} +.suggestions .media_result .thumbnail{width:100px} +.suggestions .media_result .actions{position:absolute;top:10px;right:10px;display:none;width:140px} +.suggestions .media_result:hover .actions{display:block} +.suggestions .media_result:hover h2 .title{opacity:0} +.suggestions .media_result .data.open .actions{display:none} +.suggestions .media_result .actions a{margin-left:10px;vertical-align:middle} .add_new_category{padding:20px;display:block;text-align:center;font-size:20px} .category{margin-bottom:20px;position:relative} .category>.delete{position:absolute;padding:16px;right:0;cursor:pointer;opacity:.6;color:#fd5353} @@ -334,7 +359,8 @@ .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;padding:5px;list-style:none} +#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 .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} @@ -362,7 +388,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} +.add_new_profile{padding:20px;display:block;text-align:center;font-size:20px;border-bottom:1px solid #eaeaea} .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} @@ -379,8 +405,9 @@ .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{padding:5px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center} +#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: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} @@ -404,6 +431,7 @@ .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} @@ -419,6 +447,7 @@ .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} @@ -426,7 +455,6 @@ .api_docs .database{padding:20px;margin:0} .api_docs .database *{margin:0;padding:0} .api_docs .database .nav li{display:inline-block} -.api_docs .database table input[type=submit],.page.login{display:block} .api_docs .database .nav li a{padding:5px} .api_docs .database table{font-size:11px} .api_docs .database table th{text-align:left} @@ -436,24 +464,17 @@ .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} +.api_docs .database table input[type=submit]{display:block} +.page.login,body{display:-webkit-flex;display:-ms-flexbox} +.page.login{background:#FFF;display:flex;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;font-size:1.25em} +.page.login h1{padding:0 0 10px;font-size:60px;font-family:Lobster;font-weight:400;color:#ac0000;text-align:center} +.page.login form{padding:0;width:300px} .page.login .ctrlHolder{padding:0;margin:0 0 20px} .page.login .ctrlHolder:hover{background:0 0} -.page.login input[type=password],.page.login input[type=text]{width:100%!important;font-size:25px;padding:14px!important} -.page.login .remember_me{font-size:15px;float:left;width:150px;padding:20px 0} -.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} +.page.login input[type=password],.page.login input[type=text]{width:100%!important} +.page.login .remember_me{font-size:15px;float:left;width:150px} +.page.login .button{float:right;margin:0;transition:none} +@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'} @@ -484,21 +505,21 @@ .icon-star:before{content:'\e81a'} .icon-star-empty:before{content:'\e81b'} .icon-star-half:before{content:'\e81c'} -@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} +@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} +*{margin:0;padding:0;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%;margin:0;padding:0;background:#111;overflow:hidden} +body{display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap} a{display:inline-block;position:relative;overflow:hidden;text-decoration:none;cursor:pointer;-webkit-tap-highlight-color:transparent} 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:.2;transition:all 1.5s 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:.2;transition:all 1.5s 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} @media (max-width:480px){.header{width:44px;min-width:44px;z-index:21} } @@ -576,7 +597,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;-webkit-transform-origin:80% 0;transform-origin:80% 0} -.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:1;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:1;border-radius:3px} .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} .more_menu .wrapper ul li{display:block;line-height:1em;border-top:1px solid #eaeaea} @@ -602,20 +623,20 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F .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} .mask .message h1{font-size:1.5em} -.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.with_message .spinner{margin-top:-88px} .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)} @@ -646,7 +667,7 @@ input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;background:#F @media (max-width:480px){.page.settings fieldset h2{display:block} .page.settings fieldset h2 .hint{margin:0;display:block} } -.page.settings fieldset h2 .hint a{font-weight:400;color:#ac0000} +.page.settings fieldset h2 .hint a{font-weight:400;color:#ac0000;text-decoration:underline} .page.settings fieldset .ctrlHolder{padding:6.67px 20px;border-bottom:1px solid #eaeaea;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-align-items:center;-ms-flex-align:center;align-items:center} .page.settings fieldset .ctrlHolder:last-child{border-bottom:0} .page.settings fieldset .ctrlHolder label{display:inline-block;min-width:150px} @@ -742,31 +763,4 @@ 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} -.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 +.page.settings .directory_list .actions:last-child>.save{margin-right:0} \ No newline at end of file diff --git a/couchpotato/static/style/login.scss b/couchpotato/static/style/login.scss index 8e846a9..d8682d4 100644 --- a/couchpotato/static/style/login.scss +++ b/couchpotato/static/style/login.scss @@ -2,26 +2,24 @@ /*** Login ***/ .page.login { - display: block; - background: $primary_color; + background: $background_color; + display: flex; + justify-content: center; + align-items: center; + font-size: 1.25em; h1 { padding: 0 0 10px; font-size: 60px; font-family: Lobster; font-weight: normal; - color: #FFF; + color: $primary_color; text-align: center; } form { padding: 0; - height: 300px; - width: 400px; - position: fixed; - left: 50%; - top: 50%; - margin: -200px 0 0 -200px; + width: 300px; } .ctrlHolder { @@ -36,24 +34,17 @@ input[type=text], input[type=password] { width: 100% !important; - font-size: 25px; - padding: 14px !important; } .remember_me { font-size: 15px; float: left; width: 150px; - padding: 20px 0; - - .check { - margin: 5px 5px 0 0; - } } .button { - font-size: 25px; - padding: 20px; float: right; + margin: 0; + transition: none; } } diff --git a/couchpotato/templates/login.html b/couchpotato/templates/login.html index c35c213..5d79dff 100644 --- a/couchpotato/templates/login.html +++ b/couchpotato/templates/login.html @@ -10,11 +10,8 @@ {% for url in fireEvent('clientscript.get_styles', location = 'front', single = True) %} {% end %} - {% for url in fireEvent('clientscript.get_scripts', location = 'front', single = True) %} - {% end %} - - {% for url in fireEvent('clientscript.get_styles', location = 'head', single = True) %} - {% end %} + {% for url in fireEvent('clientscript.get_scripts', location = 'front', single = True) %}{% if 'combined.plugins' not in url %} + {% end %}{% end %} @@ -23,23 +20,15 @@ {% end %} - -