From daaa2760a010b893313ea88d5840dcb900b98fe5 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 8 May 2014 15:55:36 +1000 Subject: [PATCH] Restyling active nodes for producer and hub --- .../darkswarm/active_table.css.sass | 21 ---------- .../stylesheets/darkswarm/hub_node.css.sass | 40 +++++++++++++++++-- .../darkswarm/producer_node.css.sass | 2 + 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/active_table.css.sass b/app/assets/stylesheets/darkswarm/active_table.css.sass index 2023e24cca..5843c0f547 100644 --- a/app/assets/stylesheets/darkswarm/active_table.css.sass +++ b/app/assets/stylesheets/darkswarm/active_table.css.sass @@ -70,27 +70,6 @@ border: 1px solid $dark-grey color: $dark-grey - &.inactive, &.inactive strong - color: $disabled-dark - &.closed - &:hover, &:active, &:focus - border: 1px solid $disabled-dark - color: $disabled-dark - &.open - .active_table_row:first-child - color: $dark-grey - border-top: 1px solid $disabled-dark - border-left: 1px solid $disabled-dark - border-right: 1px solid $disabled-dark - strong - color: $dark-grey - &:hover, &:active, &:focus - color: $dark-grey - .active_table_row:nth-child(2) - border-left: 1px solid $disabled-dark - border-right: 1px solid $disabled-dark - border-bottom: 1px solid $disabled-dark - &.current &.closed &, & * diff --git a/app/assets/stylesheets/darkswarm/hub_node.css.sass b/app/assets/stylesheets/darkswarm/hub_node.css.sass index a2e5f16850..eb30630ad6 100644 --- a/app/assets/stylesheets/darkswarm/hub_node.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_node.css.sass @@ -2,6 +2,38 @@ .hubs .active_table .active_table_node + + //Inactive row + &.inactive, &.inactive strong + color: $disabled-dark + &.closed + &:hover, &:active, &:focus + border: 1px solid $disabled-dark + color: $disabled-dark + &.open + .active_table_row:first-child + color: $dark-grey + border-top: 1px solid $disabled-dark + border-left: 1px solid $disabled-dark + border-right: 1px solid $disabled-dark + strong + color: $dark-grey + &:hover, &:active, &:focus + color: $dark-grey + strong + color: $dark-grey + .active_table_row:nth-child(2) + border-left: 1px solid $disabled-dark + border-right: 1px solid $disabled-dark + border-bottom: 1px solid $disabled-dark + + //Closed row + &.closed + &:hover, &:active, &:focus + border: 1px solid $clr-brick + color: $clr-brick + + //Open row &.open .active_table_row:first-child border-top: 1px solid $clr-brick @@ -19,10 +51,8 @@ background-color: $clr-brick &:hover background-color: $clr-brick-bright - &.closed - &:hover, &:active, &:focus - border: 1px solid $clr-brick - color: $clr-brick + + //Current selected row &.current &.closed &, & * @@ -31,3 +61,5 @@ .active_table_row:first-child &, & * color: $clr-brick + + diff --git a/app/assets/stylesheets/darkswarm/producer_node.css.sass b/app/assets/stylesheets/darkswarm/producer_node.css.sass index 2e3589bae1..bd2fa77372 100644 --- a/app/assets/stylesheets/darkswarm/producer_node.css.sass +++ b/app/assets/stylesheets/darkswarm/producer_node.css.sass @@ -2,6 +2,7 @@ .producers .active_table .active_table_node + //Open row &.open .active_table_row:first-child border-top: 1px solid $clr-turquoise @@ -19,6 +20,7 @@ background-color: $clr-turquoise &:hover background-color: $clr-turquoise-bright + //Closed row &.closed &, & * color: $dark-grey