moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into next

This commit is contained in:
Alex Gleason 2021-09-24 11:01:52 -05:00
parent f704024394 376c086646
commit 44db23e39f
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/styles/components/account-header.scss
View File

@ -101,7 +101,7 @@
position: relative; position: relative;
background: var(--foreground-color); background: var(--foreground-color);
@media (min-width: 895px) { @media (min-width: 896px) {
height: 74px; height: 74px;
} }
} }
@ -165,7 +165,7 @@
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
@media (min-width: 895px) and (max-width: 1190px) { @media (min-width: 896px) and (max-width: 1190px) {
max-width: 900px; max-width: 900px;
padding-left: 300px; padding-left: 300px;
} }

2
app/styles/components/columns.scss
View File

@ -45,7 +45,7 @@
@media screen and (max-width: 375px) { @media screen and (max-width: 375px) {
padding: 0 10px; padding: 0 10px;
} }
@media screen and (min-width: 895px) { @media screen and (min-width: 896px) {
margin: 0 20px; margin: 0 20px;
padding: 0; padding: 0;
} }

2
app/styles/components/profile-info-panel.scss
View File

@ -7,7 +7,7 @@
flex-direction: column; flex-direction: column;
flex: 1 1; flex: 1 1;
@media (min-width: 895px) { @media (min-width: 896px) {
padding-top: 60px; padding-top: 60px;
} }
} }

4
app/styles/components/search.scss
View File

@ -126,7 +126,7 @@
padding: 25px 0; padding: 25px 0;
background-color: var(--accent-color--med); background-color: var(--accent-color--med);
@media (min-width: 895px) { @media (min-width: 896px) {
display: block; display: block;
} }
} }
@ -155,7 +155,7 @@
} }
} }
@media (min-width: 895px) and (max-width: 1190px) { @media (min-width: 896px) and (max-width: 1190px) {
&__title-text, &__title-text,
&__type-filters-tabs { &__type-filters-tabs {
max-width: 900px; max-width: 900px;

6
app/styles/components/tabs-bar.scss
View File

@ -108,7 +108,7 @@
font-size: 18px; font-size: 18px;
color: #fff; color: #fff;
@media (min-width: 895px) { @media (min-width: 896px) {
display: none; display: none;
} }
} }
@ -191,7 +191,7 @@
} }
&--search { &--search {
@media (min-width: 895px) { @media (min-width: 896px) {
display: none; display: none;
} }
} }
@ -216,7 +216,7 @@
} }
.icon-with-counter__counter { .icon-with-counter__counter {
@media screen and (min-width: 895px) { @media screen and (min-width: 896px) {
left: 5px; left: 5px;
} }
} }

2
app/styles/demetricator.scss
View File

@ -11,6 +11,6 @@ body.demetricator {
.account__header__bar { .account__header__bar {
min-height: 50px; min-height: 50px;
@media (min-width: 895px) { height: 50px; } @media (min-width: 896px) { height: 50px; }
} }
} }

2
app/styles/ui.scss
View File

@ -339,7 +339,7 @@
z-index: 105; z-index: 105;
background: var(--foreground-color); background: var(--foreground-color);
@media (min-width: 895px) { @media (min-width: 896px) {
top: -290px; top: -290px;
position: sticky; position: sticky;
} }