Browse Source

Re-use tiny scroller for webkit

pull/3465/head
Ruud 11 years ago
parent
commit
dcd0364ecc
  1. 4
      couchpotato/core/media/movie/_base/static/movie.css
  2. 2
      couchpotato/core/media/movie/_base/static/movie.js
  3. 22
      couchpotato/core/media/movie/charts/static/charts.css
  4. 6
      couchpotato/core/media/movie/charts/static/charts.js
  5. 24
      couchpotato/static/style/main.css

4
couchpotato/core/media/movie/_base/static/movie.css

@ -357,12 +357,8 @@
top: 30px;
clear: both;
bottom: 30px;
overflow: hidden;
position: absolute;
}
.movies .data:hover .description {
overflow: auto;
}
.movies.list_list .movie:not(.details_view) .info .description,
.movies.mass_edit_list .info .description,
.movies.thumbs_list .info .description {

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

@ -158,7 +158,7 @@ var Movie = new Class({
'text': self.data.info.year || 'n/a'
})
),
self.description = new Element('div.description', {
self.description = new Element('div.description.tiny_scroll', {
'text': self.data.info.plot
}),
self.quality = new Element('div.quality', {

22
couchpotato/core/media/movie/charts/static/charts.css

@ -3,23 +3,6 @@
margin-bottom: 30px;
}
.charts ::-webkit-scrollbar {
width: 5px;
position: absolute;
}
.charts ::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.4);
-webkit-border-radius: 5px;
border-radius: 5px;
}
.charts ::-webkit-scrollbar-thumb {
-webkit-border-radius: 5px;
border-radius: 5px;
background: rgba(255,255,255,0.3);
}
.charts > h2 {
height: 40px;
}
@ -29,14 +12,9 @@
width: 50%;
vertical-align: top;
max-height: 510px;
overflow: hidden;
scrollbar-base-color: #4e5969;
}
.charts .chart:hover {
overflow-y: auto;
}
.charts .chart .media_result.hidden {
display: none;
}

6
couchpotato/core/media/movie/charts/static/charts.js

@ -22,9 +22,11 @@ var Charts = new Class({
'events': {
'click': function(e) {
e.preventDefault();
self.el.getChildren('div.chart').destroy();
self.el.getElements('.chart').destroy();
self.el_refreshing_text.show();
self.el_refresh_link.hide();
self.api_request = Api.request('charts.view', {
'data': { 'force_update': 1 },
'onComplete': self.fill.bind(self)
@ -72,7 +74,7 @@ var Charts = new Class({
Object.each(json.charts, function(chart){
var c = new Element('div.chart').grab(
var c = new Element('div.chart.tiny_scroll').grab(
new Element('h3').grab( new Element('a', {
'text': chart.name,
'href': chart.url

24
couchpotato/static/style/main.css

@ -53,6 +53,30 @@ input:-moz-placeholder {
font-style: italic;
}
.tiny_scroll {
overflow: hidden;
}
.tiny_scroll:hover {
overflow-y: auto;
}
.tiny_scroll::-webkit-scrollbar {
width: 5px;
}
.tiny_scroll::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.4);
-webkit-border-radius: 5px;
border-radius: 5px;
}
.tiny_scroll::-webkit-scrollbar-thumb {
-webkit-border-radius: 5px;
border-radius: 5px;
background: rgba(255,255,255,0.3);
}
a img {
border:none;
}

Loading…
Cancel
Save