From b853b77126a9f106beb52da9eb2c8107d5e66e63 Mon Sep 17 00:00:00 2001 From: Joy Cheng Date: Tue, 17 Aug 2021 19:39:12 +0800 Subject: [PATCH] [edit] live stream block --- app/assets/js/all.js | 17 +--- app/assets/style/pages/_index.scss | 33 +------- app/assets/style/utilities/_sizing.scss | 13 ++-- app/assets/style/utilities/_spacing.scss | 4 - app/assets/style/utilities/_utilities.scss | 5 ++ app/index.html | 90 ++++++++++++---------- 6 files changed, 65 insertions(+), 97 deletions(-) diff --git a/app/assets/js/all.js b/app/assets/js/all.js index d63b0a1..7bfbff5 100644 --- a/app/assets/js/all.js +++ b/app/assets/js/all.js @@ -4,6 +4,7 @@ var swiper = new Swiper(".swiper-js", { slidesPerView: 1, spaceBetween: 0, + breakpoints: { 576: { slidesPerView: 1, @@ -22,18 +23,4 @@ var swiper = new Swiper(".swiper-js", { centeredSlides: false, }, }, -}); - - -//ticket submit//notyet done -const ticketSubmit = document.querySelector('.ticket-purchase-done'); - -ticketSubmit = addEventListener("click",function(e){ - if(e.target.getAttribute("class")!=="ticket-purchase-done"){ - console.log('這邊不用顯示alert'); - return; - }else{ - console.log('這邊需要顯示alert'); - alert("訂購已完成，請至信箱查看相關訂購資訊"); -} -}) \ No newline at end of file +}); \ No newline at end of file diff --git a/app/assets/style/pages/_index.scss b/app/assets/style/pages/_index.scss index a17cdcc..59b6762 100644 --- a/app/assets/style/pages/_index.scss +++ b/app/assets/style/pages/_index.scss @@ -54,42 +54,11 @@ } } -/* index */ -/* popular exhibition */ -.popular{ - &-list{ - - @include media-breakpoint-up(md){ - height: 350px; - } - - } - - &-date{ - width: 40px; - } -} /* live streaming */ .live{ &-bg-img{ background-image: url(https://github.com/hexschool/webLayoutTraining1st/blob/master/exhibition-week6/people2.png?raw=truehttps://images.unsplash.com/photo-1511368466880-3ea5d800152c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1500&q=80); - height: 480px; - @include media-breakpoint-up(md){ - height: 500px; - } - - } - &-bg-color{ - background-color: #190014CC; - } - - &-card-img{ - width: 128px; - height: 128px; - } -} - -/* ticket */ \ No newline at end of file +} \ No newline at end of file diff --git a/app/assets/style/utilities/_sizing.scss b/app/assets/style/utilities/_sizing.scss index a321f7f..517afd2 100644 --- a/app/assets/style/utilities/_sizing.scss +++ b/app/assets/style/utilities/_sizing.scss @@ -10,6 +10,9 @@ .w-120 { width: 120px; } +.w-128{ + width: 128px; +} .w-md-350 { @include media-breakpoint-up(md) { @@ -22,6 +25,10 @@ .h-120 { height: 120px; } + +.h-128{ + height: 128px; +} .h-256 { height: 256px; } @@ -50,9 +57,3 @@ } } -/* font */ -.h2-md { - @include media-breakpoint-up(md) { - font-size: 2.25rem; - } -} diff --git a/app/assets/style/utilities/_spacing.scss b/app/assets/style/utilities/_spacing.scss index 054a3c7..a7910bb 100644 --- a/app/assets/style/utilities/_spacing.scss +++ b/app/assets/style/utilities/_spacing.scss @@ -46,7 +46,3 @@ margin-top: 82px; } } - -.bottom-25 { - bottom: 25%; -} diff --git a/app/assets/style/utilities/_utilities.scss b/app/assets/style/utilities/_utilities.scss index babced9..a80e1f8 100644 --- a/app/assets/style/utilities/_utilities.scss +++ b/app/assets/style/utilities/_utilities.scss @@ -31,3 +31,8 @@ height: calc(100vh - 135px); } } + +/* color */ +.bg-primary-dark{ + background-color: #190014CC; +} \ No newline at end of file diff --git a/app/index.html b/app/index.html index c2cdd3a..2c559fb 100644 --- a/app/index.html +++ b/app/index.html @@ -139,14 +139,26 @@

熱門特展