gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit '927b2fd138' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-05 18:56:16 +09:00
commit 49c193c2ff
48 changed files with 124 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/styles/mastodon/accounts.scss
View file

@ -138,7 +138,7 @@
}
.older {
float: inline-start;
float: left;
padding-inline-start: 0;
.fa {
@ -148,7 +148,7 @@
}
.newer {
float: inline-end;
float: right;
padding-inline-end: 0;
.fa {

6
app/javascript/styles/mastodon/admin.scss
View file

@ -635,7 +635,7 @@ body,
.button {
overflow: visible;
margin: 0 0 5px 5px;
float: inline-end;
float: right;
}
}
}
@ -783,7 +783,7 @@ a.name-tag,
.speech-bubble {
margin-bottom: 20px;
border-inset-inline-start: 4px solid $ui-highlight-color;
border-inline-start: 4px solid $ui-highlight-color;
&.positive {
border-left-color: $success-green;
@ -1662,7 +1662,7 @@ a.sparkline {
}
.section-skip-link {
float: inline-end;
float: right;
a {
color: $ui-highlight-color;

25
app/javascript/styles/mastodon/components.scss
View file

@ -827,7 +827,7 @@ body > [data-popper-placement] {
}
.reply-indicator__cancel {
float: inline-end;
float: right;
line-height: 24px;
}
@ -842,7 +842,7 @@ body > [data-popper-placement] {
}
.reply-indicator__display-avatar {
float: inline-start;
float: left;
margin-inline-end: 5px;
}
@ -1162,7 +1162,7 @@ body > [data-popper-placement] {
.notification__relative_time {
color: $dark-text-color;
float: inline-end;
float: right;
font-size: 14px;
padding-bottom: 1px;
}
@ -1552,7 +1552,7 @@ body > [data-popper-placement] {
position: relative;
& > div {
float: inline-start;
float: left;
position: relative;
box-sizing: border-box;
}
@ -1667,7 +1667,7 @@ a .account__avatar {
text-decoration: none;
overflow: hidden;
flex: 0 1 100%;
border-inset-inline-end: 1px solid lighten($ui-base-color, 8%);
border-inline-end: 1px solid lighten($ui-base-color, 8%);
padding: 10px 0;
border-bottom: 4px solid transparent;
@ -1707,7 +1707,7 @@ a .account__avatar {
}
.account-authorize__avatar {
float: inline-start;
float: left;
margin-inline-end: 10px;
}
@ -2687,7 +2687,7 @@ $ui-header-height: 55px;
.navigation-panel {
margin: 0;
background: $ui-base-color;
border-inset-inline-start: 1px solid lighten($ui-base-color, 8%);
border-inline-start: 1px solid lighten($ui-base-color, 8%);
height: 100vh;
}
@ -2986,7 +2986,6 @@ $ui-header-height: 55px;
width: 85%;
height: 100%;
pointer-events: none;
user-drag: none;
user-select: none;
}
@ -3924,7 +3923,7 @@ a.status-card.compact:hover {
}
.column-header__setting-arrows {
float: inline-end;
float: right;
.column-header__setting-btn {
padding: 5px;
@ -5802,7 +5801,7 @@ a.status-card.compact:hover {
.report-modal__comment {
padding: 20px;
border-inset-inline-end: 1px solid $ui-secondary-color;
border-inline-end: 1px solid $ui-secondary-color;
max-width: 320px;
p {
@ -6094,7 +6093,7 @@ a.status-card.compact:hover {
color: $dark-text-color;
padding: 8px 18px;
cursor: default;
border-inset-inline-end: 1px solid lighten($ui-base-color, 8%);
border-inline-end: 1px solid lighten($ui-base-color, 8%);
display: flex;
flex-direction: column;
align-items: center;
@ -6159,7 +6158,7 @@ a.status-card.compact:hover {
border: 0;
box-sizing: border-box;
display: block;
float: inline-start;
float: left;
position: relative;
border-radius: 4px;
overflow: hidden;
@ -7981,7 +7980,7 @@ noscript {
inset-inline-start: 0;
width: 100%;
height: 100%;
border-inset-inline-start: 4px solid $highlight-text-color;
border-inline-start: 4px solid $highlight-text-color;
pointer-events: none;
}
}

2
app/javascript/styles/mastodon/rich_text.scss
View file

@ -42,7 +42,7 @@
blockquote {
padding-inline-start: 10px;
border-inset-inline-start: 3px solid $darker-text-color;
border-inline-start: 3px solid $darker-text-color;
color: $darker-text-color;
white-space: normal;

12
app/javascript/styles/mastodon/rtl.scss
View file

@ -19,10 +19,22 @@ body.rtl {
direction: rtl;
}
.account__avatar-wrapper {
float: right;
}
.column-header__setting-arrows {
float: left;
}
.admin-wrapper {
direction: rtl;
}
.react-swipeable-view-container > * {
direction: rtl;
}
.simple_form .label_input__append {
&::after {
background-image: linear-gradient(

4
app/javascript/styles/mastodon/tables.scss
View file

@ -91,12 +91,12 @@
&:first-child {
border-radius: 4px 0 0;
border-inset-inline-start: 1px solid darken($ui-base-color, 8%);
border-inline-start: 1px solid darken($ui-base-color, 8%);
}
&:last-child {
border-radius: 0 4px 0 0;
border-inset-inline-end: 1px solid darken($ui-base-color, 8%);
border-inline-end: 1px solid darken($ui-base-color, 8%);
}
}
}