mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Finishing up look and feel of classifiers. Also added shift+j and shift+k to keyboard shortcuts modal.
This commit is contained in:
parent
7d5f160b93
commit
8062a67628
4 changed files with 90 additions and 21 deletions
|
@ -2256,7 +2256,7 @@ background: transparent;
|
|||
display: block;
|
||||
margin: 2px 6px 6px 0;
|
||||
cursor: pointer;
|
||||
padding: 0 34px 0 26px;
|
||||
padding: 0 30px 0 26px;
|
||||
font-size: 12px;
|
||||
text-transform: uppercase;
|
||||
background-color: #F5CD09;
|
||||
|
@ -2307,6 +2307,7 @@ background: transparent;
|
|||
position: absolute;
|
||||
left: 6px;
|
||||
top: 2px;
|
||||
opacity: .2;
|
||||
}
|
||||
|
||||
.NB-classifiers .NB-classifier .NB-classifier-icon-dislike {
|
||||
|
@ -2316,24 +2317,25 @@ background: transparent;
|
|||
top: -1px;
|
||||
right: -1px;
|
||||
background: transparent url('../img/reader/thumbs-down.png') no-repeat 5px -1px;
|
||||
opacity: .2;
|
||||
}
|
||||
|
||||
.NB-classifiers .NB-classifier .NB-classifier-icon-dislike-inner {
|
||||
margin: 4px 4px 0 0;
|
||||
width: 18px;
|
||||
height: 13px;
|
||||
border-left: 1px solid #F5E529;
|
||||
border-left: 1px solid #EBEBE1;
|
||||
}
|
||||
|
||||
.NB-classifiers .NB-classifier.NB-classifier-like {
|
||||
background-color: #54B54E;
|
||||
background-color: #34912E;
|
||||
border: 1px solid #202020;
|
||||
-webkit-box-shadow: 1px 1px 1px #BDC0D7;
|
||||
-moz-box-shadow: 1px 1px 1px #BDC0D7;
|
||||
box-shadow: 1px 1px 1px #BDC0D7;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike {
|
||||
background-color: #C92123;
|
||||
background-color: #A90103;
|
||||
border: 1px solid #000;
|
||||
-webkit-box-shadow: 1px 1px 1px #BDC0D7;
|
||||
-moz-box-shadow: 1px 1px 1px #BDC0D7;
|
||||
|
@ -2341,7 +2343,10 @@ background: transparent;
|
|||
}
|
||||
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-like {
|
||||
background-color: #54B54E;
|
||||
background-color: #54A54E;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-like.NB-classifier-hover-like {
|
||||
background-color: #34912E;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike.NB-classifier-hover-like {
|
||||
border: 1px solid transparent;
|
||||
|
@ -2359,14 +2364,48 @@ background: transparent;
|
|||
.NB-classifiers .NB-classifier.NB-classifier-hover-like .NB-classifier-icon-dislike {
|
||||
opacity: .1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike .NB-classifier-icon-dislike,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-dislike .NB-classifier-icon-dislike {
|
||||
opacity: 1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike .NB-classifier-icon-like,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-dislike .NB-classifier-icon-like {
|
||||
opacity: .1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike.NB-classifier-hover-like .NB-classifier-icon-like {
|
||||
opacity: 1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike.NB-classifier-hover-like .NB-classifier-icon-dislike {
|
||||
opacity: .1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-like.NB-classifier-hover-dislike .NB-classifier-icon-dislike {
|
||||
opacity: 1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-like.NB-classifier-hover-dislike .NB-classifier-icon-like {
|
||||
opacity: .1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-like .NB-classifier-icon-like,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-like .NB-classifier-icon-like,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike .NB-classifier-icon-dislike,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-dislike .NB-classifier-icon-dislike {
|
||||
opacity: 1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-dislike {
|
||||
background-color: #C92123;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-like.NB-classifier-hover-dislike {
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-like.NB-classifier-hover-like.NB-classifier-hover-dislike {
|
||||
background-color: #C92123;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike.NB-classifier-hover-like.NB-classifier-hover-dislike {
|
||||
border: 1px solid #000;
|
||||
background-color: #A90103;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike .NB-classifier-icon-dislike-inner,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-dislike .NB-classifier-icon-dislike-inner {
|
||||
border-left-color: #C17C52;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike label b,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-dislike label b {
|
||||
|
@ -2377,14 +2416,6 @@ background: transparent;
|
|||
color: white;
|
||||
text-shadow: 1px 1px 0 #7F1012;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike .NB-classifier-icon-dislike,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-dislike .NB-classifier-icon-dislike {
|
||||
opacity: 1;
|
||||
}
|
||||
.NB-classifiers .NB-classifier.NB-classifier-dislike .NB-classifier-icon-like,
|
||||
.NB-classifiers .NB-classifier.NB-classifier-hover-dislike .NB-classifier-icon-like {
|
||||
opacity: .1;
|
||||
}
|
||||
/* =================== */
|
||||
/* = Mouse Indicator = */
|
||||
/* =================== */
|
||||
|
|
|
@ -3688,6 +3688,14 @@
|
|||
$document.bind('keydown', 'shift+k', function(e) {
|
||||
e.preventDefault();
|
||||
self.show_next_feed(-1);
|
||||
});
|
||||
$document.bind('keydown', 'shift+down', function(e) {
|
||||
e.preventDefault();
|
||||
self.show_next_feed(1);
|
||||
});
|
||||
$document.bind('keydown', 'shift+up', function(e) {
|
||||
e.preventDefault();
|
||||
self.show_next_feed(-1);
|
||||
});
|
||||
$document.bind('keydown', 'left', function(e) {
|
||||
e.preventDefault();
|
||||
|
|
|
@ -547,15 +547,15 @@ var classifier_prototype = {
|
|||
$('.NB-classifier-input-dislike', $classifier).attr('checked', true);
|
||||
}
|
||||
|
||||
$('.NB-classifier', $classifier).bind('mouseover', function(e) {
|
||||
$('.NB-classifier', $classifier).bind('mouseenter', function(e) {
|
||||
$(e.currentTarget).addClass('NB-classifier-hover-like');
|
||||
}).bind('mouseout', function(e) {
|
||||
}).bind('mouseleave', function(e) {
|
||||
$(e.currentTarget).removeClass('NB-classifier-hover-like');
|
||||
});
|
||||
|
||||
$('.NB-classifier-icon-dislike', $classifier).bind('mouseover', function(e) {
|
||||
$('.NB-classifier-icon-dislike', $classifier).bind('mouseenter', function(e) {
|
||||
$('.NB-classifier', $classifier).addClass('NB-classifier-hover-dislike');
|
||||
}).bind('mouseout', function(e) {
|
||||
}).bind('mouseleave', function(e) {
|
||||
$('.NB-classifier', $classifier).removeClass('NB-classifier-hover-dislike');
|
||||
});
|
||||
|
||||
|
|
|
@ -24,8 +24,9 @@ NEWSBLUR.ReaderKeyboard.prototype = {
|
|||
$.make('div', { className: 'NB-keyboard-shortcut' }, [
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Next story'),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-key' }, [
|
||||
'↓',
|
||||
$.make('span', 'or'),
|
||||
'↓'
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-key' }, [
|
||||
'j'
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-image' }, [
|
||||
|
@ -35,8 +36,9 @@ NEWSBLUR.ReaderKeyboard.prototype = {
|
|||
$.make('div', { className: 'NB-keyboard-shortcut NB-last' }, [
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Previous story'),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-key' }, [
|
||||
'↑',
|
||||
$.make('span', 'or'),
|
||||
'↑'
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-key' }, [
|
||||
'k'
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-image' }, [
|
||||
|
@ -44,6 +46,34 @@ NEWSBLUR.ReaderKeyboard.prototype = {
|
|||
])
|
||||
])
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-group' }, [
|
||||
$.make('div', { className: 'NB-keyboard-shortcut' }, [
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Next site'),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-key' }, [
|
||||
'shift',
|
||||
$.make('span', '+'),
|
||||
'↓'
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-key' }, [
|
||||
'shift',
|
||||
$.make('span', '+'),
|
||||
'j'
|
||||
])
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut NB-last' }, [
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Prev. site'),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-key' }, [
|
||||
'shift',
|
||||
$.make('span', '+'),
|
||||
'↑'
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-key' }, [
|
||||
'shift',
|
||||
$.make('span', '+'),
|
||||
'k'
|
||||
])
|
||||
])
|
||||
]),
|
||||
$.make('div', { className: 'NB-keyboard-group' }, [
|
||||
$.make('div', { className: 'NB-keyboard-shortcut' }, [
|
||||
$.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Switch views'),
|
||||
|
|
Loading…
Add table
Reference in a new issue