Skip to content

Commit ae1de8e

Browse files
committed
Fixed some header alignment
1 parent eafd274 commit ae1de8e

File tree

4 files changed

+80
-7
lines changed

4 files changed

+80
-7
lines changed

assets/js/shapely-scripts.js

Lines changed: 72 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,44 @@
117117
});
118118
$( '.slider-paging-controls' ).flexslider({
119119
animation: 'slide',
120-
directionNav: false
120+
directionNav: false,
121+
after: function (slider){
122+
if (!slider.playing){
123+
slider.pause();
124+
slider.play();
125+
slider.off( "mouseenter mouseleave" );
126+
slider.off( "mouseover mouseout" );
127+
slider.mouseover( function() {
128+
if ( !slider.manualPlay && !slider.manualPause ){
129+
slider.pause();
130+
}
131+
}).mouseout( function() {
132+
if (!slider.manualPause && !slider.manualPlay && !slider.stopped){
133+
slider.play();
134+
}
135+
});
136+
}
137+
}
121138
});
122139
$( '.slider-arrow-controls' ).flexslider({
123-
controlNav: false
140+
controlNav: false,
141+
after: function (slider){
142+
if (!slider.playing){
143+
slider.pause();
144+
slider.play();
145+
slider.off( "mouseenter mouseleave" );
146+
slider.off( "mouseover mouseout" );
147+
slider.mouseover( function() {
148+
if ( !slider.manualPlay && !slider.manualPause ){
149+
slider.pause();
150+
}
151+
}).mouseout( function() {
152+
if (!slider.manualPause && !slider.manualPlay && !slider.stopped){
153+
slider.play();
154+
}
155+
});
156+
}
157+
}
124158
});
125159
$( '.slider-thumb-controls .slides li' ).each(function() {
126160
var imgSrc = $( this ).find( 'img' ).attr( 'src' );
@@ -129,7 +163,24 @@
129163
$( '.slider-thumb-controls' ).flexslider({
130164
animation: 'slide',
131165
controlNav: 'thumbnails',
132-
directionNav: true
166+
directionNav: true,
167+
after: function (slider){
168+
if (!slider.playing){
169+
slider.pause();
170+
slider.play();
171+
slider.off( "mouseenter mouseleave" );
172+
slider.off( "mouseover mouseout" );
173+
slider.mouseover( function() {
174+
if ( !slider.manualPlay && !slider.manualPause ){
175+
slider.pause();
176+
}
177+
}).mouseout( function() {
178+
if (!slider.manualPause && !slider.manualPlay && !slider.stopped){
179+
slider.play();
180+
}
181+
});
182+
}
183+
}
133184
});
134185
$( '.logo-carousel' ).flexslider({
135186
minItems: 1,
@@ -141,7 +192,24 @@
141192
slideshow: true,
142193
slideshowSpeed: 3000,
143194
directionNav: false,
144-
controlNav: false
195+
controlNav: false,
196+
after: function (slider){
197+
if (!slider.playing){
198+
slider.pause();
199+
slider.play();
200+
slider.off( "mouseenter mouseleave" );
201+
slider.off( "mouseover mouseout" );
202+
slider.mouseover( function() {
203+
if ( !slider.manualPlay && !slider.manualPause ){
204+
slider.pause();
205+
}
206+
}).mouseout( function() {
207+
if (!slider.manualPause && !slider.manualPlay && !slider.stopped){
208+
slider.play();
209+
}
210+
});
211+
}
212+
}
145213
});
146214

147215
// Lightbox gallery titles

header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div class="nav-container">
2929
<nav id="site-navigation" class="main-navigation" role="navigation">
3030
<div class="container nav-bar">
31-
<div class="row">
31+
<div class="flex-row">
3232
<div class="module left site-title-container">
3333
<?php shapely_get_header_logo(); ?>
3434
</div>

inc/extras.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,12 @@ function shapely_get_header_logo() {
518518
}
519519
// If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
520520
elseif ( is_customize_preview() ) {
521-
$html = sprintf( '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/>%2$s</a>',
521+
$html = sprintf( '<a href="%1$s" class="custom-logo-link"><img class="custom-logo"/ style="display:none;"><span class="site-title">%2$s</span></a>',
522+
esc_url( home_url( '/' ) ),
523+
esc_html( get_bloginfo( 'name' ) )
524+
);
525+
}else{
526+
$html = sprintf( '<a href="%1$s" class="custom-logo-link"><span class="site-title">%2$s</span></a>',
522527
esc_url( home_url( '/' ) ),
523528
esc_html( get_bloginfo( 'name' ) )
524529
);

style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ a, a:visited, a:active, a:hover {
560560
#site-navigation .module.left {
561561
padding-left: 15px;
562562
}
563-
#site-navigation .container > .row {
563+
#site-navigation .container > .flex-row {
564564
display: flex;
565565
align-items: center;
566566
justify-content: space-between;

0 commit comments

Comments
 (0)