diff --git a/Gemfile b/Gemfile index e74c069..b0aa3eb 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem 'strong_parameters' gem 'pry' gem 'launchy' gem 'kaminari' +gem 'kaminari-bootstrap' group :assets do gem 'sass-rails', '~> 3.2.3' diff --git a/Gemfile.lock b/Gemfile.lock index 7d6aa3d..14474a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,6 +109,9 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + kaminari-bootstrap (0.1.3) + kaminari (>= 0.13.0) + rails launchy (2.1.2) addressable (~> 2.3) libwebsocket (0.1.5) @@ -244,6 +247,7 @@ DEPENDENCIES high_voltage jquery-rails kaminari + kaminari-bootstrap launchy pg pry diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index f3b3d63..c2a671a 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -4755,3 +4755,8 @@ a.badge:hover { position: fixed; } +h1.inline-header { + font-size:24px; + display: inline; +} + diff --git a/app/views/receipts/index.html.erb b/app/views/receipts/index.html.erb index 31b6729..d2f826d 100644 --- a/app/views/receipts/index.html.erb +++ b/app/views/receipts/index.html.erb @@ -1,4 +1,6 @@ -

Receipts

+

Receipts

+<%= link_to "Add New Receipt", new_receipt_path, class: "btn pull-right" %> + diff --git a/spec/requests/receipt_creation_spec.rb b/spec/requests/receipt_creation_spec.rb index 703a081..9941a52 100644 --- a/spec/requests/receipt_creation_spec.rb +++ b/spec/requests/receipt_creation_spec.rb @@ -6,7 +6,8 @@ end scenario 'new receipt with only required fields' do - visit new_receipt_path + click_link "Receipts" + click_link "Add New Receipt" receipt = create(:receipt) fill_in_required_fields_with_information(receipt) verify_flash_for_receipt(receipt)
Name