diff --git a/public/stylesheets/less/style.less b/public/stylesheets/less/style.less index b37a321..6ef2e63 100644 --- a/public/stylesheets/less/style.less +++ b/public/stylesheets/less/style.less @@ -95,6 +95,10 @@ a.text-danger:hover, a.text-danger:focus { padding-top: 30px; } +.product-results h1{ + font-size: 22px; +} + .product-title-image{ margin: auto; max-height: 400px; diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index b83ca03..04f82b7 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -68,6 +68,9 @@ a.text-danger:focus { .product-layout { padding-top: 30px; } +.product-results h1 { + font-size: 22px; +} .product-title-image { margin: auto; max-height: 400px; diff --git a/public/stylesheets/style.min.css b/public/stylesheets/style.min.css index 8bc46f2..72a67a9 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}.cart-product{padding:0!important}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:0;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}.pad-right-10{padding-right:10px}.pad-right-15{padding-right:15px}.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-pad-30{padding-bottom:30px}.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;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-primary,.btn-warning{color:#fff;background-color:#000;border-color:#000}.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover{color:#fff!important;background-color:#000!important;border-color:#000!important;opacity:.65}.btn-danger{color:#fff;background-color:#cc3a2c;border-color:#cc3a2c}.btn-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}@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;margin-left:5px;margin-right:5px}#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 +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}.cart-product{padding:0!important}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-results h1{font-size:22px}.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:0;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}.pad-right-10{padding-right:10px}.pad-right-15{padding-right:15px}.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-pad-30{padding-bottom:30px}.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;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-primary,.btn-warning{color:#fff;background-color:#000;border-color:#000}.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover{color:#fff!important;background-color:#000!important;border-color:#000!important;opacity:.65}.btn-danger{color:#fff;background-color:#cc3a2c;border-color:#cc3a2c}.btn-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}@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;margin-left:5px;margin-right:5px}#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/routes/index.js b/routes/index.js index 656dbe6..63bfa58 100644 --- a/routes/index.js +++ b/routes/index.js @@ -94,7 +94,7 @@ router.get('/checkout/information', async (req, res, next) => { // render the payment page res.render(`${config.themeViews}checkout-information`, { - title: 'Checkout', + title: 'Checkout - Information', config: req.app.config, session: req.session, paymentType, @@ -138,7 +138,7 @@ router.get('/checkout/shipping', async (req, res, next) => { // render the payment page res.render(`${config.themeViews}checkout-shipping`, { - title: 'Checkout', + title: 'Checkout - Shipping', config: req.app.config, session: req.session, cartClose: false, @@ -156,6 +156,7 @@ router.get('/checkout/cart', (req, res) => { const config = req.app.config; res.render(`${config.themeViews}checkout-cart`, { + title: 'Checkout - Cart', page: req.query.path, config, session: req.session, @@ -196,7 +197,7 @@ router.get('/checkout/payment', async (req, res) => { await updateTotalCart(req, res); res.render(`${config.themeViews}checkout-payment`, { - title: 'Checkout', + title: 'Checkout - Payment', config: req.app.config, paymentConfig: getPaymentConfig(), session: req.session, diff --git a/views/themes/Cloth/checkout-cart.hbs b/views/themes/Cloth/checkout-cart.hbs index ee60c67..5169153 100644 --- a/views/themes/Cloth/checkout-cart.hbs +++ b/views/themes/Cloth/checkout-cart.hbs @@ -5,7 +5,7 @@
- Checkout + Checkout
diff --git a/views/themes/Cloth/index.hbs b/views/themes/Cloth/index.hbs index c1318f3..655a627 100644 --- a/views/themes/Cloth/index.hbs +++ b/views/themes/Cloth/index.hbs @@ -1,11 +1,11 @@ {{> themes/Cloth/front-menu}}
{{#if filtered}} -
+
{{#ifCond @root.paginateUrl '==' 'category'}} -

{{ @root.__ "Category" }}: {{@root.searchTerm}}

+

{{ @root.__ "Category" }}: {{@root.searchTerm}}

{{else}} -

{{ @root.__ "Search results" }}: {{@root.searchTerm}}

+

{{ @root.__ "Search results" }}: {{@root.searchTerm}}

{{/ifCond}}
{{/if}}