Make design responsive
This commit is contained in:
@@ -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
|
||||
|
||||
+5
-10
@@ -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
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 8.3 KiB |
+142
-19
@@ -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 @@
|
||||
|
||||
|
||||
|
||||
<text
|
||||
<rect
|
||||
style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="rect3809"
|
||||
width="96.056786"
|
||||
height="32.492115"
|
||||
x="2.5236592"
|
||||
y="47.791798"
|
||||
ry="0" /><text
|
||||
font-size="9.4245"
|
||||
id="text5"
|
||||
style="font-size:9.42450047px;fill:#634227;font-family:HelveticaRounded-Bold"
|
||||
x="25.508852"
|
||||
y="72.998604"
|
||||
style="font-size:4.56339216px;fill:#634227;font-family:HelveticaRounded-Bold"
|
||||
x="8.5248251"
|
||||
y="30.760637"
|
||||
inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
|
||||
inkscape:export-xdpi="766.79059"
|
||||
inkscape:export-ydpi="766.79059"><tspan
|
||||
style="-inkscape-font-specification:Arial Rounded MT Bold;font-family:Arial Rounded MT Bold"
|
||||
style="font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold"
|
||||
id="tspan3936">Q</tspan></text>
|
||||
|
||||
|
||||
|
||||
|
||||
<text
|
||||
id="text7"
|
||||
x="33.180241"
|
||||
y="72.998604"
|
||||
style="font-size:11.99999905px"
|
||||
x="12.23935"
|
||||
y="30.760637"
|
||||
style="font-size:5.810462px"
|
||||
inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
|
||||
inkscape:export-xdpi="766.79059"
|
||||
inkscape:export-ydpi="766.79059"><tspan
|
||||
x="33.180241"
|
||||
y="72.998604"
|
||||
x="12.23935"
|
||||
y="30.760637"
|
||||
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>
|
||||
style="font-size:4.56339216px;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"
|
||||
style="font-size:4.56339216px;fill:#634227;font-family:HelveticaRounded-Bold"
|
||||
x="26.997444"
|
||||
y="30.760637"
|
||||
inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
|
||||
inkscape:export-xdpi="766.79059"
|
||||
inkscape:export-ydpi="766.79059"><tspan
|
||||
style="-inkscape-font-specification:Arial Rounded MT Bold;font-family:Arial Rounded MT Bold"
|
||||
style="font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold"
|
||||
id="tspan3938">R</tspan></text>
|
||||
|
||||
|
||||
|
||||
|
||||
<g
|
||||
id="g3012"
|
||||
inkscape:export-filename="/Users/bterkuile/Qwaiter/Android app/Pictures/icon-high-res.png"
|
||||
inkscape:export-xdpi="766.79059"
|
||||
inkscape:export-ydpi="766.79059"><path
|
||||
inkscape:export-ydpi="766.79059"
|
||||
transform="matrix(0.48420519,0,0,0.48420519,-3.826694,-4.5856657)"><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"
|
||||
@@ -260,4 +271,116 @@
|
||||
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>
|
||||
style="fill:#231f20" /></g><g
|
||||
transform="matrix(0.33640333,0,0,0.33640333,-2.5434408,49.050237)"
|
||||
inkscape:export-ydpi="413.97891"
|
||||
inkscape:export-xdpi="413.97891"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
|
||||
id="g3013"><path
|
||||
style="fill:#ffffff"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3015"
|
||||
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/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-ydpi="112.82128" /><path
|
||||
style="fill:none;stroke:#634227;stroke-width:1.63800001"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3017"
|
||||
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/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-ydpi="112.82128" /><path
|
||||
style="fill:#634227"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3019"
|
||||
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/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-ydpi="112.82128" /><path
|
||||
style="fill:#634227"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3021"
|
||||
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)"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
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" /><circle
|
||||
d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z"
|
||||
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="circle3023"
|
||||
r="5.5359998"
|
||||
cy="4230.1689"
|
||||
cx="4250.2969"
|
||||
stroke-miterlimit="10"
|
||||
clip-path="url(#SVGID_2_-0)"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
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" /><path
|
||||
style="fill:#231f20"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3025"
|
||||
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/qwaiter/app/assets/images/icons/logo-medium.png"
|
||||
inkscape:export-xdpi="112.82128"
|
||||
inkscape:export-ydpi="112.82128" /><path
|
||||
style="fill:#231f20"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3027"
|
||||
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)"
|
||||
transform="translate(-4208.3103,-4204.1921)"
|
||||
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" /></g><text
|
||||
inkscape:export-ydpi="413.97891"
|
||||
inkscape:export-xdpi="413.97891"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
|
||||
y="68.982262"
|
||||
x="21.494862"
|
||||
style="font-size:17.67565727px;fill:#ffffff;fill-opacity:1;font-family:HelveticaRounded-Bold"
|
||||
id="text3029"
|
||||
font-size="9.4245"><tspan
|
||||
id="tspan3031"
|
||||
style="fill:#ffffff;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">Q</tspan></text>
|
||||
<text
|
||||
inkscape:export-ydpi="413.97891"
|
||||
inkscape:export-xdpi="413.97891"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
|
||||
style="font-size:20.05559921px;line-height:139.99999762%;fill:#ffffff;fill-opacity:1"
|
||||
y="69.955124"
|
||||
x="35.827068"
|
||||
id="text3033"
|
||||
sodipodi:linespacing="140%"><tspan
|
||||
style="font-size:15.75116634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:139.99999762%;letter-spacing:-0.68085659px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:'Arial Rounded MT Bold,'"
|
||||
id="tspan3035"
|
||||
font-size="9.4245"
|
||||
y="69.955124"
|
||||
x="35.827068"
|
||||
dx="0">WAITE</tspan></text>
|
||||
<text
|
||||
inkscape:export-ydpi="413.97891"
|
||||
inkscape:export-xdpi="413.97891"
|
||||
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png"
|
||||
y="69.934372"
|
||||
x="83.856453"
|
||||
style="font-size:17.45138359px;fill:#ffffff;fill-opacity:1;font-family:HelveticaRounded-Bold"
|
||||
id="text3037"
|
||||
font-size="9.4245"><tspan
|
||||
id="tspan3039"
|
||||
style="fill:#ffffff;fill-opacity:1;font-family:Arial Rounded MT Bold;-inkscape-font-specification:Arial Rounded MT Bold">R</tspan></text>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
@@ -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 = $('<div>').addClass("location_picker_map")
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require jquery-ui
|
||||
//= require bootstrap
|
||||
// require twitter/bootstrap
|
||||
//= require_directory .
|
||||
//= require_self
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
.home-tablet-phone
|
||||
float: right
|
||||
margin-top: -200px
|
||||
@@ -5,3 +5,4 @@ body
|
||||
> a
|
||||
&:hover
|
||||
background-color: transparent
|
||||
@import bootstrap-responsive
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
ul#cartoon
|
||||
list-style: none
|
||||
li
|
||||
float: left
|
||||
div
|
||||
display: inline-block
|
||||
width: 280px
|
||||
.cartoon-image
|
||||
height: 382px
|
||||
vertical-align: top
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
max-width: 960px
|
||||
position: relative
|
||||
width: 900px
|
||||
.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
|
||||
position: relative
|
||||
width: 982px
|
||||
.wsite-header
|
||||
border: 10px solid white
|
||||
margin-left: 61px
|
||||
width: 840px
|
||||
#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
|
||||
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
|
||||
max-width: 838px
|
||||
.footer-content
|
||||
background-color: #420F03
|
||||
width: 838px
|
||||
text-align: right
|
||||
padding: 72px 30px 20px 30px
|
||||
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
|
||||
a
|
||||
margin-left: 20px
|
||||
.footer-bottom
|
||||
background-image: image-url('theme1/footer-bottom.png')
|
||||
width: 898px
|
||||
height: 35px
|
||||
position: relative
|
||||
bottom: -35px
|
||||
left: -30px
|
||||
height: 35px
|
||||
padding-left: 30px
|
||||
padding-right: 30px
|
||||
max-width: 838px
|
||||
position: relative
|
||||
overflow: visible
|
||||
margin: 0 auto
|
||||
a
|
||||
color: $green
|
||||
text-decoration: none
|
||||
|
||||
@@ -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,32 +27,23 @@ 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'
|
||||
#home-splash
|
||||
#home-splash-content.container
|
||||
#home-splash-content-inner
|
||||
#home-splash-content-inner-bar
|
||||
#home-splash-footer
|
||||
.left
|
||||
.right
|
||||
.container
|
||||
#banner
|
||||
.wsite-header
|
||||
.clearing
|
||||
#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
|
||||
#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" ×
|
||||
@@ -61,4 +52,11 @@ html lang="en"
|
||||
.alert.alert-success
|
||||
a.close data-dismiss="alert" ×
|
||||
div= flash[:notice]
|
||||
= yield :page_title
|
||||
= yield
|
||||
#footer-wrap
|
||||
.footer-shadow
|
||||
.container
|
||||
.footer-content= render 'footer'
|
||||
.footer-bottom © Qwaiter 2013
|
||||
= javascript_include_tag "application"
|
||||
|
||||
@@ -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,21 +27,18 @@ 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" ×
|
||||
@@ -54,8 +52,6 @@ html lang="en"
|
||||
#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"
|
||||
|
||||
@@ -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|
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
.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
|
||||
|
||||
Reference in New Issue
Block a user