Skip to content

Commit 52e61d4

Browse files
committed
Add Lines to Desktop
1 parent beadb7c commit 52e61d4

File tree

7 files changed

+22
-10
lines changed

7 files changed

+22
-10
lines changed

dist/icons/lines-light.svg

Lines changed: 1 addition & 0 deletions
Loading

dist/icons/pin.svg

Lines changed: 1 addition & 1 deletion
Loading

js/stores/settingsStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class settingsStore {
1212
this.state[attrname] = preState[attrname]
1313
}
1414
}
15-
localStorage.setItem('AppVersion', '1.0.0')
15+
localStorage.setItem('AppVersion', '1.1.0')
1616
}
1717
getState() {
1818
return this.state

js/views/lines.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ class Lines extends React.Component {
239239

240240
return(
241241
<div>
242-
{children}
243242
<div className={className} ref="container" style={styles}>
244243
<header className='material-header'>
245244
<div>
@@ -248,6 +247,7 @@ class Lines extends React.Component {
248247
</div>
249248
</header>
250249
{ret}
250+
{children}
251251
</div>
252252
</div>
253253
)

js/views/savedstations.jsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class SidebarItem extends React.Component {
3838
}
3939
render() {
4040

41-
var classname = 'ss'
41+
var classname = (this.props.className || '') + ' ss'
4242
if (window.location.pathname == this.props.url) {
4343
classname += ' selected'
4444
}
@@ -127,6 +127,13 @@ class SavedSations extends React.Component {
127127
name="Welcome to Transit!"
128128
description="Transit is your realtime guide to AT Buses, Trains, and Ferries."
129129
/>
130+
<SidebarItem
131+
url="/l"
132+
icon="lines-light.svg"
133+
name="Lines"
134+
className="lines-btn"
135+
description="View all Bus, Train, and Ferry Services"
136+
/>
130137
<SidebarItem
131138
type="install"
132139
action={this.props.togglePin}

scss/_lines.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
z-index: 5;
88
background: $default-back;
99

10+
@media (min-width: 851px) {
11+
left: $sidebar-width;
12+
z-index: 0;
13+
}
14+
1015

1116
.material-header {
1217
height: $navsize;

scss/_navigation.scss

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,17 @@
206206
padding-bottom: 10px;
207207
}
208208
}
209-
210209
@media (min-width: 601px) {
211210
nav {
212211
box-shadow: 0 0 4px rgba(0,0,0,0.3);
213212
z-index: 3;
214213
}
215214
}
215+
@media (max-width: 850px) {
216+
.lines-btn {
217+
display: none;
218+
}
219+
}
216220

217221
@media (max-width: 900px) {
218222
nav {
@@ -234,11 +238,6 @@
234238
}
235239
}
236240

237-
@media (min-width: 851px) {
238-
// .onboard {
239-
// display: none;
240-
// }
241-
}
242241
.onboard li:last-child span {
243242
&:last-child {
244243
display: none;

0 commit comments

Comments
 (0)