From 5a68ae4b9c5ed273513b25844e618023be62e706 Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 11 Mar 2015 12:03:41 -0300 Subject: Revert "#261 Fixing the transition timing" This reverts commit b27d525efcb8b48157c3659ef98109261841aa91. --- web-ui/app/scss/styles.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'web-ui/app/scss') diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 983a1e92..67342c18 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -158,6 +158,7 @@ } &.selected { background: #FFF; + z-index: 2; a { color: #333; } @@ -253,20 +254,20 @@ section { border-right: 1px solid lighten($navigation_background, 10%); ul#default-tag-list, #custom-tag-list { li { - transition: background-color 0.15s, color 0s, z-index 0.15s; + transition: background-color 150ms ease-in-out; padding: 2px 10px; cursor: pointer; - &.selected { font-weight: bold; background: $contrast; color: $navigation_background; } - &:hover { z-index: 5; + transition: z-index 150ms ease-out; background: #CCC; color: $navigation_background; + width: 95%; opacity: 0.90; } } -- cgit v1.2.3 From 2fe630435ad5c0d95472bacf3b209a19c634957b Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 11 Mar 2015 12:03:53 -0300 Subject: Revert "#261 Adding an extra wrap around the tags-icon so we can properly split the sections on the right pane" This reverts commit 58f6a2f088a57823a4469e0c8c62ebff3f7c5597. --- web-ui/app/scss/styles.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'web-ui/app/scss') diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 67342c18..6b334099 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -360,12 +360,8 @@ section { opacity: 1; } - div.tags-icon-wrap { - padding-top: 15px; - border-top: 1px solid white; - } - div.tags-icon { + border-top: 1px solid white; padding: 10px 0 15px 0; margin-bottom: 20px; -- cgit v1.2.3 From 4e966dcb083ec365511b015d5daff8481d94f07a Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 11 Mar 2015 12:03:55 -0300 Subject: Revert "#261 Making the tags icon be displayed over the mail list when hovered" This reverts commit d0917e12464152dde8bc1ccac0748945b709804e. --- web-ui/app/scss/styles.scss | 5 ----- 1 file changed, 5 deletions(-) (limited to 'web-ui/app/scss') diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 6b334099..7c32d688 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -368,11 +368,6 @@ section { &:hover { background: #CCC; color: $navigation_background; - position: relative; - z-index: 5; - transition: z-index 150ms ease-out; - width: 95%; - opacity: 0.90; } i { -- cgit v1.2.3 From 3ae3afb2b99159addfd08645bdbc07e4e4944507 Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 11 Mar 2015 12:03:56 -0300 Subject: Revert "#261 Adding a hover behavior to tags icon - z-index TBD" This reverts commit 94d0713aa89a76ba8ecb28570163c13bc370ed0b. --- web-ui/app/scss/styles.scss | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'web-ui/app/scss') diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 7c32d688..2bd4a067 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -362,14 +362,8 @@ section { div.tags-icon { border-top: 1px solid white; - padding: 10px 0 15px 0; + padding-top: 25px; margin-bottom: 20px; - - &:hover { - background: #CCC; - color: $navigation_background; - } - i { font-size: 1.5em; font-family: "FontAwesome"; -- cgit v1.2.3 From b5d29e9681aeedd262ff11579c809ad67beaabb2 Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 11 Mar 2015 12:03:57 -0300 Subject: Revert "#261 Adding some opacity to the tags label on hover" This reverts commit c3344fd640b94b94b350a978b77d5eb3b23a2275. --- web-ui/app/scss/styles.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'web-ui/app/scss') diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 2bd4a067..7de5aef7 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -268,7 +268,6 @@ section { background: #CCC; color: $navigation_background; width: 95%; - opacity: 0.90; } } } -- cgit v1.2.3 From 48a6f44a50581001b05c06b7f758193ff59aa5d4 Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 11 Mar 2015 12:03:58 -0300 Subject: Revert "#261 Reducing the list width so it won't break for large displays" This reverts commit 7e0f1c7f86c217f903c24e7f0866ac1f6f6b06e7. --- web-ui/app/scss/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/app/scss') diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 7de5aef7..13f4c689 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -267,7 +267,7 @@ section { transition: z-index 150ms ease-out; background: #CCC; color: $navigation_background; - width: 95%; + margin-right: -10px; } } } -- cgit v1.2.3 From 12448c2fe40824a238325ec3bf42b4488ed757b5 Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 11 Mar 2015 12:03:58 -0300 Subject: Revert "#261 Adding some negative margin so the tags label won't be wider than the side nav when the user hovers them" This reverts commit b8897aa1760f7fe177fe1abaafd3addbbd0e47dc. --- web-ui/app/scss/styles.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'web-ui/app/scss') diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index 13f4c689..a7f36b35 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -267,7 +267,6 @@ section { transition: z-index 150ms ease-out; background: #CCC; color: $navigation_background; - margin-right: -10px; } } } -- cgit v1.2.3 From e455d47f16f5f76f5c68db21532958012e38381d Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 11 Mar 2015 12:03:59 -0300 Subject: Revert "#261 - Adding a hover behavior for the default tags" This reverts commit c3eab90103b01b3551a83a8d747e11fc4945582e. --- web-ui/app/scss/styles.scss | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'web-ui/app/scss') diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss index a7f36b35..d3c96530 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -158,7 +158,7 @@ } &.selected { background: #FFF; - z-index: 2; + z-index: 3; a { color: #333; } @@ -254,20 +254,18 @@ section { border-right: 1px solid lighten($navigation_background, 10%); ul#default-tag-list, #custom-tag-list { li { - transition: background-color 150ms ease-in-out; + transition: background-color 150ms ease-out; padding: 2px 10px; cursor: pointer; + &:hover { + background: #CCC; + color: $navigation_background; + } &.selected { font-weight: bold; background: $contrast; color: $navigation_background; } - &:hover { - z-index: 5; - transition: z-index 150ms ease-out; - background: #CCC; - color: $navigation_background; - } } } -- cgit v1.2.3