mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-08 19:35:11 +01:00
Remove role color highlighting from custom css (#33493)
This commit is contained in:
parent
bbe9dcfade
commit
7ad44e22ed
@ -1,8 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class CustomCssController < ActionController::Base # rubocop:disable Rails/ApplicationController
|
||||
before_action :set_user_roles
|
||||
|
||||
def show
|
||||
expires_in 3.minutes, public: true
|
||||
render content_type: 'text/css'
|
||||
@ -14,8 +12,4 @@ class CustomCssController < ActionController::Base # rubocop:disable Rails/Appli
|
||||
Setting.custom_css
|
||||
end
|
||||
helper_method :custom_css_styles
|
||||
|
||||
def set_user_roles
|
||||
@user_roles = UserRole.providing_styles
|
||||
end
|
||||
end
|
||||
|
@ -101,9 +101,6 @@ class UserRole < ApplicationRecord
|
||||
before_validation :set_position
|
||||
|
||||
scope :assignable, -> { where.not(id: EVERYONE_ROLE_ID).order(position: :asc) }
|
||||
scope :highlighted, -> { where(highlighted: true) }
|
||||
scope :with_color, -> { where.not(color: [nil, '']) }
|
||||
scope :providing_styles, -> { highlighted.with_color }
|
||||
|
||||
has_many :users, inverse_of: :role, foreign_key: 'role_id', dependent: :nullify
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
.announcements-list__item
|
||||
- if can?(:update, role)
|
||||
= link_to edit_admin_role_path(role), class: 'announcements-list__item__title' do
|
||||
%span.user-role{ class: "user-role-#{role.id}" }
|
||||
%span.user-role
|
||||
= material_symbol 'group'
|
||||
|
||||
- if role.everyone?
|
||||
@ -10,7 +10,7 @@
|
||||
= role.name
|
||||
- else
|
||||
%span.announcements-list__item__title
|
||||
%span.user-role{ class: "user-role-#{role.id}" }
|
||||
%span.user-role
|
||||
= material_symbol 'group'
|
||||
|
||||
- if role.everyone?
|
||||
|
@ -2,9 +2,3 @@
|
||||
<%= raw custom_css_styles %>
|
||||
|
||||
<%- end %>
|
||||
<%- @user_roles.each do |role| %>
|
||||
.user-role-<%= role.id %> {
|
||||
--user-role-accent: <%= role.color %>;
|
||||
}
|
||||
|
||||
<%- end %>
|
||||
|
@ -45,34 +45,5 @@ RSpec.describe 'Custom CSS' do
|
||||
CSS
|
||||
end
|
||||
end
|
||||
|
||||
context 'with highlighted colored UserRole records' do
|
||||
before do
|
||||
_highlighted_colored = Fabricate :user_role, highlighted: true, color: '#336699', id: '123_123_123'
|
||||
_highlighted_no_color = Fabricate :user_role, highlighted: true, color: ''
|
||||
_no_highlight_with_color = Fabricate :user_role, highlighted: false, color: ''
|
||||
end
|
||||
|
||||
it 'returns stylesheet from settings' do
|
||||
get '/custom.css'
|
||||
|
||||
expect(response)
|
||||
.to have_http_status(200)
|
||||
.and have_cacheable_headers
|
||||
.and have_attributes(
|
||||
content_type: match('text/css')
|
||||
)
|
||||
expect(response.body.strip)
|
||||
.to eq(expected_css)
|
||||
end
|
||||
|
||||
def expected_css
|
||||
<<~CSS.strip
|
||||
.user-role-123123123 {
|
||||
--user-role-accent: #336699;
|
||||
}
|
||||
CSS
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user