new design input from roos

app/assets/images/logo.svg

@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100"
+   height="100"
+   viewBox="0 0 99.999995 99.999995"
+   enable-background="new 0 0 8503.94 8503.94"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="logo.svg"><metadata
+   id="metadata47"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs45">
+	<defs
+   id="defs23">
+		<rect
+   height="62.563999"
+   width="46.786999"
+   y="4220.376"
+   x="4233"
+   id="SVGID_1_" />
+	</defs>
+	<clipPath
+   id="SVGID_2_">
+		<use
+   id="use27"
+   overflow="visible"
+   xlink:href="#SVGID_1_"
+   style="overflow:visible"
+   x="0"
+   y="0"
+   width="8503.9404"
+   height="8503.9404" />
+	</clipPath>
+	
+	
+	
+	
+	
+		
+	
+	
+<clipPath
+   id="SVGID_2_-0"><use
+     id="use27-0"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3815"><use
+     id="use3817"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3819"><use
+     id="use3821"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3823"><use
+     id="use3825"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3827"><use
+     id="use3829"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3831"><use
+     id="use3833"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath><clipPath
+   id="clipPath3835"><use
+     id="use3837"
+     overflow="visible"
+     xlink:href="#SVGID_1_"
+     style="overflow:visible"
+     x="0"
+     y="0"
+     width="8503.9404"
+     height="8503.9404" /></clipPath></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1122"
+   inkscape:window-height="852"
+   id="namedview43"
+   showgrid="false"
+   inkscape:zoom="2.8284271"
+   inkscape:cx="70.721631"
+   inkscape:cy="87.591402"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+
+
+
+
+
+<text
+   font-size="9.4245"
+   id="text5"
+   style="font-size:9.42450047px;fill:#634227;font-family:HelveticaRounded-Bold"
+   x="25.508852"
+   y="72.998604"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38"><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/companytools/development/rails/qrammer/app/assets/images/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38"><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/companytools/development/rails/qrammer/app/assets/images/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38"><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"
+   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/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38" /><path
+   style="fill:none;stroke:#634227;stroke-width:1.63800001"
+   inkscape:connector-curvature="0"
+   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/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38" /><path
+   style="fill:#634227"
+   inkscape:connector-curvature="0"
+   id="path33"
+   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/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38" /><path
+   style="fill:#634227"
+   inkscape:connector-curvature="0"
+   id="path35"
+   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/qrammer/app/assets/images/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38" /><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"
+   stroke-miterlimit="10"
+   clip-path="url(#SVGID_2_-0)"
+   transform="translate(-4208.3103,-4204.1921)"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38" /><path
+   style="fill:#231f20"
+   inkscape:connector-curvature="0"
+   id="path39"
+   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/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38" /><path
+   style="fill:#231f20"
+   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)"
+   transform="translate(-4208.3103,-4204.1921)"
+   inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qrammer/app/assets/images/logo.png"
+   inkscape:export-xdpi="192.38"
+   inkscape:export-ydpi="192.38" /></svg>

app/assets/stylesheets/phone/structure.css.sass

@@ -1,14 +1,14 @@
 @import compass
 $side-spacing: 5px
-$qbrown: #8B5A2B
+$qbrown: #634227
 
 
 html
-  background-image: image-url('textures/wood5.jpg')
+  background-image: image-url('textures/wood6.png')
 body
   padding-left: $side-spacing
   padding-right: $side-spacing
-  background-image: image-url('textures/wood5.jpg')
+  background-image: image-url('textures/wood6.png')
   .home-panel
     margin-left: 20px
     margin-right: 20px
@@ -17,6 +17,8 @@ body
     background-color: rgba(240, 240, 240, 0.6)
     +border-radius(10px)
     .home-header
+      padding-top: 14px
+      padding-bottom: 8px
       text-align: center
       //background-color: #eee
       //+border-top-radius(10px)
@@ -30,9 +32,9 @@ body
       //background-color: #eee
       //+border-bottom-radius(10px)
       //+opacity(0.7)
-      min-height: 100px
+      min-height: 42px
       .home-footer-content
-        margin-top: 22px
+        margin-top: 5px
         margin-left: auto
         margin-right: auto
         background-color: green
@@ -45,7 +47,7 @@ body
           width: 34px
           height: 34px
           float: left
-          margin-right: 15px
+          margin-left: 15px
           background-color: $qbrown
           text-align: center
           line-height: 34px

app/assets/stylesheets/tablet/structure.css.sass

@@ -2,7 +2,7 @@ $side-spacing: 0px
 body
   padding-left: $side-spacing
   padding-right: $side-spacing
-  background-image: image-url('textures/wood5.jpg')
+  background-image: image-url('textures/wood6.png')
   //padding-top: 50px
   .navbar-fixed-top
     margin-left: -$side-spacing

app/views/layouts/tablet.html.slim

@@ -27,13 +27,6 @@ html lang="en"
             span.icon-bar
             span.icon-bar
           a.brand href=supplier_root_path = application_title
-          ul.nav#top-navigation-list
-            li= link_to t('supplier.menu.active_orders', orders: Order.model_name.human_plural), supplier_active_orders_path
-            li= link_to t('supplier.menu.active_lists', lists: List.model_name.human_plural), supplier_active_lists_path
-            li= link_to ProductCategory.model_name.human_plural, suppliers_product_categories_path
-            li= link_to Product.model_name.human_plural, suppliers_products_path
-            li= link_to Section.model_name.human_plural, suppliers_sections_path
-            li= link_to Table.model_name.human_plural, suppliers_tables_path
           ul.nav.pull-right
             li.dropdown
               a.dropdown-toggle href="#" data-toggle="dropdown"
@@ -47,6 +40,13 @@ html lang="en"
                   li= link_to 'Settings', supplier_settings_path
                   li= link_to 'Logout', destroy_supplier_session_path, method: :delete
           .container.nav-collapse
+            ul.nav#top-navigation-list
+              li= link_to t('supplier.menu.active_orders', orders: Order.model_name.human_plural), supplier_active_orders_path
+              li= link_to t('supplier.menu.active_lists', lists: List.model_name.human_plural), supplier_active_lists_path
+              li= link_to ProductCategory.model_name.human_plural, suppliers_product_categories_path
+              li= link_to Product.model_name.human_plural, suppliers_products_path
+              li= link_to Section.model_name.human_plural, suppliers_sections_path
+              li= link_to Table.model_name.human_plural, suppliers_tables_path
 
     .container
       .content

app/views/user/home.html.slim

@@ -1,5 +1,5 @@
 .home-panel
-  .home-header = image_tag 'logo.png', width: '150', height: '140'
+  .home-header = image_tag 'logo.png'
   .home-center
     a href="#" onClick="QMobile.scanQr()" = image_tag 'scan-logo.png'
   .home-footer