autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v2.6.5' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2018-12-07 15:27:23 +01:00
parent b9f0f794db 887f9de6dc
commit f5f9fc366d
298 changed files with 2754 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/javascript/styles/mastodon/components.scss
View File

@ -1670,6 +1670,7 @@ a.account__display-name {
padding: 4px 0;
border-radius: 4px;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
z-index: 9999;
ul {
list-style: none;
@ -1847,7 +1848,7 @@ a.account__display-name {
}
.column {
width: 330px;
width: 350px;
position: relative;
box-sizing: border-box;
display: flex;
@ -2561,6 +2562,9 @@ a.status-card {
display: block;
margin-top: 5px;
font-size: 13px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.status-card__image {
@ -2585,6 +2589,31 @@ a.status-card {
}
}
.status-card.compact {
border-color: lighten($ui-base-color, 4%);
&.interactive {
border: 0;
}
.status-card__content {
padding: 8px;
padding-top: 10px;
}
.status-card__title {
white-space: nowrap;
}
.status-card__image {
flex: 0 0 60px;
}
}
a.status-card.compact:hover {
background-color: lighten($ui-base-color, 4%);
}
.status-card__image-image {
border-radius: 4px 0 0 4px;
display: block;

9
app/javascript/styles/mastodon/forms.scss
View File

@ -330,9 +330,12 @@ code {
}
input[type=text],
input[type=number],
input[type=email],
input[type=password] {
border-bottom-color: $valid-value-color;
input[type=password],
textarea,
select {
border-color: lighten($error-red, 12%);
}
.error {
@ -427,7 +430,7 @@ code {
&__append {
position: absolute;
right: 1px;
right: 3px;
top: 1px;
padding: 10px;
padding-bottom: 9px;

70
app/javascript/styles/mastodon/rtl.scss
View File

@ -73,7 +73,7 @@ body.rtl {
float: left;
}
.setting-toggle {
.setting-toggle__label {
margin-left: 0;
margin-right: 8px;
}
@ -130,17 +130,6 @@ body.rtl {
float: left;
}
.activity-stream .detailed-status.light .detailed-status__display-name > div {
float: right;
margin-right: 0;
margin-left: 10px;
}
.activity-stream .detailed-status.light .detailed-status__meta span > span {
margin-left: 0;
margin-right: 6px;
}
.status__action-bar {
&__counter {
@ -174,6 +163,10 @@ body.rtl {
margin-right: 0;
}
.detailed-status__display-name .display-name {
text-align: right;
}
.detailed-status__display-avatar {
margin-right: 0;
margin-left: 10px;
@ -206,12 +199,16 @@ body.rtl {
margin-left: 5px;
}
.simple_form .check_boxes .checkbox label,
.simple_form .input.with_label.boolean label.checkbox {
.simple_form .check_boxes .checkbox label {
padding-left: 0;
padding-right: 25px;
}
.simple_form .input.with_label.boolean label.checkbox {
padding-left: 25px;
padding-right: 0;
}
.simple_form .check_boxes .checkbox input[type="checkbox"],
.simple_form .input.boolean input[type="checkbox"] {
left: auto;
@ -246,12 +243,12 @@ body.rtl {
.simple_form .label_input__append {
right: auto;
left: 0;
left: 3px;
&::after {
right: auto;
left: 0;
background-image: linear-gradient(to left, rgba($ui-base-color, 0), $ui-base-color);
background-image: linear-gradient(to left, rgba(darken($ui-base-color, 10%), 0), darken($ui-base-color, 10%));
}
}
@ -341,14 +338,45 @@ body.rtl {
margin-right: 20px;
}
}
}
.landing-page__information {
.account__display-name {
margin-right: 0;
.landing-page__information {
.account__display-name {
margin-right: 0;
margin-left: 5px;
}
.account__avatar-wrapper {
margin-left: 12px;
margin-right: 0;
}
}
.account__avatar-wrapper {
.card__bar .display-name {
margin-left: 0;
margin-right: 15px;
text-align: right;
}
.fa-chevron-left::before {
content: "\F054";
}
.fa-chevron-right::before {
content: "\F053";
}
.column-back-button__icon {
margin-right: 0;
margin-left: 5px;
}
.column-header__setting-arrows .column-header__setting-btn:last-child {
padding-left: 0;
padding-right: 10px;
}
.simple_form .input.radio_buttons .radio > label input {
left: auto;
right: 0;
}
}