Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit 35196bc

Browse files
committed
Tweaks for SVG updates
- move star up 1px - make reload/stop/home the same size (on hover) as back/forward - move reload/stop/home out of `startButtons` and into `navigator` - change reload/stop/home to pos relative, move down 3 px Changes tested on Windows
1 parent f14dabe commit 35196bc

File tree

2 files changed

+34
-28
lines changed

2 files changed

+34
-28
lines changed

js/components/navigationBar.js

+24-24
Original file line numberDiff line numberDiff line change
@@ -125,32 +125,32 @@ class NavigationBar extends ImmutableComponent {
125125
withHomeButton={getSetting(settings.SHOW_HOME_BUTTON)}
126126
/>
127127
: null
128-
}
129-
<div className='startButtons'>
130-
{
131-
this.titleMode
132-
? null
133-
: this.loading
134-
? <span className='navigationButtonContainer'>
135-
<span data-l10n-id='stopButton'
136-
className='navigationButton stopButton'
137-
onClick={this.onStop} />
138-
</span>
139-
: <span className='navigationButtonContainer'>
140-
<span data-l10n-id='reloadButton'
141-
className='navigationButton reloadButton'
142-
onClick={this.onReload} />
143-
</span>
144-
}
145-
{
146-
!this.titleMode && getSetting(settings.SHOW_HOME_BUTTON)
128+
}
129+
{
130+
this.titleMode
131+
? null
132+
: this.loading
147133
? <span className='navigationButtonContainer'>
148-
<span data-l10n-id='homeButton'
149-
className='navigationButton homeButton'
150-
onClick={this.onHome} />
134+
<span data-l10n-id='stopButton'
135+
className='navigationButton stopButton'
136+
onClick={this.onStop} />
151137
</span>
152-
: null
153-
}
138+
: <span className='navigationButtonContainer'>
139+
<span data-l10n-id='reloadButton'
140+
className='navigationButton reloadButton'
141+
onClick={this.onReload} />
142+
</span>
143+
}
144+
{
145+
!this.titleMode && getSetting(settings.SHOW_HOME_BUTTON)
146+
? <span className='navigationButtonContainer'>
147+
<span data-l10n-id='homeButton'
148+
className='navigationButton homeButton'
149+
onClick={this.onHome} />
150+
</span>
151+
: null
152+
}
153+
<div className='startButtons'>
154154
{
155155
!this.titleMode
156156
? <span className='bookmarkButtonContainer'>

less/navigationBar.less

+10-4
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343

4444
#navigator {
4545
.homeButton {
46-
margin: 0 3px 3px 3px;
46+
margin: 0 3px 4px 3px;
4747
}
4848

4949
.stopButton {
50-
margin: 0 3px 4px 3px;
50+
margin: 0 3px 6px 3px;
5151
}
5252

5353
.reloadButton {
54-
margin: 0 3px 2px 3px;
54+
margin: 0 3px 3px 3px;
5555
}
5656
}
5757

@@ -575,12 +575,16 @@
575575
margin: 0 3px 3px 3px;
576576
padding: 0 6px;
577577
height: 9px;
578+
position: relative;
579+
top: 3px;
578580
}
579581

580582
.reloadButton {
581583
background: url('../img/toolbar/reload_btn.svg') center no-repeat;
582584
margin: 0 3px 1px 3px;
583585
padding: 0 6px;
586+
position: relative;
587+
top: 3px;
584588
}
585589

586590
.homeButton {
@@ -589,14 +593,16 @@
589593
height: 13px;
590594
margin: 0 3px 2px 3px;
591595
padding: 0 6px;
596+
position: relative;
597+
top: 3px;
592598
}
593599

594600
.bookmarkButton {
595601
background: url('../img/toolbar/bookmark_btn.svg') center no-repeat;
596602
-webkit-mask-repeat: no-repeat;
597603
width: 14px;
598604
height: 14px;
599-
margin-bottom: 1px;
605+
margin-bottom: 2px;
600606

601607
&.removeBookmarkButton {
602608
background: url('../img/toolbar/bookmark_marked.svg') center no-repeat;

0 commit comments

Comments
 (0)