[add] Sign in/up Modal effect

Joy-port · Aug 20, 2021 · b5a3216 · b5a3216
1 parent 4eed4f8
commit b5a3216
Show file tree

Hide file tree

Showing 15 changed files with 200 additions and 84 deletions.
diff --git a/app/assets/js/all.js b/app/assets/js/all.js
@@ -9,6 +9,10 @@ AOS.init({
 var swiper = new Swiper(".swiper-js", {
   slidesPerView: 1,
   spaceBetween: 0,
+  autoplay: {
+    delay: 2500,
+    disableOnInteraction: true,
+  },
 
   breakpoints: {
     576: {

diff --git a/app/assets/style/all.css b/app/assets/style/all.css
diff --git a/app/assets/style/all.css.map b/app/assets/style/all.css.map
diff --git a/app/assets/style/all.scss b/app/assets/style/all.scss
@@ -11,12 +11,9 @@
 @import './utilities/spacing';
 @import './utilities/utilities';
 
-
-
 @import './mixin/sizing';
 @import './mixin/spacing';
 
-@import './components/notification';
 @import './components/swiper';
 @import './components/timeline';
 @import './components/scrollbar';
diff --git a/app/assets/style/components/_notification.scss b/app/assets/style/components/_notification.scss
diff --git a/app/assets/style/components/_timeline.scss b/app/assets/style/components/_timeline.scss
@@ -11,7 +11,7 @@
         left: 0;
         right: 0;
         height: 3px;
-        background-color: #e31277;
+        background-color:  map-get($theme-colors, "primary");
       }
     }
 
@@ -28,14 +28,14 @@
         height: 8px;
         border-radius: 50%;
         transform: translate(-50%, -25%);
-        background-color: #e31277;
+        background-color:map-get($theme-colors, "primary");
       }
 
       &-undone {
         &::after {
           content: " ";
-          border: 1px solid #e31277;
-          background-color: #fff;
+          border: 1px solid map-get($theme-colors, "primary");
+          background-color: map-get($theme-colors, "white");;
         }
       }
     }

diff --git a/app/assets/style/helpers/bootstrap.scss b/app/assets/style/helpers/bootstrap.scss
@@ -2,4 +2,4 @@
 @import "./variables";
 @import "../../../../node_modules/bootstrap/scss/bootstrap";
 
-// 應該是沒用到拉XD
+//因為此gulp使用助教提供的bs5 fix 版本因此無法做刪除
diff --git a/app/assets/style/mixin/_sizing.scss b/app/assets/style/mixin/_sizing.scss
@@ -1,10 +1,3 @@
-/* width */
-.w-md-350 {
-  @include media-breakpoint-up(md) {
-    width: 350px;
-  }
-}
-
 /* height */
 .h-md-256 {
   @include media-breakpoint-up(md) {

diff --git a/app/assets/style/utilities/_utilities.scss b/app/assets/style/utilities/_utilities.scss
@@ -29,6 +29,6 @@
 }
 
 /* z-index */
-.z-index-1080{
-  z-index: 1080;
+.z-index-1055{
+  z-index: 1055;
 }
diff --git a/app/design.html b/app/design.html
@@ -10,7 +10,7 @@
 <main>
   <!-- exhibition display -->
   <section class="m-0">
-    <ul class="ps-0 mb-7 mb-7 mb-md-13">
+    <ul class="list-unstyled mb-7 mb-7 mb-md-13">
       <li class="bg-primary">
         <div class="container-md">
           <div class="card bg-transparent border-0 py-44 | pt-md-80 pb-md-52" data-aos="fade-left"  data-aos-duration="1200">

diff --git a/app/index.html b/app/index.html
@@ -142,7 +142,7 @@ <h2 class="fw-bold text-white | mb-2">台北當代藝術展</h2>
       >
         熱門特展
       </h3>
-      <ul class="ps-0">
+      <ul class="list-unstyled">
         <li class="card border-0 bg-light | py-7 px-5 mb-5 | p-md-0 mb-md-6"
         data-aos="fade-left"
         data-aos-duration="1400">

diff --git a/app/info.html b/app/info.html
@@ -88,7 +88,7 @@ <h2 class="h6 fw-bold mb-0 me-2">2020 台味設計展</h2>
                   <a href="#" class="px-2 | hvr-underline-from-center"
                     >學生</a
                   >
-                  <a href="#" class="px-2 | hvr-underline-from-center"
+                  <a href="#" class="border-secondary border-bottom px-2 | hvr-underline-from-center"
                     >全票</a
                   >
                   <a href="#" class="px-2 | hvr-underline-from-center"