diff --git a/templates/default/assets/js/script.js b/templates/default/assets/js/script.js index 2cc7d4b99..6938696df 100644 --- a/templates/default/assets/js/script.js +++ b/templates/default/assets/js/script.js @@ -3,7 +3,7 @@ /* ------------------------------------------------------------------ onLoad Function -------------------------------------------------- */ - $(document).ready(function(){ + $(document).ready(function(){ alert(1); // Loader var $loader = $('
'); diff --git a/templates/default/assets/less/thelia/buttons.less b/templates/default/assets/less/thelia/buttons.less index 9ac36c370..5a4c936d7 100644 --- a/templates/default/assets/less/thelia/buttons.less +++ b/templates/default/assets/less/thelia/buttons.less @@ -9,32 +9,31 @@ // Buttons .btn { - + // Remove Box Shadow &:active, &.active { .box-shadow(none); } - + // Primary Buttons &.btn_add_to_cart, &.btn-cart, &.btn-checkout, &.btn-checkout-next, &.btn-checkout-home, - &.btn-filter, &.btn-forgot, &.btn-login, &.btn-proceed-checkout, &.btn-register, &.btn-submit { .btn-primary; } - + &.btn-add-address, &.btn-checkout, &.btn-checkout-next, &.btn-checkout-home { float: right; } - - + + // Secondary Buttons &.btn-back, &.btn-continue-shopping { @@ -44,11 +43,13 @@ // Keep old style button &.btn-add-address, &.btn-coupon, + &.btn-filter, &.btn-grid, &.btn-list, + &.btn-login-mini, &.btn-search, &.btn-subscribe { .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); } - + // Account Info &.btn-change-account, &.btn-change-password { padding: 0; } @@ -57,7 +58,7 @@ &.btn-edit-address, &.btn-order-details, &.btn-remove-address { - border: 1px solid @btn-primary-border; + border: 1px solid @btn-primary-border; margin-bottom: 10px; padding: 4px 9px; &:hover, @@ -66,9 +67,9 @@ color: @text-color; } } - + // Checkout Step 3 - &.btn-change-address { + &.btn-change-address { padding: 0; &:before { .icon(@pencil); @@ -85,8 +86,8 @@ } } } - - + + // Not styled &.btn-cancel { padding-left: 0; } &.btn-compare {} diff --git a/templates/default/assets/less/thelia/cart.less b/templates/default/assets/less/thelia/cart.less index cf5cc7161..230088cea 100644 --- a/templates/default/assets/less/thelia/cart.less +++ b/templates/default/assets/less/thelia/cart.less @@ -1,9 +1,17 @@ // Thelia : Shopping Cart + +// Cart Empty +.cart-empty { margin: 0; padding: 40px; } + +// Cart Mini +.table-cart-mini { margin-bottom: 0; } + + // Cart .table-cart { .table-bordered; - + thead, tbody, tfooter { diff --git a/templates/default/assets/less/thelia/forms.less b/templates/default/assets/less/thelia/forms.less index 401920946..fbb6e4e46 100755 --- a/templates/default/assets/less/thelia/forms.less +++ b/templates/default/assets/less/thelia/forms.less @@ -9,10 +9,18 @@ } +// Form Login Mini +#form-login-mini { + .form-control { .input-sm; } + .btn { .btn-sm; } + width: 200px; +} + + // Form Login #form-login, #form-forgotpassword { - background: #f5f5f5;; + background: #f5f5f5; padding: 45px; legend { diff --git a/templates/default/assets/less/thelia/import.less b/templates/default/assets/less/thelia/import.less index afb605729..90ced90bb 100755 --- a/templates/default/assets/less/thelia/import.less +++ b/templates/default/assets/less/thelia/import.less @@ -1,6 +1,6 @@ // Thelia @import "variables.less"; -@import "path.less"; +//@import "path.less"; // Thelia : Layout @import "global.less"; diff --git a/templates/default/assets/less/thelia/navbar.less b/templates/default/assets/less/thelia/navbar.less index d397645bb..969f19c3e 100755 --- a/templates/default/assets/less/thelia/navbar.less +++ b/templates/default/assets/less/thelia/navbar.less @@ -3,35 +3,26 @@ .navbar { .navbar-default; .navbar-brand { .visible-xs; } // Visible only Small screen - /*.nav-main { - font-size: @navbar-font-size; -li > a { - color: @navbar-default-link-color; - padding: @navbar-link-padding; - - &:hover, - &:focus { - color: @navbar-default-link-hover-color; - background-color: @navbar-default-link-hover-bg; - } - - // Uncollapse the nav - @media (min-width: @grid-float-breakpoint) { - padding-top: ((@navbar-height - @line-height-computed) / 2); - padding-bottom: ((@navbar-height - @line-height-computed) / 2); + .navbar-cart { + @media (min-width: @grid-float-breakpoint) { + .dropdown > a { + .dropdown-toggle; + &:after { + float: none; + } } } - .active > a { - color: @navbar-default-link-active-color; - background-color: @navbar-default-link-active-bg; + .dropdown-menu { + @media (max-width: @grid-float-breakpoint) { display: none; } + margin: 0; padding: 20px; + &.cart-content { + width: 350px; + > p { margin: 0; } + } } - - .open > a { - color: @navbar-default-link-hover-color!important; - background-color: @navbar-default-link-hover-bg!important; - } - }*/ + .cart-not-empty .cart-content { border-top: none; padding: 0; } + } // Subnav Links @media (min-width: @grid-float-breakpoint) { @@ -40,13 +31,6 @@ li > a { border: 1px solid @navbar-subnav-border; border-radius: @navbar-subnav-border-radius; .box-shadow(@navbar-subnav-shadow); -/* - float: left; - min-width: 160px; - position: absolute; - top: 100%; left: 0; - z-index: @zindex-dropdown; -*/ // Links within the sub navigation > li > a { @@ -89,106 +73,6 @@ li > a { } } } - -/* - .subnav { - position: relative; - > ul { - //display: none; // none by default, but block on "open" of the menu - font-size: @font-size-base; - list-style: none; - margin: 0; padding: 0; - - // Links within the sub navigation - > li > a { - clear: both; - display: block; - font-weight: normal; - line-height: @line-height-base; - white-space: nowrap; // prevent links from randomly breaking onto new lines - - &:hover, - &:focus { - text-decoration: none; - } - } - - // Active state - > .active > a { - &, - &:hover, - &:focus { - outline: 0; - text-decoration: none; - } - } - - @media (min-width: @grid-float-breakpoint) { - background-color: @navbar-subnav-bg; - background-clip: padding-box; - border: 1px solid @navbar-subnav-border; - border-radius: @navbar-subnav-border-radius; - .box-shadow(@navbar-subnav-shadow); - float: left; - min-width: 160px; - position: absolute; - top: 100%; left: 0; - z-index: @zindex-dropdown; - - // Links within the sub navigation - > li > a { - color: @navbar-subnav-link-color; - padding: @navbar-subnav-link-padding; - - // Hover/Focus state - &:hover, - &:focus { - color: @navbar-subnav-link-hover-color; - background-color: @navbar-subnav-link-hover-bg; - } - } - - // Active state - > .active > a { - &, - &:hover, - &:focus { - background-color: @navbar-subnav-link-hover-bg; - color: @navbar-subnav-link-hover-color; - } - } - } - } - - /* Add support for multilevel dropdown menus - .subnav { - > ul { - top:0; left: 100%; - } - - .accordion-toggle:after { - float:right; - padding-left: .3em; - .icon(@chevron-down); - @media (min-width: @screen-desktop) { .icon(@chevron-right); margin-right: -14px; padding-left: 0; } - } - }*/ - // Sub - /* - > .active > a, - > .open > a { - &, - &:hover, - &:focus { - background-color: @navbar-subnav-link-hover-bg; - color: @navbar-subnav-link-hover-color; - } - } -*//* - } - - .navbar-nav > .subnav > ul { border-top-color: @navbar-default-link-hover-bg; } -*/ } diff --git a/templates/default/assets/less/thelia/price.less b/templates/default/assets/less/thelia/price.less index a1039926c..bf847e856 100755 --- a/templates/default/assets/less/thelia/price.less +++ b/templates/default/assets/less/thelia/price.less @@ -6,9 +6,10 @@ .price { color: @brand-primary; - font-size: ceil(@font-size-base * 1.5); + font-size: ceil(@font-size-base * 1.4); font-weight: bold; font-style: italic; + white-space: nowrap; } // Regular price diff --git a/templates/default/assets/less/thelia/variables.less b/templates/default/assets/less/thelia/variables.less index 7ed29e8b8..eae091c3c 100755 --- a/templates/default/assets/less/thelia/variables.less +++ b/templates/default/assets/less/thelia/variables.less @@ -5,7 +5,7 @@ @FontAwesomePath: "../font/fontawesome"; //bootstrap font -@icon-font-path: "../font/bootstrap/"; +@icon-font-path: "../font/bootstrap/"; // Grid system @grid-float-breakpoint: @screen-desktop; diff --git a/templates/default/assets/themes/default/less/theme.less b/templates/default/assets/themes/default/less/theme.less index 737fa7579..2bc0dceed 100755 --- a/templates/default/assets/themes/default/less/theme.less +++ b/templates/default/assets/themes/default/less/theme.less @@ -1,9 +1,11 @@ // Body padding required with the fixed navbar (By default, the navbar is 50px high.) +/* body { padding-top: 80px; } .navbar { .navbar-fixed-top; } +*/ .page-header { border: none; @@ -64,25 +66,36 @@ label { font-weight: 600; } } } > a.cart { - background-color: @brand-primary; - color: #fff; - - > .badge { - background-color: #fff; - color: @brand-primary; - } - &:hover, &:focus { + > .badge { + background-color: #fff; + color: @brand-primary; + } + } + } + &.cart-not-empty { + > a.cart { background-color: @brand-primary; color: #fff; - } - &:before { - .icon(@shopping-cart); - color: #fff; - font-size: 24px; line-height: 0; - margin-right: .4em; + > .badge { + background-color: #fff; + color: @brand-primary; + } + + &:hover, + &:focus { + background-color: @brand-primary; + color: #fff; + } + + &:before { + .icon(@shopping-cart); + color: #fff; + font-size: 24px; line-height: 0; + margin-right: .4em; + } } } } @@ -151,7 +164,7 @@ header { /* Custom button */ -.btn-primary { +.page .btn-primary { border-left: 3px solid lighten(@brand-primary, 20%); .border-radius(0); color: #fff; @@ -410,6 +423,7 @@ td.product, @media (min-width: @screen-desktop) { .product-image { padding-bottom: 40px; } .product-info { + .transition(height 300ms linear); position: absolute; bottom: 0; width: 100%; height: 50px; @@ -419,7 +433,6 @@ td.product, &:focus { cursor: pointer; height: 140px; - .transition(height 300ms linear); } } } @@ -1124,7 +1137,6 @@ td.product, > tr { > td { &.price, - &.unitprice, &.qty, &.subprice { padding: 35px 10px; } } diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl index ce7e67bb6..9544e29cc 100644 --- a/templates/default/layout.tpl +++ b/templates/default/layout.tpl @@ -23,7 +23,7 @@ URL: http://www.thelia.net {* Page Title *} - {block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} | {/foreach}{/if}Thelia{/strip}{/block} + {block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} | {/foreach}{/if}{config key="company_name"}{/strip}{/block} {* Meta Tags *} @@ -32,10 +32,14 @@ URL: http://www.thelia.net {block name="meta"}{/block} - + {* Stylesheets *} {stylesheets file='assets/less/styles.less' filters='less,cssembed,cssrewrite'} {/stylesheets} + + + + {debugbar_rendercss} {block name="stylesheet"}{/block} @@ -60,17 +64,11 @@ URL: http://www.thelia.net - Thelia + {config key="company_name"} @@ -94,8 +173,8 @@ URL: http://www.thelia.net