diff --git a/assets/css/components/carousel.scss b/assets/css/components/carousel.scss
index 12c1b45c..3fa50be1 100644
--- a/assets/css/components/carousel.scss
+++ b/assets/css/components/carousel.scss
@@ -59,13 +59,13 @@ img.reload {
font-weight: 600;
&:hover {
- background-color: rgb(0, 0, 0);
+ background-color: rgba(0, 0, 0, 1);
}
&:focus {
padding: 4px;
border: 2px solid #fff;
- background-color: rgb(0, 0, 0);
+ background-color: rgba(0, 0, 0, 1);
outline: none;
color: #fff;
}
@@ -80,7 +80,7 @@ img.reload {
border: 0 solid transparent;
&:hover {
- background-color: rgb(0, 0, 0);
+ background-color: rgba(0, 0, 0, 1);
}
}
diff --git a/assets/css/reset.scss b/assets/css/reset.scss
index d0eb51b8..75611de6 100644
--- a/assets/css/reset.scss
+++ b/assets/css/reset.scss
@@ -4,11 +4,11 @@
*:not(article) {
> h1, > h2, > h3, > h4, > h5, > h6 {
+ margin: 0;
&:not(article &) {
font-size: inherit;
}
- margin: 0;
}
}
diff --git a/assets/css/typography.scss b/assets/css/typography.scss
index d373dc6c..c338d43f 100644
--- a/assets/css/typography.scss
+++ b/assets/css/typography.scss
@@ -1,22 +1,6 @@
@import 'utilities/px-to-rem';
:root {
- &:lang(zh) {
- --body-font-family: helvetica, 'Noto Sans TC', system-ui, sans-serif;
- }
- &:lang(en) {
- --body-font-family: helvetica, system-ui, sans-serif;
- }
- &:lang(ja) {
- --body-font-family: helvetica, 'Noto Sans JP', system-ui, sans-serif;
- }
- &:lang(th) {
- --body-font-family: helvetica, 'Noto Sans Thai', system-ui, sans-serif;
- }
- &:lang(vi) {
- --body-font-family: inter, system-ui, sans-serif;
- }
-
--body-line-height: 1.7em;
--body-font-size: #{px-to-rem(16px)};
@@ -44,6 +28,22 @@
--h1-font-size: #{px-to-rem(36px)};
--h1-font-weight: 600;
+
+ &:lang(zh) {
+ --body-font-family: helvetica, 'Noto Sans TC', system-ui, sans-serif;
+ }
+ &:lang(en) {
+ --body-font-family: helvetica, system-ui, sans-serif;
+ }
+ &:lang(ja) {
+ --body-font-family: helvetica, 'Noto Sans JP', system-ui, sans-serif;
+ }
+ &:lang(th) {
+ --body-font-family: helvetica, 'Noto Sans Thai', system-ui, sans-serif;
+ }
+ &:lang(vi) {
+ --body-font-family: inter, system-ui, sans-serif;
+ }
}
a {
diff --git a/content/components/button-and-link/_index.md b/content/components/button-and-link/_index.md
index 72e45aa4..ab9d65f2 100644
--- a/content/components/button-and-link/_index.md
+++ b/content/components/button-and-link/_index.md
@@ -5,7 +5,7 @@ maturity: "alpha"
### 常見按鈕
-{{< live-example partial="ctas/button.html" i18n_selector="button" i18n="en-US:Submit,Delete,Cancel;ja:送信,削除,キャンセル;vi:Gửi,Xóa,Hủy;th:ส่ง,ลบ,ยกเลิก" >}}
+{{< live-example partial="ctas/button.html" i18n_selector="button" i18n="en-US:Submit,Delete,Next;ja:送信,削除,キャンセル;vi:Gửi,Xóa,Hủy;th:ส่ง,ลบ,ยกเลิก" >}}
#### CSS
diff --git a/content/components/form/_index.md b/content/components/form/_index.md
index 1708fe99..2bf0ccb8 100644
--- a/content/components/form/_index.md
+++ b/content/components/form/_index.md
@@ -5,7 +5,7 @@ maturity: "alpha"
### 簡易欄位
-{{< live-example partial="form/form-elements.html" i18n_selector="[for=name],[for=city],[for=desc]" i18n="en-US:Full name,City of residence,Description" >}}
+{{< live-example partial="form/form-elements.html" i18n_selector="[for=name],[for=city],[for=desc],[value='select'],[value=taipei],[value=newtaipei],[value=keelung]" i18n="en-US:Full name,City of residence,Description,Select,Taipei,New Taipei,Keelung" >}}
#### CSS
@@ -23,7 +23,7 @@ maturity: "alpha"
### 選項欄位
-{{< live-example partial="form/form-checkable.html" i18n_selector="[for=id],[for=items]" i18n="en-US:ID type,Lost document replacement" >}}
+{{< live-example partial="form/form-checkable.html" i18n_selector="[for=id],[for=items],[for=v-healthid],[for=v-moica],[for=v-phone],[for=check-h-healthid],[for=check-h-moica],[for=check-h-id]" i18n="en-US:ID type,Lost document replacement,NHI Card,Digital Certificate,Cell phone,NHI Card,Digital Certificate,ID Card" >}}
#### CSS
@@ -33,7 +33,7 @@ maturity: "alpha"
### 欄位說明
-{{< live-example partial="form/field.html" i18n_selector="label,.field-description li" i18n="en-US:Email,Address must end with @pdis.nat.gov.tw.;" >}}
+{{< live-example partial="form/field.html" i18n_selector="label,.field-description li" i18n="en-US:Email,Address must end with @pdis.nat.gov.tw." >}}
#### CSS
@@ -45,7 +45,7 @@ maturity: "alpha"
### 必要欄位
-{{< live-example partial="form/field-required.html" i18n_selector="label,.field-required" i18n="en-US:Email,required;" >}}
+{{< live-example partial="form/field-required.html" i18n_selector="label,.field-required" i18n="en-US:Email,required" >}}
#### 親和力
diff --git a/layouts/_partials/example.html b/layouts/_partials/example.html
index d9458acd..e2da4e14 100644
--- a/layouts/_partials/example.html
+++ b/layouts/_partials/example.html
@@ -8,13 +8,13 @@
}}
diff --git a/layouts/_partials/form/form-elements.html b/layouts/_partials/form/form-elements.html
index f515f541..3163155d 100644
--- a/layouts/_partials/form/form-elements.html
+++ b/layouts/_partials/form/form-elements.html
@@ -6,10 +6,10 @@