mirror of
https://github.com/glitch-soc/mastodon
synced 2025-04-24 14:14:51 +00:00
Reduce SCSS discrepancies with upstream (#3050)
This commit is contained in:
Claire
GitHub
parent
e402ef5f79
commit
134597770e
3 changed files with 11 additions and 141 deletions
|
|
@ -103,12 +103,6 @@ $font-sans-serif: 'mastodon-font-sans-serif' !default;
|
|||
$font-display: 'mastodon-font-display' !default;
|
||||
$font-monospace: 'mastodon-font-monospace' !default;
|
||||
|
||||
// Avatar border size (8% default, 100% for rounded avatars)
|
||||
$ui-avatar-border-size: 8%;
|
||||
|
||||
// More variables
|
||||
$dismiss-overlay-width: 4rem;
|
||||
|
||||
$emojis-requiring-inversion: 'back' 'copyright' 'curly_loop' 'currency_exchange'
|
||||
'end' 'heavy_check_mark' 'heavy_division_sign' 'heavy_dollar_sign'
|
||||
'heavy_minus_sign' 'heavy_multiplication_x' 'heavy_plus_sign' 'on'
|
||||
|
|
|
|||
|
|
@ -1133,6 +1133,14 @@ body > [data-popper-placement] {
|
|||
outline: 0;
|
||||
}
|
||||
|
||||
&.status__content--with-spoiler {
|
||||
white-space: normal;
|
||||
|
||||
.status__content__text {
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
}
|
||||
|
||||
.emojione {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
|
|
@ -1179,10 +1187,10 @@ body > [data-popper-placement] {
|
|||
}
|
||||
}
|
||||
|
||||
.status__content__spoiler {
|
||||
.status__content__text {
|
||||
display: none;
|
||||
|
||||
&.status__content__spoiler--visible {
|
||||
&.status__content__text--visible {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
|
@ -2343,8 +2351,7 @@ a.account__display-name {
|
|||
.muted {
|
||||
.status__content,
|
||||
.status__content p,
|
||||
.status__content a,
|
||||
.status__content__text {
|
||||
.status__content a {
|
||||
color: $dark-text-color;
|
||||
}
|
||||
|
||||
|
|
@ -4398,45 +4405,6 @@ a.status-card {
|
|||
}
|
||||
}
|
||||
|
||||
.column-header__notif-cleaning-buttons {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
justify-content: space-around;
|
||||
|
||||
.column-header__button {
|
||||
background: transparent;
|
||||
text-align: center;
|
||||
padding: 10px 5px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
b {
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.layout-single-column .column-header__notif-cleaning-buttons {
|
||||
@media screen and (min-width: $no-gap-breakpoint) {
|
||||
b,
|
||||
i {
|
||||
margin-inline-end: 5px;
|
||||
}
|
||||
|
||||
br {
|
||||
display: none;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 15px 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The notifs drawer with no padding to have more space for the buttons
|
||||
.column-header__collapsible-inner.nopad-drawer {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.no-reduce-motion .column-header__button .icon-sliders {
|
||||
transition: transform 150ms ease-in-out;
|
||||
}
|
||||
|
|
@ -4478,16 +4446,6 @@ a.status-card {
|
|||
border-top: 1px solid var(--background-border-color);
|
||||
margin: 10px 0;
|
||||
}
|
||||
|
||||
// notif cleaning drawer
|
||||
&.ncd {
|
||||
transition: none;
|
||||
|
||||
&.collapsed {
|
||||
max-height: 0;
|
||||
opacity: 0.7;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.column-header__collapsible-inner {
|
||||
|
|
@ -4561,58 +4519,6 @@ a.status-card {
|
|||
}
|
||||
}
|
||||
|
||||
.scrollable > div > :first-child .notification__dismiss-overlay > .wrappy {
|
||||
border-top: 1px solid $ui-base-color;
|
||||
}
|
||||
|
||||
.notification__dismiss-overlay {
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
inset-inline-end: 0;
|
||||
bottom: -1px;
|
||||
padding-inline-start: 15px; // space for the box shadow to be visible
|
||||
z-index: 999;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
|
||||
.wrappy {
|
||||
width: $dismiss-overlay-width;
|
||||
align-self: stretch;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: lighten($ui-base-color, 8%);
|
||||
border-inline-start: 1px solid lighten($ui-base-color, 20%);
|
||||
box-shadow: 0 0 5px black;
|
||||
border-bottom: 1px solid $ui-base-color;
|
||||
}
|
||||
|
||||
.ckbox {
|
||||
border: 2px solid $ui-primary-color;
|
||||
border-radius: 2px;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
font-size: 20px;
|
||||
color: $darker-text-color;
|
||||
text-shadow: 0 0 5px black;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
&:focus {
|
||||
outline: 0 !important;
|
||||
|
||||
.ckbox {
|
||||
box-shadow: 0 0 1px 1px $ui-highlight-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.text-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
|
|
@ -5545,13 +5451,6 @@ a.status-card {
|
|||
}
|
||||
}
|
||||
|
||||
.notif-cleaning {
|
||||
.status,
|
||||
.notification {
|
||||
padding-inline-end: ($dismiss-overlay-width + 0.5rem);
|
||||
}
|
||||
}
|
||||
|
||||
.language-dropdown {
|
||||
&__dropdown {
|
||||
padding: 0;
|
||||
|
|
@ -6877,19 +6776,6 @@ a.status-card {
|
|||
}
|
||||
}
|
||||
|
||||
// TODO
|
||||
.confirmation-modal__do_not_ask_again {
|
||||
padding-inline-start: 20px;
|
||||
padding-inline-end: 20px;
|
||||
padding-bottom: 10px;
|
||||
font-size: 14px;
|
||||
|
||||
label,
|
||||
input {
|
||||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
|
||||
.report-modal__target {
|
||||
padding: 30px;
|
||||
font-size: 16px;
|
||||
|
|
|
|||
|
|
@ -474,16 +474,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.notification__dismiss-overlay {
|
||||
.wrappy {
|
||||
box-shadow: unset;
|
||||
|
||||
.ckbox {
|
||||
text-shadow: unset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.drawer__inner__mastodon {
|
||||
background: $white
|
||||
url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue