Skip to content

closes #26 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BJudge wants to merge 2 commits into
base: master
Choose a base branch
from
Open

closes #26 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b73c6
styling
BJudge Sep 2, 2016
59cda3b
styling confilcist resolved
BJudge Sep 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,19 @@ gem 'friendly_id', '~> 5.1.0'
gem 'rake'
gem 'will_paginate'

gem 'bootstrap-sass'


group :development, :test do
gem 'dotenv-rails'
gem 'byebug'
<<<<<<< HEAD
gem "better_errors"

=======
gem 'better_errors'
gem 'coveralls', require: false
>>>>>>> c6245c0ab668a3fa0d73c42e3dc0bec0d37e0075
end

group :development do
Expand Down
6 changes: 6 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ GEM
tzinfo (~> 1.1)
addressable (2.4.0)
arel (6.0.3)
autoprefixer-rails (6.4.0.3)
execjs
aws-sdk (2.5.7)
aws-sdk-resources (= 2.5.7)
aws-sdk-core (2.5.7)
Expand All @@ -51,6 +53,9 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.2)
byebug (9.0.5)
capybara (2.8.1)
Expand Down Expand Up @@ -242,6 +247,7 @@ PLATFORMS
DEPENDENCIES
aws-sdk
better_errors
bootstrap-sass
byebug
capybara
coffee-rails (~> 4.1.0)
Expand Down
3 changes: 2 additions & 1 deletion app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require bootstrap-sprockets

//= require jquery
//= require jquery_ujs
//= require turbolinks
Expand Down
4 changes: 3 additions & 1 deletion app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*

* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
*
Expand All @@ -13,3 +13,5 @@
*= require_tree .
*= require_self
*/
@import "bootstrap-sprockets";
@import "bootstrap";
26 changes: 17 additions & 9 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,22 @@
</head>
<body>

<ul class="nav nav-pills">
<li role="presentation" ><a> <%= link_to 'Home', root_path%> </a></li>
<li role="presentation"><a> <%= link_to 'Create guide', new_instruction_path %></a></li>
<% if current_user %>

<li role="presentation"><a> <%= link_to 'Sign out', destroy_user_session_path, method: :delete %></a></li>

<% else%>
<li role="presentation"><a> <%= link_to 'Sign in', new_user_session_path %></a></li>
<li role="presentation"><a> <%= link_to 'Sign up', new_user_registration_path %></a></li>
<%end%>
</ul>

<% console if ENV['RAILS_ENV']=='development' %>
<%= link_to 'Create guide', new_instruction_path %>

<% if current_user %>
<%= link_to 'Sign out', destroy_user_session_path, method: :delete %>
<%else%>
<%= link_to 'Sign in', new_user_session_path %>
<%= link_to 'Sign up', new_user_registration_path %>
<% end %>

<% console if ENV['RAILS_ENV']=='development' %>


<p class="notice"><%= notice %></p>
Expand All @@ -28,7 +34,9 @@
<%= submit_tag('Search', name: nil) %>
</form>

<%= yield %>
</br> </br> </br>
<%= yield %>


<script id="dsq-count-scr" src="//diy-assistant.disqus.com/count.js" async></script>
</body>
Expand Down