Skip to content

Commit c847641

Browse files
authored
Merge pull request #61 from smartcatdev/updates
Updates
2 parents add0ebf + 1464b26 commit c847641

File tree

11 files changed

+145
-38
lines changed

11 files changed

+145
-38
lines changed

assets/css/buildr.css

Lines changed: 62 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ form label {
13141314
margin-bottom: 10px;
13151315
}
13161316

1317-
form input:not([type="submit"]),
1317+
form input:not([type="submit"]),
13181318
form textarea {
13191319
width: 100% !important;
13201320
border: thin solid #cacaca;
@@ -1328,6 +1328,13 @@ form textarea {
13281328
box-shadow: none;
13291329
}
13301330

1331+
#edd_checkout_form_wrap input[type=radio] {
1332+
width: auto !important;
1333+
}
1334+
#edd_checkout_form_wrap form label {
1335+
width: auto !important;
1336+
}
1337+
13311338
#pre-footer form input:not([type="submit"]),
13321339
#pre-footer form textarea {
13331340
background: #333;
@@ -2254,7 +2261,7 @@ div#edd-gallery-wrap .slick-arrow:hover {
22542261
}
22552262
}
22562263

2257-
.buildr-single-edd-product .edd_price_options input[type="radio"] {
2264+
body.single-download.single .edd_price_options input[type="radio"] {
22582265
display: inline-block !important;
22592266
width: auto !important;
22602267
margin: 0 10px 0 0 !important;
@@ -2321,9 +2328,16 @@ table#edd_purchase_receipt_products.edd-table td {
23212328
}
23222329

23232330
#edd_checkout_form_wrap legend {
2324-
padding: 10px 15px;
2325-
border: 1px solid #eeeeee;
2326-
background: #fafafa;
2331+
border: none;
2332+
font-weight: 400;
2333+
}
2334+
2335+
#edd_checkout_form_wrap #edd-login-account-wrap {
2336+
font-weight: 600;
2337+
}
2338+
2339+
#edd_checkout_user_info p {
2340+
margin-bottom: 15px;
23272341
}
23282342

23292343
table#edd_sl_license_keys,
@@ -2346,4 +2360,46 @@ form#edd_sl_license_add_site_form input.edd-input {
23462360

23472361
a.edd-manage-license-back {
23482362
margin-bottom: 30px;
2349-
}
2363+
}
2364+
2365+
2366+
2367+
/* -----------------------------------------------------------------------------
2368+
* EDD Shortcode HTML
2369+
* -------------------------------------------------------------------------- */
2370+
#edd_profile_editor_form{
2371+
background-color: transparent;
2372+
font-size: 1.4rem;
2373+
border-collapse: inherit;
2374+
border-spacing: 0;
2375+
border: 3px solid #eaeaea;
2376+
border-radius: 4px;
2377+
max-width: 100%;
2378+
width: 100%;
2379+
}
2380+
2381+
#edd_profile_editor_form fieldset>p {
2382+
padding: 0 30px;
2383+
margin-bottom: 0
2384+
}
2385+
2386+
#edd_profile_editor_form fieldset>p:last-of-type{
2387+
margin-bottom: 15px;
2388+
}
2389+
2390+
#edd_profile_editor_form fieldset>legend {
2391+
display: block;
2392+
background: #f5f5f5;
2393+
color: #555;
2394+
font-size: 1.6rem;
2395+
line-height: 20px;
2396+
font-weight: 500;
2397+
padding: 10px;
2398+
border-bottom: 3px solid #eaeaea;
2399+
margin-bottom: 30px;
2400+
}
2401+
2402+
#edd_profile_editor_form fieldset:not(:first-of-type)>legend {
2403+
border-top: 3px solid #eaeaea;
2404+
}
2405+

inc/functions-general.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function buildr_pingback_header() {
5858
function buildr_setup() {
5959

6060
if( !defined( 'BUILDR_VERSION' ) ) :
61-
define( 'BUILDR_VERSION', '1.3.1' );
61+
define( 'BUILDR_VERSION', '1.3.2' );
6262
endif;
6363

6464
/*

readme.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ Buildr includes support for Infinite Scroll in Jetpack.
3333

3434
== Changelog ==
3535

36+
= 1.3.2
37+
* Improvements for EDD and Woo
38+
3639
= 1.3.1
3740
* Updated screenshot
3841
* Updated defaults

single-download.php

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,57 @@
1919

2020
endwhile; // End of the loop.
2121
?>
22-
22+
2323
</main><!-- #main -->
24-
24+
25+
<div class="sidebar-wrap post below">
26+
27+
<div id="edd-header-wrap-wrapper">
28+
29+
<div id="edd-header-wrap-blurb">
30+
31+
<?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_CATEGORY, true ) ) : ?>
32+
33+
<span class="product-category">
34+
<?php echo esc_html( get_post_meta( get_the_ID(), BUILDR_META::EDD_CATEGORY, true ) ); ?>
35+
</span>
36+
37+
<?php endif; ?>
38+
39+
<?php the_title( '<h3 class="product_title entry-title">Buy ', ' today!</h3>' ); ?>
40+
41+
<span class="small-divider dark"></span>
42+
43+
<div class="edd-buttons">
44+
45+
<div class="product-buttons">
46+
47+
<?php echo edd_get_purchase_link( array(
48+
'download_id' => get_the_ID(),
49+
'price' => false,
50+
'direct' => false,
51+
'class' => 'primary',
52+
) ); ?>
53+
54+
<?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_LABEL, true ) && get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_URL, true ) ) : ?>
55+
56+
<a class="button secondary" href="<?php echo esc_url( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_URL, true ) ); ?>" <?php echo get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_TARGET, true ) != 'same' ? ' target="_BLANK" ' : ''; ?>>
57+
<?php echo esc_html( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_LABEL, true ) ); ?>
58+
</a>
59+
60+
<?php endif; ?>
61+
62+
</div>
63+
64+
<div class="clear"></div>
65+
66+
</div>
67+
68+
</div>
69+
</div>
70+
</div>
71+
72+
2573
</div><!-- #primary -->
2674

2775
<?php

style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Author: Smarcat
44
Author URI: https://smartcatdesign.net
55
Theme URI: http://buildr.preset1.smartcatthemes.com
66
Description: Build a professional site for yourself, for one client, or for all your clients using Buildr, without touching a line of code. A highly customizable theme which packs tons of premium features in a free theme. 3 navbar menu styles, custom header, 3 blog styles, customizable colors, fonts and so much more! Buildr comes with a free companion plugin which includes many drag & drop widgets that you can use to build your pages any way you like, as well as 3 pre-designed presets that you can install with one click, saving you time, and providing you with a professionally desined site to start from. Lastly, Buildr is integrated with WooCommerce and Easy Digital Downloads with beautiful and unique templates for either.
7-
Version: 1.3.1
7+
Version: 1.3.2
88
License: GNU General Public License v2 or later
99
License URI: LICENSE
1010
Text Domain: buildr

template-parts/content-download.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@
2222
<div class="col-sm-12">
2323

2424
<div id="edd-header-wrap-wrapper">
25-
25+
2626
<div id="edd-header-wrap-blurb">
2727

2828
<?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_CATEGORY, true ) ) : ?>
29-
29+
3030
<span class="product-category">
3131
<?php echo esc_html( get_post_meta( get_the_ID(), BUILDR_META::EDD_CATEGORY, true ) ); ?>
3232
</span>
33-
33+
3434
<?php endif; ?>
35-
35+
3636
<?php the_title( '<h1 class="product_title entry-title">', '</h1>' ); ?>
3737

3838
<span class="small-divider dark"></span>
39-
39+
4040
<?php if ( function_exists( 'edd_price' ) ) : ?>
41-
41+
4242
<?php $sale_price = get_post_meta( get_the_ID(), 'edd_sale_price', true ); ?>
43-
43+
4444
<div class="price <?php echo isset( $sale_price ) && !empty( $sale_price ) && ! edd_has_variable_prices( get_the_ID() ) ? 'on-sale' : ''; ?> ">
4545
<?php if ( edd_has_variable_prices( get_the_ID() ) ) :
4646
echo edd_price_range( get_the_ID() );
@@ -50,48 +50,48 @@
5050
</div>
5151

5252
<?php endif; ?>
53-
53+
5454
<?php the_excerpt(); ?>
55-
55+
5656
<div class="edd-buttons">
57-
57+
5858
<div class="product-buttons">
59-
59+
6060
<?php echo edd_get_purchase_link( array(
6161
'download_id' => get_the_ID(),
6262
'price' => false,
6363
'direct' => false,
6464
'class' => 'primary',
6565
) ); ?>
66-
66+
6767
<?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_LABEL, true ) && get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_URL, true ) ) : ?>
68-
68+
6969
<a class="button secondary" href="<?php echo esc_url( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_URL, true ) ); ?>" <?php echo get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_TARGET, true ) != 'same' ? ' target="_BLANK" ' : ''; ?>>
7070
<?php echo esc_html( get_post_meta( get_the_ID(), BUILDR_META::EDD_SECOND_BUTTON_LABEL, true ) ); ?>
7171
</a>
72-
72+
7373
<?php endif; ?>
74-
74+
7575
</div>
76-
76+
7777
<div class="clear"></div>
7878

7979
</div>
80-
80+
8181
</div>
82-
82+
8383
<?php if ( get_post_meta( get_the_ID(), BUILDR_META::EDD_VIDEO_ID, true ) ) : ?>
84-
84+
8585
<iframe class="edd-product-video" id="ytplayer" type="text/html" width="640" height="360"
8686
src="https://www.youtube.com/embed/<?php echo esc_attr( get_post_meta( get_the_ID(), BUILDR_META::EDD_VIDEO_ID, true ) ); ?>?autoplay=<?php echo get_post_meta( get_the_ID(), BUILDR_META::EDD_VIDEO_AUTOPLAY, true ) == 'autoplay' ? 1 : 0; ?>"
8787
frameborder="0"></iframe>
88-
88+
8989
<?php else : ?>
9090

9191
<?php buildr_output_edd_product_gallery( $edd_gallery ); ?>
92-
92+
9393
<?php endif; ?>
94-
94+
9595
</div>
9696

9797
</div>

woocommerce/archive-product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @see https://docs.woocommerce.com/document/template-structure/
1414
* @author WooThemes
1515
* @package WooCommerce/Templates
16-
* @version 3.3.0
16+
* @version 3.4.0
1717
*/
1818

1919
if ( ! defined( 'ABSPATH' ) ) {

woocommerce/cart/mini-cart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @see https://docs.woocommerce.com/document/template-structure/
1616
* @author WooThemes
1717
* @package WooCommerce/Templates
18-
* @version 3.3.0
18+
* @version 3.5.0
1919
*/
2020
if ( ! defined( 'ABSPATH' ) ) {
2121
exit;

woocommerce/content-product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @see https://docs.woocommerce.com/document/template-structure/
1414
* @author WooThemes
1515
* @package WooCommerce/Templates
16-
* @version 3.0.0
16+
* @version 3.4.0
1717
*/
1818

1919
if ( ! defined( 'ABSPATH' ) ) {

woocommerce/content-widget-product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @see https://docs.woocommerce.com/document/template-structure/
1313
* @author WooThemes
1414
* @package WooCommerce/Templates
15-
* @version 3.3.0
15+
* @version 3.5.2
1616
*/
1717

1818
if ( ! defined( 'ABSPATH' ) ) {

woocommerce/single-product-reviews.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php
22
/**
33
* Display single product reviews (comments)
44
*
@@ -13,7 +13,7 @@
1313
* @see https://docs.woocommerce.com/document/template-structure/
1414
* @author WooThemes
1515
* @package WooCommerce/Templates
16-
* @version 3.2.0
16+
* @version 3.5.0
1717
*/
1818
if ( ! defined( 'ABSPATH' ) ) {
1919
exit; // Exit if accessed directly

0 commit comments

Comments
 (0)