diff --git a/Gemfile b/Gemfile index 3612653..ebb1231 100644 --- a/Gemfile +++ b/Gemfile @@ -68,9 +68,11 @@ gem 'jquery-rails' gem 'twitter-bootstrap-rails', '2.2.8' gem 'tinymce-rails' # WYSIWYG EDITOR +gem 'substance-rails', path: '../substance-rails' # SUBSTANCE EDITOR - WYSIWYG HTML EDITOR gem 'contact_us', '>= 1.2.0' # COULD BE EASILY REPLACED WITH OUR OWN CODE gem 'recaptcha' gem 'dragonfly' # LOGO UPLOAD +gem "substance-rails", path: "../substance-rails" # SUBSTANCE EDITOR # ------------------------------------------------ # EXPORTING diff --git a/Gemfile.lock b/Gemfile.lock index eb07170..1311894 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,6 +25,14 @@ rails (>= 3.0, < 5.1) rake (>= 0.8.7) +PATH + remote: ../substance-rails + specs: + substance-rails (1.0.1) + actionpack (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + railties (>= 3.1) + GEM remote: https://rubygems.org/ specs: @@ -397,6 +405,7 @@ sass-rails simplecov sqlite3 + substance-rails! swagger-docs therubyracer (>= 0.11.4) thin diff --git a/lib/assets/javascripts/application.js b/lib/assets/javascripts/application.js index eeea9a8..6dc6135 100644 --- a/lib/assets/javascripts/application.js +++ b/lib/assets/javascripts/application.js @@ -19,7 +19,8 @@ //= require tinymce-jquery //= require i18n //= require i18n/translations - +//= require substance/substance.js +//= require substance-forms.js $( document ).ready(function() { diff --git a/lib/assets/stylesheets/application.css b/lib/assets/stylesheets/application.css index f4a3bdf..05afd6c 100644 --- a/lib/assets/stylesheets/application.css +++ b/lib/assets/stylesheets/application.css @@ -14,4 +14,5 @@ *= require bootstrap.css *= require bootstrap_and_overrides.css.less *= require select2.css + *= require substance-forms.css */