mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-18 06:59:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Glitch] Port SCSS changes from upstream

Browse source 
Port SCSS changes from:
- a58ec29631
- cdfe51e325
- 1f6ed4f86a
- 617f40fc2b
- 6a0d4d36ad
- 2374a00c10
- a2cabf3f4a
This commit is contained in:
Thibaut Girka 2018-09-20 18:07:52 +02:00
parent 022d96c999
commit a6d47ac5f5
2 changed files with 47 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/javascript/flavours/glitch/styles/forms.scss
View file

@ -50,6 +50,12 @@ code {
color: $highlight-text-color; color: $highlight-text-color;
} }
} }
code {
border-radius: 3px;
padding: 0.2em 0.4em;
background: darken($ui-base-color, 12%);
}
} }
.card { .card {
@ -136,6 +142,8 @@ code {
} }
.input.with_block_label { .input.with_block_label {
padding-top: 15px;
& > label { & > label {
font-family: inherit; font-family: inherit;
font-size: 16px; font-size: 16px;
@ -148,9 +156,8 @@ code {
margin-bottom: 15px; margin-bottom: 15px;
} }
li { ul {
float: left; columns: 2;
width: 50%;
} }
} }
@ -346,7 +353,7 @@ code {
position: relative; position: relative;
.input input { .input input {
padding-right: 127px; padding-right: 142px;
} }
.append { .append {
@ -360,6 +367,20 @@ code {
font-family: inherit; font-family: inherit;
pointer-events: none; pointer-events: none;
cursor: default; cursor: default;
max-width: 140px;
white-space: nowrap;
overflow: hidden;
&::after {
content: '';
display: block;
position: absolute;
top: 0;
right: 0;
bottom: 1px;
width: 5px;
background-image: linear-gradient(to right, rgba($ui-base-color, 0), $ui-base-color);
}
} }
} }
} }
@ -592,3 +613,18 @@ code {
display: block; display: block;
} }
} }
.scope-danger {
color: $warning-red;
}
.form_admin_settings_site_short_description,
.form_admin_settings_site_description,
.form_admin_settings_site_extended_description,
.form_admin_settings_site_terms,
.form_admin_settings_custom_css,
.form_admin_settings_closed_registrations_message {
textarea {
font-family: 'mastodon-font-monospace', monospace;
}
}

8
app/javascript/flavours/glitch/styles/rtl.scss
View file

@ -206,13 +206,19 @@ body.rtl {
} }
.simple_form .input-with-append .input input { .simple_form .input-with-append .input input {
padding-left: 127px; padding-left: 142px;
padding-right: 0; padding-right: 0;
} }
.simple_form .input-with-append .append { .simple_form .input-with-append .append {
right: auto; right: auto;
left: 0; left: 0;
&::after {
right: auto;
left: 0;
background-image: linear-gradient(to left, rgba($ui-base-color, 0), $ui-base-color);
}
} }
.table th, .table th,