Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Foundation 6.4 #19

Merged
merged 7 commits into from
Dec 1, 2017
Merged

Upgrade to Foundation 6.4 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b3a97d3
Upgrade settings.scss to Foundation 6.4.
svenvanhal Dec 1, 2017
1cbcabc
Load precompiled Foundation plug-ins.
svenvanhal Dec 1, 2017
ee897d2
Change active class to 'is-active'.
svenvanhal Dec 1, 2017
e445df4
Commit final Foundation 6.3 css/js assets.
svenvanhal Dec 1, 2017
e0aef2e
Update dependencies.
svenvanhal Dec 1, 2017
a66eb5c
Minor CSS compatibility fixes.
svenvanhal Dec 1, 2017
013887e
Commit Foundation 6.4 assets.
svenvanhal Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/css/app.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/editor.css
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 8 additions & 18 deletions assets/js/calendar.min.js
View file
Open in desktop

Large diffs are not rendered by default.

1,552 changes: 847 additions & 705 deletions assets/js/foundation.js
View file
Open in desktop

Large diffs are not rendered by default.

1,554 changes: 848 additions & 706 deletions assets/js/scripts.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/scripts.min.js
View file
Open in desktop

Large diffs are not rendered by default.

398 changes: 323 additions & 75 deletions assets/scss/_settings.scss
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions assets/scss/components/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ body {
&.is-reveal-open {
overflow: visible; // Prevent scrollbar flickering
}

.reveal-overlay {
overflow-y: auto;
}
}

.page-container {
Expand Down Expand Up @@ -115,6 +119,8 @@ $topbar-height: rem-calc(90);

> li {

display: table-cell;

&:first-child {
padding-left: 0;
}
Expand Down Expand Up @@ -148,7 +154,7 @@ $topbar-height: rem-calc(90);
padding-left: .2rem;
padding-right: .2rem;

&.active {
&.is-active {
border-bottom-color: $primary-color;
}

Expand Down Expand Up @@ -420,7 +426,7 @@ $titlebar-height: 55px;

&:hover,
&:focus,
&.active {
&.is-active {
border-bottom: 2px solid $white;
}
}
Expand Down
10 changes: 5 additions & 5 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"url": "https://github.com/WISVCH/rechallenge.git"
},
"dependencies": {
"foundation-sites": "6.3.1",
"motion-ui": "~1.2.2",
"fullcalendar": "^3.4.0",
"css-hamburgers": "^0.9.1",
"magnific-popup": "^1.1.0"
"foundation-sites": "~6.4",
"motion-ui": "~1.2",
"fullcalendar": "~3.7",
"css-hamburgers": "~0.9",
"magnific-popup": "~1.1"
},
"ignore": [
"**/.*",
Expand Down
42 changes: 21 additions & 21 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,29 @@ gulp.task('foundation-js', function () {
// './assets/components/what-input/dist/what-input.js',

// Foundation core - needed if you want to use any of the components below
'./assets/components/foundation-sites/js/foundation.core.js',
'./assets/components/foundation-sites/js/foundation.util.*.js',
'./assets/components/foundation-sites/dist/js/plugins/foundation.core.js',
'./assets/components/foundation-sites/dist/js/plugins/foundation.util.*.js',

// Pick the components you need in your project
// './assets/components/foundation-sites/js/foundation.abide.js',
'./assets/components/foundation-sites/js/foundation.accordion.js',
'./assets/components/foundation-sites/js/foundation.accordionMenu.js',
// './assets/components/foundation-sites/js/foundation.drilldown.js',
// './assets/components/foundation-sites/js/foundation.dropdown.js',
// './assets/components/foundation-sites/js/foundation.dropdownMenu.js',
'./assets/components/foundation-sites/js/foundation.equalizer.js',
// './assets/components/foundation-sites/js/foundation.interchange.js',
// './assets/components/foundation-sites/js/foundation.magellan.js',
// './assets/components/foundation-sites/js/foundation.offcanvas.js',
'./assets/components/foundation-sites/js/foundation.orbit.js',
// './assets/components/foundation-sites/js/foundation.responsiveMenu.js',
'./assets/components/foundation-sites/js/foundation.responsiveToggle.js',
'./assets/components/foundation-sites/js/foundation.reveal.js',
// './assets/components/foundation-sites/js/foundation.slider.js',
// './assets/components/foundation-sites/js/foundation.sticky.js',
// './assets/components/foundation-sites/js/foundation.tabs.js',
// './assets/components/foundation-sites/js/foundation.toggler.js',
// './assets/components/foundation-sites/js/foundation.tooltip.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.abide.js',
'./assets/components/foundation-sites/dist/js/plugins/foundation.accordion.js',
'./assets/components/foundation-sites/dist/js/plugins/foundation.accordionMenu.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.drilldown.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.dropdown.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.dropdownMenu.js',
'./assets/components/foundation-sites/dist/js/plugins/foundation.equalizer.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.interchange.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.magellan.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.offcanvas.js',
'./assets/components/foundation-sites/dist/js/plugins/foundation.orbit.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.responsiveMenu.js',
'./assets/components/foundation-sites/dist/js/plugins/foundation.responsiveToggle.js',
'./assets/components/foundation-sites/dist/js/plugins/foundation.reveal.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.slider.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.sticky.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.tabs.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.toggler.js',
// './assets/components/foundation-sites/dist/js/plugins/foundation.tooltip.js',
])
.pipe(babel({
presets: ['es2015'],
Expand Down
2 changes: 1 addition & 1 deletion lib/Foundation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static function active_nav_class($atts, $item)
{

if ($item->current === true || $item->current_item_ancestor === true) {
$atts['class'] = 'active';
$atts['class'] = 'is-active';
}

return $atts;
Expand Down
2 changes: 1 addition & 1 deletion lib/Menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static function fix_active_menu_items($atts, $item)
$career_clause = $item->object_id === $page_ids['career'] && (is_post_type_archive($cpt['career']) || is_singular($cpt['career']));

if ($association_clause || $career_clause) {
$atts['class'] = empty($atts['class']) ? 'active' : $atts['class'].' active';
$atts['class'] = empty($atts['class']) ? 'is-active' : $atts['class'].' is-active';
}

return $atts;
Expand Down
5 changes: 0 additions & 5 deletions lib/Walkers/Menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {

// Remove item classes
$item->classes = array();
//
// // Add class to active item
// if ($item->current === true || $item->current_item_ancestor === true) {
// array_push($item->classes, 'active');
// }

// Execute original function
parent::start_el($output, $item, $depth, $args, $id);
Expand Down
2 changes: 1 addition & 1 deletion parts/header/sub-nav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
$active = false;
}
?>
<li><a href="<?=get_page_link($subpage)?>"<?php echo $active ? ' class="active"' : ''; ?>><?=esc_html($subpage->post_title)?></a></li>
<li><a href="<?=get_page_link($subpage)?>"<?php echo $active ? ' class="is-active"' : ''; ?>><?=esc_html($subpage->post_title)?></a></li>
<?php
}
?>
Expand Down