From 88e59f9329f2a4aa15e39eba26d07d8ed737e8a1 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 9 Nov 2016 13:04:19 +0100 Subject: [PATCH 1/3] bringing back processing status for tasks on shots list --- src/styles/_app_utils.sass | 1 - src/styles/_shots.sass | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/styles/_app_utils.sass b/src/styles/_app_utils.sass index 3af79f6..f4bdb91 100644 --- a/src/styles/_app_utils.sass +++ b/src/styles/_app_utils.sass @@ -90,7 +90,6 @@ name: background-slide duration: 1s delay: 0s - // fill-mode: forwards iteration-count: infinite timing-function: linear diff --git a/src/styles/_shots.sass b/src/styles/_shots.sass index bf675f0..0e9d400 100644 --- a/src/styles/_shots.sass +++ b/src/styles/_shots.sass @@ -141,6 +141,7 @@ border-radius: 50% border: 2px solid transparent +position-center-translate + transition: background-color 150ms ease-in-out, border 150ms ease-in-out span display: block @@ -164,6 +165,16 @@ &:hover border-color: $color-primary-light + &.processing + background-image: none + &:before + +stripes-animate + +stripes(transparent, rgba($color-background-active, .6), -45deg, 15px) + animation-duration: 4s + + &.active + background-image: none + &.task-add width: auto border-radius: initial From dd186b0611f004d8debe94890e25bbe3d59280b7 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 9 Nov 2016 14:47:25 +0100 Subject: [PATCH 2/3] Small tweaks to list of shots Shot list can overflow horizontally Fix alignment on splitter --- src/styles/_app_base.sass | 15 +++++++++------ src/styles/_shots.sass | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/styles/_app_base.sass b/src/styles/_app_base.sass index aba2f12..6a6c879 100644 --- a/src/styles/_app_base.sass +++ b/src/styles/_app_base.sass @@ -19,11 +19,12 @@ body &[data-context="dashboard"] nav.sidebar .navbar-item.attract +sidebar-button-active + #col_main + background-color: $color-background-light + .col_header + box-shadow: none - #col_main .col_header - box-shadow: none - -$splitter-width: 6px +$splitter-width: 5px #app-main display: flex @@ -46,7 +47,6 @@ $splitter-width: 6px height: 100% min-height: 100% position: relative - background-color: $color-background-light +media-xs height: auto @@ -55,13 +55,13 @@ $splitter-width: 6px padding-left: $sidebar-width !important #col_main + background-color: $color-background width: 50% // gets overriden by JS, dragging the col-splitter +media-xs width: 100% #col_right flex: 1 1 auto - padding-left: $splitter-width // to compensate width of the splitter, which is positioned 'fixed' .col_header position: relative @@ -109,6 +109,8 @@ $splitter-width: 6px flex: 0 0 auto width: $splitter-width background-color: $color-background + border-left: thin solid $color-background-light + border-right: 2px solid $color-background-dark min-height: 200px cursor: col-resize top: 0 @@ -121,6 +123,7 @@ $splitter-width: 6px ::-webkit-scrollbar width: 5px + height: 5px ::-webkit-scrollbar-track background-color: $color-background diff --git a/src/styles/_shots.sass b/src/styles/_shots.sass index 0e9d400..043331e 100644 --- a/src/styles/_shots.sass +++ b/src/styles/_shots.sass @@ -1,5 +1,5 @@ #shot-list - overflow-x: hidden + overflow-x: scroll .table background-color: white .table-row:hover From ec6a32001e6ec16c053d17d122eadda917d09ccb Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 9 Nov 2016 15:49:27 +0100 Subject: [PATCH 3/3] No bottom border for shot-thumbnail cell --- src/styles/_shots.sass | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/styles/_shots.sass b/src/styles/_shots.sass index 043331e..b5cccdc 100644 --- a/src/styles/_shots.sass +++ b/src/styles/_shots.sass @@ -62,10 +62,8 @@ background: transparent border: 2px solid $color-text-dark-secondary - &.shot-thumbnail - border-bottom: none - img - opacity: .5 + &.shot-thumbnail img + opacity: .5 &.active +stripes(white, rgba($color-background-active, .8), 90deg, 28px) @@ -106,8 +104,11 @@ span margin: auto 0 - &.shot-thumbnail img - transition: opacity 150ms ease-in-out + &.shot-thumbnail + border-left: none + border-bottom: none + img + transition: opacity 150ms ease-in-out &.task-type position: relative @@ -161,7 +162,7 @@ &:before transform: translate(-50%, -50%) scale(1.3) border: 2px solid white - box-shadow: 0 0 5px 1px $color-background-dark, 1px 1px 0 rgba(black, .2) + box-shadow: 0 0 0 1px rgba($color-primary, .2), 1px 1px 0 rgba(black, .2) &:hover border-color: $color-primary-light