Skip to content

Commit

Permalink
Fixed Navbar, buttons and inputs. Tested Podcast & Video
Browse files Browse the repository at this point in the history
  • Loading branch information
RaddyTheBrand committed Aug 20, 2019
1 parent 4bde6b2 commit 845544e
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 24 deletions.
50 changes: 45 additions & 5 deletions css/styles.css

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

2 changes: 1 addition & 1 deletion css/styles.css.map

Large diffs are not rendered by default.

44 changes: 40 additions & 4 deletions css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,23 @@ input[type="submit"] {
}
}

label {
display: block;
}

.comment-form-author, .comment-form-url, .comment-form-email, .comment-form-comment {

textarea {
min-height: 200px;
width: 100%;
}

input {
width: 100%;
}

}

.social-icon {
fill: #d9d9d9;
}
Expand All @@ -207,15 +224,35 @@ input[type="submit"] {
}

header {
padding: 40px 0;
padding: 40px 0;
position: relative;

a {
text-decoration: none;
cursor: pointer;
display: inline-block;
}

.row {
display: flex;
flex: 1;
flex-direction: row;
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
}

.col-6 {
display: flex;
justify-content: flex-end;
align-items: center;
flex: 1;
min-height: 80px;

}

}



.mobile-menu {
float: right;
Expand Down Expand Up @@ -372,13 +409,12 @@ footer {
#toggleMyMenu {
font-size: 1.6em;
position: absolute;
top: 155px;

background-color: rgb(250, 250, 250);
left:0;
right: 0;
text-align: center;
z-index: 1;
margin: 25px;
border-bottom: 1px solid $secondary-color;


Expand Down Expand Up @@ -547,7 +583,7 @@ nav.pagination {


.row-padding {
margin: 0 (-$row-padding);
// margin: 0 (-$row-padding);
[class*="col-"] {
padding: ($row-padding + $row-padding) $row-padding;
}
Expand Down
24 changes: 14 additions & 10 deletions header.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,37 @@
<div class="row">
<div class="col-6 col-s-6">
<?php
if ( function_exists( 'the_custom_logo') !== '' ) {
if ( function_exists( 'the_custom_logo' ) && has_custom_logo() ) {
the_custom_logo();
}
else {
/*Link to homepage */
?>
<h1><a href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
<h1><a href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>"><?php echo bloginfo('name'); ?></a></h1>
<?php
}
?>
</div>
<div class="col-6 col-s-6">
<div class="col-6 col-s-6 flex-test">
<div class="mobile-menu">
<span class="open__burger"><img src="<?php echo get_template_directory_uri(); ?>/images/menu.svg" alt="Menu"/>Menu</span>
<span class="close__burger"><img src="<?php echo get_template_directory_uri(); ?>/images/menu_close.svg" alt="Close"/>Close</span>
</div>
</div>
</div>

<nav id="toggleMyMenu" style="display: none;">
<?php
wp_nav_menu( array ('theme_location' =>
'my-custom-menu', 'container_class' =>
'custom-menu-class'));
?>
</nav>


</header>

<nav id="toggleMyMenu" style="display: none;">
<?php
wp_nav_menu( array ('theme_location' =>
'my-custom-menu', 'container_class' =>
'custom-menu-class'));
?>
</nav>


<div class="row slogan">
<div class="col-12">
Expand Down
4 changes: 1 addition & 3 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,9 @@
</a>
</div>
<div class="col-6 content">
<a href="<?php the_permalink();?>">
<h2><?php the_title(); ?></h2>
<p><?php echo get_excerpt(186); ?></p>
<span class="button">More +</span>
</a>
<a class="button" href="<?php the_permalink();?>">More +</a>
</div>
</article>

Expand Down
6 changes: 5 additions & 1 deletion js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ jQuery( document ).ready(function() {
const closeBurger = jQuery('.close__burger');
let isOpen = 0;
let isOpenSearch = 0;


// Menu Positioning depending on logo/header height
let currentHeight = jQuery('header').innerHeight();
console.log(currentHeight);
jQuery(mobileNav).css({ top: currentHeight + 47 });


jQuery(navToggle).click(function(){
Expand Down
1 change: 1 addition & 0 deletions single.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<?php } ?>
<h1 class="heading"><?php the_title(); ?></h1>
<?php the_content();?>
<?php comments_template(); ?>
<?php
endwhile; }
require_once( get_template_directory() . '/include/social.php' );
Expand Down

0 comments on commit 845544e

Please sign in to comment.