dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates and fixes 14.11.2013

Browse Source
This commit is contained in:
TMMeilleur
2013-11-14 18:08:05 +02:00
parent 051ed32133
commit 0d1c113be1
39 changed files with 999 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/css/global.css
+69 -1
View File
@@ -304,6 +304,10 @@ input.button_large, input.button_large_disabled, input.exclusive_large, input.ex
background-image: url('../img/button-large.png')*/
}
.btn.disabled, .btn[disabled]:hover {
opacity: 0.3;
}
.button.button-small {
font: bold 13px/17px Arial, Helvetica, sans-serif;
color: white;
@@ -954,6 +958,16 @@ table.table_block td {
.block {
margin-bottom: 30px;
}
@media (max-width: 767px) {
.block {
margin-bottom: 0px;
}
}
@media (max-width: 767px) {
.block .block_content {
margin-bottom: 20px;
}
}
.block .title_block, .block h4 {
font: 600 18px/22px "Open Sans", sans-serif;
@@ -969,6 +983,26 @@ table.table_block td {
font-size: 14px;
}
}
@media (max-width: 767px) {
.block .title_block, .block h4 {
position: relative;
}
.block .title_block:after, .block h4:after {
display: block;
font-family: "FontAwesome";
content: "";
position: absolute;
right: 0;
top: 15px;
height: 36px;
width: 36px;
font-size: 26px;
font-weight: normal;
}
.block .title_block.active:after, .block h4.active:after {
content: "";
}
}
.block .title_block a, .block h4 a {
color: #555454;
}
@@ -988,6 +1022,11 @@ table.table_block td {
.block .list-block {
margin-top: -8px;
}
@media (max-width: 767px) {
.block .list-block {
margin-top: 0;
}
}
.block .list-block li {
padding: 5px 0 6px 20px;
border-top: 1px solid #d6d4d4;
@@ -1012,10 +1051,16 @@ table.table_block td {
.block .list-block .form-group {
padding-top: 20px;
border-top: 1px solid #d6d4d4;
margin-bottom: 0;
}
.block .list-block .form-group select {
max-width: 270px;
}
@media (max-width: 767px) {
.block .list-block .form-group select {
width: 270px;
}
}
.block .list-block .btn {
margin-top: 12px;
}
@@ -2051,6 +2096,11 @@ div.star_hover a, div.star a:hover {
.footer-container #footer .footer-block {
margin-top: 45px;
}
@media (max-width: 767px) {
.footer-container #footer .footer-block {
margin-top: 20px;
}
}
.footer-container #footer a {
color: #777;
}
@@ -2062,6 +2112,24 @@ div.star_hover a, div.star a:hover {
color: white;
margin: 0 0 13px 0;
}
@media (max-width: 767px) {
.footer-container #footer h4 {
position: relative;
margin-bottom: 0;
padding-bottom: 13px;
}
.footer-container #footer h4:after {
display: block;
content: "";
font-family: "FontAwesome";
position: absolute;
right: 0;
top: 1px;
}
.footer-container #footer h4.active:after {
content: "";
}
}
.footer-container #footer h4 a {
color: white;
}
@@ -3186,7 +3254,7 @@ div.star_hover a, div.star a:hover {
.form-group.form-ok input, .form-group.form-ok textarea {
border: 1px solid #46a74e;
color: #35b33f;
background: url(../img/icon/form-ok.png) 98% 5px no-repeat #87f590;
background: url(../img/icon/form-ok.png) 98% 5px no-repeat #ddf9e1;
}
.form-group.form-error .form-control, .form-group.form-ok .form-control {
padding-right: 30px;
themes/default-bootstrap/css/modules/blockcontact/blockcontact.css
+5
View File
@@ -1,5 +1,10 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* block CONTACT ******************************************************************************* */
@media (max-width: 767px) {
#contact_block {
margin-bottom: 20px;
}
}
#contact_block .label {
display: none;
}
themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css
+3
View File
@@ -49,6 +49,9 @@
line-height: 25px;
border: none;
}
#footer #newsletter_block_left h4:after {
display: none;
}
#footer #newsletter_block_left .block_content {
overflow: hidden;
}
themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css
+5
View File
@@ -65,6 +65,11 @@
#wishlist_block .lnk .form-group select {
max-width: 192px;
}
@media (max-width: 767px) {
#wishlist_block .lnk .form-group select {
width: 192px;
}
}
#wishlist_block .ajax_cart_block_remove_link {
font-size: 14px;
line-height: 14px;
themes/default-bootstrap/header.tpl
-7
View File
@@ -100,13 +100,6 @@
</div>
{/if}
<div id="page">
<div class="banner-top">
<div class="container">
<a href="#">
<img class="banner-top img-responsive" src="{$img_dir}top-banner.gif" alt="banner-top"/>
</a>
</div>
</div>
<!-- Header -->
<div class="header-container">
<header id="header">
themes/default-bootstrap/js/jquery/resonsive_utilites.js
Vendored
+13 -8
View File
@@ -44,6 +44,8 @@ $(document).ready(function(){
tmDropDown ('', '#header .current', 'ul.toogle_content', 'active'); // all of this should be defined or left empty brackets
//tmDropDown ('cart', 'li#shopping_cart > a', '#cart_block', 'active'); // all of this should be defined or left empty brackets
});
var responsiveflag = false;
// TOGGLE FOOTER
@@ -65,16 +67,12 @@ function accordionFooter(status){
function accordion(status){
leftColumnBlocks = $('#left_column');
if(status == 'enable'){
$('#left_column').remove();
$(leftColumnBlocks).insertAfter('#center_column').find('#categories_block_left ul.toggle_content').slideToggle('fast'); // replace left column under content
$('#right_column .title_block, #left_column .title_block, #left_column #newsletter_block_left').on('click', function(){
$('#right_column .block:not(#layered_block_left) .title_block, #left_column .block:not(#layered_block_left) .title_block, #left_column #newsletter_block_left h4').on('click', function(){
$(this).toggleClass('active').parent().find('.block_content').stop().slideToggle('medium');
})
$('#right_column, #left_column').addClass('accordion').find('.block_content').slideUp('fast');
$('#right_column, #left_column').addClass('accordion').find('.block:not(#layered_block_left) .block_content').slideUp('fast');
}else{
$('#left_column').remove();
$(leftColumnBlocks).insertBefore('#center_column'); // replace left column before content
$('#right_column .title_block, #left_column .title_block').removeClass('active').off().parent().find('.block_content').removeAttr('style').slideDown('fast');
$('#right_column .block:not(#layered_block_left) .title_block, #left_column .block:not(#layered_block_left) .title_block, #left_column #newsletter_block_left h4').removeClass('active').off().parent().find('.block_content').removeAttr('style').slideDown('fast');
$('#left_column, #right_column').removeClass('accordion');
}
}
@@ -94,4 +92,11 @@ function resposiveResize(){
}
$(document).ready(resposiveResize);
$(window).resize(resposiveResize);
$(window).resize(resposiveResize);
//replace top banner to top of page, before #header
$(document).ready(function(){
topBanner = $('body').find('#banner_block_top');
topBanner.remove();
topBanner.insertBefore('#header');
});
themes/default-bootstrap/modules/blockcms/translations/en.php
+25
View File
@@ -0,0 +1,25 @@
<?php
global $_MODULE;
$_MODULE = array();
$_MODULE['<{blockcms}prestashop>blockcms_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Information';
$_MODULE['<{blockcms}prestashop>blockcms_ea4788705e6873b424c65e91c2846b19'] = 'Cancel';
$_MODULE['<{blockcms}prestashop>blockcms_ef61fb324d729c341ea8ab9901e23566'] = 'Add new';
$_MODULE['<{blockcms}prestashop>blockcms_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_MODULE['<{blockcms}prestashop>blockcms_965be994da393e5aa15bd3a2444c6ccf'] = 'Footer\'s various links Configuration';
$_MODULE['<{blockcms}prestashop>blockcms_9aa03a5dca2e060a4ecbff0dd8616692'] = 'Save';
$_MODULE['<{blockcms}prestashop>blockcms_93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
$_MODULE['<{blockcms}prestashop>blockcms_bafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
$_MODULE['<{blockcms}prestashop>blockcms_87a2663d841b78f01c27c0edb4f50b76'] = 'Deletion successful';
$_MODULE['<{blockcms}prestashop>blockcms_34c869c542dee932ef8cd96d2f91cae6'] = 'Our stores';
$_MODULE['<{blockcms}prestashop>blockcms_3cb29f0ccc5fd220a97df89dafe46290'] = 'Best sellers';
$_MODULE['<{blockcms}prestashop>blockcms_e1da49db34b0bdfdddaba2ad6552f848'] = 'Sitemap';
$_MODULE['<{blockcms}prestashop>form_b718adec73e04ce3ec720dd11a06a308'] = 'ID';
$_MODULE['<{blockcms}prestashop>form_52f5e0bc3859bc5f5e25130b6c7e8881'] = 'Position';
$_MODULE['<{blockcms}prestashop>form_06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions';
$_MODULE['<{blockcms}prestashop>form_08a38277b0309070706f6652eeae9a53'] = 'Down';
$_MODULE['<{blockcms}prestashop>form_258f49887ef8d14ac268c92b02503aaa'] = 'Up';
$_MODULE['<{blockcms}prestashop>form_7dce122004969d56ae2e0245cb754d35'] = 'Edit';
$_MODULE['<{blockcms}prestashop>form_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_MODULE['<{blockcms}prestashop>form_49ee3087348e8d44e1feda1917443987'] = 'Name';
themes/default-bootstrap/modules/blockmyaccount/blockmyaccount.tpl
+2 -2
View File
@@ -36,9 +36,9 @@
{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)|escape:'html'}" title="{l s='My vouchers' mod='blockmyaccount'}">{l s='My vouchers' mod='blockmyaccount'}</a></li>{/if}
{$HOOK_BLOCK_MY_ACCOUNT}
</ul>
<p class="logout">
<div class="logout">
<a class="btn btn-default button button-small" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Sign out' mod='blockmyaccount'}"><span>{l s='Sign out' mod='blockmyaccount'}<i class="icon-chevron-right right"></i></span></a>
</p>
</div>
</div>
</div>
<!-- /Block myaccount module -->
themes/default-bootstrap/modules/blockspecials/blockspecials.tpl
+3 -3
View File
@@ -51,11 +51,11 @@
</div>
</li>
</ul>
<p>
<div>
<a class="btn btn-default button button-small" href="{$link->getPageLink('prices-drop')|escape:'html'}" title="{l s='All specials' mod='blockspecials'}"><span>{l s='All specials' mod='blockspecials'}<i class="icon-chevron-right right"></i></span></a>
</p>
</div>
{else}
<p>{l s='No specials at this time' mod='blockspecials'}</p>
<div>{l s='No specials at this time' mod='blockspecials'}</div>
{/if}
</div>
</div>
themes/default-bootstrap/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
+1 -1
View File
@@ -83,6 +83,6 @@ $('document').ready(function()
<ul class="footer_links clearfix">
<li>
<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'htmlall':'UTF-8'}"><span><i class="icon-chevron-left"></i>{l s='Back to your account.' mod='favoriteproducts'}</span></a></li>
<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'htmlall':'UTF-8'}"><span><i class="icon-chevron-left"></i>{l s='Back to your account' mod='favoriteproducts'}</span></a></li>
</ul>
</div>
themes/default-bootstrap/product.tpl
-9
View File
@@ -493,15 +493,6 @@ var contentOnly = {if $content_only}true{else}false{/if}
</div>
{if !$content_only}
<div class="box-security">
<h5 class="product-heading-h5">{l s='Your Security Guaranteed'}</h5>
<img class="logo-payment" src="{$img_dir}payment-logo.png" alt="" />
</div>
{/if}
</div>
themes/default-bootstrap/sass/global.scss
+68 -6
View File
@@ -240,6 +240,9 @@ input.button_large, input.button_large_disabled, input.exclusive_large, input.ex
/*width: 180px;
background-image: url('../img/button-large.png')*/
}
.btn.disabled, .btn[disabled]:hover {
opacity:0.3;
}
.button.button-small {
font:bold 13px/17px $font-famaly;
color:$button-text-color;
@@ -824,8 +827,20 @@ table.table_block td {
margin-bottom:34px;
}
}
.block {margin-bottom:30px}
.block {
.block {
margin-bottom:30px;
@media (max-width: $screen-xs-max) { // max 767px
margin-bottom:0px;
}
.block_content {
@media (max-width: $screen-xs-max) { // max 767px
margin-bottom:20px;
}
}
}
.block {
.title_block, h4 {
font:600 18px/22px $font-custom;
@@ -837,7 +852,27 @@ table.table_block td {
margin-bottom:20px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
font-size:14px;
}
}
// heading style for devices smaller that 767px width
@media (max-width: $screen-xs-max) { // max 767px
position:relative;
&:after {
display:block;
font-family:$font-icon;
content:"";
position:absolute;
right:0;
top:15px;
height:36px;
width:36px;
font-size:26px;
font-weight:normal;
}
&.active:after {
content:"";
}
}
a {
color:$base-heading-color;
@@ -860,6 +895,9 @@ table.table_block td {
}
.list-block {
margin-top:-8px;
@media (max-width: $screen-xs-max) { // max 767px
margin-top:0;
}
li {
padding:5px 0 6px 20px;
@@ -888,9 +926,13 @@ table.table_block td {
.form-group {
padding-top:20px;
border-top:1px solid $base-border-color;
margin-bottom:0;
select {
max-width:270px;
max-width:270px;
@media (max-width: $screen-xs-max) { // max 767px
width:270px;
}
}
}
@@ -1858,7 +1900,10 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
color:#777;
position:relative;
.footer-block {
margin-top:45px;
margin-top:45px;
@media (max-width: $screen-xs-max) { // max 767px
margin-top:20px;
}
}
a {
@@ -1873,6 +1918,23 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
font:600 18px/22px $font-custom;
color:$light-text-color;
margin:0 0 13px 0;
@media (max-width: $screen-xs-max) { // max 767px
position:relative;
margin-bottom:0;
padding-bottom:13px;
&:after {
display:block;
content:"";
font-family:$font-icon;
position:absolute;
right:0;
top:1px;
}
&.active:after {
content:"";
}
}
a {color:$light-text-color;}
}
@@ -2946,7 +3008,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -13px }
input, textarea {
border:1px solid #46a74e;
color:#35b33f;
background: url(../img/icon/form-ok.png) 98% 5px no-repeat #87f590;
background: url(../img/icon/form-ok.png) 98% 5px no-repeat #ddf9e1;
}
}
&.form-error, &.form-ok {
themes/default-bootstrap/sass/modules/blockcontact/blockcontact.scss
+3 -1
View File
@@ -1,7 +1,9 @@
@import '../../_theme_variables';
/* block CONTACT ******************************************************************************* */
#contact_block {
@media (max-width: $screen-xs-max) { // max 767px
margin-bottom:20px;
}
.label {display: none}
.block_content {
themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
+1
View File
@@ -52,6 +52,7 @@
font-size:21px;
line-height:25px;
border:none;
&:after {display:none;}
}
.block_content {
themes/default-bootstrap/sass/modules/blockwishlist/blockwishlist.scss
+4 -1
View File
@@ -77,7 +77,10 @@
margin-bottom:20px;
select {
max-width:192px;
max-width:192px;
@media (max-width: $screen-xs-max) { // max 767px
width:192px;
}
}
}
}