Sync again with latest foundation after bugfix and fix demo_both

Gemfile

@@ -35,7 +35,7 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
   gem 'emblem-rails'
 
-  gem 'foundation-rails', github: 'bterkuile/foundation-rails'
+  gem 'foundation-rails' #, github: 'bterkuile/foundation-rails'
   #gem 'mustache' #, :require => 'mustache/railtie'
 end
 

Gemfile.lock

@@ -26,14 +26,6 @@ GIT
     devise_simply_stored (0.3.0)
       devise
 
-GIT
-  remote: git://github.com/bterkuile/foundation-rails.git
-  revision: a2e857867e93a3e3bc74b4a61fe72349a86158e9
-  specs:
-    foundation-rails (5.4.3.1)
-      railties (>= 3.1.0)
-      sass (>= 3.2.0)
-
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
   revision: 354fde89a88c1384ccc9d82989e3f05ac6977bd1
@@ -207,6 +199,9 @@ GEM
       websocket-driver (>= 0.3.1)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
+    foundation-rails (5.4.4.0)
+      railties (>= 3.1.0)
+      sass (>= 3.2.0)
     fuubar (2.0.0)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -329,9 +324,9 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.2)
+    rspec-core (3.1.3)
       rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
+    rspec-expectations (3.1.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
     rspec-its (1.0.1)
@@ -441,7 +436,7 @@ DEPENDENCIES
   factory_girl_rails
   faye
   font-awesome-rails
-  foundation-rails!
+  foundation-rails
   fuubar
   iso_country_codes
   jquery-rails

app/assets/stylesheets/mixins.sass

@@ -1,41 +0,0 @@
-=placeholder($color: $input-placeholder)
-  \:-moz-placeholder
-    color: $color
-  \::-webkit-input-placeholder
-    color: $color
-
-=controls($color)
-  & > label, 
-  .help-block,
-  .help-inline
-    color: $color
-  input, select, textarea
-    //color: lighten($color, 20%);
-    color: $color
-    border-color: $color
-  input:focus,
-  select:focus,
-  textarea:focus
-    border-color: $color
-    +box-shadow(0 0 6px $color)
-
-=inset-panel-dark
-  +box-shadow(rgba(white, 0.1) 0 1px 0, rgba(black, 0.8) 0 1px 7px 0px inset)
-  background: darken(#2f2f2f, 6)
-  background-color: rgba(black, 0.3)
-
-=horizontal-rule-dark
-  +box-shadow(rgba(white, 0.07) 0 1px 0)
-  border-bottom: 1px solid #121212
-
-=horizontal-rule-top-dark
-  +box-shadow(rgba(white, 0.07) 0 1px 0 inset)
-  border-top: 1px solid #121212
-
-=vertical-rule-dark
-  +box-shadow(rgba(white, 0.07) 1px 0 0)
-  border-right: 1px solid #121212
-
-=vertical-rule-left-dark
-  +box-shadow(rgba(white, 0.07) 1px 0 0 inset)
-  border-left: 1px solid #121212

app/assets/stylesheets/structure.css.sass

@@ -8,29 +8,29 @@ body
   position: absolute
   top: 60px
   left: 20px
-  width: 353px
+  width: 395px
-  height: 693px
+  height: 775px
   background-image: image-url('frames/smartphone.png')
   background-repeat: no-repeat
 .phone-content-frame
   position: absolute
-  left: 40px
+  left: 38px
   top: 182px
-  height: 482px
+  height: 550px
-  width: 310px
+  width: 360px
- 
+
 
 .tablet-wrapper
   position: absolute
   top: 60px
-  left: 393px
+  left: 443px
   width: 1002px
   height: 670px
   background-image: image-url('frames/tablet.png')
   background-repeat: no-repeat
 .tablet-content-frame
   position: absolute
-  left: 433px
+  left: 493px
   top: 100px
   width: 880px
   height: 590px

app/views/layouts/application.html.slim

@@ -1,74 +0,0 @@
-doctype html
-html lang="en"
-  head
-    meta charset="utf-8"
-    meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
-    meta name="viewport" content="width=device-width, initial-scale=1.0"
-    title= content_for?(:title) ? yield(:title) : application_title
-    = csrf_meta_tags
-
-    /! 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="/favicon.ico" rel="shortcut icon"
-    link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
-
-  body
-    .header-nav-banner
-      #header-wrap
-        #ceiling
-          .left
-          .right
-          .lights
-            .light1
-            .light2
-            .light3
-          .container
-            #header
-              #header-right
-                .social
-                  a.wsite-social-facebook href="https://www.facebook.com/mozo.bar" target=:_blank
-                    span.wsite-social-inner
-                  a.wsite-social-twitter href="https://twitter.com/mozo.bar" target=:_blank
-                    span.wsite-social-inner
-                  a.wsite-social-linkedin href="http://www.linkedin.com/company/579750" target=:_blank
-                    span.wsite-social-inner
-                  a.wsite-social-rss
-                    span.wsite-social-inner
-              #logo= link_to image_tag('icons/logo-small.png', alt: application_title), root_path
-      #nav-wrap
-        .container
-          ul.nav
-            li= link_to User.model_name.human_plural, user_root_path
-            li= link_to Supplier.model_name.human_plural, supplier_root_path
-            li= link_to 'Enquete', enquete_path
-      #banner-wrap
-        .left
-        .right
-        .container
-          #banner
-            .wsite-header
-            .clearing
-      #main-wrap
-        .container
-          .content-top
-          .main-inner
-            #wsite-content.wsite-not-footer= yield
-      #footer-wrap
-        .footer-shadow
-        .container
-          .footer-top
-          .bottom
-            p © Companytools 2012
-            = yield :footer
-      .content
-        - if flash[:alert].present?
-          .alert.alert-error
-            a.close data-dismiss="alert" ×
-            div= flash[:alert]
-        - if flash[:notice].present?
-          .alert.alert-success
-            a.close data-dismiss="alert" ×
-            div= flash[:notice]
-    = javascript_include_tag "application"