resolved merge conflict

fixed video stuff
Merge branch 'master' of git.rslp.org:PuukoMonk/CodeAbode
2024-06-07 17:14:56 -04:00 · 2024-06-07 17:12:30 -04:00 · 2024-06-05 17:01:46 -04:00 · 2024-06-04 18:31:39 -04:00 · 2024-06-04 18:27:24 -04:00 · 2024-06-04 18:26:20 -04:00
4 changed files with 33 additions and 198 deletions
--- a/css/style.css
+++ b/css/style.css
@ -18921,11 +18921,7 @@ html [class*='section-'].section-bottom-0 {
 }

 .bg-secondary {
-<<<<<<< HEAD
-    background-color: #2f5f8e;
-=======
    background-color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .bg-secondary:not([style*='background-'])
@ -19844,11 +19840,7 @@ h6 a,

 h6 a:hover,
 .heading-6 a:hover {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .heading-7 {
@ -19888,11 +19880,7 @@ h6 a:hover,
 .heading-8 {
    font-size: 18px;
    line-height: 1.6;
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .heading-8 a:hover {
@ -19986,11 +19974,7 @@ p [style*='max-width'] {
 }

 .title-3 {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .context-dark .title-4,
@ -20009,11 +19993,7 @@ p [style*='max-width'] {

 .title-5 {
    font-weight: 400;
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

@media (min-width: 992px) {
@ -20105,13 +20085,8 @@ a[href*='mailto'] {
 }

 .link-border:hover {
-<<<<<<< HEAD
-    color: #2f5f8e;
-    border-color: #2f5f8e;
-=======
    color: #2a537b;
    border-color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .link-border-2 {
@ -20424,11 +20399,7 @@ a[href*='mailto'] {
 }

 .box-modern-item:nth-child(3n + 3) .box-modern-number {
-<<<<<<< HEAD
-    background: #2f5f8e;
-=======
    background: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 * + .box-modern-wrap {
@ -20884,11 +20855,7 @@ html .group-custom > * {
    width: 8px;
    height: 8px;
    border-radius: 8px;
-<<<<<<< HEAD
-    background-color: #2f5f8e;
-=======
    background-color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .index-list {
@ -21835,13 +21802,8 @@ hr {
 .button-secondary,
 .button-secondary:focus {
    color: #ffffff;
-<<<<<<< HEAD
-    background-color: #2f5f8e;
-    border-color: #2f5f8e;
-=======
    background-color: #2a537b;
    border-color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .button-secondary:hover,
@ -21859,11 +21821,7 @@ hr {
 .button-secondary.button-nuka:hover,
 .button-secondary.button-nuka:active,
 .button-secondary.button-nuka.active {
-<<<<<<< HEAD
-    background-color: #2f5f8e;
-=======
    background-color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .button-secondary.button-nuka .button-overlay {
@ -23019,11 +22977,7 @@ textarea.form-input {
    font-weight: 700;
    font-style: italic;
    line-height: 1.4;
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 * + .quote-classic-footer {
@ -23081,11 +23035,7 @@ textarea.form-input {

 .quote-corporate-body q::before {
    font-size: 40px;
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
    line-height: 0.8;
    padding-top: 8px;
    display: inline-block;
@ -23139,11 +23089,7 @@ textarea.form-input {
 }

 .quote-corporate-4 .quote-corporate-name {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

@media (min-width: 768px) {
@ -23697,11 +23643,7 @@ textarea.form-input {

 .footer-default-list .heading-6 a:hover,
 .footer-default-contacts .heading-6 a:hover {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 * + .footer-default-contacts {
@ -23805,11 +23747,7 @@ textarea.form-input {
 .footer-modern.bg-gradient-primary .list-social a:hover,
 .footer-modern.bg-gradient-primary-1 .list-social a:hover,
 .footer-modern.rd-navbar-corporate .list-social a:hover {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 /*
@ -23926,11 +23864,7 @@ textarea.form-input {
 }

 .service-corporate-icon .path-secondary {
-<<<<<<< HEAD
-    fill: #2f5f8e;
-=======
    fill: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .service-corporate-icon .path-gray-700 {
@ -23965,11 +23899,7 @@ textarea.form-input {
 }

 .service-modern-icon .path-secondary {
-<<<<<<< HEAD
-    fill: #2f5f8e;
-=======
    fill: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 * + .service-modern-title {
@ -23994,11 +23924,7 @@ textarea.form-input {
 }

 .program-day > * {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .program-title {
@ -24143,11 +24069,7 @@ textarea.form-input {
 }

 .service-ubby-title {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
    font-weight: 400;
 }

@ -24174,11 +24096,7 @@ textarea.form-input {
 }

 .service-alba-title {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

@media (min-width: 992px) {
@ -24422,11 +24340,7 @@ textarea.form-input {
 }

 .team-minimal-name {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .team-minimal-text {
@ -24507,11 +24421,7 @@ textarea.form-input {
 }

 .pricing-title {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .pricing-title > * {
@ -24691,11 +24601,7 @@ textarea.form-input {
 }

 .button-play-1::after {
-<<<<<<< HEAD
-    background: #2f5f8e;
-=======
    background: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .button-play-1::before {
@ -25066,11 +24972,7 @@ html:not(.lt-ie10) .not-animated {
    width: 64px;
    height: 64px;
    margin: 0 auto;
-<<<<<<< HEAD
-    border: 3px solid #2f5f8e;
-=======
    border: 3px solid #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
    border-radius: 50%;
    border-left-color: transparent;
    border-bottom-color: transparent;
@ -25105,11 +25007,7 @@ html:not(.lt-ie10) .not-animated {

 .ui-to-top:hover {
    color: #ffffff;
-<<<<<<< HEAD
-    background: #2f5f8e;
-=======
    background: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
    text-decoration: none;
 }

@ -26104,11 +26002,7 @@ html.tablet .ui-to-top {

 .rd-navbar-1.rd-navbar-static .rd-nav-link,
 .rd-navbar-1.rd-navbar-static .rd-nav-link:not([href]) {
-<<<<<<< HEAD
-    color: #2f5f8e;
-=======
    color: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 .rd-navbar-1.rd-navbar-static .rd-nav-link:hover {
@ -27332,11 +27226,7 @@ html.rd-navbar-fixed-linked .page {

 .owl-dots-2 .owl-dot:hover span,
 .owl-dots-2 .owl-dot.active span {
-<<<<<<< HEAD
-    background: #2f5f8e;
-=======
    background: #2a537b;
->>>>>>> 2382175d91e8c01082a1dae55be286ae1b1ae009
 }

 * + .owl-dots-1 {
@ -29816,3 +29706,13 @@ body:not(.lg-from-hash)
    -o-transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s;
    transition: left 1s cubic-bezier(0, 0, 0.25, 1) 0s, opacity 0.1s ease 0s;
 }
+
+::-webkit-scrollbar {
+    width: 15px;
+    background-color: #192031;
+}
+
+::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background-color: #4285F4;
+}
--- a/gulpfile.js
+++ b/gulpfile.js
@ -37,7 +37,7 @@ gulp.task("scripts", function () {
 // Images
 gulp.task("images", function () {
  return gulp
-    .src(["./images/**"], { removeBOM: false })
+    .src(["./images/**/*"], { removeBOM: false })
    .pipe(gulp.dest("./dist/images"))
    .pipe(connect.reload());
 });
@ -45,23 +45,22 @@ gulp.task("images", function () {
 // Fonts
 gulp.task("fonts", function () {
  return gulp
-    .src(["./fonts/**"], { removeBOM: false })
+    .src(["./fonts/**/*"], { removeBOM: false })
    .pipe(gulp.dest("./dist/fonts"))
    .pipe(connect.reload());
 });

-
-// Other useless content 
+// Other useless content
 gulp.task("other", function () {
  return gulp
-    .src(["./other/**"], { removeBOM: false })
+    .src(["./other/**/*"], { removeBOM: false })
    .pipe(gulp.dest("./dist/other"))
    .pipe(connect.reload());
 });

 gulp.task("html", function () {
  return gulp
-    .src("./index.html")
+    .src("./*.html")
    .pipe(
      htmlmin({
        collapseWhitespace: true,
@ -82,13 +81,10 @@ gulp.task("html", function () {
 // Clean
 gulp.task("clean", function () {
  return gulp
-    .src(
-      ["dist/css", "dist/js", "dist/images", "dist/index.html", "dist/fonts"],
-      {
-        read: false,
-        allowEmpty: true,
-      }
-    )
+    .src(["dist/css", "dist/js", "dist/images", "dist/*.html", "dist/fonts"], {
+      read: false,
+      allowEmpty: true,
+    })
    .pipe(clean());
 });

@ -96,7 +92,14 @@ gulp.task("clean", function () {
 gulp.task(
  "default",
  gulp.series("clean", async function minifyAll() {
-    return gulp.parallel("styles", "scripts", "images", "html", "fonts")();
+    return gulp.parallel(
+      "styles",
+      "scripts",
+      "images",
+      "html",
+      "fonts",
+      "other"
+    )();
  })
 );

@ -115,8 +118,9 @@ gulp.task("watch", function () {
  gulp.watch("./css/*.css", gulp.series("styles"));
  gulp.watch("./js/*.js", gulp.series("scripts"));
  gulp.watch("./images/**/*", gulp.series("images"));
-  gulp.watch("./index.html", gulp.series("html"));
+  gulp.watch("./*.html", gulp.series("html"));
  gulp.watch("./fonts/**/*", gulp.series("fonts"));
+  gulp.watch("./other/**/*", gulp.series("other"));
 });

 gulp.task("dev", gulp.series("default", gulp.parallel("connect", "watch")));
--- a/index.html
+++ b/index.html
@ -115,7 +115,7 @@
                      >Curriculum
                    </a>
                    <a class="button button-secondary button-nuka" href="location.html"
-                      >In Person/Virtual 
+                      >In Person/Virtual
                    </a>
                    <a class="button button-secondary button-nuka" href="faq.html"
                      >FAQ
@ -246,6 +246,7 @@
                    class="button-play"
                    href="other/Code Abode Intro.mp4"
                    data-lightgallery="item"
+                    target="_blank"
                  >
                    <svg width="19" height="21" viewbox="0 0 19 21">
                      <path
@ -475,7 +476,7 @@
                        Self-paced development
                    </h4>
                    <p class="service-corporate-text">
-                        Your child will start to code with their tools. We will get them started with any concepts they need and see them through the final stages of the development of their project. 
+                        Your child will start to code with their tools. We will get them started with any concepts they need and see them through the final stages of the development of their project.
                    </p>
                  </div>
                </article>
@ -1080,7 +1081,7 @@
            <div class="row row-fix justify-content-center wow fadeInUp">
              <div class="col-xl-8 col-lg-10">
                <h6>Why Choose Us</h6>
-                <h2>We believe firmly in nurturing curiosity</h2>
+                <h2>We firmly believe in nurturing curiosity</h2>
                <p class="big">We use your child's ideas and build the skills needed for their project. This approach has proven to be the most effective in teaching otherwise bland content that will equip them fot the future.</p>
                <a
                  class="button button-secondary button-nuka"
--- a/js/script.js
+++ b/js/script.js
@ -422,76 +422,6 @@
      }
    };

-    /**
-     * @desc Initialize the gallery with set of images
-     * @param {object} itemsToInit - jQuery object
-     * @param {string} [addClass] - additional gallery class
-     */
-    function initLightGallery(itemsToInit, addClass) {
-      if (!isNoviBuilder) {
-        $(itemsToInit).lightGallery({
-          thumbnail: $(itemsToInit).attr("data-lg-thumbnail") !== "false",
-          selector: "[data-lightgallery='item']",
-          autoplay: $(itemsToInit).attr("data-lg-autoplay") === "true",
-          pause:
-            parseInt($(itemsToInit).attr("data-lg-autoplay-delay")) || 5000,
-          addClass: addClass,
-          mode: $(itemsToInit).attr("data-lg-animation") || "lg-slide",
-          loop: $(itemsToInit).attr("data-lg-loop") !== "false",
-        });
-      }
-    }
-
-    /**
-     * @desc Initialize the gallery with dynamic addition of images
-     * @param {object} itemsToInit - jQuery object
-     * @param {string} [addClass] - additional gallery class
-     */
-    function initDynamicLightGallery(itemsToInit, addClass) {
-      if (!isNoviBuilder) {
-        $(itemsToInit).on("click", function () {
-          $(itemsToInit).lightGallery({
-            thumbnail: $(itemsToInit).attr("data-lg-thumbnail") !== "false",
-            selector: "[data-lightgallery='item']",
-            autoplay: $(itemsToInit).attr("data-lg-autoplay") === "true",
-            pause:
-              parseInt($(itemsToInit).attr("data-lg-autoplay-delay")) || 5000,
-            addClass: addClass,
-            mode: $(itemsToInit).attr("data-lg-animation") || "lg-slide",
-            loop: $(itemsToInit).attr("data-lg-loop") !== "false",
-            dynamic: true,
-            dynamicEl:
-              JSON.parse($(itemsToInit).attr("data-lg-dynamic-elements")) || [],
-          });
-        });
-      }
-    }
-
-    /**
-     * @desc Initialize the gallery with one image
-     * @param {object} itemToInit - jQuery object
-     * @param {string} [addClass] - additional gallery class
-     */
-    function initLightGalleryItem(itemToInit, addClass) {
-      if (!isNoviBuilder) {
-        $(itemToInit).lightGallery({
-          selector: "this",
-          addClass: addClass,
-          counter: false,
-          youtubePlayerParams: {
-            modestbranding: 1,
-            showinfo: 0,
-            rel: 0,
-            controls: 0,
-          },
-          vimeoPlayerParams: {
-            byline: 0,
-            portrait: 0,
-          },
-        });
-      }
-    }
-
    // Google ReCaptcha
    if (plugins.captcha.length) {
      $.getScript(
Author	SHA1	Message	Date
Sid Alapati	8104cdb1ca	resolved merge conflict	2024-06-07 17:14:56 -04:00
Sid Alapati	97ac9ac478	fixed video stuff	2024-06-07 17:12:30 -04:00
Sid Alapati	96ce0a69dc	Merge branch 'master' of git.rslp.org:PuukoMonk/CodeAbode	2024-06-05 17:01:46 -04:00
Sid Alapati	36ee71cc4b	fixed more merging confliction	2024-06-04 18:31:39 -04:00
Sid Alapati	f61aa2991b	Merge branch 'master' of git.rslp.org:PuukoMonk/CodeAbode resolved merge conflict	2024-06-04 18:27:24 -04:00
Sid Alapati	e1e017f8b3	fixed typos, added other html files to gulp, better scrollbar	2024-06-04 18:26:20 -04:00