Merge pull request #271 from bangkokrb/release/5.0.0

.gitignore

@@ -33,6 +33,3 @@ yarn-debug.log*
 
 # Yarn Integrity file
 .yarn-integrity
-
-# Git Submodules
-src/past

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "src/past/2019"]
 	path = src/past/2019
 	url = https://github.com/bangkokrb/rubyconfth-2019.git
+[submodule "src/past/2022"]
+	path = src/past/2022
+	url = https://github.com/bangkokrb/rubyconfth-2022.git

Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activesupport (7.0.4)
+    activemodel (7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activesupport (7.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -96,7 +96,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    minitest (5.16.3)
+    minitest (5.17.0)
     multipart-post (2.2.3)
     nio4r (2.5.8)
     nokogiri (1.13.10-aarch64-linux)

frontend/stylesheets/components/_app-footer.scss

@@ -1,39 +1,3 @@
-.app-footer__mailing-list {
-  padding: 2rem;
-
-  color: $white;
-  text-align: center;
-
-  background-color: black;
-
-  &__text {
-    padding: 0 2rem;
-
-    @include media-breakpoint-up('md') {
-      padding: 0;
-    }
-  }
-
-  .form-mailing-list {
-    @include media-breakpoint-up('md') {
-      @include make-col(6);
-      @include make-col-offset(3);
-    }
-  }
-
-  .form-mailing-list .form__control {
-    font-size: map-get($font-sizes, 'xs');
-
-    @include media-breakpoint-up('sm') {
-      font-size: map-get($font-sizes, 'sm');
-    }
-
-    @include media-breakpoint-up('lg') {
-      font-size: map-get($font-sizes, 'lg');
-    }
-  }
-}
-
 .app-footer__social-platform {
   padding-block: 1rem;
   text-align: center;
@@ -53,15 +17,24 @@
 
   .container {
     display: flex;
-    align-items: center;
     justify-content: space-between;
+
+    @include media-breakpoint-up('sm') {
+      display: grid;
+      grid-template-columns: repeat(3, 1fr);
+    }
   }
 
   .app-footer__community {
     display: none;
+    text-align: center;
 
     @include media-breakpoint-up('sm') {
       display: initial;
     }
   }
+
+  .app-footer__link {
+    text-align: right;
+  }
 }

frontend/stylesheets/components/_app-hero.scss

@@ -3,7 +3,7 @@
   align-items: center;
   padding: 2rem 0;
 
-  background-color: $primary;
+  background-color: $black;
 
   &__heading {
     font-weight: 500;

frontend/stylesheets/components/_app-navigation.scss

@@ -74,7 +74,7 @@
     height: 75%;
 
     opacity: 0;
-    background-color: var(--color-brand-primary);
+    background-color: $black;
     border-radius: 1rem;
     transition: all variables.$base-animation-duration variables.$base-animation-timing;
   }

frontend/stylesheets/components/_error.scss

@@ -30,7 +30,8 @@
   &__action {
     display: flex;
 
-    margin-top: 45px;
+    margin-top: 30px;
+    margin-bottom:30px;
   }
 
   &__action a {

frontend/stylesheets/components/_form-mailing-list.scss

@@ -2,11 +2,21 @@
   position: relative;
 
   .form__control {
+    font-size: map-get($font-sizes, 'xs');
+
     border-radius: var(--bs-border-radius-lg);
 
+    @include media-breakpoint-up('sm') {
+      font-size: map-get($font-sizes, 'sm');
+    }
+
     @include media-breakpoint-up('md') {
       padding-right: 155px;
     }
+
+    @include media-breakpoint-up('lg') {
+      font-size: map-get($font-sizes, 'lg');
+    }
   }
 
   .btn {

frontend/stylesheets/layouts/_default.scss

@@ -40,5 +40,29 @@
 
   .app-hero ~ .app-content {
     padding-top: 0;
-  }  
+  }
+
+  .mailing-list {
+    padding: 2rem;
+
+    color: $white;
+    text-align: center;
+
+    background-color: black;
+
+    &__text {
+      padding: 0 2rem;
+
+      @include media-breakpoint-up('md') {
+        padding: 0;
+      }
+    }
+
+    .form-mailing-list {
+      @include media-breakpoint-up('md') {
+        @include make-col(6);
+        @include make-col-offset(3);
+      }
+    }
+  }
 }

frontend/stylesheets/screens/_home.scss

@@ -1,26 +1,28 @@
 body.home .app-hero {
+
+  color: $primary;
   text-align: center;
 
-  background: {
-    image: url('/images/home/hero-background.png');
-    repeat: no-repeat;
-    position: center;
-  }
-
-  @include media-breakpoint-up('md') {
-    height: rem(460px);
-  }
+  background: $white;
 
   &__subheading {
     display: block;
     margin-bottom: 1rem;
     text-transform: uppercase;
   }
 
-  .btn {
-    margin-top: 2rem;
-    font-size: map-get($font-sizes, 'lg');
-    border-radius: var(--bs-border-radius-lg);
+  &__mailing-list {
+    width: 80%;
+    margin: 2rem auto 0;
+
+    @include media-breakpoint-up('lg') {
+      width: 50%;
+      margin-top: 3rem;
+    }
+  }
+
+  &__text {
+    color: $body-color;
   }
 }
 
@@ -32,45 +34,28 @@ body.home .app-content {
   }
 }
 
-body.home .speaker-lineup {
-  .list-speaker,
-  .btn  {
-    margin-top: 1rem;
-
-    @include media-breakpoint-up('sm') {
-      margin-top: 2rem;
-    }
-  }
-}
-
 body.home .sponsors {
 
   .list-sponsor {
     justify-content: center;
     padding-left: 0;
-
-    &--silver,&--speaker {
-      .list-sponsor__company {
-        @include media-breakpoint-up('sm') {
-          @include make-col(3);
-        }
-      }
-    }
 
     @include media-breakpoint-up('sm') {
       margin-inline: auto;
     }
   }
 
   &.list-sponsor--silver {
-    @include media-breakpoint-up('sm') {
-      width: 75%
+    @include media-breakpoint-up('md') {
+      width: 85%
     }
   }
 
-  &.list-sponsor--speaker {
+  .btn {
+    width: 80%;
+
     @include media-breakpoint-up('sm') {
-      width: 60%
+      width: auto;
     }
   }
 }

src/404.html

@@ -14,6 +14,14 @@ <h1 class="error__headline">404</h1>
   </header>
   <hr>
   <div class="error__context">
+    <p>
+      Looking for something from our previous conferences?<br/>
+      Check our archived homepage for RubyConfTH 2022 or RubyConfTH 2019.
+    </p>
+    <div class="error__action">
+      <a class="btn btn--outline" href="/past/2022/">2022 site</a>
+      <a class="btn btn--outline" href="/past/2019/">2019 site</a>
+    </div>
     <p>
       You may want to head back to the homepage.<br />
       If you think something is broken, report a problem.

src/_components/footer.liquid

@@ -1,12 +1,4 @@
 <footer class="app-footer">
-  <section class="app-footer__mailing-list">
-    <div class="container">
-      <h3>Join our mailing list</h3>
-      <p class="mailing-list__text">Sign up to receive updates about the event</p>
-      {% render "form_mailing_list" %}
-    </div>
-  </section>
-
   <section class="app-footer__social-platform">
     <div class="container">
       <h3>Follow us</h3>
@@ -17,13 +9,13 @@
   <div class="app-footer__footnote">
     <div class="container">
       <div class="app-footer__legal">
-        &copy; Bangkok.rb
+        &copy; <a href="https://bangkokrb.org/" title="Ruby Community organizer">Bangkok.rb</a>
       </div>
       <div class="app-footer__community">
         Built with <a href="https://www.ruby-lang.org/en/">Ruby</a> & <a href="https://www.bridgetownrb.com/">Bridgetown</a>
       </div>
       <div class="app-footer__link">
-        Past events: <a href="/past/2019">2019</a>
+        Past events: <a href="/past/2022/">2022</a> - <a href="/past/2019/">2019</a>
       </div>
     </div>
   </div>

src/_components/form_mailing_list.liquid

@@ -1,9 +1,9 @@
 <form action="https://rubyconfth.us20.list-manage.com/subscribe/post?u=fd4a02525718b1d58ebaed6a0&id=4af9421776" method="post" class="form-mailing-list form" target="_blank">
   <div class="form__group">
-    <input type="hidden" name="tags" value="2841779">
+    <input type="hidden" name="tags" value="3502539">
     <input type="email" name="EMAIL" placeholder="Enter your email address" class="form__control form__control--lg" required />
     <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
     <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_fd4a02525718b1d58ebaed6a0_4af9421776" tabindex="-1" value=""></div>
   </div>
-  <button type="submit" class="form-mailing-list__btn btn btn--primary">Count me in</button>
+  <button type="submit" class="form-mailing-list__btn btn btn--primary">I Love Ruby</button>
 </form>

src/_components/list_social_platform.liquid

@@ -1,7 +1,7 @@
 <ul class="list-social-platform">
   {% for social_platform in social_platforms %}
   <li class="list-social-platform__item">
-    <a href="{{ social_platform.url }}" target="_blank" class="list-social-platform__link">
+    <a href="{{ social_platform.url }}" target="_blank" class="list-social-platform__link" title="{{ social_platform.name }}">
       {% capture socialIcon %}{{ social_platform.icon | prepend: 'icon-' }}{% endcapture %}
       {% capture className %}{{ social_platform.icon | prepend: 'list-social-platform__icon--' | prepend: ' ' | prepend: 'list-social-platform__icon' | append: ' ' | append: 'icon--xs' }}{% endcapture %}
       {% render "icon", icon: socialIcon, class: className %}

src/_data/menu/header.yml

@@ -1,12 +1,12 @@
-- title: Venue
-  permalink: /venue
+# - title: Venue
+#   permalink: /venue
 - title: Practicalities
   permalink: /practicalities
-- title: Schedule
-  permalink: /schedule
-- title: Speakers
-  permalink: /speakers
-- title: Sponsors
-  permalink: /sponsors
+# - title: Schedule
+#   permalink: /schedule
+# - title: Speakers
+#   permalink: /speakers
+# - title: Sponsors
+#   permalink: /sponsors
 - title: Code of Conduct
   permalink: /code-of-conduct