dockeruser
/
CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'develop'

pull/5334/merge
Ruud 10 years ago
parent
c058e897a7 5ceaff6421
commit
9130bfd9df
2 changed files with 13 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      couchpotato/core/media/movie/_base/static/movie.scss
  2. 49
      couchpotato/static/style/combined.min.css

8
couchpotato/core/media/movie/_base/static/movie.scss
View File

@ -674,7 +674,12 @@ $mass_edit_height: 44px;
}
}
.more_menu .icon-dropdown {
.more_menu {
a {
@include theme(color, text);
}
.icon-dropdown {
padding-right: $padding;
@include media-phablet {
@ -684,6 +689,7 @@ $mass_edit_height: 44px;
}
}
}
}
.more_menu {
display: inline-block;

49
couchpotato/static/style/combined.min.css
View File

@ -290,6 +290,8 @@
.page.movie_details .scroll_content>.head h1{min-width:100%;line-height:44px}
.page.movie_details .scroll_content>.head h1 .more_menu{width:100%}
}
.page.movie_details .scroll_content>.head h1 .more_menu a{color:#000}
.dark .page.movie_details .scroll_content>.head h1 .more_menu a{color:#FFF}
.page.movie_details .scroll_content>.head h1 .more_menu .icon-dropdown{padding-right:20px}
.page.movie_details .scroll_content>.head .more_menu{display:inline-block;vertical-align:top;max-width:100%;margin-bottom:0}
.page.movie_details .scroll_content>.head .more_menu>a{line-height:80px;color:#ac0000}
@ -455,53 +457,6 @@
.alph_nav .menus .more_menu .wrapper{top:70px;padding-top:4px;border-radius:3px 3px 0 0;min-width:140px}
.alph_nav .menus .more_menu .wrapper:before{top:0;left:auto;right:22px}
.alph_nav .menus .more_menu .wrapper ul{border-radius:3px 3px 0 0}
.charts{clear:both;margin-bottom:30px}
.charts>h2{height:40px}
.charts .chart{display:inline-block;width:50%;vertical-align:top;max-height:510px;scrollbar-base-color:#4e5969}
.charts .chart .media_result.hidden{display:none}
.charts .refresh{clear:both;position:relative}
.charts .refresh .refreshing{display:block;padding:20px;font-size:20px;text-align:center}
.charts .refresh a{text-align:center;padding:0;display:none;width:30px;height:30px;position:absolute;right:10px;top:-40px;opacity:.7}
.charts .refresh a:hover{opacity:1}
.charts p.no_charts_enabled{padding:.7em 1em;display:none}
.charts .chart h3 a{color:#fff}
.charts .chart .media_result{display:inline-block;width:100%;height:150px}
@media all and (max-width:960px){.charts .chart{width:50%}
}
@media all and (max-width:600px){.charts .chart{width:100%}
}
.charts .chart .media_result .data{left:150px;background:#4e5969;border:none}
.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}
.charts .chart .media_result .data .info .year{margin:10px 0 0}
.charts .chart .media_result .data .info .rating{font-size:20px;float:right;margin-top:-20px}
.charts .chart .media_result .data .info .rating:before{content:"\e031";font-family:Elusive-Icons;font-size:14px;margin:0 5px 0 0;vertical-align:bottom}
.charts .chart .media_result .data .info .genres{font-size:11px;font-style:italic;text-align:right}
.charts .chart .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}
.charts .chart .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}
.charts .chart .media_result .data .info .plot.full{top:0;overflow:auto}
.charts .chart .media_result .data{cursor:default}
.charts .chart .media_result .options{left:150px}
.charts .chart .media_result .options select[name=category],.charts .chart .media_result .options select[name=profile],.charts .chart .media_result .options select[name=title]{width:100%}
.charts .chart .media_result .button{position:absolute;margin:2px 0 0;right:15px;bottom:15px}
.charts .chart .media_result .thumbnail{width:100px;position:absolute;left:50px}
.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)}
.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.active{border-bottom:4px solid #04bce6;color:#fff}
.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}
}
.add_new_category{padding:20px;display:block;text-align:center;font-size:20px}
.category{margin-bottom:20px;position:relative}
.category>.delete{position:absolute;padding:6.67px 20px;right:0;cursor:pointer;opacity:.6;color:#fd5353;font-size:1.5em;z-index:2}

Write Preview
Loading…
Cancel
Save