From 2869deb668a2fb3763428495e75e4a4d44308556 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Fri, 13 Apr 2018 12:02:01 -0400 Subject: [PATCH] initial develop commit --- .gitignore | 4 + .nvmrc | 1 + assets/css/glm-dev.css | 3 + assets/css/glm-dev.css.map | 1 + assets/js/glm-dev.js | 1 + footer.php | 5 +- functions.php | 8 +- glm-dev/scss/_body.scss | 49 +- glm-dev/scss/_settings.scss | 2 + glm-dev/scss/glm-dev.scss | 4 +- header.php | 3 +- package-lock.json | 6331 +++++++++++++++++++++++++++++++++++ page.php | 2 +- style.css | 17 +- 14 files changed, 6385 insertions(+), 46 deletions(-) create mode 100644 .gitignore create mode 100644 .nvmrc create mode 100644 assets/css/glm-dev.css create mode 100644 assets/css/glm-dev.css.map create mode 100644 assets/js/glm-dev.js create mode 100644 glm-dev/scss/_settings.scss create mode 100644 package-lock.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bc1733d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +node_modules +release-builds +dist +bower_components diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..b009dfb --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +lts/* diff --git a/assets/css/glm-dev.css b/assets/css/glm-dev.css new file mode 100644 index 0000000..276925b --- /dev/null +++ b/assets/css/glm-dev.css @@ -0,0 +1,3 @@ +body{background-color:#fafbfc}body.page-template-default #page #content{padding-top:150px !important}body.page-template-default #page #content .mid-content{background-color:white;box-shadow:5px 5px 25px 0 rgba(46,61,73,0.2);margin-bottom:25px}body.page-template-default #page #content .mid-content #primary{width:100%}footer#colophon.site-footer .bottom-footer{background-color:#15203d} + +/*# sourceMappingURL=glm-dev.css.map */ diff --git a/assets/css/glm-dev.css.map b/assets/css/glm-dev.css.map new file mode 100644 index 0000000..822fcbd --- /dev/null +++ b/assets/css/glm-dev.css.map @@ -0,0 +1 @@ +{"version":3,"file":"glm-dev.css","sources":["glm-dev.scss","_settings.scss","_body.scss"],"sourcesContent":["@import 'settings';\n@import 'body';","$navy : #15203d;\n$grey : #929694;","body{\n background-color: #fafbfc;\n \n}\nbody.page-template-default{\n #page{\n #content{\n padding-top: 150px !important;\n .mid-content{\n background-color: white;\n box-shadow: 5px 5px 25px 0 rgba(46,61,73,.2);\n margin-bottom: 25px ;\n #primary{\n width: 100%;\n }\n }\n }\n }\n}\nfooter#colophon.site-footer{\n \n .bottom-footer{\n background-color: $navy;\n }\n}"],"mappings":"AEAA,AAAA,IAAI,AAAA,CACA,gBAAgB,CAAE,OAAQ,CAE7B,AACD,AAEQ,IAFJ,AAAA,sBAAsB,CACtB,KAAK,CACD,QAAQ,AAAA,CACJ,WAAW,CAAE,gBAAiB,CASjC,AAZT,AAIY,IAJR,AAAA,sBAAsB,CACtB,KAAK,CACD,QAAQ,CAEJ,YAAY,AAAA,CACR,gBAAgB,CAAE,KAAM,CACxB,UAAU,CAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAI,CAC/B,aAAa,CAAE,IAAM,CAIxB,AAXb,AAQgB,IARZ,AAAA,sBAAsB,CACtB,KAAK,CACD,QAAQ,CAEJ,YAAY,CAIR,QAAQ,AAAA,CACJ,KAAK,CAAE,IAAK,CACf,AAKjB,AAEI,MAFE,AAAA,SAAS,AAAA,YAAY,CAEvB,cAAc,AAAA,CACV,gBAAgB,CDtBhB,OAAO,CCuBV","names":[]} \ No newline at end of file diff --git a/assets/js/glm-dev.js b/assets/js/glm-dev.js new file mode 100644 index 0000000..1da16fe --- /dev/null +++ b/assets/js/glm-dev.js @@ -0,0 +1 @@ +jQuery(function(n){}); \ No newline at end of file diff --git a/footer.php b/footer.php index 9b9296b..4236ee2 100644 --- a/footer.php +++ b/footer.php @@ -47,11 +47,10 @@ diff --git a/functions.php b/functions.php index 7d726c6..7d7b2a8 100644 --- a/functions.php +++ b/functions.php @@ -66,7 +66,9 @@ function accesspress_parallax_setup() { // This theme uses wp_nav_menu() in one location. register_nav_menus( array( - 'primary' => __( 'Primary Menu', 'accesspress-parallax' ), + 'primary' => __( 'Primary Menu', 'accesspress-parallax' ), + 'main' => __( 'Main Menu', 'accesspress-parallax' ), + ) ); /* @@ -185,7 +187,9 @@ function accesspress_parallax_scripts() { wp_enqueue_script( 'nivo-lightbox', get_template_directory_uri() . '/js/nivo-lightbox.min.js', array('jquery'), '1.2.0', true ); wp_enqueue_script( 'slick', get_template_directory_uri() . '/js/slick.js', array('jquery'), '1.8.0', true ); wp_enqueue_script( 'accesspress-parallax-custom', get_template_directory_uri() . '/js/custom.js', array('jquery'), '1.0', true ); - wp_localize_script( 'accesspress-parallax-custom', 'ap_params', $slider_parameters ); + wp_localize_script( 'accesspress-parallax-custom', 'ap_params', $slider_parameters ); + wp_enqueue_script( 'glm-dev', get_template_directory_uri() . '/assets/js/glm-dev.js', array(), '1.0.0', true ); + wp_enqueue_style( 'glm-style', get_template_directory_uri() . '/assets/css/glm-dev.css', false, "1.0.0" ); if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { wp_enqueue_script( 'comment-reply' ); diff --git a/glm-dev/scss/_body.scss b/glm-dev/scss/_body.scss index cb0514d..7435d85 100644 --- a/glm-dev/scss/_body.scss +++ b/glm-dev/scss/_body.scss @@ -1,46 +1,25 @@ body{ - /* STANDARD STYLES */ - &.page-template-page-php{ - #main-slider{ - display: none; - } - } + background-color: #fafbfc; +} +body.page-template-default{ #page{ - header#masthead{ - .menu-lessons{ - display: none; - } - .menu-login{ - display: block; - } - .menu-logout{ - display: none; - } - } #content{ + padding-top: 150px !important; .mid-content{ - .interior-page-content{ + background-color: white; + box-shadow: 5px 5px 25px 0 rgba(46,61,73,.2); + margin-bottom: 25px ; + #primary{ width: 100%; - } - } - } - } - /* LOGGED IN SPECIFIC STYLES */ - &.logged-in{ - #page{ - header#masthead{ - .menu-login{ - display: none; - } - .menu-lessons{ - display: block; } - .menu-logout{ - display: block; - } - } } } +} +footer#colophon.site-footer{ + + .bottom-footer{ + background-color: $navy; + } } \ No newline at end of file diff --git a/glm-dev/scss/_settings.scss b/glm-dev/scss/_settings.scss new file mode 100644 index 0000000..efc1385 --- /dev/null +++ b/glm-dev/scss/_settings.scss @@ -0,0 +1,2 @@ +$navy : #15203d; +$grey : #929694; \ No newline at end of file diff --git a/glm-dev/scss/glm-dev.scss b/glm-dev/scss/glm-dev.scss index cc587de..42b8e06 100644 --- a/glm-dev/scss/glm-dev.scss +++ b/glm-dev/scss/glm-dev.scss @@ -1,2 +1,2 @@ -@import 'video-lessons'; -@import 'body'; +@import 'settings'; +@import 'body'; \ No newline at end of file diff --git a/header.php b/header.php index 8f920a7..6ca7399 100644 --- a/header.php +++ b/header.php @@ -44,7 +44,8 @@