Skip to content

Commit 3e7ff63

Browse files
load variables first
1 parent c23dc96 commit 3e7ff63

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

Diff for: app/helpers/additionals_js_heads_helper.rb

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# frozen_string_literal: true
2+
3+
module AdditionalsJsHeadsHelper
4+
def stylesheet_link_tag(*sources)
5+
options = sources.last.is_a?(Hash) ? sources.last : {}
6+
return super if options[:plugin] || sources.exclude?('application')
7+
8+
# add additionals variables.css to load before all themes
9+
sources.unshift 'plugin_assets/additionals/variables'
10+
super
11+
end
12+
end

Diff for: app/views/additionals/_html_head.html.slim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
- additionals_top_menu_setup
22
= additionals_library_load :font_awesome
3-
= stylesheet_link_tag 'variables', 'additionals', plugin: 'additionals'
3+
= stylesheet_link_tag 'additionals', plugin: 'additionals'
44
= javascript_include_tag 'additionals', plugin: 'additionals'

Diff for: lib/additionals/patches/application_controller_patch.rb

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module ApplicationControllerPatch
88
included do
99
include InstanceMethods
1010
before_action :enable_smileys
11+
helper :additionals_js_heads
1112
end
1213

1314
module InstanceMethods

0 commit comments

Comments
 (0)