diff --git a/Gemfile b/Gemfile index 24c9773a..260627fe 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source :rubygems gem 'rails', '3.2.11' gem 'rack-cors', :require => 'rack/cors' @@ -16,7 +16,7 @@ group :assets do gem 'coffee-rails', '~> 3.2.1' #gem 'twitter-bootstrap-rails' gem 'bootstrap-sass' - gem 'compass-rails' + gem 'bourbon' # See https://github.com/sstephenson/execjs#readme for more supported runtimes #gem 'therubyracer', :platforms => :ruby diff --git a/Gemfile.lock b/Gemfile.lock index a0fa01d8..f7bd46fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,7 @@ GIT rest-client (>= 1.4.2) GEM - remote: https://rubygems.org/ + remote: http://rubygems.org/ specs: actionmailer (3.2.11) actionpack (= 3.2.11) @@ -51,6 +51,9 @@ GEM bcrypt-ruby (3.0.1) bootstrap-sass (2.3.0.0) sass (~> 3.2) + bourbon (3.1.1) + sass (>= 3.2.0) + thor builder (3.0.4) capybara (2.0.2) mime-types (>= 1.16) @@ -61,7 +64,6 @@ GEM xpath (~> 1.0.0) childprocess (0.3.8) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.2.7) coderay (1.0.8) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -70,12 +72,6 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) - compass (0.12.2) - chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) couchrest (1.1.3) mime-types (~> 1.15) multi_json (~> 1.0) @@ -103,7 +99,6 @@ GEM factory_girl (~> 4.2.0) railties (>= 3.0.0) ffi (1.4.0) - fssm (0.2.10) guard (1.6.2) listen (>= 0.6.0) lumberjack (>= 1.0.2) @@ -264,8 +259,8 @@ PLATFORMS DEPENDENCIES bootstrap-sass + bourbon coffee-rails (~> 3.2.1) - compass-rails couch_potato! devise (= 2.0.4) devise_simply_stored diff --git a/app/assets/images/icons/logo-text.png b/app/assets/images/icons/logo-text.png new file mode 100644 index 00000000..9360ccbb Binary files /dev/null and b/app/assets/images/icons/logo-text.png differ diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg index 558ff089..d123c509 100644 --- a/app/assets/images/logo.svg +++ b/app/assets/images/logo.svg @@ -131,8 +131,8 @@ id="namedview43" showgrid="false" inkscape:zoom="6.34" - inkscape:cx="50" - inkscape:cy="50" + inkscape:cx="51.171527" + inkscape:cy="47.772468" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" @@ -142,55 +142,66 @@ -Q + WAITE + style="font-size:4.56339216px;fill:#231f20;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">WAITE + R + \ No newline at end of file + style="fill:#231f20" />Q +WAITE +R + \ No newline at end of file diff --git a/app/assets/images/theme1/nav-bar-left.png b/app/assets/images/theme1/nav-bar-left.png new file mode 100644 index 00000000..cf3d4702 Binary files /dev/null and b/app/assets/images/theme1/nav-bar-left.png differ diff --git a/app/assets/images/theme1/nav-bar-middle.png b/app/assets/images/theme1/nav-bar-middle.png new file mode 100644 index 00000000..64a0bd8b Binary files /dev/null and b/app/assets/images/theme1/nav-bar-middle.png differ diff --git a/app/assets/images/theme1/nav-bar-right.png b/app/assets/images/theme1/nav-bar-right.png new file mode 100644 index 00000000..eda258bf Binary files /dev/null and b/app/assets/images/theme1/nav-bar-right.png differ diff --git a/app/assets/images/theme1/no-banner-bg-left.png b/app/assets/images/theme1/no-banner-bg-left.png new file mode 100644 index 00000000..8b4c06a7 Binary files /dev/null and b/app/assets/images/theme1/no-banner-bg-left.png differ diff --git a/app/assets/images/theme1/no-banner-bg-middle.png b/app/assets/images/theme1/no-banner-bg-middle.png new file mode 100644 index 00000000..cf19c6b3 Binary files /dev/null and b/app/assets/images/theme1/no-banner-bg-middle.png differ diff --git a/app/assets/images/theme1/no-banner-bg-right.png b/app/assets/images/theme1/no-banner-bg-right.png new file mode 100644 index 00000000..09e52a3d Binary files /dev/null and b/app/assets/images/theme1/no-banner-bg-right.png differ diff --git a/app/assets/javascripts/supplier/initializer.js.coffee b/app/assets/javascripts/supplier/initializer.js.coffee index 6df995d6..2198da02 100644 --- a/app/assets/javascripts/supplier/initializer.js.coffee +++ b/app/assets/javascripts/supplier/initializer.js.coffee @@ -27,7 +27,7 @@ $( -> # GOOGLE LOCATION PICKER $("input.location_picker").each( (i)-> - return if typeof(google) == 'undefined' + #return if typeof(google) == 'undefined' location_input = $(this) map_div = $('
').addClass("location_picker_map") diff --git a/app/assets/javascripts/theme1/application.js b/app/assets/javascripts/theme1/application.js index 4625e76a..f9afcdd3 100644 --- a/app/assets/javascripts/theme1/application.js +++ b/app/assets/javascripts/theme1/application.js @@ -13,6 +13,7 @@ //= require jquery //= require jquery_ujs //= require jquery-ui +//= require bootstrap // require twitter/bootstrap //= require_directory . //= require_self diff --git a/app/assets/stylesheets/home.css.sass b/app/assets/stylesheets/home.css.sass deleted file mode 100644 index 3f7f8e67..00000000 --- a/app/assets/stylesheets/home.css.sass +++ /dev/null @@ -1,3 +0,0 @@ -.home-tablet-phone - float: right - margin-top: -200px diff --git a/app/assets/stylesheets/theme1/bootstrap_and_overrides.css.sass b/app/assets/stylesheets/theme1/bootstrap_and_overrides.css.sass index edc735c5..bdd7a399 100644 --- a/app/assets/stylesheets/theme1/bootstrap_and_overrides.css.sass +++ b/app/assets/stylesheets/theme1/bootstrap_and_overrides.css.sass @@ -5,3 +5,4 @@ body > a &:hover background-color: transparent +@import bootstrap-responsive diff --git a/app/assets/stylesheets/theme1/cartoon.css.sass b/app/assets/stylesheets/theme1/cartoon.css.sass index fd6f87a5..0118de98 100644 --- a/app/assets/stylesheets/theme1/cartoon.css.sass +++ b/app/assets/stylesheets/theme1/cartoon.css.sass @@ -1,7 +1,7 @@ ul#cartoon list-style: none li - float: left - div - width: 280px - .cartoon-image + display: inline-block + width: 280px + height: 382px + vertical-align: top diff --git a/app/assets/stylesheets/theme1/home.css.sass b/app/assets/stylesheets/theme1/home.css.sass new file mode 100644 index 00000000..311a2138 --- /dev/null +++ b/app/assets/stylesheets/theme1/home.css.sass @@ -0,0 +1,10 @@ +.home-tablet-phone + right: 0 + top: -200px + position: absolute + z-index: 120 +.introduction + padding-top: 20px +.home-qr + float: left + margin: 0 20px 20px 0 diff --git a/app/assets/stylesheets/theme1/theme1.css.sass b/app/assets/stylesheets/theme1/theme1.css.sass index eb69ad91..50348244 100644 --- a/app/assets/stylesheets/theme1/theme1.css.sass +++ b/app/assets/stylesheets/theme1/theme1.css.sass @@ -1,8 +1,31 @@ +@import bourbon +$cth-height: 48px +=content-top-background + .left + position: absolute + bottom: 0 + left: 0 + background-image: image-url('theme1/floor-left.jpg') + background-position: right + height: $cth-height + width: 50% + .right + position: absolute + bottom: 0 + right: 0 + background-image: image-url('theme1/floor-right.jpg') + background-position: left + height: $cth-height + width: 50% + .container + position: relative + max-width: $content-max-width $green-original: #99CB23 $green: #7BB459 //Heineken $font-family-content: Georgia, serif $font-family-navigation: Verdana,serif $font-family-headers: Verdana,serif //'Pacifico', serif +$content-max-width: 962px body background-color: #333 margin: 0 @@ -47,7 +70,6 @@ body width: 315px height: 140px float: left - z-index: 2 &.light1 background-image: image-url('theme1/light-1.jpg') margin-left: 15px @@ -58,14 +80,12 @@ body &.light3 background-image: image-url('theme1/light-3.jpg') .container - width: 960px + max-width: 960px padding-top: 40px position: relative - z-index: 4 margin: 0 auto #header - margin-bottom: 20px - height: 14px + margin-bottom: 10px #logo a margin: 20px @@ -90,32 +110,30 @@ body &.wsite-social-rss background-position: -141px 0 #nav-wrap - .container - clear: both - overflow: hidden - z-index: 100 - position: relative - width: 900px + max-width: 960px + position: relative + .navbar-inner height: 48px - padding: 11px 25px 24px 25px - background-image: image-url('theme1/nav-bar.png') - background-repeat: no-repeat - background-position: 0 0 - margin: 0 auto + background-image: image-url('theme1/nav-bar-left.png'), image-url('theme1/nav-bar-right.png'), image-url('theme1/nav-bar-middle.png') + background-repeat: no-repeat, no-repeat, repeat-x + background-position: left center, right center, center center + background-color: transparent + border: 0 + .nav-collapse + &.in.collapse + background-color: rgba(0,0,0,0.4) + z-index: 400 ul.nav - float: left margin: 0 padding: 0 list-style: none li position: relative - float: left list-style: none a border: 0 color: white display: block - float: left font-family: $font-family-navigation text-decoration: none font-size: 18px @@ -129,53 +147,75 @@ body &.active a color: $green - #banner-wrap - z-index: 2 + background-color: inherit + #home-splash + height: 318px - 10px position: relative - .left - position: absolute - bottom: 0 - left: 0 - background-image: image-url('theme1/floor-left.jpg') - background-position: right - height: 48px - width: 50% - .right - position: absolute - bottom: 0 - right: 0 - background-image: image-url('theme1/floor-right.jpg') - background-position: left - height: 48px - width: 50% - .container - background-image: image-url('theme1/floor-center.jpg') - background-position: center bottom - background-repeat: no-repeat - margin: 0 auto - width: 982px - #banner - background-image: image-url('theme1/banner-bg.png') - background-position: 2px bottom - background-repeat: no-repeat - padding-bottom: 38px + #home-splash-content + z-index: 12 + height: 318px - 61px - 10px + max-width: $content-max-width + #home-splash-content-inner + background-color: white + height: 260px + margin-left: 49px + margin-right: 53px position: relative - width: 982px - .wsite-header - border: 10px solid white - margin-left: 61px - width: 840px + overflow: hidden + #home-splash-content-inner-bar + position: absolute height: 260px + left: 10px + right: 10px + top: 10px + z-index: 20 background-image: image-url("theme1/home_qwaiter_den_haag.png") - &.standard - background-image: image-url("theme1/no-banner-bg.png") - .wsite-header - display: none + background-repeat: no-repeat + background-position: center top + #home-splash-footer + +content-top-background + #home-splash-footer-inner + background-color: transparent + background-repeat: no-repeat, no-repeat + height: 61px + max-width: $content-max-width + background-position: left bottom, right bottom + background-image: image-url('theme1/button-bar-left.png'), image-url('theme1/button-bar-right.png') + color: $green + border-width: 0 + border-radius: 0 + height: 61px + #home-splash-footer-inner-bar + margin-left: 49px + margin-right: 53px + background-color: white + background-repeat: repeat-x + background-position: center bottom + background-image: image-url('theme1/button-bar-middle.png') + //min-height: 61px + height: 61px + #content-header + position: relative + height: $cth-height + +content-top-background + .container + height: $cth-height + margin: 0 auto + background-image: image-url("theme1/no-banner-bg-left.png"), image-url('theme1/no-banner-bg-right.png') + background-repeat: no-repeat, no-repeat + background-position: left bottom, right bottom + .top-ribbon + background-image: image-url("theme1/no-banner-bg-middle.png") + height: $cth-height + background-repeat: repeat-x + background-position: bottom + margin: 0 69px 0 42px #main-wrap font-size: 14px font-family: $font-family-content line-height: 1.5 color: #848585 + position: relative h1 font-size: 28px padding: 0.5em 0 0.2em 0 @@ -192,65 +232,50 @@ body background-image: image-url('theme1/wall-bg.jpg') background-position: center top overflow: visible - z-index: 2 position: relative .container - background-image: image-url('theme1/content-bg.png') - background-position: 2px - min-height: 400px margin: 0 auto - width: 974px - .content-top - width: 960px - height: 30px - margin-left: 9px - background-image: image-url('theme1/content-top.jpg') + max-width: $content-max-width .main-inner - width: 894px - padding: 0 40px 30px 40px + +linear-gradient(#d6d6d6 0, white 70px) + position: relative + padding: 10px 40px 30px 40px + margin-left: 2px + margin-right: 2px + min-height: 400px h1.page-title margin: 0 padding: 0 margin-bottom: 12px - #wsite-content #footer-wrap color: white background-image: image-url('theme1/footer-bg.jpg') background-position: center - text-align: right overflow: visible + position: relative .footer-shadow - height: 72px - width: 100% - background-image: image-url('theme1/footer-top-shadow.png') - background-repeat: repeat-x - position: relative - z-index: 4 + height: 1px + +box-shadow(0px 4px 10px #000) .container - background-color: #420F03 - width: 838px - padding: 72px 30px 20px 30px + max-width: 838px + .footer-content + background-color: #420F03 + text-align: right + padding: 72px 30px 20px 30px + overflow: visible + margin: 0 auto + a + margin-left: 20px + .footer-bottom + background-image: image-url('theme1/footer-bottom.png') + position: relative + height: 35px + padding-left: 30px + padding-right: 30px + max-width: 838px position: relative - top: -72px - z-index: 3 overflow: visible margin: 0 auto - .footer-top - width: 974px - height: 4px - position: relative - top: -72px - left: -60px - overflow: visible - background-image: image-url('theme1/footer-top.png') - .bottom - background-image: image-url('theme1/footer-bottom.png') - width: 898px - height: 35px - position: relative - bottom: -35px - left: -30px - overflow: visible a color: $green text-decoration: none diff --git a/app/views/layouts/theme1-home.html.slim b/app/views/layouts/theme1-home.html.slim index a6b0351a..100da045 100644 --- a/app/views/layouts/theme1-home.html.slim +++ b/app/views/layouts/theme1-home.html.slim @@ -10,7 +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" + = stylesheet_link_tag "theme1/application", :media => "all" link href="/favicon.ico" rel="shortcut icon" link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css' @@ -27,38 +27,36 @@ html lang="en" .container #header #header-right= render 'theme1/social' - #logo= link_to image_tag('icons/logo-medium.png', alt: application_title), root_path - #nav-wrap - .container= render 'theme1/navigation' - #banner-wrap - .left - .right - .container - #banner - .wsite-header - .clearing + #logo= link_to image_tag('icons/logo-text.png', alt: application_title), root_path + #nav-wrap.container + .navbar + .navbar-inner= render 'theme1/navigation' + #home-splash + #home-splash-content.container + #home-splash-content-inner + #home-splash-content-inner-bar + #home-splash-footer + .left + .right + #home-splash-footer-inner.container + #home-splash-footer-inner-bar #main-wrap .container .content-top .main-inner - #wsite-content.wsite-not-footer - = yield :page_title - = yield + - 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] + = yield :page_title + = yield #footer-wrap .footer-shadow .container - .footer-top - = render 'footer' - .bottom - | © Qwaiter 2012 - - .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] + .footer-content= render 'footer' + .footer-bottom © Qwaiter 2013 = javascript_include_tag "application" diff --git a/app/views/layouts/theme1.html.slim b/app/views/layouts/theme1.html.slim index b5d619eb..681fde30 100644 --- a/app/views/layouts/theme1.html.slim +++ b/app/views/layouts/theme1.html.slim @@ -12,6 +12,7 @@ html lang="en" = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" = stylesheet_link_tag "theme1/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 @@ -26,36 +27,31 @@ html lang="en" .container #header #header-right= render 'theme1/social' - #logo= link_to image_tag('icons/logo-medium.png', alt: application_title), root_path - #nav-wrap - .container= render 'theme1/navigation' - #banner-wrap + #logo= link_to image_tag('icons/logo-text.png', alt: application_title), root_path + #nav-wrap.container + .navbar + .navbar-inner= render 'theme1/navigation' + #content-header .left .right .container - #banner.standard - .wsite-header - .clearing + .top-ribbon #main-wrap .container - .content-top .main-inner - #wsite-content.wsite-not-footer - - 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] - = yield :page_title - = yield + - 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] + = yield :page_title + = yield #footer-wrap .footer-shadow .container - .footer-top - = render 'footer' - .bottom - | © Qwaiter 2012 + .footer-content= render 'footer' + .footer-bottom © Qwaiter 2013 = javascript_include_tag "theme1/application" diff --git a/app/views/supplier/edit.html.slim b/app/views/supplier/edit.html.slim index 7d05bd62..2d73edaa 100644 --- a/app/views/supplier/edit.html.slim +++ b/app/views/supplier/edit.html.slim @@ -1,4 +1,4 @@ -/- content_for :head do +- content_for :head do = javascript_include_tag 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false' = form_for @supplier, url: supplier_update_settings_path, html: {class: 'form-horizontal'} do |f| diff --git a/app/views/theme1/_navigation.html.slim b/app/views/theme1/_navigation.html.slim index 4cc4f793..17264f1d 100644 --- a/app/views/theme1/_navigation.html.slim +++ b/app/views/theme1/_navigation.html.slim @@ -1,7 +1,15 @@ -ul.nav - li[class=(current_page?(controller: '/dashboard', action: 'home') ? :active : nil)]= link_to t('menu.home'), root_path - li[class=(current_page?(controller: '/dashboard', action: 'about') ? :active : nil)]= link_to t('menu.about'), about_path - li[class=(current_page?(controller: '/dashboard', action: 'clients') ? :active : nil)]= link_to t('menu.clients'), clients_path - li[class=(current_page?(controller: '/dashboard', action: 'bars_restaurants') ? :active : nil)]= link_to t('menu.bars_restaurants'), bars_restaurants_path - li[class=(current_page?(controller: '/dashboard', action: 'cartoon') ? :active : nil)]= link_to t('menu.cartoon'), cartoon_path - li[class=(current_page?(controller: '/dashboard', action: 'contact') ? :active : nil)]= link_to t('menu.contact'), contact_path +.container + a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse" + span.icon-bar + span.icon-bar + span.icon-bar + + ul.nav + li[class=(current_page?(controller: '/dashboard', action: 'home') ? :active : nil)]= link_to t('menu.home'), root_path + li[class=(current_page?(controller: '/dashboard', action: 'about') ? :active : nil)]= link_to t('menu.about'), about_path + .nav-collapse.collapse + ul.nav + li[class=(current_page?(controller: '/dashboard', action: 'clients') ? :active : nil)]= link_to t('menu.clients'), clients_path + li[class=(current_page?(controller: '/dashboard', action: 'bars_restaurants') ? :active : nil)]= link_to t('menu.bars_restaurants'), bars_restaurants_path + li[class=(current_page?(controller: '/dashboard', action: 'cartoon') ? :active : nil)]= link_to t('menu.cartoon'), cartoon_path + li[class=(current_page?(controller: '/dashboard', action: 'contact') ? :active : nil)]= link_to t('menu.contact'), contact_path