quattro: readd video delete button styles

because i'm not so good at resolving merge conflicts...
This commit is contained in:
fabrixxm 2015-05-24 10:28:15 +02:00
parent b29b01fad4
commit 646ea377ac
4 changed files with 211 additions and 122 deletions

View File

@ -1965,6 +1965,27 @@ ul.tabs li .active {
width: 50px; width: 50px;
float: left; float: left;
} }
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
margin: 0px 10px 10px 0px;
position: relative;
}
.videos .video-top-wrapper .video-js {
width: 200px!important;
height: 132px!important;
}
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}
/* photo albums */ /* photo albums */
#photo-edit-link-wrap { #photo-edit-link-wrap {
margin-bottom: 10px; margin-bottom: 10px;

View File

@ -1965,6 +1965,27 @@ ul.tabs li .active {
width: 50px; width: 50px;
float: left; float: left;
} }
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
margin: 0px 10px 10px 0px;
position: relative;
}
.videos .video-top-wrapper .video-js {
width: 200px!important;
height: 132px!important;
}
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}
/* photo albums */ /* photo albums */
#photo-edit-link-wrap { #photo-edit-link-wrap {
margin-bottom: 10px; margin-bottom: 10px;

View File

@ -1965,6 +1965,27 @@ ul.tabs li .active {
width: 50px; width: 50px;
float: left; float: left;
} }
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
margin: 0px 10px 10px 0px;
position: relative;
}
.videos .video-top-wrapper .video-js {
width: 200px!important;
height: 132px!important;
}
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}
/* photo albums */ /* photo albums */
#photo-edit-link-wrap { #photo-edit-link-wrap {
margin-bottom: 10px; margin-bottom: 10px;

View File

@ -1318,6 +1318,32 @@ ul.tabs {
width: 50px; float: left; width: 50px; float: left;
} }
/* videos page */
.videos {
.video-top-wrapper {
width: 200px; float: left;
margin: 0px 10px 10px 0px;
position: relative;
.video-js {
width: 200px!important;
height: 132px!important;
}
.video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
&:hover .video-delete {
opacity: 1;
}
}
}
/* photo albums */ /* photo albums */
@photosize: 150px; @photosize: 150px;