Skip to content

Commit

Permalink
1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vendidero committed May 4, 2015
1 parent cd30ac2 commit e2f1ccf
Show file tree
Hide file tree
Showing 40 changed files with 1,030 additions and 377 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -33,6 +33,7 @@
._*
.Spotlight-V100
.Trashes
*.idea
ehthumbs.db
Thumbs.db

Expand Down
4 changes: 4 additions & 0 deletions assets/css/woocommerce-gzd-activation.css
Expand Up @@ -34,6 +34,7 @@
}
.dashboard_page_wc-gzd-about .wc-vendipro-features {
margin-top: 0;
border: none;
}
.dashboard_page_wc-gzd-about .wc-vendipro-features div h4 {
margin-top: 0.5em;
Expand All @@ -53,6 +54,9 @@
border-top: 1px solid #CCC;
padding-top: 0;
}
.dashboard_page_wc-gzd-about .feature-section {
border: none;
}
.dashboard_page_wc-gzd-about .vendipro .left {
display: inline-block;
width: 40%;
Expand Down
2 changes: 1 addition & 1 deletion assets/css/woocommerce-gzd-activation.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions assets/css/woocommerce-gzd-admin.css
Expand Up @@ -29,6 +29,10 @@ table.data_table tr td p.form-field {
width: 30%;
}

.wc-gzd-admin-settings-agbs, .wc-gzd-admin-settings-widerruf {
width: 100%;
}

.wc-gzd-admin-settings-sidebar img {
width: 100%;
}
Expand Down Expand Up @@ -66,6 +70,42 @@ table.data_table tr td p.form-field {
margin-right: 1em;
}

.wc-gzd-premium-section-tab, .wc-gzd-pro {
font-size: 9px;
background: #0074a2;
border-radius: 3px;
line-height: 9px;
color: #FFF;
text-align: center;
text-transform: uppercase;
padding: 1px 3px;
position: relative;
top: -1px;
}

.wc-gzd-pro {
background: #222;
text-decoration: none;
}

.wc-gzd-pro:hover {
color: #FFF;
}

.subsubsub li a:hover .wc-gzd-premium-section-tab {
background: #2ea2cc;
}

.subsubsub li a.current .wc-gzd-premium-section-tab {
background: #222;
}

.wc-gzd-premium img, .forminp-image img {
width: 100%;
height: auto;
opacity: 0.5;
}

table.wc-gzd-tax-example tr th, table.wc-gzd-tax-example tr td {
padding: 5px;
font-size: 0.9em;
Expand Down
2 changes: 1 addition & 1 deletion assets/css/woocommerce-gzd-admin.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions assets/css/woocommerce-gzd-layout.css
Expand Up @@ -81,6 +81,15 @@ p.footer-info {
.wc-gzd-item-desc p {
font-size: 0.9em;
}
.wc-gzd-edit-data-notice {
background: #EEE;
display: inline-block;
padding: 1em;
}
.wc-gzd-edit-data-notice p.wc-gzd-info {
margin: 0;
padding: 0;
}
table.product-details-inner {
table-layout:fixed;
margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion assets/css/woocommerce-gzd-layout.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added assets/images/pro/settings-agbs.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pro/settings-inline-contract.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pro/settings-inline-invoices.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pro/settings-inline-vat.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pro/settings-invoices.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pro/settings-widerruf.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/js/add-to-cart-variation.js
Expand Up @@ -14,6 +14,9 @@
if ( $('.type-product').find('.org_unit_price').length > 0 ) {
$( '.type-product .unit-price' ).html( $('.product').find('.org_unit_price').html() ).removeClass('variation_modified').show();
}
if ( $('.type-product').find('.org_tax_info').length > 0 ) {
$( '.type-product .tax-info' ).html( $('.product').find('.org_tax_info').html() ).removeClass('variation_modified').show();
}
$('.org_product_info').remove();
$('.variation_modified').remove();
}
Expand All @@ -28,6 +31,8 @@
$wrapper.append( '<div class="org_price org_product_info">' + $wrapper.find( '.price:not(.price-unit):first' ).html() + '</div>' );
if ( $wrapper.find( '.delivery-time-info:first' ).length > 0 )
$wrapper.append( '<div class="org_delivery_time org_product_info">' + $wrapper.find( '.delivery-time-info:first' ).html() + '</div>' );
if ( $wrapper.find( '.tax-info:first' ).length > 0 )
$wrapper.append( '<div class="org_tax_info org_product_info">' + $wrapper.find( '.tax-info:first' ).html() + '</div>' );
if ( $wrapper.find( '.price-unit:first' ).length > 0 )
$wrapper.append( '<div class="org_unit_price org_product_info">' + $wrapper.find( '.price-unit:first' ).html() + '</div>' );
$( '.org_product_info' ).hide();
Expand All @@ -38,8 +43,12 @@
}
$wrapper.find( '.delivery-time-info:first' ).hide();
$wrapper.find( '.price-unit:first' ).hide();
$wrapper.find( '.tax-info:first' ).hide();

if ( variation.delivery_time != '' )
$wrapper.find( 'p.delivery-time-info:first' ).html( variation.delivery_time ).addClass('variation_modified').show();
if ( variation.tax_info != '' )
$wrapper.find( '.tax-info:first' ).html( variation.tax_info ).addClass('variation_modified').show();
if ( variation.unit_price != '' ) {
$wrapper.find( '.price-unit:first' ).remove();
$wrapper.find( 'div[itemprop="offers"]:first' ).after('<p class="price price-unit smaller variation_modified">' + variation.unit_price + '</p>').show();
Expand Down

0 comments on commit e2f1ccf

Please sign in to comment.