Skip to content

Commit

Permalink
Try to fix generator
Browse files Browse the repository at this point in the history
  • Loading branch information
mrcasals committed Oct 25, 2017
1 parent 20f0639 commit 4737556
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/generators/decidim/app_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require "rails/generators"
require "rails/generators/rails/app/app_generator"
require "decidim/core/version"
require_relative "../../decidim/version"
require_relative "install_generator"

module Decidim
Expand Down
5 changes: 0 additions & 5 deletions lib/generators/decidim/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@ def rails(*args)
def soft_rails(*args)
system("bin/rails", *args, err: File::NULL)
end

def scss_variables
variables = File.join(Gem.loaded_specs["decidim-core"].full_gem_path, "app", "assets", "stylesheets", "decidim", "_variables.scss")
File.read(variables).split("\n").map { |line| "// #{line}".gsub(" !default", "") }.join("\n")
end
end
end
end
17 changes: 16 additions & 1 deletion lib/generators/decidim/templates/decidim.scss.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
<%= scss_variables %>
// Variables

// $primary: #ef604d !default;
// $secondary: #599aa6 !default;
// $success: #57d685 !default;
// $warning: #ffae00 !default;
// $alert: #ec5840 !default;

// $proposals: #238FF7 !default;
// $actions: #57D685 !default;
// $debates: #FA6C96 !default;
// $meetings: #FABC6C !default;

// $twitter: #55acee !default;
// $facebook: #3b5998 !default;
// $google: #dd4b39 !default;

@import "decidim/application";

0 comments on commit 4737556

Please sign in to comment.