Browse Source

Don't trigger hover on mobile

pull/5312/head
Ruud 10 years ago
parent
commit
3f866a36f5
  1. 7
      couchpotato/core/media/movie/_base/static/movie.js
  2. 8
      couchpotato/core/media/movie/_base/static/movie.scss
  3. 6
      couchpotato/static/scripts/combined.plugins.min.js
  4. 6
      couchpotato/static/style/combined.min.css

7
couchpotato/core/media/movie/_base/static/movie.js

@ -277,7 +277,7 @@ var Movie = new Class({
onClick: function(e){
var self = this;
if(e.target.getParents('.actions').length == 0 && e.target != self.select_checkbox){
if(e.target.getParents('.actions').length === 0 && e.target != self.select_checkbox){
(e).stopPropagation();
self.addActions();
self.openDetails();
@ -308,6 +308,11 @@ var Movie = new Class({
self.addActions();
if(self.list.current_view == 'thumb'){
self.el.addClass('hover_start');
setTimeout(function(){
self.el.removeClass('hover_start');
}, 300);
dynamics.css(self.el, {
scale: 1,
opacity: 1

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

@ -475,7 +475,8 @@ $mass_edit_height: 44px;
.actions {
background-image: linear-gradient(25deg, rgba($primary_color,0) 0%, rgba($primary_color,1) 80%);
transition: opacity 400ms;
opacity: 0;
opacity: 1;
visibility: hidden;
position: absolute;
top: 0;
right: 0;
@ -511,12 +512,17 @@ $mass_edit_height: 44px;
&:hover .actions {
opacity: 1;
visibility: visible;
@include media-phablet {
display: none;
}
}
&.hover_start .actions {
pointer-events: none;
}
.mask {
bottom: 44px;
border-radius: $border_radius;

6
couchpotato/static/scripts/combined.plugins.min.js

@ -1936,7 +1936,7 @@ var Movie = new Class({
},
onClick: function(e) {
var self = this;
if (e.target.getParents(".actions").length == 0 && e.target != self.select_checkbox) {
if (e.target.getParents(".actions").length === 0 && e.target != self.select_checkbox) {
e.stopPropagation();
self.addActions();
self.openDetails();
@ -1960,6 +1960,10 @@ var Movie = new Class({
if (App.mobile_screen) return;
self.addActions();
if (self.list.current_view == "thumb") {
self.el.addClass("hover_start");
setTimeout(function() {
self.el.removeClass("hover_start");
}, 300);
dynamics.css(self.el, {
scale: 1,
opacity: 1

6
couchpotato/static/style/combined.min.css

@ -1,3 +1,4 @@
.page.movie_details,.thumb_list .movie.hover_start .actions{pointer-events:none}
.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 *{-webkit-transform:translateZ(0);transform:translateZ(0)}
@ -224,14 +225,13 @@
.thumb_list .movie .info .eta{opacity:.5;float:right;margin-left:4px}
.thumb_list .movie .info .quality{white-space:nowrap;overflow:hidden}
.thumb_list .movie .info .quality span{font-size:.8em;margin-right:2px}
.thumb_list .movie .actions{background-image:linear-gradient(25deg,rgba(172,0,0,0) 0,#ac0000 80%);transition:opacity 400ms;opacity:0;position:absolute;top:0;right:0;bottom:0;left:0;text-align:right}
.thumb_list .movie .actions{background-image:linear-gradient(25deg,rgba(172,0,0,0) 0,#ac0000 80%);transition:opacity 400ms;opacity:1;visibility:hidden;position:absolute;top:0;right:0;bottom:0;left:0;text-align:right}
.thumb_list .movie .actions .action{position:relative;margin-right:10px;float:right;clear:both}
.thumb_list .movie .actions .action:first-child{margin-top:10px}
.thumb_list .movie .actions .action a{transition:all 150ms cubic-bezier(.9,0,.1,1);display:block;width:auto;padding:6.67px;color:#FFF;border-radius:2px}
.thumb_list .movie .actions .action a:hover{background:#FFF;color:#ac0000}
.thumb_list .movie:hover .actions{opacity:1}
.thumb_list .movie:hover .actions{opacity:1;visibility:visible}
.thumb_list .movie .mask{bottom:44px;border-radius:3px;transition:opacity 30ms}
.page.movie_details{pointer-events:none}
@media (max-width:480px){.thumb_list .movie:hover .actions{display:none}
.page.movie_details{left:0}
}

Loading…
Cancel
Save