basic refactoring & "gem update"

techexcellenceio · Jan 19, 2024 · fc2de91 · fc2de91
1 parent cade31a
commit fc2de91
Show file tree

Hide file tree

Showing 14 changed files with 154 additions and 158 deletions.
diff --git a/_includes/about.html b/_includes/about.html
@@ -3,12 +3,12 @@ <h2>About Us</h2>
 <!-- TECH EXCELLENCE  -->
 
 <div class="s-container">
-    <div class="profile-img">
+    <div class="profile-img comp-img">
         <!-- <a href="https://optivem.com/" target="_blank"> -->
             <img src="{{ site.url }}/assets/logo/tech_excellence.png" alt="Tech Excellence" width="252" height="90" />
         <!-- </a> -->
     </div>
-    <div class="text-container">
+    <div class="text-container container-fixed">
         <!-- <p class="p-date"> -->
             <!-- <a href="{{ site.url }}/" target="_blank"> -->
                 <!-- Tech Excellence -->

diff --git a/_includes/incl-code-of-conduct.html b/_includes/incl-code-of-conduct.html
@@ -1,6 +1,6 @@
 <h2>Code of conduct</h2>
 
-<div class="s-container">
+<div class="g-container">
     <!-- <a class="g-btn" href="{{ site.url }}/code-of-conduct">
         Code of conduct
     </a> -->

diff --git a/_includes/incl-faq.html b/_includes/incl-faq.html
@@ -1,6 +1,6 @@
 <h2>FAQ</h2>
 
-<div class="s-container">
+<div class="g-container">
     <a class="g-btn" href="{{ site.url }}/faq">
         Frequently asked questions
     </a>

diff --git a/_includes/partners.html b/_includes/partners.html
@@ -7,12 +7,12 @@ <h2>Our Partners</h2>
     {% for company in companies %}
     {% if company.i == partner.i %}
         <div class="s-container">
-            <div class="profile-img">
+            <div class="profile-img comp-img">
                 <a href="{{ company.website }}" target="_blank">
                     <img src="{{ site.url }}/assets/logo/{{ company.i }}.png" alt="{{ company.name }}" width="252" height="90" />
                 </a>
             </div>
-            <div class="text-container">
+            <div class="text-container container-fixed">
                 <p class="p-date">
                     <a href="{{ company.website }}" target="_blank">{{ company.name }}</a>
                 </p>

diff --git a/_includes/sponsors.html b/_includes/sponsors.html
@@ -8,12 +8,12 @@ <h2>Our Sponsors</h2>
         {% if company.i == sponsor.i %}
 
         <div class="s-container">
-            <div class="profile-img">
+            <div class="profile-img comp-img">
                 <a href="{{ company.website }}" target="_blank">
                     <img src="{{ site.url }}/assets/logo/{{ company.i }}.png" alt="{{ company.name }}" width="252" height="90" />
                 </a>
             </div>
-            <div class="text-container">
+            <div class="text-container container-fixed">
                 <p class="p-date"><a href="{{ company.website }}" target="_blank">{{ company.name }}</a></p>
                 <p> {{ company.about }}</p>
                 <div class="social-media">

diff --git a/_includes/vision.html b/_includes/vision.html
@@ -1,11 +1,11 @@
 <h2>Vision</h2>
 
-<div class="s-container">
+<div class="g-container">
     <p>
         Our vision is to raise the bar of technical excellence across the world.
     </p>
 
-    <div class="social-media">
+    <div class="social-media-lg">
         <a href="https://www.meetup.com/techexcellence" target="_blank"><i class="fab fa-meetup"></i></a>
         <a href="https://www.youtube.com/c/TechExcellence" target="_blank"><i class="fab fa-youtube"></i></a>
         <a href="https://www.linkedin.com/company/techexcellenceio" target="_blank"><i class="fab fa-linkedin"></i></a>

diff --git a/_scss/_global.scss b/_scss/_global.scss
@@ -1,31 +1,16 @@
-#speakers, #about, #sponsors, #partners, .network, #team {
-    .s-container {
-      &:first-of-type {
-        .profile-img {
-            margin-top: 1rem !important;
-            margin-bottom: 1rem !important;
-            // background-color: #2fb7b7;
+.s-container {
+    &:first-of-type {
+        margin-top: 1rem;
+        @media (max-width: 567px){
+        // @include media-breakpoint-down(xs) {
+            margin-top: 2rem;
         }
-      }
     }
-}
-
-#speakers, #about, #sponsors, #partners, .network, #team, #vision, #faq {
-    .s-container {
-        &:first-of-type {
-            margin-top: 1rem;
-            @media (max-width: 567px){
-            // @include media-breakpoint-down(xs) {
-                margin-top: 2rem;
-            }
-            }
-            &:last-of-type {
+    &:last-of-type {
+        margin-bottom: 4rem;
+        @media (max-width: 567px){
+        // @include media-breakpoint-down(xs) {
             margin-bottom: 4rem;
-            @media (max-width: 567px){
-            // @include media-breakpoint-down(xs) {
-                margin-bottom: 4rem;
-            }
-            // background-color: pink;
         }
     }
 }
@@ -54,8 +39,24 @@
             font-size: 18px;
         }
     }
+    .container-fixed {
+        max-width: 500px;
+    }
+}
+
+
+.g-container {
+    text-align: left;
+    display: block;
+    &:last-of-type {
+        margin-bottom: 4rem;
+        @media (max-width: 567px){
+            margin-bottom: 4rem;
+        }
+    }
 }
 
+
 .img-c {
     display: flex;
     justify-content: center;
@@ -74,69 +75,87 @@
     }
 }
 
+.s-container {
+    &:first-of-type {
+        .profile-img {
+            margin-top: 1rem !important;
+            margin-bottom: 1rem !important;
+        }
+    }
+}
+
+.network {
+    .s-container {
+        // margin-top: 1rem;
+        // margin-bottom: 6rem;
+        // @media (max-width: 567px){
+        //     margin-top: 2rem;
+        //     margin-bottom: 6rem;
+        // }
+        .row {
+            margin-left: -15px;
+            margin-right: -15px;
+            justify-content: center;
+            .col, [class*="col-"] {
+                text-align: center;
+                margin-bottom: 1rem;
+                padding-left: 15px;
+                padding-right: 15px;
+                max-width: 200px;
+                min-width: 200px;
+                margin-left: 0rem;
+                margin-right: 0rem;
+                margin-top: 1.5rem;
+            }
+            img {
+                min-width: 100%;
+                max-width: 100%;
+            }
+        }
+    }
+}
+
+.comp-img {
+    padding-right: 10px;
+}
 
 .markdown-body p, p {
     margin-bottom: 0;
 }
 
 // -----------------
 
-#sponsors, #partners, .network, #about {
-    .s-container {
-        @media (min-width: 567px) and (max-width: 786px){
-        // @include media-breakpoint-only(sm) {
-            margin-bottom: 2.5rem;
-        }
-    }
-    .text-container{
-        // text-align: center;
-        max-width: 500px;
-    }
-    .profile-img {
-        // text-align: left;
-        padding-right: 10px;
-        margin-top: 2.75rem; //2
-        margin-bottom: 2.75rem; //2
-        @media (max-width: 567px){
-        // @include media-breakpoint-down(xs){
-            margin-left: auto;
-            margin-right: auto;
-            margin-top: 4rem;
-            margin-bottom: 1.5rem;
-        }
-    }
-    .social-media {
-        a {
-            .fab, .fas, .fa-brands {
-                font-size: 1.75rem;
-                margin-right: 1rem;
-                margin-top: .75rem;
-                color: #babfce;
-                &:hover {
-                    color: #4664ee;
-                }
-            }
-        }
+.s-container-extra {
+    @media (min-width: 567px) and (max-width: 786px){
+    // @include media-breakpoint-only(sm) {
+        margin-bottom: 2.5rem;
     }
 }
 
-#vision, #faq {
-    .s-container {
-        text-align: left;
-        margin-top: 0 !important;
-        display: block;
-    }
+.profile-img {
+    // margin-top: 2.75rem;
+    // margin-bottom: 2.75rem;
+    // @media (max-width: 567px){
+    // // @include media-breakpoint-down(xs){
+    //     margin-left: auto;
+    //     margin-right: auto;
+    //     margin-top: 4rem;
+    //     margin-bottom: 1.5rem;
+    // }
 }
+
+
+
 
 .markdown-body img {
     max-width: none;
 }
 
 a {
-    color: #067799; // #0366d6
+    color: #067799;
     text-decoration: none !important;
     &:hover {
-        color: #0999c5; // #0366d6
+        color: #0999c5;
     }
 }
 
@@ -146,7 +165,6 @@ a.g-btn {
     padding: .5rem 2rem;
     border-radius: 50pt;
     &:hover {
-        // background-color: rgb(219, 230, 230);
         background-color: rgb(228, 240, 241);
     }
     display: inline-block;

diff --git a/_scss/_icons.scss b/_scss/_icons.scss
@@ -0,0 +1,35 @@
+.social-media-lg a {
+    .fab, .fas, .fa-brands {
+        font-size: 3rem;
+        @media (max-width: 567px) {
+            font-size: 2.5rem;
+            margin-right: 1.75rem;
+        }
+        margin-right: 2rem;
+        margin-bottom: 1rem;
+        color: #43cece;
+        &:hover {
+                color: #2fb7b7;
+                }
+        }
+        &:last-child{
+            .fab, .fas{
+                margin-right: 0;
+            }
+        }
+}
+
+
+.social-media {
+    a {
+        .fab, .fas, .fa-brands {
+            font-size: 1.75rem;
+            margin-right: 1rem;
+            margin-top: .75rem;
+            color: #babfce;
+            &:hover {
+                color: #4664ee;
+            }
+        }
+    }
+}
diff --git a/_scss/_network.scss b/_scss/_network.scss
diff --git a/_scss/_vision.scss b/_scss/_vision.scss
@@ -2,24 +2,4 @@
     p {
         margin-bottom: 2rem;
     }
-    .social-media a {
-        .fab, .fas, .fa-brands {
-        font-size: 3rem;
-        @media (max-width: 567px) {
-            font-size: 2.5rem;
-            margin-right: 1.75rem;
-        }
-        margin-right: 2rem;
-        margin-bottom: 1rem;
-        color: #43cece;
-        &:hover {
-                color: #2fb7b7;
-                }
-        }
-        &:last-child{
-            .fab, .fas{
-                margin-right: 0;
-            }
-        }
-    }
 }