Merge branch 'master' into my-feature-branch

static/assets/css/layouts/main.css

@@ -91,6 +91,14 @@ a:hover {
   color: #e5e9f2 !important;
 }
 
+.btn-link{
+  color: #248aaa;
+}
+
+.btn-link:hover{
+  color: #207089;
+}
+
 .bg-white {
   background-color: #46444D !important;
 }

static/assets/css/sections/education.css

@@ -0,0 +1,158 @@
+.education-section .education-info-table {
+    width: 100%;
+}
+
+.education-section .education-info-table tr {
+    padding: 0.1rem;
+}
+
+.education-section .timeframe {
+    color: #8392A5;
+    text-align: right;
+}
+.education-section .icon {
+    width: 2rem;
+    padding-left: 0;
+    padding-right: 0;
+    position: relative;
+}
+
+.education-section .icon .hline {
+    position: absolute;
+    left: 1rem;
+    top: 0;
+    background-color: #248aaa;
+    height: 100%;
+    width: 2px;
+}
+
+.education-section .education-info-table tr:first-child .hline {
+    height: 60%;
+    top: auto;
+}
+
+.education-section .education-info-table tr:last-child .hline {
+    height: 50%;
+}
+
+.education-section .icon-holder {
+    background-color: #248aaa;
+    border-radius: 50%;
+    height: 2rem;
+    width: 2rem;
+    padding: 0.2rem;
+    text-align: center;
+    color: #e5e9f2;
+    position: relative;
+}
+
+.education-section .line {
+    width: 5%;
+    padding-left: 0;
+    padding-right: 0;
+}
+
+.education-section .line div {
+    height: 2px;
+    /* width: 100%; */
+    margin-right: -1px;
+    background-color: #248aaa;
+}
+
+.education-section .degree-info {
+    padding: 1rem;
+    margin-top: 0.5rem;
+    margin-bottom: 0.5rem;
+    border-left: 2px solid #248aaa;
+    border-top: 1px solid #C0CCDA;
+    border-bottom: 1px solid #C0CCDA;
+    border-right: 1px solid #C0CCDA;
+    border-radius: 5px;
+}
+
+.education-section .degree-info h5{
+    margin-bottom: 0.3rem;
+}
+
+.education-section .taken-courses table {
+    margin-left: 1rem;
+    width: 100%;
+    transition: all 0.3s ease-out;
+}
+
+.education-section .taken-courses .hidden-course {
+    display: none;
+    transition: all 1s ease-out;
+}
+
+.education-section .taken-courses ul {
+    margin-bottom: 0;
+}
+
+/*============ Education Alter Template =============*/
+.education-alt .degree-info{
+    border-right: 2px solid #248aaa;
+}
+
+
+/* ============= Device specific fixes ======= */
+
+/* Large screens such as TV */
+
+@media only screen and (min-width: 1824px) {}
+
+/* Extra large devices (large desktops, 1200px and up) */
+
+@media (max-width: 1400px) {}
+
+@media (max-width: 1200px) {}
+
+/* IPad Pro */
+
+@media (max-width: 1024px) {
+    .education-section .container {
+        padding-left: 0;
+    }
+}
+
+/*  Large devices (desktops, 992px and up) */
+
+@media (max-width: 992px) {}
+
+/* Medium devices (tablets, 768px and up) */
+
+@media only screen and (max-width: 768px) {}
+
+/* Small devices (landscape phones, 576px and up) */
+
+@media only screen and (max-width: 576px) {
+    .education-section {
+        padding-left: 0.5rem;
+        padding-right: 0.5rem;
+    }
+    .education-section .container{
+        padding-right: 0;
+    }
+    
+    .education-section .icon {
+        display: none;
+    }
+    .education-section .line{
+        display: none;
+    }
+    .education-section .timeframe{
+        text-align: left;
+    }
+}
+
+/* iPhoneX, iPhone 6,7,8 */
+
+@media only screen and (max-width: 375px) {}
+
+/* Galaxy S5, Moto G4 */
+
+@media only screen and (max-width: 360px) {}
+
+/* iPhone 5 or before */
+
+@media only screen and (max-width: 320px) {}

static/assets/images/hugo-logo-wide.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" stroke-width="27" aria-label="Logo" viewBox="0 0 1493 391">
-  <path fill="#ebb951" stroke="#fcd804" d="M1345.211 24.704l112.262 64.305a43 43 0 0 1 21.627 37.312v142.237a40 40 0 0 1-20.702 35.037l-120.886 66.584a42 42 0 0 1-41.216-.389l-106.242-61.155a57 57 0 0 1-28.564-49.4V138.71a64 64 0 0 1 31.172-54.939l98.01-58.564a54 54 0 0 1 54.54-.503z"/>
-  <path fill="#33ba91" stroke="#00a88a" d="M958.07 22.82l117.31 66.78a41 41 0 0 1 20.72 35.64v139.5a45 45 0 0 1-23.1 39.32L955.68 369.4a44 44 0 0 1-43.54-.41l-105.82-61.6a56 56 0 0 1-27.83-48.4V140.07a68 68 0 0 1 33.23-58.44l98.06-58.35a48 48 0 0 1 48.3-.46z"/>
-  <path fill="#0594cb" stroke="#0083c0" d="M575.26 20.97l117.23 68.9a40 40 0 0 1 19.73 34.27l.73 138.67a48 48 0 0 1-24.64 42.2l-115.13 64.11a45 45 0 0 1-44.53-.42l-105.83-61.6a55 55 0 0 1-27.33-47.53V136.52a63 63 0 0 1 29.87-53.59l99.3-61.4a49 49 0 0 1 50.6-.56z"/>
-  <path fill="#ff4088" stroke="#c9177e" d="M195.81 24.13l114.41 66.54a44 44 0 0 1 21.88 38.04v136.43a48 48 0 0 1-24.45 41.82L194.1 370.9a49 49 0 0 1-48.48-.23L41.05 310.48a53 53 0 0 1-26.56-45.93V135.08a55 55 0 0 1 26.1-46.8l102.8-63.46a51 51 0 0 1 52.42-.69z"/>
-  <path fill="#fff" d="M1320.72 89.15c58.79 0 106.52 47.73 106.52 106.51 0 58.8-47.73 106.52-106.52 106.52-58.78 0-106.52-47.73-106.52-106.52 0-58.78 47.74-106.51 106.52-106.51zm0 39.57c36.95 0 66.94 30 66.94 66.94a66.97 66.97 0 0 1-66.94 66.94c-36.95 0-66.94-29.99-66.94-66.94a66.97 66.97 0 0 1 66.93-66.94h.01zm-283.8 65.31c0 47.18-8.94 60.93-26.81 80.58-17.87 19.65-41.57 27.57-71.1 27.57-27 0-48.75-9.58-67.61-26.23-20.88-18.45-36.08-47.04-36.08-78.95 0-31.37 11.72-58.48 32.49-78.67 18.22-17.67 45.34-29.18 73.3-29.18 33.77 0 68.83 15.98 90.44 47.53l-31.73 26.82c-13.45-25.03-32.94-33.46-60.82-34.26-30.83-.88-64.77 28.53-62.25 67.75 1.4 21.94 11.65 59.65 60.96 66.57 25.9 3.63 55.36-24.02 55.36-39.04H944.4v-37.5h92.5V194l.02.03zm-562.6-94.65h42.29v112.17c0 17.8.49 29.33 1.47 34.61 1.69 8.48 4.81 14.37 11.17 19.5 6.37 5.13 13.8 6.59 24.84 6.59 11.2 0 14.96-1.74 20.66-6.6 5.69-4.85 9.12-9.46 10.28-16.53 1.15-7.07 3.07-18.8 3.07-35.18V99.38h42.28v108.78c0 24.86-1.07 42.43-3.21 52.69-2.14 10.27-6.08 18.93-11.82 26-5.74 7.06-13.42 12.69-23.03 16.88-9.62 4.19-22.16 6.28-37.65 6.28-18.7 0-32.87-2.28-42.52-6.85-9.66-4.57-17.3-10.5-22.9-17.8-5.61-7.3-9.3-14.95-11.08-22.96-2.58-11.86-3.88-29.38-3.88-52.55V99.38h.03zM93.91 299.92V92.7h43.35v75.48h71.92V92.7h43.48v207.22h-43.48v-90.61h-71.92v90.61z"/>
-</svg>

static/assets/js/home.js

@@ -329,6 +329,19 @@ var projectCards;
           this.parentElement.classList.toggle("col-lg-12");
           this.parentElement.classList.toggle("col-md-12");
           this.parentElement.classList.toggle("col-sm-12");
+          if (this.children["SmallImage"].hasAttribute("active")) {
+            let mainLogo = this.children["LargeImage"].getAttribute("Style");
+            this.children["LargeImage"].setAttribute("active",true);
+            this.children["SmallImage"].removeAttribute("active");
+
+            this.setAttribute("Style", mainLogo);
+          } else {
+            let mainLogo = this.children["SmallImage"].getAttribute("Style");
+            this.children["SmallImage"].setAttribute("active",true);
+            this.children["LargeImage"].removeAttribute("active");
+            this.setAttribute("Style", mainLogo);
+          }
+         
           if (this.children["caption"] != undefined) {
             this.children["caption"].classList.toggle("hidden");
           }

static/assets/js/main.js

@@ -138,3 +138,27 @@ function toggleTOC() {
   }
 }
 
+// Show more rows in the taken courses table
+function showMoreCourses(elem) {
+
+  // find the courses
+  let courses = elem.parentNode.getElementsByClassName("course");
+  if (courses == null) {
+    return
+  }
+
+  // toggle hidden-course class from the third elements
+  for (var i = 0; i < courses.length; i++) {
+    if (i > 1 && courses[i].classList !== null) {
+      courses[i].classList.toggle("hidden-course");
+    }
+  }
+
+  // toggle the button text
+  let btnText = elem.innerText;
+  if (btnText == "Show More") {
+    elem.innerText = "Show Less";
+  } else {
+    elem.innerText = "Show More";
+  }
+}