From ee5400716c9b8b41be5f2c45a36cdbd401b00890 Mon Sep 17 00:00:00 2001 From: Mark Moffat Date: Sat, 28 Dec 2019 16:13:20 +1030 Subject: [PATCH] Style/layout fixes for mobile --- app.js | 8 ++--- public/stylesheets/admin.css | 3 -- public/stylesheets/admin.min.css | 2 +- public/stylesheets/less/admin.less | 4 --- public/stylesheets/less/style.less | 31 +++++++++++++++++++ public/stylesheets/style.css | 33 ++++++++++++++++----- public/stylesheets/style.min.css | 2 +- views/layouts/layout.hbs | 11 ++++--- views/themes/Cloth/checkout-information.hbs | 6 ++-- views/themes/Cloth/checkout-shipping.hbs | 4 +-- views/themes/Cloth/front-menu.hbs | 5 ++-- views/themes/Cloth/index.hbs | 4 +-- views/themes/Cloth/style.css | 15 +--------- views/themes/Cloth/style.min.css | 2 +- 14 files changed, 78 insertions(+), 52 deletions(-) diff --git a/app.js b/app.js index d7ae9f1..d4c56a1 100644 --- a/app.js +++ b/app.js @@ -121,16 +121,16 @@ handlebars = handlebars.create({ }, perRowClass: (numProducts) => { if(parseInt(numProducts) === 1){ - return'col-md-12 product-item'; + return'col-6 col-md-12 product-item'; } if(parseInt(numProducts) === 2){ - return'col-md-6 product-item'; + return'col-6 col-md-6 product-item'; } if(parseInt(numProducts) === 3){ - return'col-md-4 product-item'; + return'col-6 col-md-4 product-item'; } if(parseInt(numProducts) === 4){ - return'col-md-3 product-item'; + return'col-6 col-md-3 product-item'; } return'col-md-6 product-item'; diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css index c9fbda2..d650632 100644 --- a/public/stylesheets/admin.css +++ b/public/stylesheets/admin.css @@ -20,9 +20,6 @@ padding-top: 10px; height: 45px; } -.searchMenuLocation-side { - padding-right: 0; -} .productsWrapper { padding-right: 10px; padding-left: 10px; diff --git a/public/stylesheets/admin.min.css b/public/stylesheets/admin.min.css index dec34a0..0d89e6c 100644 --- a/public/stylesheets/admin.min.css +++ b/public/stylesheets/admin.min.css @@ -1 +1 @@ -.btn-outline-primary,.btn-warning{color:#fff!important;background-color:#000;border-color:#000}.btn-outline-danger{color:#fff!important;background-color:#cc4135;border-color:#cc4135}.has-error div,.has-error input,.has-error textarea{border-color:#cc4135}#frm_search,.search-bar-input,.search-bar-input .btn{padding-top:10px;height:45px}.searchMenuLocation-side{padding-right:0}.productsWrapper{padding-right:10px;padding-left:10px}.searchBarWrapper{padding-right:0;padding-left:0}.footer{padding-top:20px}.product-price{padding-bottom:0}.navbarMenuWrapper{background-color:#f5f5f5}.navbarMenu>ul>li>a:hover{color:#cc4135!important}.navbarMenu{padding-right:0;padding-left:0}.product-wrapper>a:hover{color:#cc4135!important}#navbar,#navbar>.navbar-nav,#navbar>.navbar-nav>li>a,.navbar-header,.navbar-static-top{margin-bottom:0;height:100px!important}#navbar>.navbar-nav>li>a{padding-top:35px}.pagination>li>a{background-color:#cc4135!important}body .popover{display:none!important}.navbar-brand{color:#cc4135!important;letter-spacing:4px;padding-left:20px!important;padding-top:0!important;height:80px!important;font-size:55px!important}.navbar-brand,.navbar-brand-image{height:80px;padding-left:10px;padding-top:10px}.navbar-default .badge{background-color:#cc4135}#empty-cart:active,#empty-cart:active:hover,#empty-cart:focus,#empty-cart:hover,.pushy-link:active,.pushy-link:active:hover,.pushy-link:focus,.pushy-link:hover{border-color:#cc4135;background-color:#cc4135}.navActive>a{margin-bottom:0;padding-top:15px;border-bottom:5px solid #cc4135}#navbar,#navbar>.navbar-nav,#navbar>.navbar-nav>li>a,.navbar-header,.navbar-static-top{background-color:#fff}.navbar-default .navbar-nav>li>a{color:#838b8f;font-size:20px}@media only screen and (max-width:768px){.navbar-default .navbar-brand{padding-top:10px}.navbar-default .navbar-nav>li>a{font-size:16px}.searchBarWrapper{padding-top:10px}.navbarMenuWrapper{padding-left:0;padding-right:0}.navbarMenuOuter{padding-left:0;padding-right:0}.navActive>a{color:#fff!important}.navbarMenu{padding-right:7.5px;padding-left:7.5px}.navActive>a{color:#fff!important;background-color:#cc4135;border-bottom:none}.footer{padding-top:10px}} \ No newline at end of file +.btn-outline-primary,.btn-warning{color:#fff!important;background-color:#000;border-color:#000}.btn-outline-danger{color:#fff!important;background-color:#cc4135;border-color:#cc4135}.has-error div,.has-error input,.has-error textarea{border-color:#cc4135}#frm_search,.search-bar-input,.search-bar-input .btn{padding-top:10px;height:45px}.productsWrapper{padding-right:10px;padding-left:10px}.searchBarWrapper{padding-right:0;padding-left:0}.footer{padding-top:20px}.product-price{padding-bottom:0}.navbarMenuWrapper{background-color:#f5f5f5}.navbarMenu>ul>li>a:hover{color:#cc4135!important}.navbarMenu{padding-right:0;padding-left:0}.product-wrapper>a:hover{color:#cc4135!important}#navbar,#navbar>.navbar-nav,#navbar>.navbar-nav>li>a,.navbar-header,.navbar-static-top{margin-bottom:0;height:100px!important}#navbar>.navbar-nav>li>a{padding-top:35px}.pagination>li>a{background-color:#cc4135!important}body .popover{display:none!important}.navbar-brand{color:#cc4135!important;letter-spacing:4px;padding-left:20px!important;padding-top:0!important;height:80px!important;font-size:55px!important}.navbar-brand,.navbar-brand-image{height:80px;padding-left:10px;padding-top:10px}.navbar-default .badge{background-color:#cc4135}#empty-cart:active,#empty-cart:active:hover,#empty-cart:focus,#empty-cart:hover,.pushy-link:active,.pushy-link:active:hover,.pushy-link:focus,.pushy-link:hover{border-color:#cc4135;background-color:#cc4135}.navActive>a{margin-bottom:0;padding-top:15px;border-bottom:5px solid #cc4135}#navbar,#navbar>.navbar-nav,#navbar>.navbar-nav>li>a,.navbar-header,.navbar-static-top{background-color:#fff}.navbar-default .navbar-nav>li>a{color:#838b8f;font-size:20px}@media only screen and (max-width:768px){.navbar-default .navbar-brand{padding-top:10px}.navbar-default .navbar-nav>li>a{font-size:16px}.searchBarWrapper{padding-top:10px}.navbarMenuWrapper{padding-left:0;padding-right:0}.navbarMenuOuter{padding-left:0;padding-right:0}.navActive>a{color:#fff!important}.navbarMenu{padding-right:7.5px;padding-left:7.5px}.navActive>a{color:#fff!important;background-color:#cc4135;border-bottom:none}.footer{padding-top:10px}} \ No newline at end of file diff --git a/public/stylesheets/less/admin.less b/public/stylesheets/less/admin.less index 386c429..666276b 100644 --- a/public/stylesheets/less/admin.less +++ b/public/stylesheets/less/admin.less @@ -25,10 +25,6 @@ height: 45px; } -.searchMenuLocation-side { - padding-right: 0; -} - .productsWrapper{ padding-right: 10px; padding-left: 10px; diff --git a/public/stylesheets/less/style.less b/public/stylesheets/less/style.less index 89fd380..6598644 100644 --- a/public/stylesheets/less/style.less +++ b/public/stylesheets/less/style.less @@ -109,6 +109,15 @@ input[type=number]::-webkit-outer-spin-button { margin: 0; } +.navbar-brand{ + color: @secondary-btn-color; + letter-spacing: 4px; + padding-left: 20px; + padding-top: 10px; + height: 80px; + font-size: 55px; +} + .navbar-brand>img { width: auto; height: 100%; @@ -421,6 +430,16 @@ input.form-control.customerDetails{ margin-bottom: 0; } +.previous a{ + border-bottom-left-radius: .25rem; + border-top-left-radius: .25rem; +} + +.next a{ + border-bottom-right-radius: .25rem; + border-top-right-radius: .25rem; +} + .image-next{ position: absolute; top: 180px; @@ -556,6 +575,7 @@ a { .pushy { width: calc(100%); } + .pushy-right { -webkit-transform: translate3d(calc(100%), 0, 0); -ms-transform: translate3d(calc(100%), 0, 0); @@ -600,6 +620,8 @@ a { .product-layout{ padding-top: 0px; padding-bottom: 30px; + padding-left: 10px; + padding-right: 10px; } #btn_search{ @@ -632,4 +654,13 @@ a { body{ margin-bottom: @footer-height; } + + .navbar-brand { + padding-left: 0px; + height: auto; + } + + .thumbnail{ + min-height: 0; + } } \ No newline at end of file diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index ab3e3a7..30dbace 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -81,6 +81,14 @@ input[type=number]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } +.navbar-brand { + color: #cc3a2c; + letter-spacing: 4px; + padding-left: 20px; + padding-top: 10px; + height: 80px; + font-size: 55px; +} .navbar-brand > img { width: auto; height: 100%; @@ -217,14 +225,6 @@ input[type=number]::-webkit-outer-spin-button { .search-bar { margin-top: 10px; } -.searchMenuLocation-side { - padding-left: 25px; - padding-right: 25px; -} -.searchMenuLocation-top { - padding-left: 5px; - padding-right: 5px; -} .breadcrumb { background-color: #f8f9fa; margin-top: 10px; @@ -343,6 +343,14 @@ input.form-control.customerDetails { .admin { margin-bottom: 0; } +.previous a { + border-bottom-left-radius: 0.25rem; + border-top-left-radius: 0.25rem; +} +.next a { + border-bottom-right-radius: 0.25rem; + border-top-right-radius: 0.25rem; +} .image-next { position: absolute; top: 180px; @@ -499,6 +507,8 @@ a { .product-layout { padding-top: 0px; padding-bottom: 30px; + padding-left: 10px; + padding-right: 10px; } #btn_search { border-top-right-radius: 4px; @@ -524,4 +534,11 @@ a { body { margin-bottom: 100px; } + .navbar-brand { + padding-left: 0px; + height: auto; + } + .thumbnail { + min-height: 0; + } } diff --git a/public/stylesheets/style.min.css b/public/stylesheets/style.min.css index 78ee378..8db656b 100644 --- a/public/stylesheets/style.min.css +++ b/public/stylesheets/style.min.css @@ -1 +1 @@ -html{position:relative;min-height:100%}body{margin-bottom:140px}body,html{font-size:16px}.content-body{margin-bottom:40px}.menu-top{margin-top:15px;margin-left:15px;margin-right:15px}.menu-side,.product-layout{padding-top:35px}.menu-side-mobile{background-color:transparent!important;color:inherit!important;text-align:center;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.dragable_item{cursor:move}.page-header{padding-bottom:5px}.cart-contents-title{font-size:18px;font-weight:700}.cart-row{padding-bottom:10px;display:flex;align-items:center}.cart-item-row{margin-top:5px}.cart-link{padding-left:7px}a.text-danger:focus,a.text-danger:hover{color:#cc3a2c}.cart-update-button{cursor:pointer}.thumbnail-image{cursor:pointer}#product-images{margin-bottom:30px}.product-layout{padding-top:30px}.product-title-image{margin:auto;max-height:400px;width:auto}.thumbnail-image-container .img-fluid{display:block;width:auto;max-height:100%;margin:auto}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.navbar-brand>img{width:auto;height:100%}.thumbnail{min-height:415px}.vertical-center{display:flex;align-items:center}.title-image-container .img-fluid{display:block;width:auto;max-height:100%;margin:auto}.title-image-container{height:400px}.thumbnail-image-container{height:350px}.product-title{font-size:20px;margin-top:0}.product-title-home{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;align-items:center;justify-content:center;text-align:center}.product-price{padding-bottom:10px;font-size:20px;color:#aaa}.productOptions{padding-bottom:15px}.product-option{font-size:18px}.body_text,.btnAddToCart{padding-top:15px;padding-bottom:15px}.product-option-text{font-size:16px;color:#aaa;padding-bottom:10px;padding-top:10px}.seporator{padding-top:5px;border-bottom:1px solid #eee;padding-bottom:6px}.list-group-input-pad select{margin-top:-7px}.no-pad-left{padding-left:0}.no-pad-right{padding-right:0}.top-marg-10{margin-top:10px}.top-marg-15{margin-top:15px}.top-marg-20{margin-top:20px}.top-pad-5{padding-top:10px}.top-pad-8{padding-top:8px}.top-pad-10{padding-top:10px}.top-pad-20{padding-top:20px}.top-pad-50{padding-top:50px}.top-pad-100{padding-top:100px}.bottom-pad-10{padding-bottom:10px}.bottom-pad-15{padding-bottom:15px}.bottom-pad-20{padding-bottom:20px}.bottom-marg-10{margin-bottom:10px}.bottom-marg-15{margin-bottom:15px}.bottom-marg-20{margin-bottom:20px}.left-pad-10{padding-left:10px}.left-pad-30{padding-left:30px}.right-pad-10{padding-right:10px}.shipping-form input{margin-bottom:15px}#header{height:50px}.search-bar{margin-top:10px}.searchMenuLocation-side{padding-left:25px;padding-right:25px}.searchMenuLocation-top{padding-left:5px;padding-right:5px}.breadcrumb{background-color:#f8f9fa;margin-top:10px}.breadcrumbProPerRow-3{margin-left:10px;margin-right:10px}.searchProPerRow-3,.searchProPerRow-4{padding-left:0;padding-right:0}.dropup-button{height:34px;padding:0;color:#fff!important}.dropdown-menu>li>a{padding-top:5px!important}.pad-bottom{padding-bottom:25px}.keywords{padding-bottom:30px;padding-top:20px;font-size:19px}.file-form{padding-left:15px;padding-right:15px}.editor_btn_action{border-top-left-radius:4px!important;border-bottom-left-radius:4px!important}.dropup-list{padding-bottom:5px;margin-right:10px;margin-left:10px;margin-top:10px}#notify_message{position:fixed;display:none;z-index:9999;padding-top:10px;height:50px;bottom:0;width:100%;text-align:center;font-size:22px}.input-group .form-control{z-index:1}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;filter:alpha(opacity=0);opacity:0;outline:0;background:#fff;cursor:inherit;display:block}.offcanvas-element{z-index:100;background-color:#fff}.product-item{padding-left:0;padding-right:0}input:focus{outline:0;background:#fbfbe9}input+label{display:block;cursor:text;transition:.15s ease-out all;position:absolute;top:.9em;left:1.3em}.floatLabel{top:.1em;left:32px;font-size:.7em;color:#999;font-weight:400;transition:.15s ease-out all}input.form-control.customerDetails{padding-bottom:5px}.footer{position:absolute;bottom:0;width:100%;height:100px;padding-top:25px;background-color:#f5f5f5}.admin{margin-bottom:0}.image-next{position:absolute;top:180px;right:0}.image-prev{position:absolute;top:180px;left:0}.image-button{cursor:pointer;opacity:.7}.image-button-show{cursor:pointer;opacity:.7!important}.navbar-default{background-color:#fff}.navbar-default .navbar-nav>li>a{color:#000}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#000}.btn-outline-primary,.btn-warning{color:#fff;background-color:#000;border-color:#000}.btn-outline-primary:hover,.btn-warning:hover{color:#fff!important;background-color:#000!important;border-color:#000!important;opacity:.65}.btn-outline-danger{color:#fff;background-color:#cc3a2c;border-color:#cc3a2c}.btn-outline-danger:hover{color:#fff!important;background-color:#cc3a2c!important;border-color:#cc3a2c!important;opacity:.65}a:focus,a:hover{color:#000}a{color:#000}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{background-color:#000;border-color:#000}.navbar-default .navbar-brand{color:#000;font-size:40px;font-weight:700}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#000}.navbar-brand-image{padding:0;height:70px}.page-item.disabled .page-link{color:#b7b7b7}.page-link{color:#fff;border:0}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#000}.thumbnail{border:none}.help-block{color:#95a5a6}.list-group-item:first-child,.list-group-item:last-child{border-top-right-radius:0;border-top-left-radius:0}@media only screen and (min-width:768px){.pushy{width:700px}.pushy-right{-webkit-transform:translate3d(700px,0,0);-ms-transform:translate3d(700px,0,0);transform:translate3d(700px,0,0)}.pushy-open-right #container,.pushy-open-right .push{-webkit-transform:translate3d(-700px,0,0);-ms-transform:translate3d(-700px,0,0);transform:translate3d(-700px,0,0)}}@media only screen and (max-width:768px){.pushy{width:calc(100%)}.pushy-right{-webkit-transform:translate3d(calc(100%),0,0);-ms-transform:translate3d(calc(100%),0,0);transform:translate3d(calc(100%),0,0)}.pushy-open-right #container,.pushy-open-right .push{-webkit-transform:translate3d(-calc(100%),0,0);-ms-transform:translate3d(-calc(100%),0,0);transform:translate3d(-calc(100%),0,0)}.product-item{padding-left:0;padding-right:0}.showFooter{margin-bottom:220px}.title-image-container{height:auto}.product-title{font-size:18px;padding-top:18px;min-height:auto}.search-bar-input{padding-left:0;padding-right:0}.menu-side{padding-top:15px}.product-layout{padding-top:0;padding-bottom:30px}#btn_search{border-top-right-radius:4px;border-bottom-right-radius:4px}.cart-row{padding-top:10px;border-bottom:1px solid #ecf0f1;display:block}.cart-body{padding-top:0}.cart-contents-shipping{padding-top:10px}#cart{padding-bottom:15px}.footer{height:100px}body{margin-bottom:100px}} \ No newline at end of file +html{position:relative;min-height:100%}body{margin-bottom:140px}body,html{font-size:16px}.content-body{margin-bottom:40px}.menu-top{margin-top:15px;margin-left:15px;margin-right:15px}.menu-side,.product-layout{padding-top:35px}.menu-side-mobile{background-color:transparent!important;color:inherit!important;text-align:center;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.dragable_item{cursor:move}.page-header{padding-bottom:5px}.cart-contents-title{font-size:18px;font-weight:700}.cart-row{padding-bottom:10px;display:flex;align-items:center}.cart-item-row{margin-top:5px}.cart-link{padding-left:7px}a.text-danger:focus,a.text-danger:hover{color:#cc3a2c}.cart-update-button{cursor:pointer}.thumbnail-image{cursor:pointer}#product-images{margin-bottom:30px}.product-layout{padding-top:30px}.product-title-image{margin:auto;max-height:400px;width:auto}.thumbnail-image-container .img-fluid{display:block;width:auto;max-height:100%;margin:auto}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.navbar-brand{color:#cc3a2c;letter-spacing:4px;padding-left:20px;padding-top:10px;height:80px;font-size:55px}.navbar-brand>img{width:auto;height:100%}.thumbnail{min-height:415px}.vertical-center{display:flex;align-items:center}.title-image-container .img-fluid{display:block;width:auto;max-height:100%;margin:auto}.title-image-container{height:400px}.thumbnail-image-container{height:350px}.product-title{font-size:20px;margin-top:0}.product-title-home{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;align-items:center;justify-content:center;text-align:center}.product-price{padding-bottom:10px;font-size:20px;color:#aaa}.productOptions{padding-bottom:15px}.product-option{font-size:18px}.body_text,.btnAddToCart{padding-top:15px;padding-bottom:15px}.product-option-text{font-size:16px;color:#aaa;padding-bottom:10px;padding-top:10px}.seporator{padding-top:5px;border-bottom:1px solid #eee;padding-bottom:6px}.list-group-input-pad select{margin-top:-7px}.no-pad-left{padding-left:0}.no-pad-right{padding-right:0}.top-marg-10{margin-top:10px}.top-marg-15{margin-top:15px}.top-marg-20{margin-top:20px}.top-pad-5{padding-top:10px}.top-pad-8{padding-top:8px}.top-pad-10{padding-top:10px}.top-pad-20{padding-top:20px}.top-pad-50{padding-top:50px}.top-pad-100{padding-top:100px}.bottom-pad-10{padding-bottom:10px}.bottom-pad-15{padding-bottom:15px}.bottom-pad-20{padding-bottom:20px}.bottom-marg-10{margin-bottom:10px}.bottom-marg-15{margin-bottom:15px}.bottom-marg-20{margin-bottom:20px}.left-pad-10{padding-left:10px}.left-pad-30{padding-left:30px}.right-pad-10{padding-right:10px}.shipping-form input{margin-bottom:15px}#header{height:50px}.search-bar{margin-top:10px}.breadcrumb{background-color:#f8f9fa;margin-top:10px}.breadcrumbProPerRow-3{margin-left:10px;margin-right:10px}.searchProPerRow-3,.searchProPerRow-4{padding-left:0;padding-right:0}.dropup-button{height:34px;padding:0;color:#fff!important}.dropdown-menu>li>a{padding-top:5px!important}.pad-bottom{padding-bottom:25px}.keywords{padding-bottom:30px;padding-top:20px;font-size:19px}.file-form{padding-left:15px;padding-right:15px}.editor_btn_action{border-top-left-radius:4px!important;border-bottom-left-radius:4px!important}.dropup-list{padding-bottom:5px;margin-right:10px;margin-left:10px;margin-top:10px}#notify_message{position:fixed;display:none;z-index:9999;padding-top:10px;height:50px;bottom:0;width:100%;text-align:center;font-size:22px}.input-group .form-control{z-index:1}.btn-file{position:relative;overflow:hidden}.btn-file input[type=file]{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;filter:alpha(opacity=0);opacity:0;outline:0;background:#fff;cursor:inherit;display:block}.offcanvas-element{z-index:100;background-color:#fff}.product-item{padding-left:0;padding-right:0}input:focus{outline:0;background:#fbfbe9}input+label{display:block;cursor:text;transition:.15s ease-out all;position:absolute;top:.9em;left:1.3em}.floatLabel{top:.1em;left:32px;font-size:.7em;color:#999;font-weight:400;transition:.15s ease-out all}input.form-control.customerDetails{padding-bottom:5px}.footer{position:absolute;bottom:0;width:100%;height:100px;padding-top:25px;background-color:#f5f5f5}.admin{margin-bottom:0}.previous a{border-bottom-left-radius:.25rem;border-top-left-radius:.25rem}.next a{border-bottom-right-radius:.25rem;border-top-right-radius:.25rem}.image-next{position:absolute;top:180px;right:0}.image-prev{position:absolute;top:180px;left:0}.image-button{cursor:pointer;opacity:.7}.image-button-show{cursor:pointer;opacity:.7!important}.navbar-default{background-color:#fff}.navbar-default .navbar-nav>li>a{color:#000}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#000}.btn-outline-primary,.btn-warning{color:#fff;background-color:#000;border-color:#000}.btn-outline-primary:hover,.btn-warning:hover{color:#fff!important;background-color:#000!important;border-color:#000!important;opacity:.65}.btn-outline-danger{color:#fff;background-color:#cc3a2c;border-color:#cc3a2c}.btn-outline-danger:hover{color:#fff!important;background-color:#cc3a2c!important;border-color:#cc3a2c!important;opacity:.65}a:focus,a:hover{color:#000}a{color:#000}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{background-color:#000;border-color:#000}.navbar-default .navbar-brand{color:#000;font-size:40px;font-weight:700}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#000}.navbar-brand-image{padding:0;height:70px}.page-item.disabled .page-link{color:#b7b7b7}.page-link{color:#fff;border:0}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#000}.thumbnail{border:none}.help-block{color:#95a5a6}.list-group-item:first-child,.list-group-item:last-child{border-top-right-radius:0;border-top-left-radius:0}@media only screen and (min-width:768px){.pushy{width:700px}.pushy-right{-webkit-transform:translate3d(700px,0,0);-ms-transform:translate3d(700px,0,0);transform:translate3d(700px,0,0)}.pushy-open-right #container,.pushy-open-right .push{-webkit-transform:translate3d(-700px,0,0);-ms-transform:translate3d(-700px,0,0);transform:translate3d(-700px,0,0)}}@media only screen and (max-width:768px){.pushy{width:calc(100%)}.pushy-right{-webkit-transform:translate3d(calc(100%),0,0);-ms-transform:translate3d(calc(100%),0,0);transform:translate3d(calc(100%),0,0)}.pushy-open-right #container,.pushy-open-right .push{-webkit-transform:translate3d(-calc(100%),0,0);-ms-transform:translate3d(-calc(100%),0,0);transform:translate3d(-calc(100%),0,0)}.product-item{padding-left:0;padding-right:0}.showFooter{margin-bottom:220px}.title-image-container{height:auto}.product-title{font-size:18px;padding-top:18px;min-height:auto}.search-bar-input{padding-left:0;padding-right:0}.menu-side{padding-top:15px}.product-layout{padding-top:0;padding-bottom:30px;padding-left:10px;padding-right:10px}#btn_search{border-top-right-radius:4px;border-bottom-right-radius:4px}.cart-row{padding-top:10px;border-bottom:1px solid #ecf0f1;display:block}.cart-body{padding-top:0}.cart-contents-shipping{padding-top:10px}#cart{padding-bottom:15px}.footer{height:100px}body{margin-bottom:100px}.navbar-brand{padding-left:0;height:auto}.thumbnail{min-height:0}} \ No newline at end of file diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs index 21375c8..2aa2a51 100644 --- a/views/layouts/layout.hbs +++ b/views/layouts/layout.hbs @@ -87,13 +87,12 @@ {{else}} {{/if}} - -
+
{{#if paymentMessage}}

{{paymentMessage}}

{{/if}} -
+
-
+
{{> (getTheme 'cart')}} {{#if @root.session.cart}}
diff --git a/views/themes/Cloth/checkout-shipping.hbs b/views/themes/Cloth/checkout-shipping.hbs index ec10802..f7abed7 100644 --- a/views/themes/Cloth/checkout-shipping.hbs +++ b/views/themes/Cloth/checkout-shipping.hbs @@ -8,7 +8,7 @@
-
+
{{ @root.__ "Shipping options" }}
@@ -26,7 +26,7 @@ {{ @root.__ "Return to information" }} {{ @root.__ "Proceed to payment" }}
-
+
{{> (getTheme 'cart')}}
{{#if @root.session.cart}} diff --git a/views/themes/Cloth/front-menu.hbs b/views/themes/Cloth/front-menu.hbs index f53a435..1d82911 100644 --- a/views/themes/Cloth/front-menu.hbs +++ b/views/themes/Cloth/front-menu.hbs @@ -1,6 +1,5 @@ -