-
Notifications
You must be signed in to change notification settings - Fork 351
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Replace Hari with Hari 2 #6844
Open
pbking
wants to merge
1
commit into
trunk
Choose a base branch
from
replace/hari
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Replace Hari with Hari 2 #6844
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+91.9 KB
hari-2/assets/images/luna-active-fitness-zumrc5gomno-unsplash-edited.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
<?php | ||
/** | ||
* Title: Home Pattern | ||
* slug: hari/home | ||
* inserter: no | ||
*/ | ||
?> | ||
|
||
<!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"30px","padding":{"top":"16vh","bottom":"8vh"}}}} --> | ||
<div class="wp-block-group alignwide" style="padding-top:16vh;padding-bottom:8vh;"><!-- wp:columns {"align":"wide"} --> | ||
<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} --> | ||
<div class="wp-block-column" style="flex-basis:66.66%;"><!-- wp:heading {"style":{"typography":{"lineHeight":"1.3","fontSize":"3.6rem"}},"textColor":"primary"} --> | ||
<h2 class="has-primary-color has-text-color" id="our-eco-friendly-yoga-mats-give-you-all-the-comfort-and-support-you-need" style="font-size:3.6rem;line-height:1.3;">Our eco-friendly yoga mats give you all the comfort and support you need.</h2> | ||
<!-- /wp:heading --></div> | ||
<!-- /wp:column --> | ||
|
||
<!-- wp:column {"width":"33.33%"} --> | ||
<div class="wp-block-column" style="flex-basis:33.33%;"></div> | ||
<!-- /wp:column --></div> | ||
<!-- /wp:columns --> | ||
|
||
<!-- wp:image {"align":"wide","id":30,"sizeSlug":"large","linkDestination":"none"} --> | ||
<figure class="wp-block-image alignwide size-large"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/pexels-elina-fairytale-3822164-2.jpg'; ?>" alt="" class="wp-image-30" /></figure> | ||
<!-- /wp:image --> | ||
|
||
<!-- wp:columns {"align":"wide"} --> | ||
<div class="wp-block-columns alignwide"><!-- wp:column {"width":"33.33%"} --> | ||
<div class="wp-block-column" style="flex-basis:33.33%;"></div> | ||
<!-- /wp:column --> | ||
|
||
<!-- wp:column {"width":"66.66%"} --> | ||
<div class="wp-block-column" style="flex-basis:66.66%;"><!-- wp:paragraph --> | ||
<p>Whether you're a novice or a seasoned yogi, our mats are designed to support you in your practise. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat pariatur. </p> | ||
<!-- /wp:paragraph --></div> | ||
<!-- /wp:column --></div> | ||
<!-- /wp:columns --></div> | ||
<!-- /wp:group --> | ||
|
||
<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"8vh","bottom":"8vh"}}},"backgroundColor":"tertiary","layout":{"inherit":true}} --> | ||
<div class="wp-block-group alignfull has-tertiary-background-color has-background" style="padding-top:8vh;padding-bottom:8vh;"><!-- wp:columns {"align":"wide"} --> | ||
<div class="wp-block-columns alignwide"><!-- wp:column {"style":{"spacing":{"padding":{"top":"0px","bottom":"0px"}}}} --> | ||
<div class="wp-block-column" style="padding-top:0;padding-bottom:0;"><!-- wp:image {"id":36,"width":375,"height":376,"sizeSlug":"large","linkDestination":"none"} --> | ||
<figure class="wp-block-image size-large is-resized"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/luna-active-fitness-zumrc5gomno-unsplash-edited.jpg'; ?>" alt="" class="wp-image-36" width="375" height="376" /></figure> | ||
<!-- /wp:image --></div> | ||
<!-- /wp:column --> | ||
|
||
<!-- wp:column --> | ||
<div class="wp-block-column"><!-- wp:spacer {"height":"200px"} --> | ||
<div style="height:200px;" aria-hidden="true" class="wp-block-spacer"></div> | ||
<!-- /wp:spacer --> | ||
|
||
<!-- wp:image {"id":33,"sizeSlug":"large","linkDestination":"none"} --> | ||
<figure class="wp-block-image size-large"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/luna-active-fitness-uuzdsjtkaaa-unsplash.jpg'; ?>" alt="" class="wp-image-33" /></figure> | ||
<!-- /wp:image --></div> | ||
<!-- /wp:column --></div> | ||
<!-- /wp:columns --></div> | ||
<!-- /wp:group --> | ||
|
||
<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"6vh","right":"0vh","bottom":"6vh","left":"0vh"},"blockGap":"0px"}}} --> | ||
<div class="wp-block-group alignwide" style="padding-top:6vh;padding-right:0;padding-bottom:6vh;padding-left:0;"><!-- wp:columns {"align":"wide"} --> | ||
<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} --> | ||
<div class="wp-block-column" style="flex-basis:66.66%;"><!-- wp:heading {"style":{"typography":{"fontSize":"40px","lineHeight":"1.3"}},"textColor":"primary"} --> | ||
<h2 class="has-primary-color has-text-color" id="we-are-an-australian-brand-on-a-mission-to-inspire-active-lifestyle-and-wellbeing" style="font-size:40px;line-height:1.3;">We are an Australian brand on a mission to inspire active lifestyle and wellbeing.</h2> | ||
<!-- /wp:heading --></div> | ||
<!-- /wp:column --> | ||
|
||
<!-- wp:column {"width":"33.33%"} --> | ||
<div class="wp-block-column" style="flex-basis:33.33%;"></div> | ||
<!-- /wp:column --></div> | ||
<!-- /wp:columns --> | ||
|
||
<!-- wp:columns {"align":"wide"} --> | ||
<div class="wp-block-columns alignwide"><!-- wp:column {"width":"33.33%"} --> | ||
<div class="wp-block-column" style="flex-basis:33.33%;"></div> | ||
<!-- /wp:column --> | ||
|
||
<!-- wp:column {"width":"66.66%"} --> | ||
<div class="wp-block-column" style="flex-basis:66.66%;"><!-- wp:paragraph --> | ||
<p>Here's what you can expect from our product:</p> | ||
<!-- /wp:paragraph --> | ||
|
||
<!-- wp:list --> | ||
<ul><li>Eco-friendly, biodegradable, and non-toxic.</li><li>Made from sustainably and ethically sourced raw materials.</li><li>Size: 175cm x 61cm x 4mm, weight: 1kg.</li><li>Comes with adjustable strap and carry bag.</li><li>Minimal, fully recyclable packaging.</li></ul> | ||
<!-- /wp:list --></div> | ||
<!-- /wp:column --></div> | ||
<!-- /wp:columns --></div> | ||
<!-- /wp:group --> | ||
|
||
<!-- wp:separator {"color":"tertiary","align":"wide","className":"is-style-wide"} --> | ||
<hr class="wp-block-separator alignwide has-text-color has-background has-tertiary-background-color has-tertiary-color is-style-wide" /> | ||
<!-- /wp:separator --> | ||
|
||
<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"6vh","bottom":"6vh"}}}} --> | ||
<div class="wp-block-group alignwide" style="padding-top:6vh;padding-bottom:6vh;"><!-- wp:columns {"align":"wide"} --> | ||
<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66%"} --> | ||
<div class="wp-block-column" style="flex-basis:66%;"><!-- wp:image {"id":34,"sizeSlug":"full","linkDestination":"none"} --> | ||
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/luna-active-fitness-ai5hk6stbdo-unsplash-1.jpg'; ?>" alt="" class="wp-image-34" /></figure> | ||
<!-- /wp:image --></div> | ||
<!-- /wp:column --> | ||
|
||
<!-- wp:column {"verticalAlignment":"center"} --> | ||
<div class="wp-block-column is-vertically-aligned-center"><!-- wp:heading {"style":{"typography":{"lineHeight":"1.3"}},"textColor":"primary"} --> | ||
<h2 class="has-primary-color has-text-color" id="eco-friendly-printedyoga-mat" style="line-height:1.3;">Eco-friendly Printed<br>Yoga Mat</h2> | ||
<!-- /wp:heading --> | ||
|
||
<!-- wp:jetpack/recurring-payments --> | ||
<div class="wp-block-jetpack-recurring-payments"><!-- wp:jetpack/button {"element":"a","text":"Buy Now","borderRadius":0,"className":""} /--></div> | ||
<!-- /wp:jetpack/recurring-payments --></div> | ||
<!-- /wp:column --></div> | ||
<!-- /wp:columns --></div> | ||
<!-- /wp:group --> | ||
|
||
<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"6vh","bottom":"6vh"}}},"backgroundColor":"primary","textColor":"background","layout":{"inherit":true}} --> | ||
<div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background" style="padding-top:6vh;padding-bottom:6vh;"><!-- wp:columns {"align":"wide"} --> | ||
<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%","style":{"spacing":{"padding":{"top":"0px","bottom":"0px"}}}} --> | ||
<div class="wp-block-column" style="padding-top:0;padding-bottom:0;flex-basis:66.66%;"><!-- wp:heading {"style":{"typography":{"lineHeight":"1.3"}}} --> | ||
<h2 id="i-absolutely-love-my-yoga-mat-the-size-is-perfect-and-the-quality-is-excellent-it-s-a-delight-to-use" style="line-height:1.3;"><em>“I absolutely love my Yoga Mat. The size is perfect, and the quality is excellent. It's a delight to use!”</em></h2> | ||
<!-- /wp:heading --> | ||
|
||
<!-- wp:paragraph --> | ||
<p>-- Sarah, Newcastle</p> | ||
<!-- /wp:paragraph --></div> | ||
<!-- /wp:column --> | ||
|
||
<!-- wp:column {"width":"33.33%"} --> | ||
<div class="wp-block-column" style="flex-basis:33.33%;"></div> | ||
<!-- /wp:column --></div> | ||
<!-- /wp:columns --></div> | ||
<!-- /wp:group --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
/* | ||
Theme Name: Hari | ||
Theme Name: Hari 2 | ||
Theme URI: https://wordpress.com/theme/hari | ||
Author: Automattic | ||
Author URI: https://automattic.com/ | ||
Description: Hari is a minimalist, product-oriented theme. | ||
Requires at least: 5.9 | ||
Tested up to: 5.9 | ||
Tested up to: 6.1 | ||
Requires PHP: 5.7 | ||
Version: 0.0.3 | ||
Version: 1.0.0 | ||
License: GNU General Public License v2 or later | ||
License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE | ||
Template: blockbase | ||
Text Domain: hari | ||
Text Domain: hari-2 | ||
Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage | ||
*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<!-- wp:template-part {"slug":"header","tagName":"header"} /--> | ||
|
||
<!-- wp:group {"tagName":"main","layout":{"inherit":true}} --> | ||
<main class="wp-block-group"> | ||
<!-- wp:pattern {"slug":"hari/home"} --> | ||
</main> | ||
<!-- /wp:group --> | ||
|
||
<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /--> |
File renamed without changes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
escape for translations.