Merge branch 'master' of https://github.com/benjaminvo/quasi

benjaminvo · Feb 14, 2017 · 7ca4c6b · 7ca4c6b
2 parents 5b334e3 + d337a16
commit 7ca4c6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/Article/ListItem.vue b/src/components/Article/ListItem.vue
@@ -30,11 +30,11 @@
         </div>
         <div v-if="interestingCount > 0" class="display-flex alignItems-center margin-left">
           <span class="margin-right-1-2" :class="{ 'color-primary': interestingReactedByCurrentUser }">{{ interestingCount }}</span>
-          <img src="/dist/emoji_interesting.svg" title="Understandable" width="12" />
+          <img src="/dist/emoji_interesting.svg" title="Interesting" width="12" />
         </div>
         <div v-if="understandableCount > 0" class="display-flex alignItems-center margin-left">
           <span class="margin-right-1-2" :class="{ 'color-primary': understandableReactedByCurrentUser }">{{ understandableCount }}</span>
-          <img src="/dist/emoji_understandable.svg" title="Interesting" width="12" />
+          <img src="/dist/emoji_understandable.svg" title="Understandable" width="12" />
         </div>
       </div>
     </div>

diff --git a/src/components/NotificationTicker.vue b/src/components/NotificationTicker.vue
@@ -11,7 +11,7 @@
 
           <!-- EVENT -->
           {{ notification.type === 'articleFinished' ? 'finished' :
-             notification.type === 'contributionAdded' ? 'added a thought to to' : null }}
+             notification.type === 'contributionAdded' ? 'added a thought to' : null }}
           <div v-if="notification.type === 'reactionAdded'" class="display-inlineBlock"> reacted with <span v-html="renderEmoji(notification.emoji)" />&nbsp; to </div>
 
           <!-- ARTICLE -->