From 6e805fed3efef66ecb5f621facd56f3b28c8f872 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Thu, 26 Feb 2015 06:37:22 +0100
Subject: [PATCH] cleanup and demo both working

---
 app/assets/stylesheets/forms.css.sass         |  3 ---
 app/assets/stylesheets/general.css.sass       | 23 -------------------
 .../pages/_demo_both.css.sass}                | 17 --------------
 app/assets/stylesheets/users.css.scss         |  3 ---
 app/controllers/dashboard_controller.rb       |  2 +-
 app/views/layouts/demo-both.html.slim         |  6 +----
 6 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 app/assets/stylesheets/forms.css.sass
 delete mode 100644 app/assets/stylesheets/general.css.sass
 rename app/assets/stylesheets/{structure.css.sass => theme1/pages/_demo_both.css.sass} (67%)
 delete mode 100644 app/assets/stylesheets/users.css.scss

diff --git a/app/assets/stylesheets/forms.css.sass b/app/assets/stylesheets/forms.css.sass
deleted file mode 100644
index 0c9cb99b..00000000
--- a/app/assets/stylesheets/forms.css.sass
+++ /dev/null
@@ -1,3 +0,0 @@
-form
-  input.currency
-    text-align: right
diff --git a/app/assets/stylesheets/general.css.sass b/app/assets/stylesheets/general.css.sass
deleted file mode 100644
index 18006010..00000000
--- a/app/assets/stylesheets/general.css.sass
+++ /dev/null
@@ -1,23 +0,0 @@
-table
-  thead
-    th 
-      &.currency
-        text-align: right
-      &.numeric
-        text-align: right
-      &.actions
-        text-align: right
-
-  tbody
-    td
-      &.status-icons
-      &.currency
-        text-align: right
-      &.numeric
-        text-align: right
-      &.actions
-        text-align: right
-  tfoot
-    td
-      &.currency
-        text-align: right
diff --git a/app/assets/stylesheets/structure.css.sass b/app/assets/stylesheets/theme1/pages/_demo_both.css.sass
similarity index 67%
rename from app/assets/stylesheets/structure.css.sass
rename to app/assets/stylesheets/theme1/pages/_demo_both.css.sass
index 6eeee878..81bdce76 100644
--- a/app/assets/stylesheets/structure.css.sass
+++ b/app/assets/stylesheets/theme1/pages/_demo_both.css.sass
@@ -1,9 +1,3 @@
-@import constants
-html
-  background-color: $background-brown
-  background-image: $wood
-body
-  background-color: transparent
 .phone-wrapper
   position: absolute
   top: 60px
@@ -35,14 +29,3 @@ body
   width: 880px
   height: 590px
 
-#qr-list
-  list-style: none
-  margin: 0
-  padding: 0
-  li
-    float: left
-img.home-qr
-  float: left
-  margin: 0 20px 20px 0
-.clearing
-  clear: both
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
deleted file mode 100644
index 31a2eacb..00000000
--- a/app/assets/stylesheets/users.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the Users controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index b3ed4397..e4bdddf7 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -27,7 +27,7 @@ class DashboardController < ApplicationController
     if Rails.env.test?
       @tables = Table.all
     else
-      @tables = (Supplier.last || Supplier.first).tables.sample(5) | List.active.map(&:table) | Supplier.find_by_email('supplier2@mozo.bar').tables.sample(3)
+      @tables = List.active.map(&:table) | Supplier.find_by_name('Bora').tables.sample(3)
     end
     respond_to do |format|
       format.html { render layout: 'phone' }
diff --git a/app/views/layouts/demo-both.html.slim b/app/views/layouts/demo-both.html.slim
index 1122662b..b39ebb0f 100644
--- a/app/views/layouts/demo-both.html.slim
+++ b/app/views/layouts/demo-both.html.slim
@@ -10,11 +10,7 @@ html lang="en"
     /! Le HTML5 shim, for IE6-8 support of HTML elements
     /[if lt IE 9]
       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
-    = stylesheet_link_tag "application", :media => "all"
-    link href="/images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
-    link href="/images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
-    link href="/images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
-    link href="/images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
+    = stylesheet_link_tag "theme1/application", media: "all"
     link href="/favicon.ico" rel="shortcut icon"
   body class=action_name
     .container