From 63e201a69f2093a6594216aec2b1bc2979a7a593 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sat, 2 Mar 2013 16:04:16 +0100 Subject: [PATCH] Make design responsive --- Gemfile | 4 +- Gemfile.lock | 15 +- app/assets/images/icons/logo-text.png | Bin 0 -> 8544 bytes app/assets/images/logo.svg | 161 +++++++++++-- app/assets/images/theme1/nav-bar-left.png | Bin 0 -> 2102 bytes app/assets/images/theme1/nav-bar-middle.png | Bin 0 -> 10766 bytes app/assets/images/theme1/nav-bar-right.png | Bin 0 -> 2972 bytes .../images/theme1/no-banner-bg-left.png | Bin 0 -> 2438 bytes .../images/theme1/no-banner-bg-middle.png | Bin 0 -> 3181 bytes .../images/theme1/no-banner-bg-right.png | Bin 0 -> 3756 bytes .../supplier/initializer.js.coffee | 2 +- app/assets/javascripts/theme1/application.js | 1 + app/assets/stylesheets/home.css.sass | 3 - .../theme1/bootstrap_and_overrides.css.sass | 1 + .../stylesheets/theme1/cartoon.css.sass | 8 +- app/assets/stylesheets/theme1/home.css.sass | 10 + app/assets/stylesheets/theme1/theme1.css.sass | 221 ++++++++++-------- app/views/layouts/theme1-home.html.slim | 54 +++-- app/views/layouts/theme1.html.slim | 42 ++-- app/views/supplier/edit.html.slim | 2 +- app/views/theme1/_navigation.html.slim | 22 +- 21 files changed, 350 insertions(+), 196 deletions(-) create mode 100644 app/assets/images/icons/logo-text.png create mode 100644 app/assets/images/theme1/nav-bar-left.png create mode 100644 app/assets/images/theme1/nav-bar-middle.png create mode 100644 app/assets/images/theme1/nav-bar-right.png create mode 100644 app/assets/images/theme1/no-banner-bg-left.png create mode 100644 app/assets/images/theme1/no-banner-bg-middle.png create mode 100644 app/assets/images/theme1/no-banner-bg-right.png delete mode 100644 app/assets/stylesheets/home.css.sass create mode 100644 app/assets/stylesheets/theme1/home.css.sass 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 0000000000000000000000000000000000000000..9360ccbb40a9fad4e102688fb06a38a722af1f08 GIT binary patch literal 8544 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 a;Qs*&<>qJt!9&#m0000Q + 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 0000000000000000000000000000000000000000..cf3d470228cf02d6d5a03a75ce83cd692c1db038 GIT binary patch literal 2102 zcmV-62+8+}P)e%$~703B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00){$L_t(Y$0gIri)B{< zz~SE+?zzJo>s7t#>gpQ0GjtM72%W)%7!(mrvQmfy6chzTbR~!`{RiAhAR@ty5L^Wp zMv<6>0TUy^kim}Ku{)ivN>_DNy{cFDz5DKP&bh~h-~aH5SD)K>*C%ODWe&H9Wz{r3 z4wgZji5q#|4nf|z+Ep_{dp4#$RYLSj$J`q9K1Lv zKD@DC^3MjIyf9>WDW*M+IZdaeRmyTEA#RyEgA`J;J6Uil1v(1cGf+HvCSjwSa8L@) z^}4vGBuxyXU>SD}nMlZI4SMIGtqFip znq7a&a%K>}{K~q^MMv4Pz*&KkErYS46F^jo+uqSS$L!Q{>Eek0+^o2FQ!&}EkoRtn zSm|qu*b+xAOG^gp4U5{~r029KiK7T%6bB~_aqRf;=9Im%L4UA2<63UHZ?r_$SoR9b zX*)-H0ZMaWkdb>3c&b^8=~yN{qmwH1UoJ1&!g#f%B_~$0xA4R`a-lh@7i_N#DNhT^ zj-p%FoV4J)M>>Ug>U`f?ZS<)Xbaca-mc%Myr>KxE^s|JxZCFnNdsV;&jffo6+@iak zz9`xpkPK9cQIh`Im`h%gPg-uamch9`Z(g2LwKZK6P$6OK+!Erci#>N*Ni}zp?>;={ zvAYF(x#x6W;@bsnnz1TiK7!?AxauX2lB_alDH3`z#|p#WuH;x!j%IM{cERR4sH2)I z$pUu}u^t(!CXgFg>orJMmdrv*TbI0dH07P$hOTK?Ul*hz<~RhpaYn~lgpMfch9v^N zmdGYjRJLYeB61rzo>$1KC5r{tfp1zmArOqFc8;{;==BVB)go;Y(KAbAI$~pF*ckOV zt_4REPpkk{B7|f$GZYica;FDUQag{jwATAYH}+CH&mh$-7LIQ0@v`Op{f39mjd4YPLmE4vMv!>N*u>X+XnK+(`h{im7{Wo zRVh(EF!KuM1yz8_?FG(5-^L6H5Idv}4v9g<9r9VttSU)U$q>m&4(xqUOIMUs0(Pg>T7aGEwu7x3@ebHmk`x<;2)G0f)t z=yPZA5vb#ah?M?%!Zw~=+j7@h#s?o;7TTd2OLw?N@DbvB4{f-oDZBP%_3xN zHOV-moCm@LHdi7V>$&#ng0d;Obua@5`xDQtqNXIlMTY+#)#$Nl*y_Uidcsjzvj0iL z+b0oOKjZrsV*Y-;MP-gUXrveTBw>)Y9OeP>vnSWwNn_MKTMAKYo`3B+Pk;43UU>P} zz!p@`^PLBOLz+fxuW1_B(ve-x-f7V1qAtD2^63${W=f?cFMPIulNb5nw|BU3_&Tp1 zt@86HB6{P9o40Ci9!^O*9rSiq(<*ptzhHmTVpPnIjo5toU4H-CWiEKj7cM%aQygE- z>GeAtd)PT#ps!gdk1dDZa1bi8B;v=f1KVdHyYCcb8g7dykTZyup0e%7p_Uog;9%aEf>#p zxPRsUoBC1Ue45Z5wJajTVcxJ21umW$;_C)^*G3Ya+=5S=!27e3z?{cMG3SR8uOe<0 z4S&7ba5O2Hl!2G7FSvP9GZziw^LM27c#2Nb7_Dj|tq38(wGAs;($s>c+Y&iQv>=f! zwuzYG(M#Qd2-e~>Op1gg7W7PuXe9?oeALn|Km!Mr140RvZMl;7SL)!t4XEj$Z3o) gY)e*gdg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..64a0bd8bed961a947967e3eff2a7c34c5fb19211 GIT binary patch literal 10766 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 M07*qoM6N<$f|A3l4gdfE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eda258bf412887e1ff080daca3ba1054b07567d0 GIT binary patch literal 2972 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 Ef-qo;)c^nh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cf19c6b3dafa711090024b847e3890bb1c5fa9c3 GIT binary patch literal 3181 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 # 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