update front image, update theme and add cartoon
This commit is contained in:
Vendored
BIN
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 74 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 74 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 63 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
+71
-67
@@ -130,7 +130,7 @@
|
||||
inkscape:window-height="852"
|
||||
id="namedview43"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.8284271"
|
||||
inkscape:zoom="1"
|
||||
inkscape:cx="70.721631"
|
||||
inkscape:cy="87.591402"
|
||||
inkscape:window-x="0"
|
||||
@@ -148,105 +148,109 @@
|
||||
style="font-size:9.42450047px;fill:#634227;font-family:HelveticaRounded-Bold"
|
||||
x="25.508852"
|
||||
y="72.998604"
|
||||
inkscape:export-filename="/Users/bterkuile/Documents/workspace/Qwaiter/res/drawable-xhdpi/q_launcher.png"
|
||||
inkscape:export-xdpi="144.16052"
|
||||
inkscape:export-ydpi="144.16052"><tspan
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-ydpi="112.82128"><tspan
|
||||
style="-inkscape-font-specification:Arial Rounded MT Bold;font-family:Arial Rounded MT Bold"
|
||||
id="tspan3936">Q</tspan></text>
|
||||
|
||||
|
||||
<text
|
||||
id="text7"
|
||||
x="33.180241"
|
||||
y="72.998604"
|
||||
style="font-size:11.99999905px"
|
||||
inkscape:export-filename="/Users/bterkuile/Documents/workspace/Qwaiter/res/drawable-xhdpi/q_launcher.png"
|
||||
inkscape:export-xdpi="144.16052"
|
||||
inkscape:export-ydpi="144.16052"><tspan
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-ydpi="112.82128"><tspan
|
||||
x="33.180241"
|
||||
y="72.998604"
|
||||
font-size="9.4245"
|
||||
id="tspan9"
|
||||
style="font-size:9.42450046999999991px;fill:#231f20;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">WAITE</tspan></text>
|
||||
|
||||
|
||||
<text
|
||||
font-size="9.4245"
|
||||
id="text19"
|
||||
style="font-size:9.42450047px;fill:#634227;font-family:HelveticaRounded-Bold"
|
||||
x="63.659245"
|
||||
y="72.998604"
|
||||
inkscape:export-filename="/Users/bterkuile/Documents/workspace/Qwaiter/res/drawable-xhdpi/q_launcher.png"
|
||||
inkscape:export-xdpi="144.16052"
|
||||
inkscape:export-ydpi="144.16052"><tspan
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-ydpi="112.82128"><tspan
|
||||
style="-inkscape-font-specification:Arial Rounded MT Bold;font-family:Arial Rounded MT Bold"
|
||||
id="tspan3938">R</tspan></text>
|
||||
|
||||
<path
|
||||
style="fill:#ffffff"
|
||||
inkscape:connector-curvature="0"
|
||||
|
||||
<g
|
||||
id="g3012"><path
|
||||
inkscape:export-ydpi="112.82128"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
|
||||
id="path29"
|
||||
d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/logo-big.png"
|
||||
inkscape:export-xdpi="492.5"
|
||||
inkscape:export-ydpi="492.5" /><path
|
||||
style="fill:none;stroke:#634227;stroke-width:1.63800001"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff" /><path
|
||||
inkscape:export-ydpi="112.82128"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
|
||||
id="path31"
|
||||
d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/logo-big.png"
|
||||
inkscape:export-xdpi="492.5"
|
||||
inkscape:export-ydpi="492.5" /><path
|
||||
style="fill:#634227"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path33"
|
||||
style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path
|
||||
inkscape:export-ydpi="112.82128"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/logo-big.png"
|
||||
inkscape:export-xdpi="492.5"
|
||||
inkscape:export-ydpi="492.5" /><path
|
||||
style="fill:#634227"
|
||||
id="path33"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path35"
|
||||
style="fill:#634227" /><path
|
||||
inkscape:export-ydpi="112.82128"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
id="path35"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#634227" /><circle
|
||||
inkscape:export-ydpi="112.82128"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/logo-big.png"
|
||||
inkscape:export-xdpi="492.5"
|
||||
inkscape:export-ydpi="492.5" /><circle
|
||||
style="fill:none;stroke:#634227;stroke-width:0.182;stroke-miterlimit:10"
|
||||
sodipodi:ry="5.5359998"
|
||||
sodipodi:rx="5.5359998"
|
||||
sodipodi:cy="4230.1689"
|
||||
sodipodi:cx="4250.2969"
|
||||
id="circle37"
|
||||
r="5.5359998"
|
||||
cy="4230.1689"
|
||||
cx="4250.2969"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
stroke-miterlimit="10"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
cx="4250.2969"
|
||||
cy="4230.1689"
|
||||
r="5.5359998"
|
||||
id="circle37"
|
||||
sodipodi:cx="4250.2969"
|
||||
sodipodi:cy="4230.1689"
|
||||
sodipodi:rx="5.5359998"
|
||||
sodipodi:ry="5.5359998"
|
||||
style="fill:none;stroke:#634227;stroke-width:0.182;stroke-miterlimit:10" /><path
|
||||
inkscape:export-ydpi="112.82128"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/logo-big.png"
|
||||
inkscape:export-xdpi="492.5"
|
||||
inkscape:export-ydpi="492.5" /><path
|
||||
style="fill:#231f20"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path39"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/logo-big.png"
|
||||
inkscape:export-xdpi="492.5"
|
||||
inkscape:export-ydpi="492.5" /><path
|
||||
style="fill:#231f20"
|
||||
id="path39"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path41"
|
||||
d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
style="fill:#231f20" /><path
|
||||
inkscape:export-ydpi="112.82128"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/icons/logo-big.png"
|
||||
inkscape:export-xdpi="492.5"
|
||||
inkscape:export-ydpi="492.5" /></svg>
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354"
|
||||
id="path41"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#231f20" /></g></svg>
|
||||
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 492 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
@@ -0,0 +1,7 @@
|
||||
ul#cartoon
|
||||
list-style: none
|
||||
li
|
||||
float: left
|
||||
div
|
||||
width: 280px
|
||||
.cartoon-image
|
||||
@@ -44,3 +44,5 @@ body
|
||||
img.home-qr
|
||||
float: left
|
||||
margin: 0 20px 20px 0
|
||||
.clearing
|
||||
clear: both
|
||||
|
||||
@@ -111,13 +111,19 @@ body
|
||||
color: white
|
||||
display: block
|
||||
float: left
|
||||
font-family: 'Pacifico',serif
|
||||
font-family: Verdana,serif
|
||||
text-decoration: none
|
||||
font-size: 18px
|
||||
height: 46px
|
||||
line-height: 46px
|
||||
margin: 0 10px
|
||||
padding: 0 20px
|
||||
text-shadow: 0 2px 2px rgba(0, 0, 0, 0.5)
|
||||
&:hover
|
||||
color: #99CB23
|
||||
&.active
|
||||
a
|
||||
color: #99CB23
|
||||
#banner-wrap
|
||||
z-index: 2
|
||||
position: relative
|
||||
@@ -155,7 +161,11 @@ body
|
||||
margin-left: 61px
|
||||
width: 840px
|
||||
height: 260px
|
||||
background-image: image-url('theme1/banner-tall.png')
|
||||
background-image: image-url("theme1/home_qwaiter_den_haag.png")
|
||||
&.standard
|
||||
background-image: image-url("theme1/no-banner-bg.png")
|
||||
.wsite-header
|
||||
display: none
|
||||
#main-wrap
|
||||
font-size: 14px
|
||||
font-family: Georgia, serif
|
||||
@@ -174,9 +184,8 @@ body
|
||||
font-family: 'Pacifico', serif
|
||||
color: #AE571F
|
||||
|
||||
|
||||
background-image: image-url('theme1/wall-bg.jpg')
|
||||
background-position: center
|
||||
background-position: center top
|
||||
overflow: visible
|
||||
z-index: 2
|
||||
position: relative
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
- cartoon_text = {\
|
||||
1 => "I feel like a beer!!", \
|
||||
2 => "Where is the waiter?", \
|
||||
3 => "Lets order a beer with my phone!", \
|
||||
4 => "Now I can do things I like in stead of waitingat the bar", \
|
||||
5 => "Relaxt, I get my beer as ordered", \
|
||||
6 => "Qwaiter rocks!!!!" \
|
||||
}
|
||||
ul#cartoon
|
||||
- for i in 1..6
|
||||
li
|
||||
.cartoon-image= image_tag "cartoon/qwaiter-cartoon-#{i}.png"
|
||||
.cartoon-text= cartoon_text[i]
|
||||
.clearing
|
||||
|
||||
@@ -36,13 +36,9 @@ html lang="en"
|
||||
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
|
||||
#logo= link_to image_tag('icons/logo-medium.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
|
||||
.container= render 'theme1/navigation'
|
||||
#banner-wrap
|
||||
.left
|
||||
.right
|
||||
|
||||
@@ -36,13 +36,16 @@ html lang="en"
|
||||
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
|
||||
#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
|
||||
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.standard
|
||||
.wsite-header
|
||||
.clearing
|
||||
#main-wrap
|
||||
.container
|
||||
.content-top
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
ul.nav
|
||||
li[class=(current_page?(controller: 'dashboard', action: 'home') ? :active : nil)]= link_to 'Home', root_path
|
||||
li= link_to User.model_name.human_plural, user_root_path
|
||||
li= link_to Supplier.model_name.human_plural, supplier_root_path
|
||||
li[class=(current_page?(controller: 'dashboard', action: 'enquete') ? :active : nil)]= link_to 'Enquete', enquete_path
|
||||
li[class=(current_page?(controller: 'dashboard', action: 'cartoon') ? :active : nil)]= link_to 'Cartoon', cartoon_path
|
||||
@@ -67,6 +67,7 @@ Qrammer::Application.routes.draw do
|
||||
match '/qr' => 'dashboard#qr'
|
||||
match '/demo_both' => 'dashboard#demo_both'
|
||||
match '/enquete' => 'dashboard#enquete'
|
||||
match '/cartoon' => 'dashboard#cartoon'
|
||||
|
||||
namespace :suppliers, path: '/supplier' do
|
||||
resources :sections do
|
||||
|
||||
Reference in New Issue
Block a user