diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store index e78adf88..7dd0890c 100644 Binary files a/app/assets/images/.DS_Store and b/app/assets/images/.DS_Store differ diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png index 0e3a188d..075f7f4f 100644 Binary files a/app/assets/images/logo.png and b/app/assets/images/logo.png differ diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg new file mode 100644 index 00000000..ca97660f --- /dev/null +++ b/app/assets/images/logo.svg @@ -0,0 +1,249 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + +Q +WAITE +R + \ No newline at end of file diff --git a/app/assets/images/textures/wood6.png b/app/assets/images/textures/wood6.png new file mode 100644 index 00000000..0fcd467c Binary files /dev/null and b/app/assets/images/textures/wood6.png differ diff --git a/app/assets/stylesheets/phone/structure.css.sass b/app/assets/stylesheets/phone/structure.css.sass index 05258971..b0b96f0c 100644 --- a/app/assets/stylesheets/phone/structure.css.sass +++ b/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 diff --git a/app/assets/stylesheets/tablet/structure.css.sass b/app/assets/stylesheets/tablet/structure.css.sass index 127b8f38..aff9922c 100644 --- a/app/assets/stylesheets/tablet/structure.css.sass +++ b/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 diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim index e182611c..30955aae 100644 --- a/app/views/layouts/tablet.html.slim +++ b/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 diff --git a/app/views/user/home.html.slim b/app/views/user/home.html.slim index 2aa9bc1c..7bf887c0 100644 --- a/app/views/user/home.html.slim +++ b/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