From 9adbc2c17fced9328771a5f6e7cfefef54ebfb79 Mon Sep 17 00:00:00 2001 From: taehoon Date: Wed, 15 May 2019 22:01:04 -0400 Subject: make only screen name as link --- src/components/user_card/user_card.vue | 71 ++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 33 deletions(-) (limited to 'src/components/user_card/user_card.vue') diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 2d02ca03..f21770ce 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -6,7 +6,7 @@ -
+
{{user.name}}
@@ -18,12 +18,14 @@
- - @{{user.screen_name}} +
+ + @{{user.screen_name}} {{visibleRole}} - + + {{dailyAvg}} {{ $t('user_card.per_day') }} - +
@@ -232,7 +234,7 @@ opacity: .8; } - .name-and-screen-name { + .user-summary { display: block; margin-left: 0.6em; text-align: left; @@ -249,6 +251,7 @@ vertical-align: middle; object-fit: contain } + .top-line { display: flex; } @@ -269,40 +272,42 @@ } } - .user-screen-name { - color: $fallback--lightText; - color: var(--lightText, $fallback--lightText); - display: inline-block; + .bottom-line { + display: flex; font-weight: light; font-size: 15px; padding-right: 0.1em; width: 100%; - display: flex; + } - .dailyAvg { - min-width: 1px; - flex: 0 0 auto; - margin-left: 1em; - font-size: 0.7em; - color: $fallback--text; - color: var(--text, $fallback--text); - } + .user-screen-name-role { + min-width: 1px; + flex: 0 1 auto; + text-overflow: ellipsis; + overflow: hidden; + } - .handle { - min-width: 1px; - flex: 0 1 auto; - text-overflow: ellipsis; - overflow: hidden; - } + .user-screen-name { + color: $fallback--lightText; + color: var(--lightText, $fallback--lightText); + } - // TODO use proper colors - .staff { - text-transform: capitalize; - color: $fallback--text; - color: var(--btnText, $fallback--text); - background-color: $fallback--fg; - background-color: var(--btn, $fallback--fg); - } + .dailyAvg { + min-width: 1px; + flex: 0 0 auto; + margin-left: 1em; + font-size: 0.7em; + color: $fallback--text; + color: var(--text, $fallback--text); + } + + // TODO use proper colors + .staff { + text-transform: capitalize; + color: $fallback--text; + color: var(--btnText, $fallback--text); + background-color: $fallback--fg; + background-color: var(--btn, $fallback--fg); } .user-meta { -- cgit v1.2.3-70-g09d2 From 34ffcb028a9cf195f430a33d8c029ac4cc8b191d Mon Sep 17 00:00:00 2001 From: taehoon Date: Wed, 15 May 2019 22:01:31 -0400 Subject: refactor css --- src/components/user_card/user_card.vue | 54 ++++++++++++++++------------------ 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'src/components/user_card/user_card.vue') diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index f21770ce..530f56e0 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -276,38 +276,36 @@ display: flex; font-weight: light; font-size: 15px; - padding-right: 0.1em; - width: 100%; - } - .user-screen-name-role { - min-width: 1px; - flex: 0 1 auto; - text-overflow: ellipsis; - overflow: hidden; - } + .user-screen-name-role { + min-width: 1px; + flex: 0 1 auto; + text-overflow: ellipsis; + overflow: hidden; + } - .user-screen-name { - color: $fallback--lightText; - color: var(--lightText, $fallback--lightText); - } + .user-screen-name { + color: $fallback--lightText; + color: var(--lightText, $fallback--lightText); + } - .dailyAvg { - min-width: 1px; - flex: 0 0 auto; - margin-left: 1em; - font-size: 0.7em; - color: $fallback--text; - color: var(--text, $fallback--text); - } + .dailyAvg { + min-width: 1px; + flex: 0 0 auto; + margin-left: 1em; + font-size: 0.7em; + color: $fallback--text; + color: var(--text, $fallback--text); + } - // TODO use proper colors - .staff { - text-transform: capitalize; - color: $fallback--text; - color: var(--btnText, $fallback--text); - background-color: $fallback--fg; - background-color: var(--btn, $fallback--fg); + // TODO use proper colors + .staff { + text-transform: capitalize; + color: $fallback--text; + color: var(--btnText, $fallback--text); + background-color: $fallback--fg; + background-color: var(--btn, $fallback--fg); + } } .user-meta { -- cgit v1.2.3-70-g09d2 From 205a9821e630fae9864a518824e52dea4fd0de28 Mon Sep 17 00:00:00 2001 From: taehoon Date: Sun, 19 May 2019 14:25:02 -0400 Subject: make staff label visible --- src/components/user_card/user_card.vue | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/components/user_card/user_card.vue') diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 530f56e0..b4495673 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -19,10 +19,8 @@
- - @{{user.screen_name}} - {{visibleRole}} - + @{{user.screen_name}} + {{visibleRole}} {{dailyAvg}} {{ $t('user_card.per_day') }}
@@ -277,14 +275,11 @@ font-weight: light; font-size: 15px; - .user-screen-name-role { + .user-screen-name { min-width: 1px; flex: 0 1 auto; text-overflow: ellipsis; overflow: hidden; - } - - .user-screen-name { color: $fallback--lightText; color: var(--lightText, $fallback--lightText); } @@ -300,6 +295,7 @@ // TODO use proper colors .staff { + flex: none; text-transform: capitalize; color: $fallback--text; color: var(--btnText, $fallback--text); -- cgit v1.2.3-70-g09d2