From 369159da974fee0f6d217877b66b9912b75e65e8 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Tue, 1 Nov 2016 15:54:37 +0100 Subject: [PATCH] Move activities styles to base --- src/styles/_app_base.sass | 60 ++++++++++++++++++++++++++++++++++++++ src/styles/_dashboard.sass | 53 --------------------------------- 2 files changed, 60 insertions(+), 53 deletions(-) diff --git a/src/styles/_app_base.sass b/src/styles/_app_base.sass index 3181870..aff50bc 100644 --- a/src/styles/_app_base.sass +++ b/src/styles/_app_base.sass @@ -358,3 +358,63 @@ input, input.form-control transition: all 250ms ease-in-out &.in opacity: 1 + +/* General style for activities in all places */ +.d-activity + font-size: .9em + + $activity-highlight-color: #00cc9f + ul + cursor: default + padding: 5px + color: $color-text-dark-primary + list-style: none + + li + padding: 0 10px 7px 10px + position: relative + + span.date + color: darken($activity-highlight-color, 5%) + + /* Left Dot */ + &:after + content: '' + display: block + position: absolute + top: 6px + left: -3px + width: 5px + height: 5px + border-radius: 50% + background-color: $color-background-light + border: thin solid $activity-highlight-color + transition: all 250ms ease-in-out + + /* Left Line */ + &:before + content: '' + display: block + position: absolute + top: 10px + left: -1px + width: 1px + height: 100% + background-color: $activity-highlight-color + transition: all 250ms ease-in-out + + &:last-child + &:before + background-color: transparent + + span.actor + padding: 0 5px + color: $color-text-dark + + img.actor-avatar + width: 16px + height: 16px + border-radius: 50% + margin-right: 5px + position: relative + top: -2px diff --git a/src/styles/_dashboard.sass b/src/styles/_dashboard.sass index c29cf6c..4673156 100644 --- a/src/styles/_dashboard.sass +++ b/src/styles/_dashboard.sass @@ -85,59 +85,6 @@ border-top-right-radius: 3px transition: opacity 150ms ease-in-out - -/* General style for activities in all places */ -.d-activity - font-size: .9em - - $activity-highlight-color: #00cc9f - ul - cursor: default - padding: 5px - color: $color-text-dark-primary - list-style: none - - li - padding: 0 10px 7px 10px - position: relative - - span.date - color: darken($activity-highlight-color, 5%) - - /* Left Dot */ - &:after - content: '' - display: block - position: absolute - top: 6px - left: -3px - width: 5px - height: 5px - border-radius: 50% - background-color: $color-background-light - border: thin solid $activity-highlight-color - transition: all 250ms ease-in-out - - /* Left Line */ - &:before - content: '' - display: block - position: absolute - top: 10px - left: -1px - width: 1px - height: 100% - background-color: $activity-highlight-color - transition: all 250ms ease-in-out - - &:last-child - &:before - background-color: transparent - - span.actor - padding: 0 5px - color: $color-text-dark - /* Dashboard specific styles */ .dashboard .d-stats