git ssb - Merge pull request #88 from ticktackim/new_icons

add icons for subscriptions

mix irving authored on 2/7/2018, 4:36:26 AM
GitHub committed on 2/7/2018, 4:36:26 AM
Parent: f56fcb98e3ebbac5cfca9281bc5b9806f407689e
Parent: ad8479ef8553f26f80510ad8a990631103af7f51

app/html/sideNav/sideNav.mcss	changed
app/html/sideNav/sideNavDiscovery.js	changed
assets/friends_subscribed.png	added
assets/my_subscribed.png	added

app/html/sideNav/sideNav.mcssView
		@@ -70,10 +70,9 @@
70	70	}
71	71	}
72	72
73	73	div.circle {
74		- width: 3.6rem
75		- position: relative
	74	+ margin-right: .6rem
76	75
77	76	div.alert {
78	77	position: absolute
79	78	width: 1.2rem
		@@ -99,8 +98,9 @@
99	98	i {
100	99	$circleSmall
101	100	$colorPrimary
102	101	font-size: 1.3rem
	102	+
103	103	display: flex
104	104	justify-content: center
105	105	align-items: center
106	106	}

app/html/sideNav/sideNavDiscovery.jsView
		@@ -136,9 +136,9 @@
136	136
137	137	// My subscriptions
138	138	Option({
139	139	imageEl: h('i', [
140		- h('img', { src: path.join(__dirname, '../../../assets', 'discover.png') })
	140	+ h('img', { src: path.join(__dirname, '../../../assets', 'my_subscribed.png') })
141	141	]),
142	142	label: strings.subscriptions.user,
143	143	selected: location.page === 'channelSubscriptions' && location.scope === 'user',
144	144	location: { page: 'channelSubscriptions', scope: 'user' },
		@@ -146,9 +146,9 @@
146	146
147	147	// Friends subscriptions
148	148	Option({
149	149	imageEl: h('i', [
150		- h('img', { src: path.join(__dirname, '../../../assets', 'discover.png') })
	150	+ h('img', { src: path.join(__dirname, '../../../assets', 'friends_subscribed.png') })
151	151	]),
152	152	label: strings.subscriptions.friends,
153	153	selected: location.page === 'channelSubscriptions' && location.scope === 'friends',
154	154	location: { page: 'channelSubscriptions', scope: 'friends' },

assets/friends_subscribed.png

assets/my_subscribed.png

mixmix / ticktack