Skip to content

Commit

Permalink
menu fix and cleaning shop
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan McEldowney authored and Evan McEldowney committed Jul 7, 2017
1 parent a00c7a9 commit c5e1287
Show file tree
Hide file tree
Showing 11 changed files with 154 additions and 87 deletions.
Binary file added assets/images/icons/close.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 15 additions & 3 deletions assets/javascript/custom/init-foundation.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
jQuery(document).foundation();


$('li.top-link').click(function(e) {
$('li.top-link').not(this).find('ul').hide();
$(this).find('ul').toggle();
e.preventDefault();
console.log('dog');
console.log("here");
});

$('.opener').click(function(e) {
e.preventDefault();
var $this = $(this).parent();

if($this.hasClass("opened")){
$('.sub-menu').slideUp(400);
$this.removeClass("opened");
}
else{
$(".opener").removeClass("opened");
$('.sub-menu').slideUp(400);
$this.children('.sub-menu').delay(400).slideDown("slow");
$this.addClass("opened");
}
});

$('.sub-menu-closer').click(function(e){
$('.sub-menu').slideUp(400);
$this.children('.sub-menu').delay(400).slideDown("slow");
});
18 changes: 15 additions & 3 deletions assets/javascript/foundation.js

Large diffs are not rendered by default.

101 changes: 57 additions & 44 deletions assets/scss/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,85 +1,98 @@
h1{
h1 {
text-transform: uppercase;
}

h2,h3,h4,h5,h6{
color:$light-gray;
h2,
h3,
h4,
h5,
h6 {
color: $light-gray;
}

.sidebar-left .row{ //subtitle
margin-top:2em;
.sidebar-left .row {
//subtitle
margin-top: 2em;
}

blockquote{
color:$primary-color;
blockquote {
color: $primary-color;
font-style: italic;
font-weight: 300;
font-size:1.9em;
font-size: 1.9em;
}

//for all bolded statments
.type__callout, bold, .bold{
font-weight:bold;
color:$medium-gray;
.bold,
.type__callout,
bold {
font-weight: bold;
color: $medium-gray;
}

p a{
p a {
position: relative;
display: inline-block;
@include underline;
color:$primary-color;
cursor:pointer;
color: $primary-color;
cursor: pointer;
//transition: opacity 0.35s;
}

a:hover {
&:after{
}

a:hover {
&:after {
transform-origin: right;
transform: scaleX(1);
}
}

.no-underline{
&:hover{
opacity:.9;
.no-underline {
&:hover {
opacity: 0.9;
}
&:after{
display:none;

&:after {
display: none;
}
}

ul li {
list-style-type: none;
list-style-type: none;
}

ul li:before {
color: $primary-color;
float: left;
margin: 0 0 0 -1em;
width: 1em;
content: '\25AA';
color: $primary-color;
float: left;
margin: 0 0 0 -1em;
width: 1em;
content: '\25AA';
}

input::-webkit-input-placeholder { /* Chrome */
color: $white;
input::-webkit-input-placeholder {
/* Chrome */
color: $white;
}
input:-ms-input-placeholder { /* IE 10+ */
color: $white;

input:-ms-input-placeholder {
/* IE 10+ */
color: $white;
}
input::-moz-placeholder { /* Firefox 19+ */
color: $white;
opacity: 1;

input::-moz-placeholder {
/* Firefox 19+ */
color: $white;
opacity: 1;
}
input:-moz-placeholder { /* Firefox 4 - 18 */
color: $white;
opacity: 1;

input:-moz-placeholder {
/* Firefox 4 - 18 */
color: $white;
opacity: 1;
}

.left{
float:left;
.left {
float: left;
}

.right{
float:right;
.right {
float: right;
}
2 changes: 1 addition & 1 deletion assets/scss/global/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace;
$header-color: $medium-gray;
$header-lineheight: 1.2;
$header-margin-bottom: 0.5rem;
$header-top-length:200px;
$header-top-length: 200px;
$header-styles: (
small: (
'h1': ('font-size': 24),
Expand Down
5 changes: 1 addition & 4 deletions assets/scss/modules/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
}

.footer {

ul {
list-style-type: none;
margin: 0;
Expand All @@ -24,8 +23,6 @@
color: $white;
}

.form-description {}

nf-field {
color: $white;
width: 50%;
Expand Down Expand Up @@ -107,7 +104,7 @@

.footer-lower {
background-color: $dark-gray;
padding: 60px 0 ;
padding: 60px 0;
}
}

Expand Down
50 changes: 28 additions & 22 deletions assets/scss/templates/_top-menus.scss
Original file line number Diff line number Diff line change
@@ -1,33 +1,23 @@
// main styling for all top right nav
// construction happens in navigation.php, custom walker classes, and header


//mobile-menu
.title-bar{
background-color:$white;
color:$white;
padding:10px;
position:fixed;
width:100%;

.title-bar {
background-color: $white;
color: $white;
padding: 10px;
position: fixed;
width: 100%;
}

.mobile-off-canvas-menu{
margin-top:10px;
background-color:$white;
li{
border-bottom: .1px $light-gray solid;
.mobile-off-canvas-menu {
margin-top: 10px;
background-color: $white;

li {
border-bottom: 0.1px $light-gray solid;
}
}




//desk-top




.site-navigation {
color: $medium-gray;
position: fixed;
Expand Down Expand Up @@ -174,6 +164,22 @@
text-align: left;
background-image: url("../images/menu.jpg");

.sub-menu-closer {
@include grid-column(2);
cursor: pointer;
float: left;
width: 30px;
height: 30px;
background-repeat: no-repeat;
background-size: contain;
background-image: url('../images/icons/close.png');
transition: all 0.45s;

&:hover {
opacity: 0.6;
}
}

.sub-menu-label {
@include grid-column(5);
float: left;
Expand Down
35 changes: 32 additions & 3 deletions assets/stylesheets/foundation.css

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

2 changes: 1 addition & 1 deletion assets/stylesheets/foundation.css.map

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @package FoundationPress
* @since FoundationPress 1.0.0
*/

//controlled in the widget sections
?>

</section>
Expand All @@ -16,14 +16,12 @@
<?php do_action( 'foundationpress_before_footer' ); ?>
<div class="footer-form">
<div class="row">

<?php dynamic_sidebar( 'form-footer-widgets' ); ?>

<?php dynamic_sidebar( 'form-footer-widgets' ); ?>
</div>
</div>
<div class="footer-upper">
<div class="row-16">
<?php dynamic_sidebar( 'upper-footer-widgets' ); ?>
<?php dynamic_sidebar( 'upper-footer-widgets' ); ?>
</div>
</div>
<div class="footer-lower">
Expand Down
2 changes: 1 addition & 1 deletion library/class-foundationpress-program-bar-walker.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function start_lvl( &$output, $depth = 0, $args = array() ) {
$indent = str_repeat("\t", $depth);
global $description;
global $title;
$output .= "\n$indent<ul class='sub-menu'><div class='sub-menu-label'><div class='sub-menu-title'>".$title."</div> <div class='sub-menu-description'>".$description."</div></div><div class='sub-menu-items'>\n";
$output .= "\n$indent<ul class='sub-menu'><div class='sub-menu-closer'></div><div class='sub-menu-label'><div class='sub-menu-title'>".$title."</div> <div class='sub-menu-description'>".$description."</div></div><div class='sub-menu-items'>\n";
}

function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
Expand Down

0 comments on commit c5e1287

Please sign in to comment.