From 53fed694dfa4f2c4fe5c8f58ad8eb728c7720449 Mon Sep 17 00:00:00 2001 From: Jiayi Zheng Date: Sun, 13 Nov 2016 17:52:20 +0100 Subject: [PATCH] Refactor css Apply different styles to reply, retweet and favorite buttons --- src/App.scss | 8 +++----- src/_variables.scss | 6 ++++++ .../favorite_button/favorite_button.vue | 15 +++++++++++---- .../retweet_button/retweet_button.vue | 18 +++++++++++------- src/components/status/status.vue | 13 +++++++++---- 5 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 src/_variables.scss diff --git a/src/App.scss b/src/App.scss index c155de73..a97ad56d 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,7 +1,4 @@ -$main-color: #f58d2c; -$main-background: white; -$darkened-background: whitesmoke; - +@import './_variables.scss'; #app { background-color: $main-color; background-size: cover; @@ -225,9 +222,10 @@ status.ng-enter.ng-enter-active { } .fa { - color: $main-color; + color: grey; } + .status-actions { width: 50%; display: flex; diff --git a/src/_variables.scss b/src/_variables.scss new file mode 100644 index 00000000..c317fd32 --- /dev/null +++ b/src/_variables.scss @@ -0,0 +1,6 @@ +$main-color: #f58d2c; +$main-background: white; +$darkened-background: whitesmoke; +$green: #0fa00f; +$blue: #0095ff; + diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue index 0455c706..6eaf0607 100644 --- a/src/components/favorite_button/favorite_button.vue +++ b/src/components/favorite_button/favorite_button.vue @@ -7,8 +7,15 @@ - diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue index ec94356a..9b2f5c7b 100644 --- a/src/components/retweet_button/retweet_button.vue +++ b/src/components/retweet_button/retweet_button.vue @@ -7,12 +7,16 @@ - diff --git a/src/components/status/status.vue b/src/components/status/status.vue index d309c495..d4bcc279 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -51,7 +51,8 @@