Skip to content

Commit

Permalink
5.0.0
Browse files Browse the repository at this point in the history
CSS
- Updated Edje to v3.0
- Updated all CSS to use the new shorthand syntax
- Removed default gutenberg styles
- Added custom styles for all blocks in `_fw-gutenberg.sass`
- Renamed `block-editor.sass` to `admin-gutenberg.sass`
- Removed styling for TinyMCE Editor in `_fw-blog.sass`
- Added styling for Read More button. The script is inside Edje WP Library
- Color from editor is now set using CSS Variable, the class like `has-red-background-color` only change the variable value

TWIG
- Set Cover block for featured image.

WORDPRESS
- Combined the theme_support to `functions.php`
- Added back jQuery because it is needed by many plugins especially WooCommerce and Jetpack

WOOCOMMERCE
- Fixed the Cart button and Cross sells not working due to old path name
- Moved app-shop.js to `Edje WC Library`
  • Loading branch information
hrsetyono committed May 6, 2019
1 parent 0db1ef5 commit 6971a08
Show file tree
Hide file tree
Showing 42 changed files with 917 additions and 3,196 deletions.
79 changes: 0 additions & 79 deletions acf-json/group_5c05eb7398466.json

This file was deleted.

4 changes: 2 additions & 2 deletions archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@


// If post category
if( is_category() || is_tax() ) {
if( is_category() ) {
$context['term'] = $query;
$context['blog_nav'] = new TimberMenu( 'blog-nav' );
}
// If custom taxonomy page
if( is_tax() ) {
elseif( is_tax() ) {
$context['term'] = $query;
array_unshift( $templates, 'archive-' . $query->taxonomy . '.twig' );
}
Expand Down
1 change: 1 addition & 0 deletions assets/css/admin-gutenberg.css

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

2 changes: 1 addition & 1 deletion assets/css/app.css

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

Empty file removed assets/css/block-editor.css
Empty file.
2 changes: 1 addition & 1 deletion assets/css/framework.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/shop.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/block-editor.js → assets/js/admin-gutenberg.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
wp.domReady( () => {

// wp.blocks.registerBlockStyle( 'core/table', {
// wp.blocks.registerBlockStyle( 'core/button', {
// name: 'custom-style',
// label: 'Custom Style'
// } );
Expand Down
20 changes: 0 additions & 20 deletions assets/js/app-shop.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
(function() { 'use strict';

if( window.jQuery ) { $ = jQuery; }

$( onReady );
$( window ).on( 'load', onLoad );

function onReady () {
myShop.init();
myAccount.init();
}

// functions that needs to run only after everything loads
Expand All @@ -17,25 +15,7 @@ function onLoad() {

var myShop = {
init: function() {
$('.woocommerce-info, .woocommerce-message, .woocommerce-error').on( 'click', this.closeToast );
},

closeToast: function() {
$(this).hide();
}
};


var myAccount = {
init: function() {
// toggle between Register and Login form
$('.h-toggle-form').on( 'click', this.toggleForm );
},

toggleForm: function() {
$(this).closest( '.u-columns' ).find( '.u-column1, .u-column2' ).toggle();
},
};


})();
40 changes: 20 additions & 20 deletions assets/sass/_app-nav.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ body
+h( d-flex fd-column ovx-hidden h100vh )

.main-nav
+h( relative bg-white bb1-solid bc-gray z100 pv075 )
+h( relative bg-white bb1-solid bc-gray z100 pv0_75 )

.has-fixed-nav &
+h( fixed w100 )
+h( fixed w100p )

.nav-wrapper
+h( d-flex ai-center )
Expand Down Expand Up @@ -48,7 +48,7 @@ body.dialog-is-active
+h( relative )

> a
+h( d-block pv075 ph1 c-body transition-none )
+h( d-block pv0_75 ph1 c-text transition-none )

&:hover
+h( o70 )
Expand All @@ -73,7 +73,7 @@ body.dialog-is-active
+h( v-visible o100 )

a
+h( d-block pv025 ph05 c-inherit brad )
+h( d-block pv0_25 ph0_5 c-inherit brad )

a:hover
+h( bg-gray )
Expand All @@ -82,9 +82,9 @@ body.dialog-is-active
@media ($below-nav)
+h( top0 left100 )
transform: translateX(-10px)

a
+h( pv05 ph075 )
+h( pv05 ph0_75 )


// NAV MOBILE TOGGLE
Expand All @@ -109,7 +109,7 @@ body.dialog-is-active
+h( d-flex order2 ai-center relative )

.button
+h( lh1 ml025 )
+h( lh1 ml0_25 )

span
line-height: 20px
Expand Down Expand Up @@ -139,11 +139,11 @@ body.dialog-is-active
///// MAIN FOOTER /////
.main-footer
+h( mt-auto bg-black75 c-white )
+h( mt-auto bg-black_75 c-white )

// widgets
.footer-widgets
+h( pv25 c-white50 fs-s )
+h( pv2_5 c-white_50 fs-s )

h-grid
grid-row-gap: $grid-gap
Expand All @@ -153,15 +153,15 @@ body.dialog-is-active
+column(4)

.widgettitle
+h( mb025 c-white75 fs-h5 )
+h( mb0_25 c-white_75 fs-h5 )

ul
+h( pl125 )
+h( pl1_25 )

///// FOOTER BAR
.footer-bar
+h( pv05 bg-main10 c-white50 fs-s )
+h( pv0_5 bg-main_10 c-white_50 fs-s )

.copyright,
.partners
Expand All @@ -173,37 +173,37 @@ body.dialog-is-active

.copyright
a
+h( mr05 )
+h( mr0_5 )

@media ($above-s)
header
+h( mr15 )
+h( mr1_5 )

// partners
.partners
+h( jc-end )

img
+h( p025 )
+h( p0_25 )
width: 32px

a
+h( d-block relative mh025 bg-main25 brad-circle transition )
+h( d-block relative mh0_25 bg-main_25 brad-circle transition )

a:hover
+h( bg-main50 c-white )
+h( bg-main_50 c-white )

.partner-caption
+h( v-hidden o0 absolute right0 pv05 ph1 bg-main )
+h( v-hidden o0 absolute right0 pv0_5 ph1 bg-main )
+h( c-white ta-center brad transition )
bottom: calc(100% + 8px)
transform: translateY(20px)

&::after
content: ""
+h( absolute top100 )
+h( absolute top100p )
right: 10px
+triangle(12px, bottom, $main, 5px)
+triangle( s, $main, 12px, 5px)

a:hover &
+h( v-visible o100 )
Expand Down
Loading

0 comments on commit 6971a08

Please sign in to comment.