Skip to content

Fix some footer layout bugs #2

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

Merged
zgreen merged 3 commits into from
Nov 13, 2014
Merged

Fix some footer layout bugs #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f608281
fix some footer layout bugs
Nov 13, 2014
bfe4d87
Merge branch 'fix-footer-resposiveness' into prod
Nov 13, 2014
51cc3fa
update some CSS & JS versions
Nov 13, 2014
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
9 changes: 3 additions & 6 deletions css/partials/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
.footer-main {
background: lighten($color-primary, 7.8431%);
background: $color-primary;
flex-wrap: wrap;
@include bp-large {
background: $color-primary;
}
@include bp-tablet--portrait {
padding: 2em 1.375em;
}
Expand Down Expand Up @@ -63,7 +60,7 @@
padding: 0;
z-index: map-get($zindex, main-secondary);
}
@include bp-tablet--portrait-only { // Prevent these links from overflowing into Social icons
@include bp-tablet--landscape-below { // Prevent these links from overflowing into Social icons
@include rem-first(margin-top, 1.5);
@include rem-first(margin-left, 0);
}
Expand All @@ -86,7 +83,7 @@
}
}
span:first-of-type {
@include bp-tablet--portrait-only {
@include bp-tablet--landscape-below {
padding-left: 0; // So that primary links are flush with left edge
}
}
Expand Down
6 changes: 3 additions & 3 deletions functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function twentytwelve_scripts_styles() {
*/
wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );

wp_register_style('libraries-global', get_template_directory_uri() . '/css/build/minified/global.css', array('twentytwelve-style'), '2.0.2');
wp_register_style('libraries-global', get_template_directory_uri() . '/css/build/minified/global.css', array('twentytwelve-style'), '2.2.0');

wp_enqueue_style('libraries-global');

Expand All @@ -129,9 +129,9 @@ function twentytwelve_scripts_styles() {

wp_register_script('modernizr', get_template_directory_uri() . '/js/modernizr.js', array(), '2.8.1', false);

wp_register_script('homeJS', get_template_directory_uri() . '/js/build/home.min.js', array('jquery', 'modernizr'), '20140709', true);
wp_register_script('homeJS', get_template_directory_uri() . '/js/build/home.min.js', array('jquery', 'modernizr'), '2.2.0', true);

wp_register_script('productionJS', get_template_directory_uri() . '/js/build/production.min.js', array('jquery'), '201400616', true);
wp_register_script('productionJS', get_template_directory_uri() . '/js/build/production.min.js', array('jquery'), '2.2.0', true);

wp_register_script('hoursJS', get_template_directory_uri() . '/js/build/hours.min.js', array('jquery', 'productionJS'), '20140312', true);

Expand Down