decoupled merged and fixed sylesheet inclusion
This commit is contained in:
parent
be96f62452
commit
0ab31b11ac
15
Gemfile.lock
15
Gemfile.lock
@ -1,6 +1,6 @@
|
||||
GIT
|
||||
remote: https://github.com/HubFeenixMakers/merged
|
||||
revision: dbcb6549907109c973cb6828b46d81e4db8b865e
|
||||
revision: badcd70aebfe9227828c5c3abf0202141aed4292
|
||||
specs:
|
||||
merged (0.1.0)
|
||||
git
|
||||
@ -123,8 +123,11 @@ GEM
|
||||
loofah (2.19.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
mail (2.8.0)
|
||||
mini_mime (>= 0.1.1)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
marcel (1.0.2)
|
||||
matrix (0.4.2)
|
||||
method_source (1.0.0)
|
||||
@ -135,7 +138,7 @@ GEM
|
||||
net-protocol
|
||||
net-pop (0.1.2)
|
||||
net-protocol
|
||||
net-protocol (0.1.3)
|
||||
net-protocol (0.2.0)
|
||||
timeout
|
||||
net-smtp (0.3.3)
|
||||
net-protocol
|
||||
@ -146,10 +149,10 @@ GEM
|
||||
rack
|
||||
rake (>= 0.8.1)
|
||||
pg (1.4.5)
|
||||
public_suffix (5.0.0)
|
||||
public_suffix (5.0.1)
|
||||
puma (5.6.5)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.6.0)
|
||||
racc (1.6.1)
|
||||
rack (2.2.4)
|
||||
rack-test (2.0.2)
|
||||
rack (>= 1.3)
|
||||
@ -211,7 +214,7 @@ GEM
|
||||
temple (0.9.1)
|
||||
thor (1.2.1)
|
||||
tilt (2.0.11)
|
||||
timeout (0.3.0)
|
||||
timeout (0.3.1)
|
||||
tzinfo (2.0.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
web-console (4.2.0)
|
||||
|
@ -12,4 +12,5 @@
|
||||
*
|
||||
*= require_tree .
|
||||
*= require_self
|
||||
*= require merged/merged.css
|
||||
*/
|
||||
|
@ -6,7 +6,6 @@ module.exports = {
|
||||
'./app/helpers/**/*.rb',
|
||||
'./app/javascript/**/*.js',
|
||||
'./app/views/**/*.{erb,haml,html,slim}' ,
|
||||
'./merged/app/**/*.{erb,haml,html,slim,rb}'
|
||||
],
|
||||
theme: {
|
||||
extend: {
|
||||
|
1
merged
1
merged
@ -1 +0,0 @@
|
||||
Subproject commit dbcb6549907109c973cb6828b46d81e4db8b865e
|
Loading…
Reference in New Issue
Block a user