tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
root
2023-08-10 15:15:39 -04:00
parent 22eecd2de6 3b49b5a880
commit bf4ff204f7
578 changed files with 6933 additions and 4940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/styles/components/drawer.scss
View File

@@ -99,10 +99,6 @@
}
}
.search-popout {
@include search-popout;
}
.navigation-bar {
padding: 10px;
color: $darker-text-color;

45
app/javascript/flavours/glitch/styles/components/explore.scss
View File

@@ -18,6 +18,10 @@
padding: 10px;
}
.search__popout {
border: 1px solid lighten($ui-base-color, 8%);
}
.search .fa {
top: 10px;
inset-inline-end: 10px;
@@ -40,8 +44,9 @@
align-items: center;
color: $primary-text-color;
text-decoration: none;
padding: 15px 0;
padding: 15px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
gap: 15px;
&:last-child {
border-bottom: 0;
@@ -50,33 +55,40 @@
&:hover,
&:active,
&:focus {
background-color: lighten($ui-base-color, 4%);
color: $highlight-text-color;
.story__details__publisher,
.story__details__shared {
color: $highlight-text-color;
}
}
&__details {
padding: 0 15px;
flex: 1 1 auto;
&__publisher {
color: $darker-text-color;
margin-bottom: 4px;
margin-bottom: 8px;
}
&__title {
font-size: 19px;
line-height: 24px;
font-weight: 500;
margin-bottom: 4px;
margin-bottom: 8px;
}
&__shared {
color: $darker-text-color;
}
strong {
font-weight: 500;
}
}
&__thumbnail {
flex: 0 0 auto;
margin: 0 15px;
position: relative;
width: 120px;
height: 120px;
@@ -87,7 +99,7 @@
}
img {
border-radius: 4px;
border-radius: 8px;
display: block;
margin: 0;
width: 100%;
@@ -96,7 +108,7 @@
}
&__preview {
border-radius: 4px;
border-radius: 8px;
display: block;
margin: 0;
width: 100%;
@@ -112,4 +124,21 @@
}
}
}
&.expanded {
flex-direction: column;
.story__thumbnail {
order: 1;
width: 100%;
height: auto;
aspect-ratio: 1.91 / 1;
}
.story__details {
order: 2;
width: 100%;
flex: 0 0 auto;
}
}
}

3
app/javascript/flavours/glitch/styles/components/misc.scss
View File

@@ -1351,6 +1351,8 @@ button.icon-button.active i.fa-retweet {
padding: 0;
margin: 0;
border: 0;
border-radius: 4px;
color: $white;
&__label {
display: flex;
@@ -1358,7 +1360,6 @@ button.icon-button.active i.fa-retweet {
justify-content: center;
gap: 8px;
flex-direction: column;
color: $primary-text-color;
font-weight: 500;
font-size: 14px;
}

115
app/javascript/flavours/glitch/styles/components/modal.scss
View File

@@ -1306,13 +1306,13 @@ img.modal-warning {
.interaction-modal {
max-width: 90vw;
width: 600px;
background: $ui-base-color;
background: var(--modal-background-color);
border: 1px solid var(--modal-border-color);
border-radius: 8px;
overflow-x: hidden;
overflow-y: auto;
overflow: visible;
position: relative;
display: block;
padding: 20px;
padding: 40px;
h3 {
font-size: 22px;
@@ -1321,63 +1321,100 @@ img.modal-warning {
text-align: center;
}
p {
font-size: 17px;
line-height: 22px;
color: $darker-text-color;
strong {
color: $primary-text-color;
font-weight: 700;
}
}
p.hint {
margin-bottom: 14px;
font-size: 14px;
}
&__icon {
color: $highlight-text-color;
margin: 0 5px;
}
&__lead {
padding: 20px;
text-align: center;
margin-bottom: 20px;
h3 {
margin-bottom: 15px;
}
p {
font-size: 17px;
line-height: 22px;
color: $darker-text-color;
}
}
&__choices {
display: flex;
&__login {
position: relative;
margin-bottom: 20px;
&__choice {
flex: 0 0 auto;
width: 50%;
box-sizing: border-box;
padding: 20px;
&__input {
@include search-input;
h3 {
margin-bottom: 20px;
}
border: 1px solid lighten($ui-base-color, 8%);
padding: 4px 6px;
color: $primary-text-color;
font-size: 16px;
line-height: 18px;
display: flex;
align-items: center;
p {
color: $darker-text-color;
margin-bottom: 20px;
input {
background: transparent;
color: inherit;
font: inherit;
border: 0;
padding: 15px - 4px 15px - 6px;
flex: 1 1 auto;
&::placeholder {
color: lighten($darker-text-color, 4%);
}
&:focus {
outline: 0;
}
}
.button {
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
flex: 0 0 auto;
}
}
.search__popout {
margin-top: -1px;
padding-top: 5px;
padding-bottom: 5px;
border: 1px solid lighten($ui-base-color, 8%);
}
&.focused &__input {
border-color: $highlight-text-color;
background: lighten($ui-base-color, 4%);
}
&.invalid &__input {
border-color: $error-red;
}
&.expanded .search__popout {
display: block;
}
&.expanded &__input {
border-radius: 4px 4px 0 0;
}
}
@media screen and (max-width: $no-gap-breakpoint - 1px) {
&__choices {
display: block;
&__choice {
width: auto;
margin-bottom: 20px;
}
}
.link-button {
font-size: inherit;
display: inline;
}
}

1425
app/javascript/flavours/glitch/styles/components/modal.scss.orig Normal file
View File

File diff suppressed because it is too large Load Diff

82
app/javascript/flavours/glitch/styles/components/search.scss
View File

@@ -1,6 +1,86 @@
.search {
margin-bottom: 10px;
position: relative;
&__popout {
box-sizing: border-box;
display: none;
position: absolute;
inset-inline-start: 0;
margin-top: -2px;
width: 100%;
background: $ui-base-color;
border-radius: 0 0 4px 4px;
box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
z-index: 99;
font-size: 13px;
padding: 15px 5px;
h4 {
text-transform: uppercase;
color: $dark-text-color;
font-weight: 500;
padding: 0 10px;
margin-bottom: 10px;
}
&__menu {
&__message {
color: $dark-text-color;
padding: 0 10px;
}
&__item {
display: block;
box-sizing: border-box;
width: 100%;
border: 0;
font: inherit;
background: transparent;
color: $darker-text-color;
padding: 10px;
cursor: pointer;
border-radius: 4px;
text-align: start;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
&--flex {
display: flex;
justify-content: space-between;
}
.icon-button {
transition: none;
}
&:hover,
&:focus,
&:active,
&.selected {
background: $ui-highlight-color;
color: $primary-text-color;
.icon-button {
color: $primary-text-color;
}
}
mark {
background: transparent;
font-weight: 700;
color: $primary-text-color;
}
}
}
}
&.active {
.search__popout {
display: block;
}
}
}
.search__input {
@@ -45,7 +125,6 @@
position: absolute;
top: 16px;
inset-inline-end: 10px;
z-index: 2;
display: inline-block;
opacity: 0;
transition: all 100ms linear;
@@ -241,5 +320,6 @@
&--compact &__item {
padding: 10px;
padding-inline-end: 28px;
}
}

5
app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
View File

@@ -24,13 +24,16 @@ html {
.column > .scrollable,
.getting-started,
.column-inline-form,
.error-column,
.regeneration-indicator {
background: $white;
border: 1px solid lighten($ui-base-color, 8%);
border-top: 0;
}
.error-column {
border: 1px solid lighten($ui-base-color, 8%);
}
.column > .scrollable.about {
border-top: 1px solid lighten($ui-base-color, 8%);
}

26
app/javascript/flavours/glitch/styles/polls.scss
View File

@@ -127,11 +127,6 @@
border-radius: 4px;
}
&.active {
border-color: $valid-value-color;
background: $valid-value-color;
}
&:active,
&:focus,
&:hover {
@@ -139,6 +134,11 @@
border-width: 4px;
}
&.active {
background-color: $valid-value-color;
border-color: $valid-value-color;
}
&::-moz-focus-inner {
outline: 0 !important;
border: 0;
@@ -223,6 +223,14 @@
padding: 10px;
}
.poll__input {
&:active,
&:focus,
&:hover {
border-color: $ui-button-focus-background-color;
}
}
.poll__footer {
border-top: 1px solid darken($simple-background-color, 8%);
padding: 10px;
@@ -249,6 +257,14 @@
color: $action-button-color;
border-color: $action-button-color;
margin-inline-end: 5px;
&:hover,
&:focus,
&.active {
border-color: $action-button-color;
background-color: $action-button-color;
color: $ui-button-color;
}
}
li {

2
app/javascript/flavours/glitch/styles/variables.scss
View File

@@ -98,4 +98,6 @@ $dismiss-overlay-width: 4rem;
--dropdown-background-color: #{lighten($ui-base-color, 4%)};
--dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
--modal-background-color: #{darken($ui-base-color, 4%)};
--modal-border-color: #{lighten($ui-base-color, 4%)};
}