From 180f0e6715ded984d8f14dab49f4f3f44f03ec53 Mon Sep 17 00:00:00 2001 From: Claire Date: Sun, 2 Jul 2023 16:08:58 +0200 Subject: [PATCH 01/22] Fix inefficient query when requesting a new confirmation email from a logged-in account (#25669) --- .../auth/confirmations_controller.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 632b624a37..3c8d09993b 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -28,6 +28,24 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController resource.email = current_user.unconfirmed_email || current_user.email if user_signed_in? end + def create + # Since we don't allow users to request confirmation emails for other accounts when they + # are already logged in, so we can cut on the expensive queries by simply reusing the + # current user. + if user_signed_in? + self.resource = current_user + resource.send_confirmation_instructions + else + self.resource = current_user || User.send_confirmation_instructions(resource_params) + end + + if successfully_sent?(resource) + respond_with({}, location: after_resending_confirmation_instructions_path_for(resource_name)) + else + respond_with(resource) + end + end + def confirm_captcha check_captcha! do |message| flash.now[:alert] = message From 933ba1a3ebb3cd0ef9ac385ae277f6643480d7b2 Mon Sep 17 00:00:00 2001 From: Claire Date: Sun, 2 Jul 2023 16:56:16 +0200 Subject: [PATCH 02/22] Add superapp index on `oauth_applications` (#25670) --- .../20230702131023_add_superapp_index_to_applications.rb | 9 +++++++++ db/schema.rb | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20230702131023_add_superapp_index_to_applications.rb diff --git a/db/migrate/20230702131023_add_superapp_index_to_applications.rb b/db/migrate/20230702131023_add_superapp_index_to_applications.rb new file mode 100644 index 0000000000..f301127a3e --- /dev/null +++ b/db/migrate/20230702131023_add_superapp_index_to_applications.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddSuperappIndexToApplications < ActiveRecord::Migration[6.1] + disable_ddl_transaction! + + def change + add_index :oauth_applications, :superapp, where: 'superapp = true', algorithm: :concurrently + end +end diff --git a/db/schema.rb b/db/schema.rb index dbd792a617..de88cb9d23 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_06_30_145300) do +ActiveRecord::Schema.define(version: 2023_07_02_131023) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -700,6 +700,7 @@ ActiveRecord::Schema.define(version: 2023_06_30_145300) do t.bigint "owner_id" t.boolean "confidential", default: true, null: false t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type" + t.index ["superapp"], name: "index_oauth_applications_on_superapp", where: "(superapp = true)" t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true end From e6a8faae81e8dff3d1ef74d159d280c5ea762739 Mon Sep 17 00:00:00 2001 From: Claire Date: Sun, 2 Jul 2023 19:41:35 +0200 Subject: [PATCH 03/22] Add users index on unconfirmed_email (#25672) --- .../auth/confirmations_controller.rb | 18 ------------------ db/schema.rb | 3 ++- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 3c8d09993b..632b624a37 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -28,24 +28,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController resource.email = current_user.unconfirmed_email || current_user.email if user_signed_in? end - def create - # Since we don't allow users to request confirmation emails for other accounts when they - # are already logged in, so we can cut on the expensive queries by simply reusing the - # current user. - if user_signed_in? - self.resource = current_user - resource.send_confirmation_instructions - else - self.resource = current_user || User.send_confirmation_instructions(resource_params) - end - - if successfully_sent?(resource) - respond_with({}, location: after_resending_confirmation_instructions_path_for(resource_name)) - else - respond_with(resource) - end - end - def confirm_captcha check_captcha! do |message| flash.now[:alert] = message diff --git a/db/schema.rb b/db/schema.rb index de88cb9d23..64f1f93aaa 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_07_02_131023) do +ActiveRecord::Schema.define(version: 2023_07_02_151753) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1097,6 +1097,7 @@ ActiveRecord::Schema.define(version: 2023_07_02_131023) do t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, opclass: :text_pattern_ops, where: "(reset_password_token IS NOT NULL)" t.index ["role_id"], name: "index_users_on_role_id", where: "(role_id IS NOT NULL)" + t.index ["unconfirmed_email"], name: "index_users_on_unconfirmed_email", where: "(unconfirmed_email IS NOT NULL)" end create_table "web_push_subscriptions", force: :cascade do |t| From 54cb679c19728c27ff2ccb94a7fa70f44e07936c Mon Sep 17 00:00:00 2001 From: Trevor Wolf Date: Mon, 3 Jul 2023 19:32:31 +1000 Subject: [PATCH 04/22] Change button colors to increase hover/focus contrast and consistency (#25677) --- .../styles/mastodon-light/diff.scss | 33 ----------- .../styles/mastodon-light/variables.scss | 13 +++++ app/javascript/styles/mastodon/admin.scss | 13 +---- .../styles/mastodon/components.scss | 55 ++++++------------- app/javascript/styles/mastodon/dashboard.scss | 4 +- app/javascript/styles/mastodon/forms.scss | 15 ++--- app/javascript/styles/mastodon/variables.scss | 29 +++++++++- 7 files changed, 66 insertions(+), 96 deletions(-) diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index 91828d408a..9f33a5c9cc 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -5,19 +5,6 @@ html { scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25); } -// Change the colors of button texts -.button { - color: $white; - - &.button-alternative-2 { - color: $white; - } - - &.button-tertiary { - color: $highlight-text-color; - } -} - .simple_form .button.button-tertiary { color: $highlight-text-color; } @@ -436,26 +423,6 @@ html { color: $white; } -.button.button-tertiary { - &:hover, - &:focus, - &:active { - color: $white; - } -} - -.button.button-secondary { - border-color: $darker-text-color; - color: $darker-text-color; - - &:hover, - &:focus, - &:active { - border-color: darken($darker-text-color, 8%); - color: darken($darker-text-color, 8%); - } -} - .flash-message.warning { color: lighten($gold-star, 16%); } diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss index cae065878c..250e200fc6 100644 --- a/app/javascript/styles/mastodon-light/variables.scss +++ b/app/javascript/styles/mastodon-light/variables.scss @@ -7,6 +7,12 @@ $classic-primary-color: #9baec8; $classic-secondary-color: #d9e1e8; $classic-highlight-color: #6364ff; +$blurple-600: #563acc; // Iris +$blurple-500: #6364ff; // Brand purple +$blurple-300: #858afa; // Faded Blue +$grey-600: #4e4c5a; // Trout +$grey-100: #dadaf3; // Topaz + // Differences $success-green: lighten(#3c754d, 8%); @@ -19,6 +25,13 @@ $ui-primary-color: #9bcbed; $ui-secondary-color: $classic-base-color !default; $ui-highlight-color: $classic-highlight-color !default; +$ui-button-secondary-color: $grey-600 !default; +$ui-button-secondary-border-color: $grey-600 !default; +$ui-button-secondary-focus-color: $white !default; + +$ui-button-tertiary-color: $blurple-500 !default; +$ui-button-tertiary-border-color: $blurple-500 !default; + $primary-text-color: $black !default; $darker-text-color: $classic-base-color !default; $highlight-text-color: darken($ui-highlight-color, 8%) !default; diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 376cffe48a..bbb6ffdff7 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -128,7 +128,6 @@ $content-width: 840px; } &.selected { - background: darken($ui-base-color, 2%); border-radius: 4px 0 0; } } @@ -146,13 +145,9 @@ $content-width: 840px; .simple-navigation-active-leaf a { color: $primary-text-color; - background-color: darken($ui-highlight-color, 2%); + background-color: $ui-highlight-color; border-bottom: 0; border-radius: 0; - - &:hover { - background-color: $ui-highlight-color; - } } } @@ -246,12 +241,6 @@ $content-width: 840px; font-weight: 700; color: $primary-text-color; background: $ui-highlight-color; - - &:hover, - &:focus, - &:active { - background: lighten($ui-highlight-color, 4%); - } } } } diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 3bf0b10edb..43c9255d9e 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -47,11 +47,11 @@ } .button { - background-color: darken($ui-highlight-color, 2%); + background-color: $ui-button-background-color; border: 10px none; border-radius: 4px; box-sizing: border-box; - color: $primary-text-color; + color: $ui-button-color; cursor: pointer; display: inline-block; font-family: inherit; @@ -71,14 +71,14 @@ &:active, &:focus, &:hover { - background-color: $ui-highlight-color; + background-color: $ui-button-focus-background-color; } &--destructive { &:active, &:focus, &:hover { - background-color: $error-red; + background-color: $ui-button-destructive-focus-background-color; transition: none; } } @@ -108,39 +108,18 @@ outline: 0 !important; } - &.button-alternative { - color: $inverted-text-color; - background: $ui-primary-color; - - &:active, - &:focus, - &:hover { - background-color: lighten($ui-primary-color, 4%); - } - } - - &.button-alternative-2 { - background: $ui-base-lighter-color; - - &:active, - &:focus, - &:hover { - background-color: lighten($ui-base-lighter-color, 4%); - } - } - &.button-secondary { - color: $darker-text-color; + color: $ui-button-secondary-color; background: transparent; padding: 6px 17px; - border: 1px solid lighten($ui-base-color, 12%); + border: 1px solid $ui-button-secondary-border-color; &:active, &:focus, &:hover { - background: lighten($ui-base-color, 4%); - border-color: lighten($ui-base-color, 16%); - color: lighten($darker-text-color, 4%); + border-color: $ui-button-secondary-focus-background-color; + color: $ui-button-secondary-focus-color; + background-color: $ui-button-secondary-focus-background-color; text-decoration: none; } @@ -152,14 +131,14 @@ &.button-tertiary { background: transparent; padding: 6px 17px; - color: $highlight-text-color; - border: 1px solid $highlight-text-color; + color: $ui-button-tertiary-color; + border: 1px solid $ui-button-tertiary-border-color; &:active, &:focus, &:hover { - background: $ui-highlight-color; - color: $primary-text-color; + background-color: $ui-button-tertiary-focus-background-color; + color: $ui-button-tertiary-focus-color; border: 0; padding: 7px 18px; } @@ -5810,15 +5789,15 @@ a.status-card.compact:hover { } .button.button-secondary { - border-color: $inverted-text-color; - color: $inverted-text-color; + border-color: $ui-button-secondary-border-color; + color: $ui-button-secondary-color; flex: 0 0 auto; &:hover, &:focus, &:active { - border-color: lighten($inverted-text-color, 15%); - color: lighten($inverted-text-color, 15%); + border-color: $ui-button-secondary-focus-background-color; + color: $ui-button-secondary-focus-color; } } diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss index bc34c6ec0a..36a7f44253 100644 --- a/app/javascript/styles/mastodon/dashboard.scss +++ b/app/javascript/styles/mastodon/dashboard.scss @@ -81,7 +81,7 @@ display: flex; align-items: baseline; border-radius: 4px; - background: darken($ui-highlight-color, 2%); + background: $ui-button-background-color; color: $primary-text-color; transition: all 100ms ease-in; font-size: 14px; @@ -94,7 +94,7 @@ &:active, &:focus, &:hover { - background-color: $ui-highlight-color; + background-color: $ui-button-focus-background-color; transition: all 200ms ease-out; } diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index 81a656a602..f69b699a0a 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -511,8 +511,8 @@ code { width: 100%; border: 0; border-radius: 4px; - background: darken($ui-highlight-color, 2%); - color: $primary-text-color; + background: $ui-button-background-color; + color: $ui-button-color; font-size: 18px; line-height: inherit; height: auto; @@ -534,7 +534,7 @@ code { &:active, &:focus, &:hover { - background-color: $ui-highlight-color; + background-color: $ui-button-focus-background-color; } &:disabled:hover { @@ -542,15 +542,12 @@ code { } &.negative { - background: $error-value-color; - - &:hover { - background-color: lighten($error-value-color, 5%); - } + background: $ui-button-destructive-background-color; + &:hover, &:active, &:focus { - background-color: darken($error-value-color, 5%); + background-color: $ui-button-destructive-focus-background-color; } } } diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss index d6dda1b3c7..3e1f24c490 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss @@ -1,8 +1,16 @@ // Commonly used web colors $black: #000000; // Black $white: #ffffff; // White +$red-600: #b7253d !default; // Deep Carmine +$red-500: #df405a !default; // Cerise +$blurple-600: #563acc; // Iris +$blurple-500: #6364ff; // Brand purple +$blurple-300: #858afa; // Faded Blue +$grey-600: #4e4c5a; // Trout +$grey-100: #dadaf3; // Topaz + $success-green: #79bd9a !default; // Padua -$error-red: #df405a !default; // Cerise +$error-red: $red-500 !default; // Cerise $warning-red: #ff5050 !default; // Sunset Orange $gold-star: #ca8f04 !default; // Dark Goldenrod @@ -31,6 +39,22 @@ $ui-base-lighter-color: lighten( $ui-primary-color: $classic-primary-color !default; // Lighter $ui-secondary-color: $classic-secondary-color !default; // Lightest $ui-highlight-color: $classic-highlight-color !default; +$ui-button-color: $white !default; +$ui-button-background-color: $blurple-500 !default; +$ui-button-focus-background-color: $blurple-600 !default; + +$ui-button-secondary-color: $grey-100 !default; +$ui-button-secondary-border-color: $grey-100 !default; +$ui-button-secondary-focus-background-color: $grey-600 !default; +$ui-button-secondary-focus-color: $white !default; + +$ui-button-tertiary-color: $blurple-300 !default; +$ui-button-tertiary-border-color: $blurple-300 !default; +$ui-button-tertiary-focus-background-color: $blurple-600 !default; +$ui-button-tertiary-focus-color: $white !default; + +$ui-button-destructive-background-color: $red-500 !default; +$ui-button-destructive-focus-background-color: $red-600 !default; // Variables for texts $primary-text-color: $white !default; @@ -38,7 +62,8 @@ $darker-text-color: $ui-primary-color !default; $dark-text-color: $ui-base-lighter-color !default; $secondary-text-color: $ui-secondary-color !default; $highlight-text-color: lighten($ui-highlight-color, 8%) !default; -$action-button-color: $ui-base-lighter-color !default; +$action-button-color: $ui-base-color !default; +$action-button-focus-color: $ui-base-color !default; $passive-text-color: $gold-star !default; $active-passive-text-color: $success-green !default; From 69e124e2edfc6c3b73054266257b669aa2d2446b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 3 Jul 2023 16:51:04 +0200 Subject: [PATCH 05/22] Fix regression of icon button colors in web UI (#25679) --- app/javascript/styles/mastodon/variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss index 3e1f24c490..68db9d5fc0 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss @@ -62,8 +62,8 @@ $darker-text-color: $ui-primary-color !default; $dark-text-color: $ui-base-lighter-color !default; $secondary-text-color: $ui-secondary-color !default; $highlight-text-color: lighten($ui-highlight-color, 8%) !default; -$action-button-color: $ui-base-color !default; -$action-button-focus-color: $ui-base-color !default; +$action-button-color: $ui-base-lighter-color !default; +$action-button-focus-color: lighten($ui-base-lighter-color, 4%) !default; $passive-text-color: $gold-star !default; $active-passive-text-color: $success-green !default; From 383c00819cce101673f6c6ede08098336024ee70 Mon Sep 17 00:00:00 2001 From: Daniel M Brasil Date: Mon, 3 Jul 2023 13:06:57 -0300 Subject: [PATCH 06/22] Fix `/api/v2/search` not working with following query param (#25681) --- app/controllers/api/v2/search_controller.rb | 4 +-- app/services/search_service.rb | 16 +++++---- .../api/v2/search_controller_spec.rb | 33 +++++++++++++++++-- spec/services/search_service_spec.rb | 2 +- 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb index 4d20aeb10f..35be549305 100644 --- a/app/controllers/api/v2/search_controller.rb +++ b/app/controllers/api/v2/search_controller.rb @@ -34,11 +34,11 @@ class Api::V2::SearchController < Api::BaseController params[:q], current_account, limit_param(RESULTS_LIMIT), - search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed)) + search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed), following: truthy_param?(:following)) ) end def search_params - params.permit(:type, :offset, :min_id, :max_id, :account_id) + params.permit(:type, :offset, :min_id, :max_id, :account_id, :following) end end diff --git a/app/services/search_service.rb b/app/services/search_service.rb index dad8c0b28f..05d2d0e7ce 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -2,12 +2,13 @@ class SearchService < BaseService def call(query, account, limit, options = {}) - @query = query&.strip - @account = account - @options = options - @limit = limit.to_i - @offset = options[:type].blank? ? 0 : options[:offset].to_i - @resolve = options[:resolve] || false + @query = query&.strip + @account = account + @options = options + @limit = limit.to_i + @offset = options[:type].blank? ? 0 : options[:offset].to_i + @resolve = options[:resolve] || false + @following = options[:following] || false default_results.tap do |results| next if @query.blank? || @limit.zero? @@ -31,7 +32,8 @@ class SearchService < BaseService limit: @limit, resolve: @resolve, offset: @offset, - use_searchable_text: true + use_searchable_text: true, + following: @following ) end diff --git a/spec/controllers/api/v2/search_controller_spec.rb b/spec/controllers/api/v2/search_controller_spec.rb index bfabe8cc17..a3b92fc37a 100644 --- a/spec/controllers/api/v2/search_controller_spec.rb +++ b/spec/controllers/api/v2/search_controller_spec.rb @@ -14,13 +14,40 @@ RSpec.describe Api::V2::SearchController do end describe 'GET #index' do - before do - get :index, params: { q: 'test' } - end + let!(:bob) { Fabricate(:account, username: 'bob_test') } + let!(:ana) { Fabricate(:account, username: 'ana_test') } + let!(:tom) { Fabricate(:account, username: 'tom_test') } + let(:params) { { q: 'test' } } it 'returns http success' do + get :index, params: params + expect(response).to have_http_status(200) end + + context 'when searching accounts' do + let(:params) { { q: 'test', type: 'accounts' } } + + it 'returns all matching accounts' do + get :index, params: params + + expect(body_as_json[:accounts].pluck(:id)).to contain_exactly(bob.id.to_s, ana.id.to_s, tom.id.to_s) + end + + context 'with following=true' do + let(:params) { { q: 'test', type: 'accounts', following: 'true' } } + + before do + user.account.follow!(ana) + end + + it 'returns only the followed accounts' do + get :index, params: params + + expect(body_as_json[:accounts].pluck(:id)).to contain_exactly(ana.id.to_s) + end + end + end end end diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb index 3bf7f8ce9f..497ec74474 100644 --- a/spec/services/search_service_spec.rb +++ b/spec/services/search_service_spec.rb @@ -68,7 +68,7 @@ describe SearchService, type: :service do allow(AccountSearchService).to receive(:new).and_return(service) results = subject.call(query, nil, 10) - expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false, use_searchable_text: true) + expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false, use_searchable_text: true, following: false) expect(results).to eq empty_results.merge(accounts: [account]) end end From 54a10523e2c452a0d356d70507729c67b3436e0d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 3 Jul 2023 22:57:18 +0200 Subject: [PATCH 07/22] Change labels of live feeds tabs in web UI (#25683) --- .../mastodon/features/firehose/index.jsx | 25 ++++++++++--------- .../features/public_timeline/index.jsx | 3 ++- app/javascript/mastodon/locales/en.json | 6 ++--- config/routes.rb | 1 + 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx index e8e399f787..4602213a61 100644 --- a/app/javascript/mastodon/features/firehose/index.jsx +++ b/app/javascript/mastodon/features/firehose/index.jsx @@ -135,12 +135,13 @@ const Firehose = ({ feedType, multiColumn }) => { /> ) : ( - - - + + + ); const emptyMessage = feedType === 'community' ? ( @@ -149,10 +150,10 @@ const Firehose = ({ feedType, multiColumn }) => { defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' /> ) : ( - + ); return ( @@ -171,11 +172,11 @@ const Firehose = ({ feedType, multiColumn }) => {
- + - + diff --git a/app/javascript/mastodon/features/public_timeline/index.jsx b/app/javascript/mastodon/features/public_timeline/index.jsx index d77b76a63e..352baa8336 100644 --- a/app/javascript/mastodon/features/public_timeline/index.jsx +++ b/app/javascript/mastodon/features/public_timeline/index.jsx @@ -8,6 +8,7 @@ import { Helmet } from 'react-helmet'; import { connect } from 'react-redux'; import DismissableBanner from 'mastodon/components/dismissable_banner'; +import { domain } from 'mastodon/initial_state'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { connectPublicStream } from '../../actions/streaming'; @@ -143,7 +144,7 @@ class PublicTimeline extends PureComponent { } + prepend={} timelineId={`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`} onLoadMore={this.handleLoadMore} trackScroll={!pinned} diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index f1617a2040..b33c8e677e 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -202,7 +202,7 @@ "dismissable_banner.explore_links": "These are news stories being shared the most on the social web today. Newer news stories posted by more different people are ranked higher.", "dismissable_banner.explore_statuses": "These are posts from across the social web that are gaining traction today. Newer posts with more boosts and favourites are ranked higher.", "dismissable_banner.explore_tags": "These are hashtags that are gaining traction on the social web today. Hashtags that are used by more different people are ranked higher.", - "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.", + "dismissable_banner.public_timeline": "These are the most recent public posts from people on the social web that people on {domain} follow.", "embed.instructions": "Embed this post on your website by copying the code below.", "embed.preview": "Here is what it will look like:", "emoji_button.activity": "Activity", @@ -269,8 +269,8 @@ "filter_modal.select_filter.title": "Filter this post", "filter_modal.title.status": "Filter a post", "firehose.all": "All", - "firehose.local": "Local", - "firehose.remote": "Remote", + "firehose.local": "This server", + "firehose.remote": "Other servers", "follow_request.authorize": "Authorize", "follow_request.reject": "Reject", "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.", diff --git a/config/routes.rb b/config/routes.rb index feb24bdd2a..fa72d8b065 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,6 +12,7 @@ Rails.application.routes.draw do /home /public /public/local + /public/remote /conversations /lists/(*any) /notifications From d9a5c1acfaea82570f2990ad2fc234eba6f57c60 Mon Sep 17 00:00:00 2001 From: forsamori Date: Mon, 3 Jul 2023 21:58:10 +0100 Subject: [PATCH 08/22] Add at-symbol prepended to mention span title (#25684) Co-authored-by: Sam BC --- app/javascript/mastodon/components/status_content.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx index 3b3a191d6c..688a456319 100644 --- a/app/javascript/mastodon/components/status_content.jsx +++ b/app/javascript/mastodon/components/status_content.jsx @@ -104,7 +104,7 @@ class StatusContent extends PureComponent { if (mention) { link.addEventListener('click', this.onMentionClick.bind(this, mention), false); - link.setAttribute('title', mention.get('acct')); + link.setAttribute('title', `@${mention.get('acct')}`); link.setAttribute('href', `/@${mention.get('acct')}`); } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) { link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false); From 6268188543ff685e943d65e3d1f335d9d3260658 Mon Sep 17 00:00:00 2001 From: mogaminsk Date: Tue, 4 Jul 2023 07:37:57 +0900 Subject: [PATCH 09/22] Fix local live feeds does not expand (#25694) --- app/javascript/mastodon/features/firehose/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx index 4602213a61..9ba4fd5b2b 100644 --- a/app/javascript/mastodon/features/firehose/index.jsx +++ b/app/javascript/mastodon/features/firehose/index.jsx @@ -84,7 +84,7 @@ const Firehose = ({ feedType, multiColumn }) => { (maxId) => { switch(feedType) { case 'community': - dispatch(expandCommunityTimeline({ onlyMedia })); + dispatch(expandCommunityTimeline({ maxId, onlyMedia })); break; case 'public': dispatch(expandPublicTimeline({ maxId, onlyMedia })); From 12fa24a885f131fb2cc071dbc41c2984678316ae Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 4 Jul 2023 11:25:29 +0200 Subject: [PATCH 10/22] Fix forgotten unconfirmed_email migration file (#25702) --- ...20230702151753_add_index_user_on_unconfirmed_email.rb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 db/migrate/20230702151753_add_index_user_on_unconfirmed_email.rb diff --git a/db/migrate/20230702151753_add_index_user_on_unconfirmed_email.rb b/db/migrate/20230702151753_add_index_user_on_unconfirmed_email.rb new file mode 100644 index 0000000000..a935463eaa --- /dev/null +++ b/db/migrate/20230702151753_add_index_user_on_unconfirmed_email.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddIndexUserOnUnconfirmedEmail < ActiveRecord::Migration[6.1] + disable_ddl_transaction! + + def change + add_index :users, :unconfirmed_email, where: 'unconfirmed_email IS NOT NULL', algorithm: :concurrently + end +end From 182fd93a076592634d909cca1267cd25c6f87c29 Mon Sep 17 00:00:00 2001 From: Trevor Wolf Date: Tue, 4 Jul 2023 22:57:46 +1000 Subject: [PATCH 11/22] fix read more button overlapping thread line bug (#25706) --- app/javascript/styles/mastodon/components.scss | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 43c9255d9e..e66f8bdfe6 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1127,6 +1127,8 @@ body > [data-popper-placement] { } &--in-thread { + $thread-margin: 46px + 10px; + border-bottom: 0; .status__content, @@ -1137,8 +1139,12 @@ body > [data-popper-placement] { .attachment-list, .picture-in-picture-placeholder, .status-card { - margin-inline-start: 46px + 10px; - width: calc(100% - (46px + 10px)); + margin-inline-start: $thread-margin; + width: calc(100% - ($thread-margin)); + } + + .status__content__read-more-button { + margin-inline-start: $thread-margin; } } From 4658263b4adeafa337d31fe93339fc809ce62e26 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 4 Jul 2023 18:36:24 +0200 Subject: [PATCH 12/22] Fix re-activated accounts being deleted by AccountDeletionWorker (#25711) --- app/workers/account_deletion_worker.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/workers/account_deletion_worker.rb b/app/workers/account_deletion_worker.rb index fdf013e010..b501511728 100644 --- a/app/workers/account_deletion_worker.rb +++ b/app/workers/account_deletion_worker.rb @@ -6,9 +6,12 @@ class AccountDeletionWorker sidekiq_options queue: 'pull', lock: :until_executed def perform(account_id, options = {}) + account = Account.find(account_id) + return unless account.suspended? + reserve_username = options.with_indifferent_access.fetch(:reserve_username, true) skip_activitypub = options.with_indifferent_access.fetch(:skip_activitypub, false) - DeleteAccountService.new.call(Account.find(account_id), reserve_username: reserve_username, skip_activitypub: skip_activitypub, reserve_email: false) + DeleteAccountService.new.call(account, reserve_username: reserve_username, skip_activitypub: skip_activitypub, reserve_email: false) rescue ActiveRecord::RecordNotFound true end From eb2417ce99ef99b7430d45b6936cf572bac172d4 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 4 Jul 2023 18:58:23 +0200 Subject: [PATCH 13/22] Fix OAuth apps page crashing when listing apps with certain admin API scopes (#25713) --- app/lib/scope_parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/scope_parser.rb b/app/lib/scope_parser.rb index d268688c83..45eb3c7b93 100644 --- a/app/lib/scope_parser.rb +++ b/app/lib/scope_parser.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class ScopeParser < Parslet::Parser - rule(:term) { match('[a-z]').repeat(1).as(:term) } + rule(:term) { match('[a-z_]').repeat(1).as(:term) } rule(:colon) { str(':') } rule(:access) { (str('write') | str('read')).as(:access) } rule(:namespace) { str('admin').as(:namespace) } From b7910bc7512b8c08e6d4e8233e0d90aab0c7f35d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 5 Jul 2023 10:32:04 +0200 Subject: [PATCH 14/22] Add button to see results for polls in web UI (#25726) --- app/javascript/mastodon/components/poll.jsx | 13 +++++++++---- app/javascript/mastodon/locales/en.json | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx index dfc4034fa3..4304f9acd4 100644 --- a/app/javascript/mastodon/components/poll.jsx +++ b/app/javascript/mastodon/components/poll.jsx @@ -130,6 +130,10 @@ class Poll extends ImmutablePureComponent { this.props.refresh(); }; + handleReveal = () => { + this.setState({ revealed: true }); + } + renderOption (option, optionIndex, showResults) { const { poll, lang, disabled, intl } = this.props; const pollVotesCount = poll.get('voters_count') || poll.get('votes_count'); @@ -205,14 +209,14 @@ class Poll extends ImmutablePureComponent { render () { const { poll, intl } = this.props; - const { expired } = this.state; + const { revealed, expired } = this.state; if (!poll) { return null; } const timeRemaining = expired ? intl.formatMessage(messages.closed) : ; - const showResults = poll.get('voted') || expired; + const showResults = poll.get('voted') || revealed || expired; const disabled = this.props.disabled || Object.entries(this.state.selected).every(item => !item); let votesCount = null; @@ -231,9 +235,10 @@ class Poll extends ImmutablePureComponent {
{!showResults && } - {showResults && !this.props.disabled && · } + {!showResults && <> · } + {showResults && !this.props.disabled && <> · } {votesCount} - {poll.get('expires_at') && · {timeRemaining}} + {poll.get('expires_at') && <> · {timeRemaining}}
); diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index b33c8e677e..2afac7e7e8 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -487,6 +487,7 @@ "picture_in_picture.restore": "Put it back", "poll.closed": "Closed", "poll.refresh": "Refresh", + "poll.reveal": "See results", "poll.total_people": "{count, plural, one {# person} other {# people}}", "poll.total_votes": "{count, plural, one {# vote} other {# votes}}", "poll.vote": "Vote", From 000b8358034106c63fc69f4deeac8a6fb7b51f92 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 5 Jul 2023 11:25:27 +0200 Subject: [PATCH 15/22] Add canonical link tags in web UI (#25715) --- app/javascript/mastodon/features/account/components/header.jsx | 1 + app/javascript/mastodon/features/status/index.jsx | 1 + 2 files changed, 2 insertions(+) diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx index 5eea1abf04..b718e860d0 100644 --- a/app/javascript/mastodon/features/account/components/header.jsx +++ b/app/javascript/mastodon/features/account/components/header.jsx @@ -476,6 +476,7 @@ class Header extends ImmutablePureComponent { {titleFromAccount(account)} +
); diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx index 892cfbb7b3..e5faba0839 100644 --- a/app/javascript/mastodon/features/status/index.jsx +++ b/app/javascript/mastodon/features/status/index.jsx @@ -713,6 +713,7 @@ class Status extends ImmutablePureComponent { {titleFromStatus(intl, status)} + ); From 0a5271629c451795ce885c01c668f0d64e6675c2 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 3 Jul 2023 22:57:18 +0200 Subject: [PATCH 16/22] [Glitch] Change labels of live feeds tabs in web UI Port 54a10523e2c452a0d356d70507729c67b3436e0d to glitch-soc Signed-off-by: Claire --- .../glitch/features/firehose/index.jsx | 25 ++++++++++--------- .../glitch/features/public_timeline/index.jsx | 3 ++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx index ae71ba1764..2fc544a1f1 100644 --- a/app/javascript/flavours/glitch/features/firehose/index.jsx +++ b/app/javascript/flavours/glitch/features/firehose/index.jsx @@ -154,12 +154,13 @@ const Firehose = ({ feedType, multiColumn }) => { /> ) : ( - - - + + + ); const emptyMessage = feedType === 'community' ? ( @@ -168,10 +169,10 @@ const Firehose = ({ feedType, multiColumn }) => { defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' /> ) : ( - + ); return ( @@ -190,11 +191,11 @@ const Firehose = ({ feedType, multiColumn }) => {
- + - + diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.jsx b/app/javascript/flavours/glitch/features/public_timeline/index.jsx index 4e4b350f8b..c1e49e6ef3 100644 --- a/app/javascript/flavours/glitch/features/public_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/public_timeline/index.jsx @@ -13,6 +13,7 @@ import { expandPublicTimeline } from 'flavours/glitch/actions/timelines'; import Column from 'flavours/glitch/components/column'; import ColumnHeader from 'flavours/glitch/components/column_header'; import DismissableBanner from 'flavours/glitch/components/dismissable_banner'; +import { domain } from 'flavours/glitch/initial_state'; import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container'; import ColumnSettingsContainer from './containers/column_settings_container'; @@ -147,7 +148,7 @@ class PublicTimeline extends PureComponent { } + prepend={} timelineId={`public${onlyRemote ? ':remote' : (allowLocalOnly ? ':allow_local_only' : '')}${onlyMedia ? ':media' : ''}`} onLoadMore={this.handleLoadMore} trackScroll={!pinned} From ac74374311badec585ffbbee58c016fe1815cc17 Mon Sep 17 00:00:00 2001 From: forsamori Date: Mon, 3 Jul 2023 21:58:10 +0100 Subject: [PATCH 17/22] [Glitch] Add at-symbol prepended to mention span title Port d9a5c1acfaea82570f2990ad2fc234eba6f57c60 to glitch-soc Co-authored-by: Sam BC Signed-off-by: Claire --- app/javascript/flavours/glitch/components/status_content.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/components/status_content.jsx b/app/javascript/flavours/glitch/components/status_content.jsx index 9b1e2e0265..955bf661ca 100644 --- a/app/javascript/flavours/glitch/components/status_content.jsx +++ b/app/javascript/flavours/glitch/components/status_content.jsx @@ -163,7 +163,7 @@ class StatusContent extends PureComponent { if (mention) { link.addEventListener('click', this.onMentionClick.bind(this, mention), false); - link.setAttribute('title', mention.get('acct')); + link.setAttribute('title', `@${mention.get('acct')}`); if (rewriteMentions !== 'no') { while (link.firstChild) link.removeChild(link.firstChild); link.appendChild(document.createTextNode('@')); From c6246807f599b24e810f5cf04ef90073c7e6668b Mon Sep 17 00:00:00 2001 From: mogaminsk Date: Tue, 4 Jul 2023 07:37:57 +0900 Subject: [PATCH 18/22] [Glitch] Fix local live feeds does not expand Port 6268188543ff685e943d65e3d1f335d9d3260658 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/features/firehose/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx index 2fc544a1f1..53a39eb63d 100644 --- a/app/javascript/flavours/glitch/features/firehose/index.jsx +++ b/app/javascript/flavours/glitch/features/firehose/index.jsx @@ -103,7 +103,7 @@ const Firehose = ({ feedType, multiColumn }) => { (maxId) => { switch(feedType) { case 'community': - dispatch(expandCommunityTimeline({ onlyMedia })); + dispatch(expandCommunityTimeline({ maxId, onlyMedia })); break; case 'public': dispatch(expandPublicTimeline({ maxId, onlyMedia, allowLocalOnly })); From b3f209370bfbf78dd2e21a36b145a5cce0005f2b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 5 Jul 2023 11:25:27 +0200 Subject: [PATCH 19/22] [Glitch] Add canonical link tags in web UI Port 000b8358034106c63fc69f4deeac8a6fb7b51f92 to glitch-soc Signed-off-by: Claire --- .../flavours/glitch/features/account/components/header.jsx | 1 + app/javascript/flavours/glitch/features/status/index.jsx | 1 + 2 files changed, 2 insertions(+) diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx index ca2eb37eb1..0c440dc8a3 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.jsx +++ b/app/javascript/flavours/glitch/features/account/components/header.jsx @@ -398,6 +398,7 @@ class Header extends ImmutablePureComponent { {titleFromAccount(account)} +
); diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx index 20dc85e264..0c2536f2ad 100644 --- a/app/javascript/flavours/glitch/features/status/index.jsx +++ b/app/javascript/flavours/glitch/features/status/index.jsx @@ -754,6 +754,7 @@ class Status extends ImmutablePureComponent { {titleFromStatus(intl, status)} + ); From a117c953d00848b0a4877a7f00400caba29cc0f3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 5 Jul 2023 10:32:04 +0200 Subject: [PATCH 20/22] [Glitch] Add button to see results for polls in web UI Port b7910bc7512b8c08e6d4e8233e0d90aab0c7f35d to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/components/poll.jsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/javascript/flavours/glitch/components/poll.jsx b/app/javascript/flavours/glitch/components/poll.jsx index eca7b5c525..623d343806 100644 --- a/app/javascript/flavours/glitch/components/poll.jsx +++ b/app/javascript/flavours/glitch/components/poll.jsx @@ -131,6 +131,10 @@ class Poll extends ImmutablePureComponent { this.props.refresh(); }; + handleReveal = () => { + this.setState({ revealed: true }); + } + renderOption (option, optionIndex, showResults) { const { poll, lang, disabled, intl } = this.props; const pollVotesCount = poll.get('voters_count') || poll.get('votes_count'); @@ -206,14 +210,14 @@ class Poll extends ImmutablePureComponent { render () { const { poll, intl } = this.props; - const { expired } = this.state; + const { revealed, expired } = this.state; if (!poll) { return null; } const timeRemaining = expired ? intl.formatMessage(messages.closed) : ; - const showResults = poll.get('voted') || expired; + const showResults = poll.get('voted') || revealed || expired; const disabled = this.props.disabled || Object.entries(this.state.selected).every(item => !item); let votesCount = null; @@ -232,9 +236,10 @@ class Poll extends ImmutablePureComponent {
{!showResults && } - {showResults && !this.props.disabled && · } + {!showResults && <> · } + {showResults && !this.props.disabled && <> · } {votesCount} - {poll.get('expires_at') && · {timeRemaining}} + {poll.get('expires_at') && <> · {timeRemaining}}
); From 4719d881173a84d8bcd762f64b65668bf161136e Mon Sep 17 00:00:00 2001 From: Trevor Wolf Date: Mon, 3 Jul 2023 19:32:31 +1000 Subject: [PATCH 21/22] [Glitch] Change button colors to increase hover/focus contrast and consistency Port 54cb679c19728c27ff2ccb94a7fa70f44e07936c to glitch-soc Signed-off-by: Claire --- .../flavours/glitch/styles/admin.scss | 13 +---- .../glitch/styles/components/misc.scss | 47 +++++-------------- .../glitch/styles/components/modal.scss | 8 ++-- .../flavours/glitch/styles/dashboard.scss | 4 +- .../flavours/glitch/styles/forms.scss | 15 +++--- .../glitch/styles/mastodon-light/diff.scss | 33 ------------- .../styles/mastodon-light/variables.scss | 13 +++++ .../flavours/glitch/styles/variables.scss | 35 ++++++++++++-- 8 files changed, 69 insertions(+), 99 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index a57e014e9e..7adeaeee01 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -128,7 +128,6 @@ $content-width: 840px; } &.selected { - background: darken($ui-base-color, 2%); border-radius: 4px 0 0; } } @@ -146,13 +145,9 @@ $content-width: 840px; .simple-navigation-active-leaf a { color: $primary-text-color; - background-color: darken($ui-highlight-color, 2%); + background-color: $ui-highlight-color; border-bottom: 0; border-radius: 0; - - &:hover { - background-color: $ui-highlight-color; - } } } @@ -246,12 +241,6 @@ $content-width: 840px; font-weight: 700; color: $primary-text-color; background: $ui-highlight-color; - - &:hover, - &:focus, - &:active { - background: lighten($ui-highlight-color, 4%); - } } } } diff --git a/app/javascript/flavours/glitch/styles/components/misc.scss b/app/javascript/flavours/glitch/styles/components/misc.scss index 208204021a..c8c227e0cb 100644 --- a/app/javascript/flavours/glitch/styles/components/misc.scss +++ b/app/javascript/flavours/glitch/styles/components/misc.scss @@ -38,11 +38,11 @@ } .button { - background-color: darken($ui-highlight-color, 3%); + background-color: $ui-button-background-color; border: 10px none; border-radius: 4px; box-sizing: border-box; - color: $primary-text-color; + color: $ui-button-color; cursor: pointer; display: inline-block; font-family: inherit; @@ -62,14 +62,14 @@ &:active, &:focus, &:hover { - background-color: $ui-highlight-color; + background-color: $ui-button-focus-background-color; } &--destructive { &:active, &:focus, &:hover { - background-color: $error-red; + background-color: $ui-button-destructive-focus-background-color; transition: none; } } @@ -79,43 +79,22 @@ cursor: default; } - &.button-alternative { - color: $inverted-text-color; - background: $ui-primary-color; - - &:active, - &:focus, - &:hover { - background-color: lighten($ui-primary-color, 4%); - } - } - - &.button-alternative-2 { - background: $ui-base-lighter-color; - - &:active, - &:focus, - &:hover { - background-color: lighten($ui-base-lighter-color, 4%); - } - } - &.button-secondary { font-size: 16px; line-height: 36px; height: auto; - color: $darker-text-color; + color: $ui-button-secondary-color; text-transform: none; background: transparent; padding: 6px 17px; - border: 1px solid lighten($ui-base-color, 12%); + border: 1px solid $ui-button-secondary-border-color; &:active, &:focus, &:hover { - background: lighten($ui-base-color, 4%); - border-color: lighten($ui-base-color, 16%); - color: lighten($darker-text-color, 4%); + border-color: $ui-button-secondary-focus-background-color; + color: $ui-button-secondary-focus-color; + background-color: $ui-button-secondary-focus-background-color; text-decoration: none; } @@ -127,14 +106,14 @@ &.button-tertiary { background: transparent; padding: 6px 17px; - color: $highlight-text-color; - border: 1px solid $highlight-text-color; + color: $ui-button-tertiary-color; + border: 1px solid $ui-button-tertiary-border-color; &:active, &:focus, &:hover { - background: $ui-highlight-color; - color: $primary-text-color; + background-color: $ui-button-tertiary-focus-background-color; + color: $ui-button-tertiary-focus-color; border: 0; padding: 7px 18px; } diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss index c68c5fc53d..9c4149fb95 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss @@ -718,15 +718,15 @@ } .button.button-secondary { - border-color: $inverted-text-color; - color: $inverted-text-color; + border-color: $ui-button-secondary-border-color; + color: $ui-button-secondary-color; flex: 0 0 auto; &:hover, &:focus, &:active { - border-color: lighten($inverted-text-color, 15%); - color: lighten($inverted-text-color, 15%); + border-color: $ui-button-secondary-focus-background-color; + color: $ui-button-secondary-focus-color; } } diff --git a/app/javascript/flavours/glitch/styles/dashboard.scss b/app/javascript/flavours/glitch/styles/dashboard.scss index bc34c6ec0a..36a7f44253 100644 --- a/app/javascript/flavours/glitch/styles/dashboard.scss +++ b/app/javascript/flavours/glitch/styles/dashboard.scss @@ -81,7 +81,7 @@ display: flex; align-items: baseline; border-radius: 4px; - background: darken($ui-highlight-color, 2%); + background: $ui-button-background-color; color: $primary-text-color; transition: all 100ms ease-in; font-size: 14px; @@ -94,7 +94,7 @@ &:active, &:focus, &:hover { - background-color: $ui-highlight-color; + background-color: $ui-button-focus-background-color; transition: all 200ms ease-out; } diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss index 81f42af145..850374f613 100644 --- a/app/javascript/flavours/glitch/styles/forms.scss +++ b/app/javascript/flavours/glitch/styles/forms.scss @@ -512,8 +512,8 @@ code { width: 100%; border: 0; border-radius: 4px; - background: darken($ui-highlight-color, 2%); - color: $primary-text-color; + background: $ui-button-background-color; + color: $ui-button-color; font-size: 18px; line-height: inherit; height: auto; @@ -535,7 +535,7 @@ code { &:active, &:focus, &:hover { - background-color: $ui-highlight-color; + background-color: $ui-button-focus-background-color; } &:disabled:hover { @@ -543,15 +543,12 @@ code { } &.negative { - background: $error-value-color; - - &:hover { - background-color: lighten($error-value-color, 5%); - } + background: $ui-button-destructive-background-color; + &:hover, &:active, &:focus { - background-color: darken($error-value-color, 5%); + background-color: $ui-button-destructive-focus-background-color; } } } diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss index cfcdd742e1..ce74e88bd9 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss @@ -5,19 +5,6 @@ html { scrollbar-color: $ui-base-color rgba($ui-base-color, 0.25); } -// Change the colors of button texts -.button { - color: $white; - - &.button-alternative-2 { - color: $white; - } - - &.button-tertiary { - color: $highlight-text-color; - } -} - .simple_form .button.button-tertiary { color: $highlight-text-color; } @@ -436,26 +423,6 @@ html { color: $white; } -.button.button-tertiary { - &:hover, - &:focus, - &:active { - color: $white; - } -} - -.button.button-secondary { - border-color: $darker-text-color; - color: $darker-text-color; - - &:hover, - &:focus, - &:active { - border-color: darken($darker-text-color, 8%); - color: darken($darker-text-color, 8%); - } -} - .flash-message.warning { color: lighten($gold-star, 16%); } diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss index cae065878c..250e200fc6 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss @@ -7,6 +7,12 @@ $classic-primary-color: #9baec8; $classic-secondary-color: #d9e1e8; $classic-highlight-color: #6364ff; +$blurple-600: #563acc; // Iris +$blurple-500: #6364ff; // Brand purple +$blurple-300: #858afa; // Faded Blue +$grey-600: #4e4c5a; // Trout +$grey-100: #dadaf3; // Topaz + // Differences $success-green: lighten(#3c754d, 8%); @@ -19,6 +25,13 @@ $ui-primary-color: #9bcbed; $ui-secondary-color: $classic-base-color !default; $ui-highlight-color: $classic-highlight-color !default; +$ui-button-secondary-color: $grey-600 !default; +$ui-button-secondary-border-color: $grey-600 !default; +$ui-button-secondary-focus-color: $white !default; + +$ui-button-tertiary-color: $blurple-500 !default; +$ui-button-tertiary-border-color: $blurple-500 !default; + $primary-text-color: $black !default; $darker-text-color: $classic-base-color !default; $highlight-text-color: darken($ui-highlight-color, 8%) !default; diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss index 8608fec723..465edff9e7 100644 --- a/app/javascript/flavours/glitch/styles/variables.scss +++ b/app/javascript/flavours/glitch/styles/variables.scss @@ -1,10 +1,18 @@ // Commonly used web colors $black: #000000; // Black $white: #ffffff; // White -$success-green: #79bd9a; // Padua -$error-red: #df405a; // Cerise -$warning-red: #ff5050; // Sunset Orange -$gold-star: #ca8f04; // Dark Goldenrod +$red-600: #b7253d !default; // Deep Carmine +$red-500: #df405a !default; // Cerise +$blurple-600: #563acc; // Iris +$blurple-500: #6364ff; // Brand purple +$blurple-300: #858afa; // Faded Blue +$grey-600: #4e4c5a; // Trout +$grey-100: #dadaf3; // Topaz + +$success-green: #79bd9a !default; // Padua +$error-red: $red-500 !default; // Cerise +$warning-red: #ff5050 !default; // Sunset Orange +$gold-star: #ca8f04 !default; // Dark Goldenrod $red-bookmark: $warning-red; @@ -31,6 +39,22 @@ $ui-base-lighter-color: lighten( $ui-primary-color: $classic-primary-color !default; // Lighter $ui-secondary-color: $classic-secondary-color !default; // Lightest $ui-highlight-color: $classic-highlight-color !default; +$ui-button-color: $white !default; +$ui-button-background-color: $blurple-500 !default; +$ui-button-focus-background-color: $blurple-600 !default; + +$ui-button-secondary-color: $grey-100 !default; +$ui-button-secondary-border-color: $grey-100 !default; +$ui-button-secondary-focus-background-color: $grey-600 !default; +$ui-button-secondary-focus-color: $white !default; + +$ui-button-tertiary-color: $blurple-300 !default; +$ui-button-tertiary-border-color: $blurple-300 !default; +$ui-button-tertiary-focus-background-color: $blurple-600 !default; +$ui-button-tertiary-focus-color: $white !default; + +$ui-button-destructive-background-color: $red-500 !default; +$ui-button-destructive-focus-background-color: $red-600 !default; // Variables for texts $primary-text-color: $white !default; @@ -38,7 +62,8 @@ $darker-text-color: $ui-primary-color !default; $dark-text-color: $ui-base-lighter-color !default; $secondary-text-color: $ui-secondary-color !default; $highlight-text-color: lighten($ui-highlight-color, 8%) !default; -$action-button-color: $ui-base-lighter-color !default; +$action-button-color: $ui-base-color !default; +$action-button-focus-color: $ui-base-color !default; $passive-text-color: $gold-star !default; $active-passive-text-color: $success-green !default; From c0fa85b8dd3a0970f5edec718b2dc7015397d65f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 3 Jul 2023 16:51:04 +0200 Subject: [PATCH 22/22] [Glitch] Fix regression of icon button colors in web UI Port 69e124e2edfc6c3b73054266257b669aa2d2446b to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss index 465edff9e7..8924e43113 100644 --- a/app/javascript/flavours/glitch/styles/variables.scss +++ b/app/javascript/flavours/glitch/styles/variables.scss @@ -62,8 +62,8 @@ $darker-text-color: $ui-primary-color !default; $dark-text-color: $ui-base-lighter-color !default; $secondary-text-color: $ui-secondary-color !default; $highlight-text-color: lighten($ui-highlight-color, 8%) !default; -$action-button-color: $ui-base-color !default; -$action-button-focus-color: $ui-base-color !default; +$action-button-color: $ui-base-lighter-color !default; +$action-button-focus-color: lighten($ui-base-lighter-color, 4%) !default; $passive-text-color: $gold-star !default; $active-passive-text-color: $success-green !default;