tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-02-02 02:58:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix scroll issues in switch_profile_guide.

Browse Source
This commit is contained in:
FelisCatus 2016-03-17 15:18:44 +08:00
parent bf7a7810fe
commit 374b8a42c5
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
omega-web/src/coffee/switch_profile_guide.coffee
View File

@ -1,15 +1,15 @@
$script 'lib/tether/tether.js', ->
$script 'lib/shepherd.js/shepherd.min.js', ->
return if jQuery('.switch-rule-row').length == 0
jQuery('html, body').scrollTop(0)
tr = chrome.i18n.getMessage.bind(chrome.i18n)
tour = new Shepherd.Tour
defaults:
classes: 'shepherd-theme-arrows'
scrollTo: true
tour.addStep 'condition-step',
text: tr('options_guide_conditionStep')
attachTo: '.switch-rule-row bottom'
scrollTo: true
buttons: [
{
text: tr('options_guideSkip')
@ -28,7 +28,6 @@ $script 'lib/tether/tether.js', ->
advanceOn:
selector: '.close-condition-help'
event: 'click'
scrollTo: true
buttons: [
text: tr('options_guideNext')
action: tour.next
@ -45,21 +44,25 @@ $script 'lib/tether/tether.js', ->
tour.addStep 'condition-profile-step',
text: tr('options_guide_conditionProfileStep')
attachTo: '.switch-rule-row-target bottom'
scrollTo: true
buttons: [
text: tr('options_guideNext')
action: tour.next
]
tour.addStep 'switch-default-step',
defaultStep = tour.addStep 'switch-default-step',
text: tr('options_guide_switchDefaultStep')
attachTo: '.switch-default-row top'
scrollTo: true
buttons: [
text: tr('options_guideNext')
action: tour.next
]
defaultStep.on 'show', ->
row = jQuery('.switch-default-row')
scrollTop = row.offset().top + row.height() - $(window).height()
scrollTop = 0 if scrollTop < 0
jQuery('html, body').animate({scrollTop: scrollTop})
tour.addStep 'apply-switch-profile-step',
text: tr('options_guide_applySwitchProfileStep')
attachTo: 'body top'

6
omega-web/src/less/options.less
View File

@ -420,7 +420,11 @@ main {
.switch-attached {
> tr > td {
background-color: #F9F9F9;
background-color: #f9f9f9;
.shepherd-active & {
background-color: transparent;
}
&:first-child {
text-align: center;