potsda.mn/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve light theme (#10992)

Browse source
This commit is contained in:
Eugen Rochko 2019-06-08 10:23:41 +02:00 committed by GitHub
parent 25f93f4097
commit f4bc77f290
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 290 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/list_timeline/index.js
View file

@ -175,8 +175,6 @@ class ListTimeline extends React.PureComponent {
<Icon id='trash' /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' /> <Icon id='trash' /> <FormattedMessage id='lists.delete' defaultMessage='Delete list' />
</button> </button>
</div> </div>
<hr />
</ColumnHeader> </ColumnHeader>
<StatusListContainer <StatusListContainer

2
app/javascript/mastodon/features/lists/index.js
View file

@ -65,11 +65,11 @@ class Lists extends ImmutablePureComponent {
<NewListForm /> <NewListForm />
<ColumnSubheading text={intl.formatMessage(messages.subheading)} />
<ScrollableList <ScrollableList
scrollKey='lists' scrollKey='lists'
shouldUpdateScroll={shouldUpdateScroll} shouldUpdateScroll={shouldUpdateScroll}
emptyMessage={emptyMessage} emptyMessage={emptyMessage}
prepend={<ColumnSubheading text={intl.formatMessage(messages.subheading)} />}
> >
{lists.map(list => {lists.map(list =>
<ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} /> <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />

280
app/javascript/styles/mastodon-light/diff.scss
View file

@ -1,6 +1,10 @@
// Notes! // Notes!
// Sass color functions, "darken" and "lighten" are automatically replaced. // Sass color functions, "darken" and "lighten" are automatically replaced.
html {
scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25);
}
// Change the colors of button texts // Change the colors of button texts
.button { .button {
color: $white; color: $white;
@ -11,18 +15,119 @@
} }
// Change default background colors of columns // Change default background colors of columns
.column { .column > .scrollable,
> .scrollable { .getting-started,
.column-inline-form {
background: $white;
border: 1px solid lighten($ui-base-color, 8%);
border-top: 0;
}
.column-back-button,
.column-header {
background: $white;
border: 1px solid lighten($ui-base-color, 8%);
&--slim-button {
border: 0;
top: -49px;
right: 1px;
}
}
.column-header__back-button,
.column-header__button,
.column-header__button.active,
.account__header__bar {
background: $white;
}
.column-header__button.active {
color: $ui-highlight-color;
&:hover,
&:active,
&:focus {
color: $ui-highlight-color;
background: $white; background: $white;
} }
} }
.drawer__inner { .account__header__bar .avatar .account__avatar {
border-color: $white;
}
.getting-started__footer a {
color: $ui-secondary-color;
text-decoration: underline;
}
.column-subheading {
background: darken($ui-base-color, 4%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
}
.getting-started,
.scrollable {
.column-link {
background: $white;
border-bottom: 1px solid lighten($ui-base-color, 8%);
&:hover,
&:active,
&:focus {
background: $ui-base-color;
}
}
}
.compose-form__autosuggest-wrapper,
.poll__text input[type="text"],
.compose-form .spoiler-input__input,
.compose-form__poll-wrapper select,
.search__input,
.setting-text,
.box-widget input[type="text"],
.box-widget input[type="email"],
.box-widget input[type="password"],
.box-widget textarea,
.statuses-grid .detailed-status {
border: 1px solid lighten($ui-base-color, 8%);
}
.list-editor .search .search__input {
border-top: 0;
border-bottom: 0;
}
.compose-form__poll-wrapper select {
background: $simple-background-color url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>") no-repeat right 8px center / auto 16px;
}
.compose-form__poll-wrapper,
.compose-form__poll-wrapper .poll__footer {
border-top-color: lighten($ui-base-color, 8%);
}
.notification__filter-bar {
border: 1px solid lighten($ui-base-color, 8%);
border-top: 0;
}
.compose-form .compose-form__buttons-wrapper {
background: $ui-base-color; background: $ui-base-color;
border: 1px solid lighten($ui-base-color, 8%);
border-top: 0;
}
.drawer__header,
.drawer__inner {
background: $white;
border: 1px solid lighten($ui-base-color, 8%);
} }
.drawer__inner__mastodon { .drawer__inner__mastodon {
background: $ui-base-color url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($white)}"/></svg>') no-repeat bottom / 100% auto; background: $white url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>') no-repeat bottom / 100% auto;
} }
// Change the colors used in compose-form // Change the colors used in compose-form
@ -93,16 +198,16 @@
.detailed-status, .detailed-status,
.detailed-status__action-bar { .detailed-status__action-bar {
background: darken($ui-base-color, 6%); background: $white;
} }
// Change the background colors of status__content__spoiler-link // Change the background colors of status__content__spoiler-link
.reply-indicator__content .status__content__spoiler-link, .reply-indicator__content .status__content__spoiler-link,
.status__content .status__content__spoiler-link { .status__content .status__content__spoiler-link {
background: $ui-base-lighter-color; background: $ui-base-color;
&:hover { &:hover {
background: lighten($ui-base-lighter-color, 6%); background: lighten($ui-base-color, 4%);
} }
} }
@ -112,41 +217,47 @@
background: $ui-base-color; background: $ui-base-color;
} }
.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
color: $white;
}
.account-gallery__item a { .account-gallery__item a {
background-color: $ui-base-color; background-color: $ui-base-color;
} }
// Change the colors used in the dropdown menu // Change the colors used in the dropdown menu
.dropdown-menu { .dropdown-menu {
background: $ui-base-color; background: $white;
&__arrow { &__arrow {
&.left { &.left {
border-left-color: $ui-base-color; border-left-color: $white;
} }
&.top { &.top {
border-top-color: $ui-base-color; border-top-color: $white;
} }
&.bottom { &.bottom {
border-bottom-color: $ui-base-color; border-bottom-color: $white;
} }
&.right { &.right {
border-right-color: $ui-base-color; border-right-color: $white;
} }
} }
&__item { &__item {
a { a {
background: $ui-base-color; background: $white;
color: $darker-text-color; color: $darker-text-color;
} }
} }
} }
// Change the text colors on inverted background // Change the text colors on inverted background
.privacy-dropdown__option.active,
.privacy-dropdown__option:hover,
.privacy-dropdown__option.active .privacy-dropdown__option__content, .privacy-dropdown__option.active .privacy-dropdown__option__content,
.privacy-dropdown__option.active .privacy-dropdown__option__content strong, .privacy-dropdown__option.active .privacy-dropdown__option__content strong,
.privacy-dropdown__option:hover .privacy-dropdown__option__content, .privacy-dropdown__option:hover .privacy-dropdown__option__content,
@ -162,7 +273,7 @@
.actions-modal ul li:not(:empty) a:focus button, .actions-modal ul li:not(:empty) a:focus button,
.actions-modal ul li:not(:empty) a:hover, .actions-modal ul li:not(:empty) a:hover,
.actions-modal ul li:not(:empty) a:hover button, .actions-modal ul li:not(:empty) a:hover button,
.admin-wrapper .sidebar ul li a.selected, .admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
.simple_form .block-button, .simple_form .block-button,
.simple_form .button, .simple_form .button,
.simple_form button { .simple_form button {
@ -170,7 +281,7 @@
} }
.dropdown-menu__separator { .dropdown-menu__separator {
border-bottom-color: lighten($ui-base-color, 12%); border-bottom-color: lighten($ui-base-color, 4%);
} }
// Change the background colors of modals // Change the background colors of modals
@ -185,6 +296,12 @@
background: $ui-base-color; background: $ui-base-color;
} }
.column-header__collapsible-inner {
background: darken($ui-base-color, 4%);
border: 1px solid lighten($ui-base-color, 8%);
border-top: 0;
}
.boost-modal__action-bar, .boost-modal__action-bar,
.confirmation-modal__action-bar, .confirmation-modal__action-bar,
.mute-modal__action-bar, .mute-modal__action-bar,
@ -239,7 +356,76 @@
border-bottom-color: lighten($ui-base-color, 8%); border-bottom-color: lighten($ui-base-color, 8%);
} }
.box-widget,
.nothing-here,
.page-header,
.directory__tag > a,
.directory__tag > div,
.landing-page__call-to-action,
.contact-widget,
.landing .hero-widget__text,
.landing-page__information.contact-widget {
background: $white;
border: 1px solid lighten($ui-base-color, 8%);
}
.landing .hero-widget__text {
border-top: 0;
border-bottom: 0;
}
.landing .hero-widget__footer {
background: $white;
border: 1px solid lighten($ui-base-color, 8%);
border-top: 0;
}
.brand__tagline {
color: $ui-secondary-color;
}
.directory__tag > a {
&:hover,
&:active,
&:focus {
background: $ui-base-color;
}
}
.directory__tag.active > a,
.directory__tag.active > div {
border-color: $ui-highlight-color;
&,
h4,
h4 small,
.fa,
.trends__item__current {
color: $white;
}
&:hover,
&:active,
&:focus {
background: $ui-highlight-color;
}
}
.batch-table {
&__toolbar,
&__row,
.nothing-here {
border-color: lighten($ui-base-color, 8%);
}
}
.activity-stream { .activity-stream {
border: 1px solid lighten($ui-base-color, 8%);
&--under-tabs {
border-top: 0;
}
.entry { .entry {
background: $account-background-color; background: $account-background-color;
@ -294,6 +480,22 @@
background: rgba($error-red, 0.5); background: rgba($error-red, 0.5);
text-shadow: none; text-shadow: none;
} }
.recommended {
border-color: $ui-highlight-color;
color: $ui-highlight-color;
background-color: rgba($ui-highlight-color, 0.1);
}
}
.compose-form .compose-form__warning {
border-color: $ui-highlight-color;
background-color: rgba($ui-highlight-color, 0.1);
&,
a {
color: $ui-highlight-color;
}
} }
.status__content, .status__content,
@ -312,14 +514,42 @@
} }
.public-layout { .public-layout {
.account__section-headline {
border: 1px solid lighten($ui-base-color, 8%);
}
.header, .header,
.public-account-header, .public-account-header,
.public-account-bio { .public-account-bio {
box-shadow: none; box-shadow: none;
} }
.public-account-bio,
.hero-widget__text {
background: $account-background-color;
border: 1px solid lighten($ui-base-color, 8%);
}
.header { .header {
background: lighten($ui-base-color, 12%); background: lighten($ui-base-color, 24%);
.nav-link {
color: $white;
&:hover,
&:focus,
&:active {
color: $white;
}
}
.brand {
&:hover,
&:focus,
&:active {
background: lighten($ui-base-color, 28%);
}
}
} }
.public-account-header { .public-account-header {
@ -331,6 +561,18 @@
} }
} }
&__bar {
&::before {
background: $account-background-color;
border: 1px solid lighten($ui-base-color, 8%);
border-top: 0;
}
.avatar img {
border-color: $account-background-color;
}
}
&__tabs { &__tabs {
&__name { &__name {
h1, h1,
@ -342,6 +584,7 @@
} }
} }
.notification__filter-bar button.active::after,
.account__section-headline a.active::after { .account__section-headline a.active::after {
border-color: transparent transparent $white; border-color: transparent transparent $white;
} }
@ -355,6 +598,9 @@
.activity-stream, .activity-stream,
.nothing-here, .nothing-here,
.directory__tag > a, .directory__tag > a,
.directory__tag > div { .directory__tag > div,
.card > a,
.page-header,
.compose-form .compose-form__warning {
box-shadow: none; box-shadow: none;
} }

2
app/javascript/styles/mastodon-light/variables.scss
View file

@ -17,7 +17,7 @@ $ui-base-color: $classic-secondary-color !default;
$ui-base-lighter-color: #b0c0cf; $ui-base-lighter-color: #b0c0cf;
$ui-primary-color: #9bcbed; $ui-primary-color: #9bcbed;
$ui-secondary-color: $classic-base-color !default; $ui-secondary-color: $classic-base-color !default;
$ui-highlight-color: #2b5fd9; $ui-highlight-color: #2b90d9;
$primary-text-color: $black !default; $primary-text-color: $black !default;
$darker-text-color: $classic-base-color !default; $darker-text-color: $classic-base-color !default;

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

@ -2212,17 +2212,6 @@ a.account__display-name {
height: calc(100% - 10px); height: calc(100% - 10px);
overflow-y: hidden; overflow-y: hidden;
.search__input {
line-height: 18px;
font-size: 16px;
padding: 15px;
padding-right: 30px;
}
.search__icon .fa {
top: 15px;
}
.navigation-bar { .navigation-bar {
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
@ -2709,21 +2698,22 @@ a.account__display-name {
} }
.setting-text { .setting-text {
color: $darker-text-color;
background: transparent;
border: 0;
border-bottom: 2px solid $ui-primary-color;
box-sizing: border-box;
display: block; display: block;
font-family: inherit; box-sizing: border-box;
margin-bottom: 10px;
padding: 7px 0;
width: 100%; width: 100%;
margin: 0;
color: $inverted-text-color;
background: $simple-background-color;
padding: 10px;
font-family: inherit;
font-size: 14px;
resize: vertical;
border: 0;
outline: 0;
border-radius: 4px;
&:focus, &:focus {
&:active { outline: 0;
color: $primary-text-color;
border-bottom-color: $highlight-text-color;
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
@ -3895,8 +3885,10 @@ a.status-card.compact:hover {
@include search-input; @include search-input;
display: block; display: block;
padding: 10px; padding: 15px;
padding-right: 30px; padding-right: 30px;
line-height: 18px;
font-size: 16px;
} }
.search__icon { .search__icon {
@ -3911,7 +3903,7 @@ a.status-card.compact:hover {
.fa { .fa {
position: absolute; position: absolute;
top: 10px; top: 15px;
right: 10px; right: 10px;
z-index: 2; z-index: 2;
display: inline-block; display: inline-block;
@ -5473,8 +5465,8 @@ noscript {
} }
.column-inline-form { .column-inline-form {
padding: 7px 15px; padding: 15px;
padding-right: 5px; padding-right: 0;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
@ -5485,7 +5477,6 @@ noscript {
input { input {
width: 100%; width: 100%;
margin-bottom: 6px;
&:focus { &:focus {
outline: 0; outline: 0;
@ -5495,7 +5486,7 @@ noscript {
.icon-button { .icon-button {
flex: 0 0 auto; flex: 0 0 auto;
margin: 0 5px; margin: 0 10px;
} }
} }

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

@ -4,6 +4,10 @@
overflow: hidden; overflow: hidden;
margin-bottom: 10px; margin-bottom: 10px;
&--under-tabs {
border-radius: 0 0 4px 4px;
}
@media screen and (max-width: $no-gap-breakpoint) { @media screen and (max-width: $no-gap-breakpoint) {
margin-bottom: 0; margin-bottom: 0;
border-radius: 0; border-radius: 0;

2
app/views/accounts/show.html.haml
View file

@ -38,7 +38,7 @@
- elsif @statuses.empty? - elsif @statuses.empty?
= nothing_here 'nothing-here--under-tabs' = nothing_here 'nothing-here--under-tabs'
- else - else
.activity-stream .activity-stream.activity-stream--under-tabs
- if params[:page].to_i.zero? - if params[:page].to_i.zero?
= render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true } = render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true }