Skip to content

Commit

Permalink
Make notifications quick-filter use consistent style with profile tabs (
Browse files Browse the repository at this point in the history
  • Loading branch information
Gargron authored and hiyuki2578 committed Oct 2, 2019
1 parent 0486c21 commit 29c91f6
Showing 1 changed file with 7 additions and 46 deletions.
53 changes: 7 additions & 46 deletions app/javascript/styles/mastodon/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1484,52 +1484,6 @@ a.account__display-name {
}
}

.notification__filter-bar {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
background: $ui-base-color;

& > button {
position: relative;
flex-grow: 1;
color: $primary-text-color;
padding: 10px 5px 12px;
text-decoration: none;
font-weight: 400;
font-size: 15px;
line-height: 18px;
background: darken($ui-base-color, 4%);
border: 0;
border-bottom: 1px solid lighten($ui-base-color, 8%);
cursor: default;

&.active {
color: $secondary-text-color;

&::before,
&::after {
display: block;
content: "";
position: absolute;
bottom: 0;
left: 50%;
width: 0;
height: 0;
transform: translateX(-50%);
border-style: solid;
border-width: 0 10px 10px;
border-color: transparent transparent lighten($ui-base-color, 8%);
}

&::after {
bottom: -1px;
border-color: transparent transparent $ui-base-color;
}
}
}
}

.notification__message {
margin: 0 10px 0 68px;
padding: 8px 0 0;
Expand Down Expand Up @@ -4846,12 +4800,19 @@ a.status-card.compact:hover {
}
}

.notification__filter-bar,
.account__section-headline {
background: darken($ui-base-color, 4%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
cursor: default;
display: flex;

button {
background: darken($ui-base-color, 4%);
border: 0;
}

button,
a {
display: block;
flex: 1 1 auto;
Expand Down

0 comments on commit 29c91f6

Please sign in to comment.