Clean up theme_helper style builders (#30617)
				
					
				
			This commit is contained in:
		
							parent
							
								
									91ef4a6fc5
								
							
						
					
					
						commit
						543b59fa14
					
				| @ -3,8 +3,10 @@ | |||||||
| module ThemeHelper | module ThemeHelper | ||||||
|   def theme_style_tags(theme) |   def theme_style_tags(theme) | ||||||
|     if theme == 'system' |     if theme == 'system' | ||||||
|       stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') + |       ''.html_safe.tap do |tags| | ||||||
|         stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous') |         tags << stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous') | ||||||
|  |         tags << stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous') | ||||||
|  |       end | ||||||
|     else |     else | ||||||
|       stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous' |       stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous' | ||||||
|     end |     end | ||||||
| @ -12,8 +14,10 @@ module ThemeHelper | |||||||
| 
 | 
 | ||||||
|   def theme_color_tags(theme) |   def theme_color_tags(theme) | ||||||
|     if theme == 'system' |     if theme == 'system' | ||||||
|       tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') + |       ''.html_safe.tap do |tags| | ||||||
|         tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)') |         tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:dark], media: '(prefers-color-scheme: dark)') | ||||||
|  |         tags << tag.meta(name: 'theme-color', content: Themes::THEME_COLORS[:light], media: '(prefers-color-scheme: light)') | ||||||
|  |       end | ||||||
|     else |     else | ||||||
|       tag.meta name: 'theme-color', content: theme_color_for(theme) |       tag.meta name: 'theme-color', content: theme_color_for(theme) | ||||||
|     end |     end | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user