Merge pull request #24 from ggtkx/update-new-show

update recent show
ggtkx · Oct 10, 2024 · 254e0bf · 254e0bf
2 parents f1d0b15 + 2aa830d
commit 254e0bf
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 20 deletions.
diff --git a/_layouts/home.html b/_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>

diff --git a/_sass/components/_intro-image.scss b/_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;
   }
 }

diff --git a/_sass/components/_intro.scss b/_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 {

diff --git a/pages/index.md b/pages/index.md
@@ -2,14 +2,12 @@
 title: 硅谷脱口秀：硅谷地区汉语喜剧社团！
 layout: home
 description: 硅谷脱口秀：硅谷地区汉语喜剧社团！
-intro_image: "/images/illustrations/micdrop.svg"
+show_image: "https://i.imgur.com/FSYvupn.png"
+show_image2: "https://i.imgur.com/n3YYEqR.png"
 intro_image_absolute: true
-intro_image_hide_on_mobile: true
 show_people: true
 permalink: /
 ---
-&nbsp;
-
 ## 开放麦
 
 {% include call.html show_button=true labels=site.data.l10n.cn %}
@@ -34,5 +32,6 @@ permalink: /
 
 - 小红书号：[ggtkx_org](https://www.xiaohongshu.com/user/profile/5c0c79410000000006003274)
 - 微信公众号：svcomedy
+- Instagram: [silicomedy](https://www.instagram.com/silicomedy/)
 - [YouTube](https://www.youtube.com/channel/UCqG1oe7CjCghQdZDldNKT0A/featured)频道
 - [哔哩哔哩](https://space.bilibili.com/482647119)频道