Merge branch 'ssrihari-header_icons_hover' into develop
This commit is contained in:
commit
2d18184653
5 changed files with 7 additions and 1 deletions
|
|
@ -44,6 +44,7 @@
|
|||
* Fix mobile view of deleted reshares [#4397](https://github.com/diaspora/diaspora/issues/4397)
|
||||
* Fix the overlapping of embedded youtube videos [#2943](https://github.com/diaspora/diaspora/issues/2943)
|
||||
* Fix opacity of control icons [#4414](https://github.com/diaspora/diaspora/issues/4414/)
|
||||
* Add hover state to header icons [#4436](https://github.com/diaspora/diaspora/pull/4436)
|
||||
|
||||
## Features
|
||||
* Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)
|
||||
|
|
|
|||
BIN
app/assets/images/icons/mail_grey_hover.png
Normal file
BIN
app/assets/images/icons/mail_grey_hover.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 265 B |
BIN
app/assets/images/icons/notifications_grey_hover.png
Normal file
BIN
app/assets/images/icons/notifications_grey_hover.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 449 B |
|
|
@ -5,9 +5,9 @@
|
|||
@import 'new_styles/_spinner'
|
||||
|
||||
@import 'sidebar'
|
||||
@import 'sprites'
|
||||
@import 'header'
|
||||
@import 'footer'
|
||||
@import 'sprites'
|
||||
@import 'opengraph'
|
||||
|
||||
@import 'profile.css.scss'
|
||||
|
|
|
|||
|
|
@ -75,6 +75,11 @@ body > header {
|
|||
&:hover .badge_count { background-color: lighten(#A40802, 5%); }
|
||||
|
||||
.icons-notifications_grey { height: 16px; }
|
||||
|
||||
&.active .icons-notifications_grey:hover {
|
||||
background-position: sprite-position($icons-sprites, notifications_grey);
|
||||
}
|
||||
|
||||
.icons-mail_grey { height: 11px }
|
||||
|
||||
a.badge_link {
|
||||
|
|
|
|||
Loading…
Reference in a new issue