Merge upstream!! #64 <3 <3

This commit is contained in:
kibigo!
2017-07-12 02:03:17 -07:00
340 changed files with 4980 additions and 2321 deletions

View File

@@ -116,10 +116,6 @@
.wrapper {
padding: 20px;
}
.features-list {
display: block;
}
}
}
@@ -299,80 +295,438 @@
}
}
.features-list {
.features-list__row {
display: flex;
margin-bottom: 20px;
padding: 10px 0;
justify-content: space-between;
.features-list__column {
flex: 1 1 0;
&:first-child {
padding-top: 0;
}
ul {
list-style: none;
.visual {
flex: 0 0 auto;
display: flex;
align-items: center;
margin-left: 15px;
.fa {
display: block;
color: $ui-primary-color;
font-size: 48px;
}
}
li {
margin: 0;
.text {
font-size: 16px;
line-height: 30px;
color: lighten($ui-base-color, 26%);
h6 {
font-weight: 500;
color: $ui-primary-color;
}
}
}
.screenshot-with-signup {
display: flex;
margin-bottom: 20px;
.landing-page {
.header-wrapper {
padding-top: 15px;
background: $ui-base-color;
background: linear-gradient(150deg, lighten($ui-base-color, 8%), $ui-base-color);
position: relative;
.mascot {
flex: 1 1 auto;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
img {
display: block;
.mascot-container {
max-width: 800px;
margin: 0 auto;
max-width: 100%;
position: absolute;
top: 0;
left: 0;
right: 0;
height: 100%;
}
.mascot {
position: absolute;
bottom: -14px;
width: auto;
height: auto;
left: 60px;
z-index: 3;
}
}
.simple_form,
.closed-registrations-message {
width: 300px;
flex: 0 0 auto;
background: rgba(darken($ui-base-color, 7%), 0.5);
padding: 14px;
border-radius: 4px;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.4);
p,
li {
font: inherit;
font-weight: inherit;
margin-bottom: 0;
}
.actions {
margin-bottom: 0;
.header {
line-height: 30px;
overflow: hidden;
.container {
display: flex;
justify-content: space-between;
}
.info {
text-align: center;
.hero {
margin-top: 50px;
align-items: center;
position: relative;
.floats {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
img {
position: absolute;
transition: all 0.1s linear;
animation-name: floating;
animation-duration: 1.7s;
animation-iteration-count: infinite;
animation-direction: alternate;
animation-timing-function: linear;
z-index: 2;
}
.float-1 {
height: 170px;
right: -120px;
bottom: 0;
}
.float-2 {
height: 100px;
right: 210px;
bottom: 0;
animation-delay: 0.2s;
}
.float-3 {
height: 140px;
right: 110px;
top: -30px;
animation-delay: 0.1s;
}
}
.simple_form,
.closed-registrations-message {
background: darken($ui-base-color, 4%);
width: 280px;
padding: 15px 20px;
border-radius: 4px 4px 0 0;
line-height: initial;
position: relative;
z-index: 4;
.actions {
margin-bottom: 0;
button,
.button,
.block-button {
margin-bottom: 0;
}
}
}
.heading {
position: relative;
z-index: 4;
padding-bottom: 150px;
}
.closed-registrations-message {
min-height: 330px;
display: flex;
flex-direction: column;
justify-content: space-between;
}
}
ul {
list-style: none;
margin: 0;
li {
display: inline-block;
vertical-align: bottom;
margin: 0;
&:first-child a {
padding-left: 0;
}
&:last-child a {
padding-right: 0;
}
}
}
.links {
position: relative;
z-index: 4;
a {
color: $ui-secondary-color;
display: flex;
justify-content: center;
align-items: center;
color: $ui-primary-color;
text-decoration: none;
padding: 12px 16px;
line-height: 32px;
font-family: 'mastodon-font-display', sans-serif;
font-weight: 500;
font-size: 14px;
&:hover {
color: $ui-secondary-color;
}
}
.brand {
a {
padding-left: 0;
color: $white;
}
img {
width: 32px;
height: 32px;
margin-right: 10px;
}
}
}
}
@media screen and (max-width: 625px) {
.mascot {
display: none;
.container {
width: 100%;
box-sizing: border-box;
max-width: 800px;
margin: 0 auto;
}
.wrapper {
max-width: 800px;
margin: 0 auto;
padding: 0;
}
.learn-more-cta {
background: darken($ui-base-color, 4%);
padding: 50px 0;
}
h3 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 16px;
line-height: 24px;
font-weight: 500;
margin-bottom: 20px;
color: $ui-primary-color;
}
p {
font-size: 16px;
line-height: 30px;
color: lighten($ui-base-color, 26%);
}
.features {
padding: 50px 0;
.container {
display: flex;
}
}
#mastodon-timeline {
-webkit-overflow-scrolling: touch;
-ms-overflow-style: -ms-autohiding-scrollbar;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-size: 13px;
line-height: 18px;
font-weight: 400;
color: $primary-text-color;
width: 330px;
margin-right: 30px;
flex: 0 0 auto;
background: $ui-base-color;
overflow: hidden;
box-shadow: 0 0 6px rgba($black, 0.1);
.column {
padding: 0;
border-radius: 4px;
overflow: hidden;
height: 100%;
}
.simple_form,
.closed-registrations-message {
flex: auto;
.scrollable {
height: 400px;
}
p {
font-size: inherit;
line-height: inherit;
font-weight: inherit;
color: $primary-text-color;
a {
color: $ui-secondary-color;
text-decoration: none;
}
}
}
.about-mastodon {
max-width: 675px;
p {
margin-bottom: 20px;
}
.features-list {
margin-top: 20px;
}
}
em {
display: inline;
margin: 0;
padding: 0;
font-weight: 500;
background: transparent;
font-family: inherit;
font-size: inherit;
line-height: inherit;
color: $ui-primary-color;
}
h1 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 26px;
line-height: 30px;
margin-bottom: 0;
font-weight: 500;
color: $ui-secondary-color;
small {
font-family: 'mastodon-font-sans-serif', sans-serif;
display: block;
font-size: 18px;
font-weight: 400;
color: lighten($ui-base-color, 26%);
}
}
.footer-links {
padding-bottom: 50px;
text-align: right;
color: lighten($ui-base-color, 26%);
p {
font-size: 14px;
}
a {
color: inherit;
text-decoration: underline;
}
}
@media screen and (max-width: 800px) {
.container {
padding: 0 20px;
}
.header-wrapper .mascot {
left: 20px;
}
}
@media screen and (max-width: 689px) {
.header-wrapper .mascot {
display: none;
}
}
@media screen and (max-width: 675px) {
.header-wrapper {
padding-top: 0;
}
.header .container,
.features .container {
display: block;
}
.links {
padding-top: 15px;
background: darken($ui-base-color, 4%);
}
.header {
padding-top: 0;
.hero {
margin-top: 30px;
padding: 0;
.heading {
padding-bottom: 20px;
}
}
.floats {
display: none;
}
.heading,
.nav {
text-align: center;
}
.heading h1 {
padding: 30px 0;
}
.hero {
.simple_form,
.closed-registrations-message {
background: darken($ui-base-color, 8%);
width: 100%;
border-radius: 0;
box-sizing: border-box;
}
}
}
#mastodon-timeline {
height: 70vh;
width: 100%;
margin-bottom: 50px;
}
}
}
.closed-registrations-message {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
text-align: center;
@keyframes floating {
from {
transform: translate(0, 0);
}
65% {
transform: translate(0, 4px);
}
to {
transform: translate(0, -0);
}
}

View File

@@ -1,6 +1,6 @@
body {
font-family: 'mastodon-font-sans-serif', sans-serif;
background: $ui-base-color url('../images/background-photo.jpg');
background: $ui-base-color;
background-size: cover;
background-attachment: fixed;
font-size: 13px;
@@ -11,6 +11,8 @@ 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: transparent;
&.app-body {
position: fixed;
@@ -20,6 +22,11 @@ body {
background: $ui-base-color;
}
&.about-body {
background: darken($ui-base-color, 8%);
padding-bottom: 0;
}
&.embed {
background: transparent;
margin: 0;
@@ -61,3 +68,18 @@ button {
align-items: center;
justify-content: center;
}
.system-font {
// system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
// -apple-system => Safari <11 specific
// BlinkMacSystemFont => Chrome <56 on macOS specific
// Segoe UI => Windows 7/8/10
// Oxygen => KDE
// Ubuntu => Unity/Ubuntu
// Cantarell => GNOME
// Fira Sans => Firefox OS
// Droid Sans => Older Androids (<4.0)
// Helvetica Neue => Older macOS <10.11
// mastodon-font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
font-family: system-ui, -apple-system,BlinkMacSystemFont, "Segoe UI","Oxygen", "Ubuntu","Cantarell","Fira Sans","Droid Sans","Helvetica Neue",mastodon-font-sans-serif, sans-serif;
}

File diff suppressed because one or more lines are too long

View File

@@ -42,8 +42,38 @@
cursor: default;
}
&.button-alternative {
font-size: 16px;
line-height: 36px;
height: auto;
color: $ui-base-color;
background: $ui-primary-color;
text-transform: none;
padding: 4px 16px;
&:active,
&:focus,
&:hover {
background-color: lighten($ui-primary-color, 4%);
}
}
&.button-secondary {
//
font-size: 16px;
line-height: 36px;
height: auto;
color: $ui-primary-color;
text-transform: none;
background: transparent;
padding: 3px 15px;
border: 1px solid $ui-primary-color;
&:active,
&:focus,
&:hover {
border-color: lighten($ui-primary-color, 4%);
color: lighten($ui-primary-color, 4%);
}
}
&.button--block {
@@ -1327,6 +1357,20 @@
height: 100%;
background-image: none;
}
&.image-loader--amorphous {
position: static;
.image-loader__preview-canvas {
display: none;
}
.image-loader__img {
position: static;
width: auto;
height: auto;
}
}
}
.navigation-bar {
@@ -1463,6 +1507,23 @@
.columns-area {
padding: 0;
}
.react-swipeable-view-container .columns-area {
height: calc(100% - 20px) !important;
}
}
.react-swipeable-view-container {
&,
.columns-area,
.drawer,
.column {
height: 100%;
}
}
.react-swipeable-view-container > * {
height: 100%;
}
.column {
@@ -1510,8 +1571,7 @@
.drawer__tab {
display: block;
flex: 1 1 auto;
padding: 15px;
padding-bottom: 13px;
padding: 15px 5px 13px;
color: $ui-primary-color;
text-decoration: none;
text-align: center;
@@ -2537,7 +2597,8 @@ button.icon-button.active i.fa-retweet {
vertical-align: middle;
}
.empty-column-indicator {
.empty-column-indicator,
.error-column {
color: lighten($ui-base-color, 20%);
background: $ui-base-color;
text-align: center;
@@ -2563,6 +2624,10 @@ button.icon-button.active i.fa-retweet {
}
}
.error-column {
flex-direction: column;
}
@keyframes pulse {
0% {
opacity: 1;
@@ -3206,7 +3271,7 @@ button.icon-button.active i.fa-retweet {
video {
max-width: 80vw;
max-height: 80vh;
width: auto;
width: 100%;
height: auto;
}
@@ -3214,6 +3279,7 @@ button.icon-button.active i.fa-retweet {
canvas {
display: block;
background: url('../images/void.png') repeat;
object-fit: contain;
}
}
@@ -3224,7 +3290,8 @@ button.icon-button.active i.fa-retweet {
z-index: 100;
}
.onboarding-modal {
.onboarding-modal,
.error-modal {
background: $ui-secondary-color;
color: $ui-base-color;
border-radius: 8px;
@@ -3238,6 +3305,26 @@ button.icon-button.active i.fa-retweet {
width: 80vw;
max-width: 520px;
max-height: 420px;
.react-swipeable-view-container > div {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 25px;
display: none;
flex-direction: column;
align-items: center;
justify-content: center;
display: flex;
user-select: text;
}
}
.error-modal__body {
height: 80vh;
width: 80vw;
max-width: 520px;
max-height: 420px;
position: relative;
& > div {
@@ -3258,6 +3345,14 @@ button.icon-button.active i.fa-retweet {
}
}
.error-modal__body {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
}
@media screen and (max-width: 550px) {
.onboarding-modal {
width: 100%;
@@ -3274,7 +3369,8 @@ button.icon-button.active i.fa-retweet {
}
}
.onboarding-modal__paginator {
.onboarding-modal__paginator,
.error-modal__footer {
flex: 0 0 auto;
background: darken($ui-secondary-color, 8%);
display: flex;
@@ -3284,7 +3380,8 @@ button.icon-button.active i.fa-retweet {
min-width: 33px;
}
.onboarding-modal__nav {
.onboarding-modal__nav,
.error-modal__nav {
color: darken($ui-secondary-color, 34%);
background-color: transparent;
border: 0;
@@ -3307,6 +3404,10 @@ button.icon-button.active i.fa-retweet {
}
}
.error-modal__footer {
justify-content: center;
}
.onboarding-modal__dots {
flex: 1 1 auto;
display: flex;
@@ -3676,6 +3777,7 @@ button.icon-button.active i.fa-retweet {
.report-modal__statuses {
min-height: 20vh;
max-height: 40vh;
overflow-y: auto;
overflow-x: hidden;
}
@@ -3831,8 +3933,7 @@ button.icon-button.active i.fa-retweet {
.media-gallery__item-thumbnail {
cursor: zoom-in;
display: flex;
align-items: center;
display: block;
text-decoration: none;
width: 100%;
height: 100%;

View File

@@ -10,52 +10,36 @@
}
.logo-container {
max-width: 400px;
margin: 100px auto;
margin-bottom: 0;
cursor: default;
margin-bottom: 50px;
@media screen and (max-width: 360px) {
margin: 30px auto;
}
h1 {
display: block;
text-align: center;
color: $primary-text-color;
font-size: 48px;
font-weight: 500;
display: flex;
justify-content: center;
align-items: center;
img {
display: block;
margin: 20px auto;
width: 180px;
height: 180px;
width: 32px;
height: 32px;
margin-right: 10px;
}
a {
color: inherit;
display: flex;
justify-content: center;
align-items: center;
color: $primary-text-color;
text-decoration: none;
outline: 0;
img {
opacity: 0.8;
transition: opacity 0.8s ease;
}
&:hover {
img {
opacity: 1;
transition-duration: 0.2s;
}
}
}
small {
display: block;
font-size: 12px;
font-weight: 400;
font-family: 'mastodon-font-monospace', monospace;
padding: 12px 16px;
line-height: 32px;
font-family: 'mastodon-font-display', sans-serif;
font-weight: 500;
font-size: 14px;
}
}
}

View File

@@ -7,3 +7,11 @@
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'mastodon-font-display';
src: local('Montserrat'),
url('../fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
font-weight: 500;
font-style: normal;
}

View File

@@ -24,6 +24,20 @@ code {
p.hint {
margin-bottom: 15px;
color: lighten($ui-base-color, 32%);
&.subtle-hint {
text-align: center;
font-size: 12px;
line-height: 18px;
margin-top: 15px;
margin-bottom: 0;
color: lighten($ui-base-color, 26%);
a {
color: $ui-primary-color;
}
}
}
strong {
@@ -43,10 +57,7 @@ code {
}
}
.input.file,
.input.select,
.input.radio_buttons,
.input.check_boxes {
.input.with_label {
padding: 15px 0;
margin-bottom: 0;
@@ -57,6 +68,44 @@ code {
display: block;
padding-top: 5px;
}
&.boolean {
padding: initial;
margin-bottom: initial;
.label_input > label {
font-family: inherit;
font-size: 14px;
color: $primary-text-color;
display: block;
width: auto;
}
label.checkbox {
position: relative;
padding-left: 25px;
flex: 1 1 auto;
}
}
}
.input.with_block_label {
& > label {
font-family: inherit;
font-size: 16px;
color: $primary-text-color;
display: block;
padding-top: 5px;
}
.hint {
margin-bottom: 15px;
}
li {
float: left;
width: 50%;
}
}
.fields-group {
@@ -92,7 +141,7 @@ code {
input[type=checkbox] {
position: absolute;
left: 0;
top: 1px;
top: 5px;
margin: 0;
}
@@ -102,6 +151,29 @@ code {
}
}
.check_boxes {
.checkbox {
label {
font-family: inherit;
font-size: 14px;
color: $primary-text-color;
display: block;
width: auto;
position: relative;
padding-top: 5px;
padding-left: 25px;
flex: 1 1 auto;
}
input[type=checkbox] {
position: absolute;
left: 0;
top: 5px;
margin: 0;
}
}
}
input[type=text],
input[type=number],
input[type=email],
@@ -197,8 +269,6 @@ code {
&:active,
&:focus {
position: relative;
top: 1px;
background-color: darken($ui-highlight-color, 5%);
}
@@ -219,6 +289,27 @@ code {
select {
font-size: 16px;
}
.input-with-append {
position: relative;
.input input {
padding-right: 127px;
}
.append {
position: absolute;
right: 0;
top: 0;
padding: 7px 4px;
padding-bottom: 9px;
font-size: 16px;
color: lighten($ui-base-color, 26%);
font-family: inherit;
pointer-events: none;
cursor: default;
}
}
}
.flash-message {
@@ -240,7 +331,7 @@ code {
text-align: center;
a {
color: $primary-text-color;
color: $ui-primary-color;
text-decoration: none;
&:hover {
@@ -357,21 +448,11 @@ code {
}
}
.user_filtered_languages {
& > label {
font-family: inherit;
font-size: 16px;
color: $primary-text-color;
display: block;
padding-top: 5px;
}
.post-follow-actions {
text-align: center;
color: $ui-primary-color;
.hint {
margin-bottom: 15px;
}
li {
float: left;
width: 50%;
div {
margin-bottom: 4px;
}
}

View File

@@ -326,6 +326,18 @@
}
}
.media-spoiler-wrapper {
&.media-spoiler-wrapper__visible {
.media-spoiler {
display: none;
}
.spoiler-button {
display: block;
}
}
}
.pre-header {
padding: 14px 0;
padding-left: (48px + 14px * 2);