Skip to content

Commit

Permalink
Merge branch 'release/1.7.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
Misplon committed Nov 7, 2019
2 parents e07fccf + b4cb2e9 commit f89f4ad
Show file tree
Hide file tree
Showing 15 changed files with 149 additions and 154 deletions.
1 change: 0 additions & 1 deletion inc/template-tags.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ function siteorigin_north_display_retina_logo( $attr ) {
return $attr;
}
endif;
add_filter( 'siteorigin_north_logo_attributes', 'siteorigin_north_display_retina_logo' );
add_filter( 'wp_get_attachment_image_attributes', 'siteorigin_north_display_retina_logo' );

if ( ! function_exists( 'siteorigin_north_the_post_navigation' ) ) :
Expand Down
5 changes: 0 additions & 5 deletions js/north.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,6 @@ jQuery( function( $ ) {
// Remove the no-js body class.
$( 'body.no-js' ).removeClass( 'no-js' );
if ( $( 'body' ).hasClass( 'css3-animations' ) ) {
// Display the burst animation.
$( '.search-field' ).burstAnimation( {
event: "focus",
container: ".search-form"
} );

var alignMenu = function() {
$( '#primary-menu > li > ul.sub-menu' ).each( function() {
Expand Down
7 changes: 6 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Contributors: siteOrigin
Tags: one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-menu, custom-logo, featured-images, footer-widgets, full-width-template, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce
Requires at least: 4.7
Tested up to: 5.2
Tested up to: 5.3
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -100,6 +100,11 @@ Original design files are available on [Google Drive](https://drive.google.com/f

== Changelog ==

= 1.7.8 - 07 November 2019 =
* Set heading styles for `h1` to `h6`.
* Improved search form styling.
* Updated WooCommerce `cart.php` template to WooCommerce `3.8.0`.

= 1.7.7 - 21 October 2019 =
* WooCommerce mini-cart: prevented long titles from overlapping remove icon.
* Changed bottom bar text separators to hyphens.
Expand Down
5 changes: 3 additions & 2 deletions sass/forms/_fields.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ textarea {
box-sizing: border-box;
color: $color__text_medium;
font-family: $font__detail;
font-size: 0.85em;
padding: 7px 30px;
font-size: .9333em;
line-height: normal;
padding: 9px 13px 10px;
width: 100%;

&:focus {
Expand Down
3 changes: 1 addition & 2 deletions sass/navigation/_menus.scss
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,7 @@
width: 100%;
z-index: 99999;

.container,
.search-form {
.container {
height: 100%;
}

Expand Down
2 changes: 1 addition & 1 deletion sass/site/primary/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

a {
color: $footer__link_color;

&:hover {
color: $footer__link_hover_color;
}
Expand Down
40 changes: 39 additions & 1 deletion sass/site/primary/_posts-and-pages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,44 @@ article.page {

@media (max-width: 1024px) {
width: auto;
}
}
}
}

/*--------------------------------------------------------------
## Search Form
--------------------------------------------------------------*/
.search-form,
.woocommerce-product-search {
position: relative;

input[type="search"] {
min-width: 300px;
padding-right: 54px;
}

button[type="submit"] {
border: none;
box-shadow: none;
color: $color__text_medium;
line-height: normal;
padding: 12px 18px 8px;
position: absolute;
right: 0;
top: 0;

&:hover {
background: none;
color: $color__text_dark;
}

svg {
height: 14px;
width: 14px;

path {
fill: $color__text-medium;
}
}
}
}
61 changes: 7 additions & 54 deletions sass/site/secondary/_widgets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,6 @@
}
}

/* Search widget. */
.widget_search {

input[type="search"] {
display: inline-block;
vertical-align: top;
width: 75%;
}

button {
padding: 10px 25px 10px;
}
}

.textwidget {

> *:first-child {
Expand All @@ -59,29 +45,15 @@
}
}

.search-form {
position: relative;
// Search form widget.
.widget .search-form {
width: 100%;

.search-field {
border-color: $color__border-table;
border-radius: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border-width: 0 0 1px 0;
display: block;
font-family: $font__detail;
font-size: 0.9em;
padding: 8px 15px;
input[type="search"] {
width: 100%;

&:focus {
background: #fbfbfb;
outline: none;
}

input:-webkit-autofill {
color: #2a2a2a !important;

@at-root #secondary & {
min-width: 0;
}
}
}
Expand Down Expand Up @@ -324,22 +296,3 @@
}
}
}

// Search widget.
.widget-area form[role="search"] {

input[type="search"] {
width: 85%;
}

button[type="submit"] {
padding: 10px 0;
width: 13%;

i {
display: inline-block;
text-align: center;
width: 100%;
}
}
}
25 changes: 25 additions & 0 deletions sass/typography/_headings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,33 @@ h6 {
font-weight: normal;
font-family: $font__headings;
color: $color__text_dark;
margin: 25px 0;

.widget & {
color: inherit;
}
}

h1 {
font-size: 29px;
}

h2 {
font-size: 25px;
}

h3 {
font-size: 22px;
}

h4 {
font-size: 20px;
}

h5 {
font-size: 18px;
}

h6 {
font-size: 16px;
}
23 changes: 0 additions & 23 deletions sass/woocommerce/_widgets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -167,26 +167,3 @@
}
}
}

// Product search.
.widget_product_search {
form[role="search"] {

input[type="search"] {
border: none;
padding-left: 0;
width: 85%;
}

button[type="submit"] {
padding: 10px 0;
width: 13%;

i {
display: inline-block;
text-align: center;
width: 100%;
}
}
}
}
4 changes: 2 additions & 2 deletions searchform.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<form method="get" action="<?php echo esc_url( home_url( '/' ) ) ?>">
<form method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ) ?>">
<input type="search" name="s" aria-label="<?php esc_attr_e( 'Search for', 'siteorigin-north' ); ?>" placeholder="<?php esc_attr_e('Search', 'siteorigin-north') ?>" value="<?php echo get_search_query() ?>" />
<button type="submit" aria-label="<?php esc_attr_e( 'Search', 'siteorigin-north' ); ?>">
<i class="north-icon-search"></i>
<?php siteorigin_north_display_icon( 'search' ); ?>
</button>
</form>
Loading

0 comments on commit f89f4ad

Please sign in to comment.