From 5f6545cd2e6ca6d8abd9138189fdf743474ee7f9 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Thu, 14 Apr 2016 14:10:45 -0400 Subject: [PATCH] Glmpayment date fixed, off-canvas nav button moved over on expand --- css/app.css | 27 +++++++++++++++++++++++++-- header.php | 21 ++++++++++++--------- js/app.js | 30 ++++-------------------------- js/custom/pageSetup.js | 30 ++++-------------------------- scss/_page.header.scss | 3 ++- scss/_plugins.scss | 3 ++- scss/_right-off-canvas.scss | 11 ++++++----- scss/plugins/_glmpayment.scss | 21 +++++++++++++++++++++ 8 files changed, 76 insertions(+), 70 deletions(-) create mode 100644 scss/plugins/_glmpayment.scss diff --git a/css/app.css b/css/app.css index 2575f77..f4da714 100644 --- a/css/app.css +++ b/css/app.css @@ -6334,8 +6334,9 @@ header { -ms-transform: rotate(45deg); transform: rotate(45deg); } header ul#second-nav { - list-style: none; + float: left; margin-top: 10px; + padding-right: 90px; width: 90%; } header ul#second-nav li { display: inline; @@ -7241,6 +7242,24 @@ td.gfield_list_cell.gfield_list_56_cell1, td.gfield_list_cell.gfield_list_57_cel .gform_wrapper .top_label li.gfield.gf_first_quarter + .gform_footer, .gform_wrapper .top_label li.gfield.gf_second_quarter + .gform_footer, .gform_wrapper .top_label li.gfield.gf_third_quarter + .gform_footer, .gform_wrapper .top_label li.gfield.gf_fourth_quarter + .gform_footer { clear: both; } +#exp_year { + float: right; } + +.inputbox.exp_month { + width: 48%; } + +#submit-button td { + text-align: center; + width: 100%; } + +@media only screen and (min-width:40.063em) and (max-width:64em) { + .inputbox.exp_month { + width: 46%; } } + +@media only screen and (max-width: 40em) { + .inputbox.exp_month { + width: 100%; } } + .home-feed-post { padding-bottom: 25px; } @media only screen and (max-width: 40em) { @@ -7722,8 +7741,12 @@ aside.right-off-canvas-menu.glm-move-left { .inner-wrap { transform: none !important; } +.move-left #stick-header div.top-right-items { + position: absolute; + right: 260px; } + .move-left .exit-off-canvas { - transform: translate3d(-250px, 0px, 0px); } + transform: translateX(-250px); } aside.right-off-canvas-menu li.page_item { display: block; diff --git a/header.php b/header.php index a111b73..8e58746 100644 --- a/header.php +++ b/header.php @@ -17,15 +17,18 @@
-
- -
-
- +
+
+ +
+
+ +
+
diff --git a/js/app.js b/js/app.js index 30739bf..c5ee99f 100644 --- a/js/app.js +++ b/js/app.js @@ -50,36 +50,14 @@ $(document).ready(function () { $(".photoTitle").each(function() { $(this).find(">:first-child").remove(); }); - - - $('nav').on('click.fndtn.offcanvas', '.left-off-canvas-toggle', function (e) { - e.preventDefault(); - $(this).closest('.off-canvas-wrap').toggleClass('move-1'); - }); - $('nav').on('click.fndtn.offcanvas', '.exit-off-canvas', function (e) { - e.preventDefault(); - $(".off-canvas-wrap").removeClass("move-2"); - }); - $('nav').on('click.fndtn.offcanvas', '.right-off-canvas-toggle', function (e) { - e.preventDefault(); - $(this).closest(".off-canvas-wrap").toggleClass("move-3"); - }); - $('nav').on('click.fndtn.offcanvas', '.exit-off-canvas', function (e) { - e.preventDefault(); - $(".off-canvas-wrap").removeClass("move-4"); - }); - + $('.exit-off-canvas').click(function(e) { $('.right-off-canvas-menu').toggleClass('glm-move-left'); }); $('.right-off-canvas-toggle').click(function(e) { -// alert("Handler called"); -// e.preventDefault(); -// $('.off-canvas-wrap').off( "click", "**" ); -// $('.off-canvas-wrap').off( "click.fndtn.offcanvas", "**" ); -// $('.off-canvas-wrap').removeClass("move-left"); -// $('.off-canvas-wrap').toggleClass('move-1'); $('.right-off-canvas-menu').toggleClass('glm-move-left'); - }); + + $('#submit-button > td').attr("colspan",2); + }); diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js index c1382ec..1fd8d49 100644 --- a/js/custom/pageSetup.js +++ b/js/custom/pageSetup.js @@ -41,36 +41,14 @@ $(document).ready(function () { $(".photoTitle").each(function() { $(this).find(">:first-child").remove(); }); - - - $('nav').on('click.fndtn.offcanvas', '.left-off-canvas-toggle', function (e) { - e.preventDefault(); - $(this).closest('.off-canvas-wrap').toggleClass('move-1'); - }); - $('nav').on('click.fndtn.offcanvas', '.exit-off-canvas', function (e) { - e.preventDefault(); - $(".off-canvas-wrap").removeClass("move-2"); - }); - $('nav').on('click.fndtn.offcanvas', '.right-off-canvas-toggle', function (e) { - e.preventDefault(); - $(this).closest(".off-canvas-wrap").toggleClass("move-3"); - }); - $('nav').on('click.fndtn.offcanvas', '.exit-off-canvas', function (e) { - e.preventDefault(); - $(".off-canvas-wrap").removeClass("move-4"); - }); - + $('.exit-off-canvas').click(function(e) { $('.right-off-canvas-menu').toggleClass('glm-move-left'); }); $('.right-off-canvas-toggle').click(function(e) { -// alert("Handler called"); -// e.preventDefault(); -// $('.off-canvas-wrap').off( "click", "**" ); -// $('.off-canvas-wrap').off( "click.fndtn.offcanvas", "**" ); -// $('.off-canvas-wrap').removeClass("move-left"); -// $('.off-canvas-wrap').toggleClass('move-1'); $('.right-off-canvas-menu').toggleClass('glm-move-left'); - }); + + $('#submit-button > td').attr("colspan",2); + }); diff --git a/scss/_page.header.scss b/scss/_page.header.scss index 1441133..8e878d7 100644 --- a/scss/_page.header.scss +++ b/scss/_page.header.scss @@ -59,8 +59,9 @@ header { } } ul#second-nav { - list-style: none; + float: left; margin-top: 10px; + padding-right: 90px; width: 90%; li { display: inline; diff --git a/scss/_plugins.scss b/scss/_plugins.scss index c8c8f39..15d2da7 100644 --- a/scss/_plugins.scss +++ b/scss/_plugins.scss @@ -1,2 +1,3 @@ @import "plugins/nextgen"; - @import "plugins/gravityforms"; \ No newline at end of file + @import "plugins/gravityforms"; + @import "plugins/glmpayment"; \ No newline at end of file diff --git a/scss/_right-off-canvas.scss b/scss/_right-off-canvas.scss index 47880d5..7f33d5c 100644 --- a/scss/_right-off-canvas.scss +++ b/scss/_right-off-canvas.scss @@ -1,8 +1,5 @@ /* for the mobile menu */ -aside.right-off-canvas-menu { -// background-color: $primary-color; -// color: white; -} + aside.right-off-canvas-menu { visibility: hidden; position: fixed; @@ -19,8 +16,12 @@ aside.right-off-canvas-menu.glm-move-left { .inner-wrap { transform: none !important; } +.move-left #stick-header div.top-right-items { + position: absolute; + right: 260px; +} .move-left .exit-off-canvas { - transform: translate3d(-250px, 0px, 0px); + transform: translateX(-250px); } aside.right-off-canvas-menu li.page_item { display: block; diff --git a/scss/plugins/_glmpayment.scss b/scss/plugins/_glmpayment.scss new file mode 100644 index 0000000..12cc110 --- /dev/null +++ b/scss/plugins/_glmpayment.scss @@ -0,0 +1,21 @@ +#exp_year { + float: right; +} +.inputbox.exp_month { + width: 48%; +} +#submit-button td { + text-align: center; + width: 100%; +} +@media #{$medium-only} { + .inputbox.exp_month { + width: 46%; + } +} +@media #{$small-only} { + .inputbox.exp_month { + width: 100%; + } +} + -- 2.17.1