diff --git a/cms/src/app.postcss b/cms/src/app.postcss index a9f59b2..b034321 100644 --- a/cms/src/app.postcss +++ b/cms/src/app.postcss @@ -7,16 +7,16 @@ font-family: 'Noto Sans Thai', sans-serif; } h1 { - @apply text-4xl; - } - h2 { @apply text-2xl; } + h2 { + @apply text-xl; + } ul{ - @apply list-disc + @apply list-disc; } ol{ - @apply list-decimal + @apply list-decimal; } .cardxl{ padding-right: 2rem; @@ -41,14 +41,15 @@ .parallax-inner > h2{ color: #fff; text-transform: uppercase; - letter-spacing: 5px; + letter-spacing: 2px; position: absolute; top: 50%; left: 0; margin-top: -20.5px; width: 100%; text-align: center; - font-weight: 500; + font-weight: 600; + font-size: 1.5rem !important; } .breadTaxt{ font-weight: 300; diff --git a/cms/src/routes/about/+page.svelte b/cms/src/routes/about/+page.svelte index 81691df..5987853 100644 --- a/cms/src/routes/about/+page.svelte +++ b/cms/src/routes/about/+page.svelte @@ -5,14 +5,38 @@ export let data: PageData; -
-
-
- {@html data.detail} +
+
+

เกี่ยวกับเรา

+
+
+
+
+
+ +
+
+
+
+
+ {@html data.detail} +
+
{data.contact.description}
+ +
{ver.version}
+
{ver.builddate}
-
{data.contact.description}
-
{ver.version}
-
{ver.builddate}
diff --git a/cms/src/routes/competitive/+page.svelte b/cms/src/routes/competitive/+page.svelte index 110cde6..6fffaab 100644 --- a/cms/src/routes/competitive/+page.svelte +++ b/cms/src/routes/competitive/+page.svelte @@ -33,7 +33,7 @@

รายการสอบ

diff --git a/cms/src/routes/qualifying/+page.server.ts b/cms/src/routes/qualifying/+page.server.ts index 2e569f6..81f30f5 100644 --- a/cms/src/routes/qualifying/+page.server.ts +++ b/cms/src/routes/qualifying/+page.server.ts @@ -6,13 +6,16 @@ export const load: PageServerLoad = async () => { const exams = await getQualifyExams() const events:CalendarEvent[]=[] exams.forEach(({id,title,start,institute_id})=>{ - let backgroundColor ="#1111EE" + let backgroundColor ="" switch (institute_id) { case 1: - backgroundColor="#EE1111" + backgroundColor="rgba(251,64,75,.2)" break; case 2: - backgroundColor="#11EE11" + backgroundColor="#23ccef" + break; + case 3: + backgroundColor="rgba(68,125,247,.2)" break; default: break; diff --git a/cms/src/routes/qualifying/+page.svelte b/cms/src/routes/qualifying/+page.svelte index 2b66c80..30b64af 100644 --- a/cms/src/routes/qualifying/+page.svelte +++ b/cms/src/routes/qualifying/+page.svelte @@ -29,20 +29,20 @@
-
+
-
+

รายการสอบ

diff --git a/cms/static/styles/fullcalendar.css b/cms/static/styles/fullcalendar.css index 1cafbef..73f11c7 100644 --- a/cms/static/styles/fullcalendar.css +++ b/cms/static/styles/fullcalendar.css @@ -42,11 +42,19 @@ button:active {outline:none;} background: #e3e3e3 ; color : #66615b; } -/* ----------- table ----------- */ - .fc .fc-toolbar-title{ font-size: 1.4rem; } +@media only screen and (max-width: 1024px) { + .fc .fc-toolbar-title{ + font-size: 1.2rem; + } + +} + +/* ----------- table ----------- */ + + thead tr.fc-first{ border-color: #cdcdcd; @@ -84,4 +92,24 @@ table.fc-border-separate{ /* ----------- table today ----------- */ .fc .fc-daygrid-day.fc-day-today{ background-color: rgba(100, 116, 139, 0.06); +} + +/* ----------- table event ----------- */ +.fc-h-event{ + width: auto; + border: none; +} +.fc-h-event .fc-event-title{ + padding-left: 0.5em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color:#334155; + font-weight:400 !important; +} +.fc-daygrid-event .fc-event-title{ + white-space: wrap; + overflow: hidden; + text-overflow: ellipsis; + font-weight: 400; } \ No newline at end of file