[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -4,7 +4,7 @@
 #   pre-commit autoupdate
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
     -   id: check-added-large-files
     -   id: check-case-conflict

Gemfile.lock

@@ -1,47 +1,57 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
-    deep_merge (1.2.1)
-    em-websocket (0.5.2)
+    concurrent-ruby (1.3.4)
+    deep_merge (1.2.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.0)
+    ffi (1.17.0)
     forwardable-extended (2.6.0)
-    htmlbeautifier (1.4.2)
+    google-protobuf (4.28.2-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.28.2-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.28.2-x86_64-linux)
+      bigdecimal
+      rake (>= 13)
+    htmlbeautifier (1.4.3)
     htmlcompressor (0.4.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.9)
+    http_parser.rb (0.8.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.0)
+    jekyll (4.3.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-environment-variables (1.0.1)
       jekyll (>= 3.0, < 5.x)
     jekyll-get-json (1.0.0)
       deep_merge (~> 1.2)
       jekyll (>= 3.0)
-    jekyll-last-modified-at (1.3.0)
+    jekyll-last-modified-at (1.3.2)
       jekyll (>= 3.7, < 5.0)
-      posix-spawn (~> 0.3.9)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-tidy (0.2.2)
       htmlbeautifier
       htmlcompressor
@@ -50,33 +60,35 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.0)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.4.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    posix-spawn (0.3.15)
-    public_suffix (4.0.6)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.26.0)
+    rexml (3.3.8)
+    rouge (4.4.0)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
-    webrick (1.7.0)
+    sass-embedded (1.79.4)
+      google-protobuf (~> 4.27)
+      rake (>= 13)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.6.0)
+    webrick (1.8.2)
 
 PLATFORMS
+  arm64-darwin-23
   universal-darwin-20
   universal-darwin-21
   x86_64-linux

README.md

@@ -6,6 +6,11 @@ The Website is deployed to [GitHub pages](https://ggtkx.github.io/) and is serve
 
 The Website is statically generated with [Jekyll](https://jekyllrb.com/). To serve it locally, run:
 
+Make sure you have Ruby 3.3.5, to install dependencies
+```shell
+bundle install
+```
+
 ```shell
 bundle exec jekyll serve
 ```

_layouts/home.html

@@ -6,18 +6,46 @@
 
 <div class="intro">
   <div class="container">
+    <img width="20%" class="{% if page.intro_image_hide_on_mobile %} intro-image-hide-mobile{% endif %}" alt="硅谷脱口秀" src="/images/logo.svg" />
     <div class="row justify-content-start">
+      <!-- left column -->
       <div class="col-12 col-md-7 col-lg-6 order-2 order-md-1">
-        {% if page.intro_image %}
-          <img width="50%" class="{% if page.intro_image_hide_on_mobile %} intro-image-hide-mobile{% endif %}" alt="硅谷脱口秀" src="/images/logo.svg" />
-        {% endif %}
         {{ content }}
       </div>
-      {% if page.intro_image %}
+
+      <!-- right column -->
       <div class="col-12 col-md-5 col-lg-6 order-1 order-md-2 position-relative">
+      {% if page.intro_image %}
         <img alt={{ page.title }} class="intro-image{% if page.intro_image_absolute %} intro-image-absolute{% endif %}{% if page.intro_image_hide_on_mobile %} intro-image-hide-mobile{% endif %}" src="{{ page.intro_image | relURL }}" />
-      </div>
       {% endif %}
+      {% if page.show_image %}
+        <h2>近期演出</h2>
+        <img alt={{ page.title }} class=" intro-image{% if page.intro_image_absolute %} intro-image-absolute{% endif %}{% if page.intro_image_hide_on_mobile %} intro-image-hide-mobile{% endif %}" src="{{ page.show_image | relURL }}"/>
+        <div class="call">
+          <div class="call-box-top">
+            <div class="call-phone"><strong>时间：</strong>10月27日 7:30 PM </div>
+            <div class="call-email"><strong>地点：</strong><a href="https://maps.app.goo.gl/6FpdNAoa28cLVWAM9">Hammer Theatre Center, San Jose</a></div>
+          </div>
+          <div class="call-box-bottom">
+            <a href="https://5birthdaySJ.eventbrite.com/" class="primary button">购票</a>
+          </div>
+        </div>
+        <div style="margin-bottom: 20px"> </div>
+        {% endif %}
+        {% if page.show_image2 %}
+        <img alt={{ page.title }} class=" intro-image{% if page.intro_image_absolute %} intro-image-absolute{% endif %}{% if page.intro_image_hide_on_mobile %} intro-image-hide-mobile{% endif %}" src="{{ page.show_image2 | relURL }}"/>
+        <div class="call">
+          <div class="call-box-top">
+            <div class="call-phone"><strong>时间：</strong>11月02日 3:00 PM </div>
+            <div class="call-email"><strong>地点：</strong><a href="https://maps.app.goo.gl/SzArZZigs73ocSzY9">BATS Improv Theatre, San Francisco</a></div>
+          </div>
+          <div class="call-box-bottom">
+            <a href="https://5birthdaySF.eventbrite.com/" class="primary button">购票</a>
+          </div>
+        </div>
+        <div style="margin-bottom: 20px"> </div>
+        {% endif %}
+      </div>
     </div>
   </div>
 </div>

_sass/components/_intro-image.scss

@@ -1,32 +1,24 @@
 .intro-image {
   width: 100%;
   height: auto;
-  margin-top: -40px;
 }
 .limit-height {
   max-height: 300px;
 }
 .intro-image-absolute {
-  max-width: none;
-
+  max-height:100%;
+  max-width:100%;
   padding: 0;
   margin-bottom: 30px;
   @include media-breakpoint-up(sm) {
   }
   @include media-breakpoint-up(md) {
-    position: absolute;
-    bottom: -50px;
-    left: -50px;
     width: 700px;
   }
   @include media-breakpoint-up(lg) {
-    bottom: -60px;
-    left: -60px;
     width: 800px;
   }
   @include media-breakpoint-up(xl) {
-    bottom: -100px;
-    left: -70px;
     width: 850px;
   }
 }

_sass/components/_intro.scss

@@ -6,7 +6,6 @@
   padding-bottom: 60px;
   overflow: hidden;
   @include media-breakpoint-up(md) {
-    padding-top: 140px;
     padding-bottom: 140px;
   }
   h1 {