diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp index 398154e4..8fb70a05 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03010-main.jsp @@ -16,10 +16,8 @@ " /> - - - - + " /> + " /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp index c0183aa9..c263b6c7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp @@ -16,10 +16,8 @@ " /> - - - - + " /> + " /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/include/head.jsp b/src/main/webapp/WEB-INF/jsp/include/head.jsp index c055d5e2..91a45e03 100644 --- a/src/main/webapp/WEB-INF/jsp/include/head.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/head.jsp @@ -16,10 +16,8 @@ " /> - - - - + " /> + " /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 216a5dfb..44d30bba 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -16,9 +16,7 @@ " /> - - - + " /> " /> diff --git a/src/main/webapp/resources/font/publicsans/fontface.css b/src/main/webapp/resources/font/publicsans/fontface.css new file mode 100644 index 00000000..67535f6f --- /dev/null +++ b/src/main/webapp/resources/font/publicsans/fontface.css @@ -0,0 +1,272 @@ +@charset "UTF-8"; + +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 300; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJPax9k0.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 300; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJLax9k0.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 300; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJzaxw.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJPax9k0.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJLax9k0.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJzaxw.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 500; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJPax9k0.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 500; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJLax9k0.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 500; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJzaxw.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 600; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJPax9k0.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 600; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJLax9k0.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 600; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJzaxw.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 700; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJPax9k0.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 700; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJLax9k0.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: italic; + font-weight: 700; + font-display: swap; + src: url('ijwTs572Xtc6ZYQws9YVwnNDTJzaxw.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNJfJ7Cww.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNIfJ7Cww.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNGfJ4.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNJfJ7Cww.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNIfJ7Cww.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNGfJ4.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNJfJ7Cww.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNIfJ7Cww.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNGfJ4.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNJfJ7Cww.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNIfJ7Cww.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNGfJ4.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNJfJ7Cww.woff2') format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNIfJ7Cww.woff2') format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Public Sans'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('ijwRs572Xtc6ZYQws9YVwnNGfJ4.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNGfJ4.woff2 b/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNGfJ4.woff2 new file mode 100644 index 00000000..b2e6e1ad Binary files /dev/null and b/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNGfJ4.woff2 differ diff --git a/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNIfJ7Cww.woff2 b/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNIfJ7Cww.woff2 new file mode 100644 index 00000000..7626e5ac Binary files /dev/null and b/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNIfJ7Cww.woff2 differ diff --git a/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNJfJ7Cww.woff2 b/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNJfJ7Cww.woff2 new file mode 100644 index 00000000..8e5366a6 Binary files /dev/null and b/src/main/webapp/resources/font/publicsans/ijwRs572Xtc6ZYQws9YVwnNJfJ7Cww.woff2 differ diff --git a/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJLax9k0.woff2 b/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJLax9k0.woff2 new file mode 100644 index 00000000..aab67570 Binary files /dev/null and b/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJLax9k0.woff2 differ diff --git a/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJPax9k0.woff2 b/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJPax9k0.woff2 new file mode 100644 index 00000000..e21b3e72 Binary files /dev/null and b/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJPax9k0.woff2 differ diff --git a/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJzaxw.woff2 b/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJzaxw.woff2 new file mode 100644 index 00000000..169b319a Binary files /dev/null and b/src/main/webapp/resources/font/publicsans/ijwTs572Xtc6ZYQws9YVwnNDTJzaxw.woff2 differ