switch to zurb buttons

trosborn · Dec 30, 2015 · 3341207 · 3341207
1 parent 58eeddf
commit 3341207
Show file tree

Hide file tree

Showing 30 changed files with 42 additions and 171 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: ruby
 rvm:
 - 2.2.2
-before_script: bundle exec rake db:create
+before_script: bundle exec rake db:setup
 deploy:
   provider: heroku
   api_key:

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -5,5 +5,5 @@
 @import 'navbar';
 @import 'reset';
 @import 'welcome';
-@import 'order-bar';
+@import 'order_bar';
 @import 'menu';
diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/colors.scss
@@ -1,2 +1,3 @@
-$pag-red: #B81F23;
-$pag-tan: #FFFDEE;
+$pag-red: #b81f23;
+$pag-dark-red: #96191d;
+$pag-tan: #fffdee;
diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss
@@ -3,10 +3,18 @@
   margin-right: auto;
   margin-left: auto;
   display: block;
-  position: relative;
+}
+
+#logo-wrapper {
+  height: 200px;
+  width: 163px;
   top: -40px;
+  position: relative;
 }
 
 #phone-numbers a {
   color: white;
+  font-size: 140%;
+  font-weight: 600;
+  text-shadow: 0 0 20px #000;
 }
diff --git a/app/assets/stylesheets/order-bar.scss b/app/assets/stylesheets/order-bar.scss
diff --git a/app/assets/stylesheets/order_bar.scss b/app/assets/stylesheets/order_bar.scss
@@ -0,0 +1,14 @@
+.button {
+  background-color: $pag-red;
+  width: 220px;
+  &:hover {
+    background-color: $pag-dark-red;
+  }
+}
+
+@media only screen and (max-width: 40em) {
+  .button {
+    max-width: 180px;
+  }
+}
+
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
@@ -1,7 +1,8 @@
-.row
+.row#logo-wrapper
   = link_to image_tag('pag-banner-logo.png', id: 'logo'), '/'
 .row#phone-numbers
   .large-6.small-6.columns
-    = link_to '206-727-1717', 'tel:+12067261717', class: 'right'
+    = link_to '206.727.1717', 'tel:+12067261717', class: 'right'
   .large-6.small-6.columns
-    = link_to '425-453-1717', 'tel:+14254531717'
+    = link_to '425.453.1717', 'tel:+14254531717'
+%br
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
@@ -11,5 +11,3 @@
   %li
     = link_to 'MENU', '/menu'
   %li
-
-
diff --git a/app/views/layouts/_order_bar.html.haml b/app/views/layouts/_order_bar.html.haml
@@ -1,7 +1,6 @@
 .row
   .large-6.small-6.columns
-    .order-buttons.right
-      = link_to 'ORDER ONLINE!', 'pagliacci.com', alt: 'Order Online!'
+    .right
+      = link_to 'ORDER ONLINE', 'pagliacci.com', alt: 'Order Online', class: 'button large'
   .large-6.small-6.columns
-    .order-buttons
-      = link_to 'FIND SLICES!', 'pagliacci.com', alt: 'Find Slices!'
+    = link_to 'FIND SLICES', 'pagliacci.com', alt: 'Find Slices', class: 'button large'
diff --git a/db/migrate/20151001200751_create_salad_toppings.rb b/db/migrate/20151001200751_create_salad_toppings.rb
diff --git a/db/migrate/20151014024316_create_beverages.rb b/db/migrate/20151014024316_create_beverages.rb
diff --git a/db/migrate/20151018005333_add_seasonal_to_gelatos.rb b/db/migrate/20151018005333_add_seasonal_to_gelatos.rb
diff --git a/db/migrate/20151018005515_add_active_to_gelatos.rb b/db/migrate/20151018005515_add_active_to_gelatos.rb
diff --git a/db/migrate/20151019084003_add_sizes_to_gelato.rb b/db/migrate/20151019084003_add_sizes_to_gelato.rb
diff --git a/db/migrate/20151024070446_create_sizes.rb b/db/migrate/20151024070446_create_sizes.rb
diff --git a/db/migrate/20151031071104_add_salad_id_to_sizes.rb b/db/migrate/20151031071104_add_salad_id_to_sizes.rb
diff --git a/db/migrate/20151107113606_remove_extra_columns.rb b/db/migrate/20151107113606_remove_extra_columns.rb
diff --git a/db/migrate/20151110092342_drop_salads_table.rb b/db/migrate/20151110092342_drop_salads_table.rb
diff --git a/db/migrate/20151110093955_add_topping_references_to_items.rb b/db/migrate/20151110093955_add_topping_references_to_items.rb
diff --git a/db/migrate/20151110100001_remove_all_the_tables.rb b/db/migrate/20151110100001_remove_all_the_tables.rb
diff --git a/db/migrate/20151110223825_remove_toppings_from_items.rb b/db/migrate/20151110223825_remove_toppings_from_items.rb
diff --git a/db/migrate/20151111041950_add_pizza_i_dto_items.rb b/db/migrate/20151111041950_add_pizza_i_dto_items.rb
diff --git a/db/migrate/20151111043919_removestuff.rb b/db/migrate/20151111043919_removestuff.rb
diff --git a/db/migrate/20151111075226_create_item_toppings.rb b/db/migrate/20151111075226_create_item_toppings.rb
diff --git a/db/migrate/20151111082945_rename_salad_id.rb b/db/migrate/20151111082945_rename_salad_id.rb
diff --git a/db/migrate/20151113081409_and_attributes_to_items.rb b/db/migrate/20151113081409_and_attributes_to_items.rb
diff --git a/db/migrate/20151116230429_create_toppings.rb b/db/migrate/20151116230429_create_toppings.rb
diff --git a/db/migrate/20151116231655_destroy_toppings.rb b/db/migrate/20151116231655_destroy_toppings.rb
diff --git a/db/migrate/20151119082005_add_qualifier_to_items.rb b/db/migrate/20151119082005_add_qualifier_to_items.rb
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151119082005) do
+ActiveRecord::Schema.define(version: 20151211090127) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -25,6 +25,7 @@
     t.datetime "created_at",  null: false
     t.datetime "updated_at",  null: false
     t.integer  "location_id"
+    t.integer  "order_id"
   end
 
   create_table "item_toppings", force: :cascade do |t|
@@ -57,6 +58,11 @@
     t.datetime "updated_at",       null: false
   end
 
+  create_table "orders", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "sizes", force: :cascade do |t|
     t.string   "name"
     t.float    "price"