Skip to content

Commit

Permalink
Merge branch 'release/1.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
siteorigin-support committed Jan 21, 2021
2 parents 7d3a26f + e91238e commit 9e96293
Show file tree
Hide file tree
Showing 11 changed files with 655 additions and 149 deletions.
2 changes: 1 addition & 1 deletion admin/about/page-github.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3><?php _e( 'Developed on Github', 'origami' ) ?></h3>
<img src="<?php echo get_template_directory_uri() ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
<img src="<?php echo esc_url( get_template_directory_uri() ) ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
<p>
<?php printf( __( "Origami is actively %sdeveloped on Github%s.", 'origami' ), '<a href="https://github.com/siteorigin/origami">', '</a>' ) ?>
<?php _e( "You can watch what's happening with its development and even make contributions yourself.", 'origami' ) ?>
Expand Down
2 changes: 1 addition & 1 deletion build
Submodule build updated 1 files
+3 −3 package-lock.json
4 changes: 2 additions & 2 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,10 @@ function origami_print_styles(){
function origami_html_shiv(){
?>
<!--[if lt IE 9]>
<script src="<?php echo get_template_directory_uri(); ?>/js/html5shiv.js" type="text/javascript"></script>
<script src="<?php echo esc_url( get_template_directory_uri() ); ?>/js/html5shiv.js" type="text/javascript"></script>
<![endif]-->
<!--[if (gte IE 6)&(lte IE 8)]>
<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/selectivizr.js"></script>
<script type="text/javascript" src="<?php echo esc_url( get_template_directory_uri() ); ?>/js/selectivizr.js"></script>
<![endif]-->
<?php
}
Expand Down
Loading

0 comments on commit 9e96293

Please sign in to comment.