From cf59bb894970aab5ca05c7055686cd31d2e757c7 Mon Sep 17 00:00:00 2001 From: Tanyalak Date: Thu, 13 Apr 2023 15:34:45 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=20list=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=AA?= =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B8=84=E0=B8=B1=E0=B8=94=E0=B9=80=E0=B8=A5?= =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=81,=E0=B9=81=E0=B8=82=E0=B9=88?= =?UTF-8?q?=E0=B8=87=E0=B8=82=E0=B8=B1=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cms/src/app.postcss | 38 ++++++++++++ .../lib/components/ActivityCalendar.svelte | 2 +- cms/src/lib/utils.ts | 2 +- cms/src/routes/competitive/+page.svelte | 62 +++++++++++++------ cms/src/routes/qualifying/+page.svelte | 45 ++++++++++---- cms/src/routes/qualifying/[id]/+page.svelte | 2 +- cms/static/styles/fullcalendar.css | 2 +- 7 files changed, 118 insertions(+), 35 deletions(-) diff --git a/cms/src/app.postcss b/cms/src/app.postcss index d00ac4a..e1be7d2 100644 --- a/cms/src/app.postcss +++ b/cms/src/app.postcss @@ -99,4 +99,42 @@ .display-none{ display: none; } + .imgCard2{ + height: 85px; + filter: brightness(0.98); + } + .fit2{ + display: block; + height: 100%; + width: 100%; + object-fit: cover; + object-position: top; + } + + .text-sub{ + height: 45px; + align-items: start; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + .card-list{ + height: 530px; + overflow-x: scroll; + width: 100%; + } + .card-outline{ + border-radius:5px !important; + border: 1px solid #d6dee195; + background-color: white; + cursor: pointer; + font-size: 0.95rem; + + } + .card-outline:hover{ + color: #02A998; + box-shadow: rgba(149, 157, 165, 0.15) 0px 5px 10px; + } } diff --git a/cms/src/lib/components/ActivityCalendar.svelte b/cms/src/lib/components/ActivityCalendar.svelte index 018765e..7d33fd8 100644 --- a/cms/src/lib/components/ActivityCalendar.svelte +++ b/cms/src/lib/components/ActivityCalendar.svelte @@ -11,7 +11,7 @@ headerToolbar: { left: 'title', center: '', - right: 'prev,next today' + right: 'prev next today' }, dayMaxEventRows:3, moreLinkContent:function(args: { num: number; }){ diff --git a/cms/src/lib/utils.ts b/cms/src/lib/utils.ts index 8be9f33..1326bda 100644 --- a/cms/src/lib/utils.ts +++ b/cms/src/lib/utils.ts @@ -6,7 +6,7 @@ * @param nameColor dictionary like object for name and color */ export function getBgColorDict(name:string,nameColor:{ [index: string]:string}){ - const eventBg = ["#E6B0AA","#D2B4DE","#AED6F1","#A2D9CE","#FAD7A0 ","#D5DBDB",] + const eventBg = ["#67a1ff4a","#D2B4DE","#D5DBDB","#a2d9ce8f","#FAD7A0 ","#E6B0AA",] if(!nameColor[name]){ const len = Object.keys(nameColor).length nameColor[name]=len>eventBg.length?eventBg[0]:eventBg[len] diff --git a/cms/src/routes/competitive/+page.svelte b/cms/src/routes/competitive/+page.svelte index db56934..144e887 100644 --- a/cms/src/routes/competitive/+page.svelte +++ b/cms/src/routes/competitive/+page.svelte @@ -31,43 +31,67 @@ -->
-
-
+
+
-
+
-
-
-
-

- รายการสอบ -

+ class="flex flex-col min-w-0 break-words w-full shadow-lg auto-rows-max card bg-white"> +
+
+

+ รายการสอบแข่งขัน +

+
จำนวน {exams.length} รายการ
+
-
-
-
+
+
+ {#each exams as exam} +
+ +
+
+ 1 +
+
+

+ {exam.date??""} +

+
+ {exam.title} +
+
+
+ +
+ {/each} +
+
diff --git a/cms/src/routes/qualifying/+page.svelte b/cms/src/routes/qualifying/+page.svelte index 8c13dfa..9e9b657 100644 --- a/cms/src/routes/qualifying/+page.svelte +++ b/cms/src/routes/qualifying/+page.svelte @@ -33,24 +33,45 @@
-->
-
-
+
+
-
+
-
-
-
-

- รายการสอบ + class="flex flex-col min-w-0 break-words w-full shadow-lg auto-rows-max card bg-white"> +
+
+

+ รายการสอบคัดเลือก

-
+
จำนวน {exams.length} รายการ

-
+
+
+ {#each exams as exam} +
+ +
+
+ 1 +
+
+

+ {exam.date??""} +

+
+ {exam.title} +
+
+
+ +
+ {/each} +
+
diff --git a/cms/src/routes/qualifying/[id]/+page.svelte b/cms/src/routes/qualifying/[id]/+page.svelte index b3377da..f7765e0 100644 --- a/cms/src/routes/qualifying/[id]/+page.svelte +++ b/cms/src/routes/qualifying/[id]/+page.svelte @@ -47,7 +47,7 @@
-
+
สมัครสอบ diff --git a/cms/static/styles/fullcalendar.css b/cms/static/styles/fullcalendar.css index c8fc8b0..b66dd9a 100644 --- a/cms/static/styles/fullcalendar.css +++ b/cms/static/styles/fullcalendar.css @@ -91,7 +91,7 @@ table.fc-border-separate{ /* ----------- table today ----------- */ .fc .fc-daygrid-day.fc-day-today{ - background-color: rgba(100, 116, 139, 0.06); + background-color: rgba(100, 116, 139, 0.15); } /* ----------- table event ----------- */