summaryrefslogtreecommitdiffstats
path: root/webapp/sass
diff options
context:
space:
mode:
authorSudheer <sudheer.105@gmail.com>2017-08-21 19:42:40 +0530
committerHarrison Healey <harrisonmhealey@gmail.com>2017-08-21 10:12:40 -0400
commitb2e53086b3b4527af04d4689f0d836fefd10f8fb (patch)
treee365d0b520a6e3b0532f6de5faa73f37e8af5974 /webapp/sass
parent2986c384690951b2e87c016efaa6f447d844e6b2 (diff)
downloadchat-b2e53086b3b4527af04d4689f0d836fefd10f8fb.tar.gz
chat-b2e53086b3b4527af04d4689f0d836fefd10f8fb.tar.bz2
chat-b2e53086b3b4527af04d4689f0d836fefd10f8fb.zip
PLT-5747: Fixed inconsistent on-hover, tooltip, and active states for buttons. (#7174)
* Fixed LHS Team Sidebar on hover highlight. * Fixed LHS Main Menu on hover tooltip to show "Main menu". * Added On-hover highlight for Favorite button in channel heading. * Added active state for channel members icon. * Added active class based on internal react state with new changeCss rule. * Changed cursor to pointer on hovering a theme. * Fixed Invite New Member Add Button to have text-underline on hover.
Diffstat (limited to 'webapp/sass')
-rw-r--r--webapp/sass/components/_modal.scss6
-rw-r--r--webapp/sass/layout/_headers.scss9
-rw-r--r--webapp/sass/layout/_team-sidebar.scss3
-rw-r--r--webapp/sass/routes/_settings.scss3
4 files changed, 15 insertions, 6 deletions
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index 5ecc0d43e..58887b0bc 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -692,3 +692,9 @@
padding-left: 0;
}
}
+
+.modal-invite-member {
+ .btn:hover {
+ text-decoration: underline;
+ }
+}
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 3e0a51422..4b7348d7b 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -157,12 +157,10 @@
.channel-header__info {
margin-top: 12px;
white-space: nowrap;
-
+ .header-dropdown__icon {
+ color: $dark-gray;
+ }
.channel-header__title {
- .header-dropdown__icon {
- color: $dark-gray;
- }
-
> a {
display: inline-block;
text-decoration: none;
@@ -458,7 +456,6 @@
&.inactive {
color: inherit;
- &:hover,
&:active {
color: inherit;
}
diff --git a/webapp/sass/layout/_team-sidebar.scss b/webapp/sass/layout/_team-sidebar.scss
index cb003c828..f44454eb7 100644
--- a/webapp/sass/layout/_team-sidebar.scss
+++ b/webapp/sass/layout/_team-sidebar.scss
@@ -25,6 +25,9 @@
display: block;
margin-left: 11px;
text-decoration: none;
+ &:hover .team-btn {
+ border-color: white;
+ }
}
.team-btn {
diff --git a/webapp/sass/routes/_settings.scss b/webapp/sass/routes/_settings.scss
index f33417200..0c690178e 100644
--- a/webapp/sass/routes/_settings.scss
+++ b/webapp/sass/routes/_settings.scss
@@ -225,6 +225,9 @@
img {
border: 3px solid transparent;
+ &:hover {
+ cursor: pointer;
+ }
}
.active {