diff --git a/Gemfile b/Gemfile index 6d05ce8..e178f4a 100644 --- a/Gemfile +++ b/Gemfile @@ -58,3 +58,4 @@ gem 'rails_admin_rollincode', '~> 1.0' gem "devise" gem "figaro" gem 'rest-client' +gem 'bootstrap-sass' diff --git a/Gemfile.lock b/Gemfile.lock index 907b76b..9b7c02e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,8 +65,13 @@ GEM addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) arel (8.0.0) + autoprefixer-rails (7.1.2.2) + execjs bcrypt (3.1.11) bindex (0.5.0) + bootstrap-sass (3.3.7) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) builder (3.2.3) byebug (9.0.6) capybara (2.14.4) @@ -255,6 +260,7 @@ PLATFORMS ruby DEPENDENCIES + bootstrap-sass byebug capybara (~> 2.13) coffee-rails (~> 4.2) diff --git a/README.md b/README.md index 7db80e4..5f8e64f 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ application up and running. Things you may want to cover: * Ruby version +2.3.0 * System dependencies diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 46b2035..a5d30d5 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,5 +11,7 @@ // about supported directives. // //= require rails-ujs +//= require jquery +//= require bootstrap-sprockets //= require turbolinks //= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 93% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index d05ea0f..0a84050 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -13,3 +13,5 @@ *= require_tree . *= require_self */ +@import "bootstrap-sprockets"; +@import "bootstrap"; diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 2085730..318af4b 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,2 +1,37 @@ -

Home#index

-

Find me in app/views/home/index.html.erb

+
+ +
+ +
+

Links

+ +
+ +
+

Builpacks

+
+
+ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9c78b6b..2eb26d1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,15 @@ - - - InfernoTool + + + InfernoTool <%= csrf_meta_tags %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - - - <%= yield %> + + <%= render "shared/header" %> +



+ <%= yield %> diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb new file mode 100644 index 0000000..effdca4 --- /dev/null +++ b/app/views/shared/_header.html.erb @@ -0,0 +1,34 @@ + + \ No newline at end of file
FirstnameLastnameEmail
JohnDoejohn@example.com