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

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
This commit is contained in:
Thibaut Girka
2019-06-07 17:00:36 +02:00
parent 8360019896 a60364ca7d
commit 34b8346e7f
63 changed files with 239 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/styles/contrast/diff.scss
View File

@@ -5,7 +5,7 @@
&-description {
input {
&::placeholder {
opacity: 1.0;
opacity: 1;
}
}
}

2
app/javascript/styles/contrast/variables.scss
View File

@@ -20,5 +20,5 @@ $highlight-text-color: $classic-highlight-color !default;
$action-button-color: #8d9ac2;
$inverted-text-color: $black !default;
$lighter-text-color: darken($ui-base-color,6%) !default;
$lighter-text-color: darken($ui-base-color, 6%) !default;
$light-text-color: darken($ui-primary-color, 40%) !default;

4
app/javascript/styles/mailer.scss
View File

@@ -279,6 +279,8 @@ h5 {
}
.hero-with-button {
padding-bottom: 16px;
h1 {
margin-bottom: 4px;
}
@@ -286,8 +288,6 @@ h5 {
p.lead {
margin-bottom: 32px;
}
padding-bottom: 16px;
}
.header {

10
app/javascript/styles/mastodon/_mixins.scss
View File

@@ -1,21 +1,21 @@
@mixin avatar-radius() {
@mixin avatar-radius {
border-radius: 4px;
background: transparent no-repeat;
background-position: 50%;
background-clip: padding-box;
}
@mixin avatar-size($size:48px) {
@mixin avatar-size($size: 48px) {
width: $size;
height: $size;
background-size: $size $size;
}
@mixin search-input() {
@mixin search-input {
outline: 0;
box-sizing: border-box;
width: 100%;
border: none;
border: 0;
box-shadow: none;
font-family: inherit;
background: $ui-base-color;
@@ -42,7 +42,7 @@
}
}
@mixin search-popout() {
@mixin search-popout {
background: $simple-background-color;
border-radius: 4px;
padding: 10px 14px;

2
app/javascript/styles/mastodon/admin.scss
View File

@@ -171,7 +171,7 @@ $content-width: 840px;
text-transform: none;
padding-bottom: 0;
margin-bottom: 0;
border-bottom: none;
border-bottom: 0;
}
& > p {

5
app/javascript/styles/mastodon/basics.scss
View File

@@ -2,7 +2,8 @@
@if type-of($color) == 'color' {
$color: str-slice(ie-hex-str($color), 4);
}
@return '%23' + unquote($color)
@return '%23' + unquote($color);
}
body {
@@ -15,7 +16,7 @@ body {
text-rendering: optimizelegibility;
font-feature-settings: "kern";
text-size-adjust: none;
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
&.system-font {

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

@@ -128,7 +128,7 @@
display: inline-block;
padding: 0;
color: $action-button-color;
border: none;
border: 0;
background: transparent;
cursor: pointer;
transition: color 100ms ease-in;
@@ -196,7 +196,7 @@
.text-icon-button {
color: $lighter-text-color;
border: none;
border: 0;
background: transparent;
cursor: pointer;
font-weight: 600;
@@ -353,12 +353,12 @@
.spoiler-input {
height: 0;
transform-origin: bottom;
opacity: 0.0;
opacity: 0;
&.spoiler-input--visible {
height: 36px;
margin-bottom: 11px;
opacity: 1.0;
opacity: 1;
}
}
@@ -408,12 +408,20 @@
}
}
.emoji-picker-wrapper,
.autosuggest-textarea__suggestions-wrapper {
position: relative;
height: 0;
}
.emoji-picker-wrapper {
position: relative;
height: 0;
&.emoji-picker-wrapper--hidden {
display: none;
}
}
.autosuggest-textarea__suggestions {
box-sizing: border-box;
display: none;
@@ -1185,7 +1193,7 @@
}
.account__avatar {
@include avatar-radius();
@include avatar-radius;
position: relative;
&-inline {
@@ -1195,11 +1203,11 @@
}
&-composite {
@include avatar-radius();
@include avatar-radius;
overflow: hidden;
& > div {
@include avatar-radius();
@include avatar-radius;
float: left;
position: relative;
box-sizing: border-box;
@@ -1215,12 +1223,12 @@ a .account__avatar {
@include avatar-size(48px);
&-base {
@include avatar-radius();
@include avatar-radius;
@include avatar-size(36px);
}
&-overlay {
@include avatar-radius();
@include avatar-radius;
@include avatar-size(24px);
position: absolute;
@@ -1598,13 +1606,13 @@ a.account__display-name {
.icon-button.close {
position: absolute;
pointer-events: none;
transform: scale(0.0, 1.0) translate(-100%, 0);
transform: scale(0, 1) translate(-100%, 0);
opacity: 0;
}
.compose__action-bar .icon-button {
pointer-events: auto;
transform: scale(1.0, 1.0) translate(0, 0);
transform: scale(1, 1) translate(0, 0);
opacity: 1;
}
}
@@ -2071,6 +2079,10 @@ a.account__display-name {
.account {
padding: 15px 10px;
&__header__bio {
margin: 0 -10px;
}
}
.notification {
@@ -2699,7 +2711,7 @@ a.account__display-name {
.setting-text {
color: $darker-text-color;
background: transparent;
border: none;
border: 0;
border-bottom: 2px solid $ui-primary-color;
box-sizing: border-box;
display: block;
@@ -3037,7 +3049,7 @@ a.status-card.compact:hover {
& > button {
margin: 0;
border: none;
border: 0;
padding: 15px 0 15px 15px;
color: inherit;
background: transparent;
@@ -3202,11 +3214,11 @@ a.status-card.compact:hover {
}
.no-reduce-motion .loading-indicator span {
animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.61, 0.355, 1);
}
.no-reduce-motion .loading-indicator__figure {
animation: loader-figure 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
animation: loader-figure 1.15s infinite cubic-bezier(0.215, 0.61, 0.355, 1);
}
@keyframes loader-figure {
@@ -3373,7 +3385,7 @@ a.status-card.compact:hover {
.column-select {
&__control {
@include search-input();
@include search-input;
}
&__placeholder {
@@ -3424,7 +3436,7 @@ a.status-card.compact:hover {
}
&__menu {
@include search-popout();
@include search-popout;
padding: 0;
background: $ui-secondary-color;
}
@@ -3585,7 +3597,7 @@ a.status-card.compact:hover {
.no-reduce-motion .shake-bottom {
transform-origin: 50% 100%;
animation: shake-bottom 0.8s cubic-bezier(0.455, 0.030, 0.515, 0.955) 2s 2 both;
animation: shake-bottom 0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955) 2s 2 both;
}
.emoji-picker-dropdown__menu {
@@ -3880,10 +3892,11 @@ a.status-card.compact:hover {
}
.search__input {
@include search-input;
display: block;
padding: 10px;
padding-right: 30px;
@include search-input();
}
.search__icon {
@@ -4491,14 +4504,14 @@ a.status-card.compact:hover {
}
.actions-modal {
max-height: 80vh;
max-width: 80vw;
.status {
overflow-y: auto;
max-height: 300px;
}
max-height: 80vh;
max-width: 80vw;
.actions-modal__item-label {
font-weight: 500;
}
@@ -4713,7 +4726,7 @@ a.status-card.compact:hover {
}
.media-gallery__item {
border: none;
border: 0;
box-sizing: border-box;
display: block;
float: left;
@@ -5173,7 +5186,7 @@ a.status-card.compact:hover {
}
.account-gallery__item {
border: none;
border: 0;
box-sizing: border-box;
display: block;
position: relative;
@@ -5247,7 +5260,7 @@ a.status-card.compact:hover {
}
.search-popout {
@include search-popout();
@include search-popout;
}
noscript {
@@ -5349,14 +5362,14 @@ noscript {
.icon-button.close {
pointer-events: auto;
opacity: 1;
transform: scale(1.0, 1.0) translate(0, 0);
transform: scale(1, 1) translate(0, 0);
bottom: 5px;
}
.compose__action-bar .icon-button {
pointer-events: none;
opacity: 0;
transform: scale(0.0, 1.0) translate(100%, 0);
transform: scale(0, 1) translate(100%, 0);
}
}
}
@@ -5386,7 +5399,7 @@ noscript {
box-sizing: border-box;
display: block;
width: 100%;
border: none;
border: 0;
padding: 10px;
font-family: $font-monospace, monospace;
background: $ui-base-color;

4
app/javascript/styles/mastodon/containers.scss
View File

@@ -121,7 +121,7 @@
grid-auto-rows: max-content;
.column-0 {
grid-column: 1/3;
grid-column: 1 / 3;
grid-row: 1;
}
@@ -136,7 +136,7 @@
}
.column-3 {
grid-column: 1/3;
grid-column: 1 / 3;
grid-row: 3;
}

8
app/javascript/styles/mastodon/emoji_picker.scss
View File

@@ -1,14 +1,14 @@
.emoji-mart {
font-size: 13px;
display: inline-block;
color: $inverted-text-color;
&,
* {
box-sizing: border-box;
line-height: 1.15;
}
font-size: 13px;
display: inline-block;
color: $inverted-text-color;
.emoji-mart-emoji {
padding: 6px;
}

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

@@ -553,7 +553,7 @@ code {
box-sizing: border-box;
display: block;
width: 100%;
border: none;
border: 0;
padding: 10px;
font-family: $font-monospace, monospace;
background: $ui-base-color;

1
app/javascript/styles/mastodon/polls.scss
View File

@@ -47,7 +47,6 @@
width: 100%;
font-size: 14px;
color: $inverted-text-color;
display: block;
outline: 0;
font-family: inherit;
background: $simple-background-color;

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

@@ -180,7 +180,6 @@ body.rtl {
}
.fa-ul {
margin-left: 0;
margin-left: 2.14285714em;
}