Repos / gorts / 9cd54bdf44
commit 9cd54bdf4432d4f6f08ee59c557d33eacc74b672
Author: Nhân <hi@imnhan.com>
Date: Tue Jun 20 17:37:10 2023 +0700
new design
diff --git a/web/assets/fonts/SIL Open Font License.txt b/web/assets/fonts/SIL Open Font License.txt
deleted file mode 100644
index d4bc2f0..0000000
--- a/web/assets/fonts/SIL Open Font License.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Copyright (c) 2012, Vernon Adams (vern@newtypography.co.uk),
-with Reserved Font Name Oswald
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
-
-5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-500.woff b/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-500.woff
deleted file mode 100644
index b3e9884..0000000
Binary files a/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-500.woff and /dev/null differ
diff --git a/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-600.woff b/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-600.woff
deleted file mode 100644
index 9795b96..0000000
Binary files a/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-600.woff and /dev/null differ
diff --git a/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-700.woff b/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-700.woff
deleted file mode 100644
index 062d835..0000000
Binary files a/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-700.woff and /dev/null differ
diff --git a/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-regular.woff b/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-regular.woff
deleted file mode 100644
index cc6a4b9..0000000
Binary files a/web/assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-regular.woff and /dev/null differ
diff --git a/web/assets/scoreboard.png b/web/assets/scoreboard.png
index 4b3863f..ee683b5 100644
Binary files a/web/assets/scoreboard.png and b/web/assets/scoreboard.png differ
diff --git a/web/fonts.css b/web/fonts.css
new file mode 100644
index 0000000..3ffe8dc
--- /dev/null
+++ b/web/fonts.css
@@ -0,0 +1,62 @@
+/*
+Lifted from https://gwfh.mranftl.com/fonts
+*/
+
+/* jura-300 - cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese */
+@font-face {
+ font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+ font-family: "Jura";
+ font-style: normal;
+ font-weight: 300;
+ src: url("./fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-300.woff2")
+ format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
+/* jura-regular - cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese */
+@font-face {
+ font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+ font-family: "Jura";
+ font-style: normal;
+ font-weight: 400;
+ src: url("./fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-regular.woff2")
+ format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
+/* jura-500 - cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese */
+@font-face {
+ font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+ font-family: "Jura";
+ font-style: normal;
+ font-weight: 500;
+ src: url("./fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-500.woff2")
+ format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
+/* jura-600 - cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese */
+@font-face {
+ font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+ font-family: "Jura";
+ font-style: normal;
+ font-weight: 600;
+ src: url("./fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-600.woff2")
+ format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
+/* jura-700 - cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese */
+@font-face {
+ font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+ font-family: "Jura";
+ font-style: normal;
+ font-weight: 700;
+ src: url("./fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-700.woff2")
+ format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
+/* noto-color-emoji-regular - emoji */
+@font-face {
+ font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+ font-family: "Noto Color Emoji";
+ font-style: normal;
+ font-weight: 400;
+ src: url("./fonts/noto-color-emoji-v25-emoji-regular.woff2") format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
diff --git a/web/fonts/License.txt b/web/fonts/License.txt
new file mode 100644
index 0000000..eb4f70b
--- /dev/null
+++ b/web/fonts/License.txt
@@ -0,0 +1,6 @@
+Retrieved from:
+https://fonts.google.com/noto/specimen/Noto+Color+Emoji
+https://fonts.google.com/specimen/Jura/about
+
+All of these fonts are licensed under the Open Font License.
+See OFL.txt for details.
diff --git a/web/fonts/OFL.txt b/web/fonts/OFL.txt
new file mode 100644
index 0000000..f1a20ac
--- /dev/null
+++ b/web/fonts/OFL.txt
@@ -0,0 +1,97 @@
+Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
+with Reserved Font Name <Reserved Font Name>.
+Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>),
+with Reserved Font Name <additional Reserved Font Name>.
+Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>).
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-300.woff2 b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-300.woff2
new file mode 100644
index 0000000..82ba2d2
Binary files /dev/null and b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-300.woff2 differ
diff --git a/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-500.woff2 b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-500.woff2
new file mode 100644
index 0000000..6f72738
Binary files /dev/null and b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-500.woff2 differ
diff --git a/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-600.woff2 b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-600.woff2
new file mode 100644
index 0000000..51280b3
Binary files /dev/null and b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-600.woff2 differ
diff --git a/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-700.woff2 b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-700.woff2
new file mode 100644
index 0000000..b1c5b3f
Binary files /dev/null and b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-700.woff2 differ
diff --git a/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-regular.woff2 b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-regular.woff2
new file mode 100644
index 0000000..b983f61
Binary files /dev/null and b/web/fonts/jura-v29-cyrillic_cyrillic-ext_greek_greek-ext_kayah-li_latin_latin-ext_vietnamese-regular.woff2 differ
diff --git a/web/fonts/noto-color-emoji-v25-emoji-regular.woff2 b/web/fonts/noto-color-emoji-v25-emoji-regular.woff2
new file mode 100644
index 0000000..ec0c030
Binary files /dev/null and b/web/fonts/noto-color-emoji-v25-emoji-regular.woff2 differ
diff --git a/web/index.css b/web/index.css
index f75719b..8c706c9 100644
--- a/web/index.css
+++ b/web/index.css
@@ -1,57 +1,12 @@
-/*
-Fonts lifted from https://google-webfonts-helper.herokuapp.com.
-I'm using woff instead of woff2 simply because OBS's Browser Source
-plugin apparently came with a pretty old Chromium.
-*/
-@font-face {
- font-family: "Oswald";
- font-style: normal;
- font-weight: 400;
- src: local("Oswald Regular"), local("Oswald-Regular"),
- url("assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-regular.woff")
- format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-/* oswald-500 - vietnamese_cyrillic_latin_latin-ext */
-@font-face {
- font-family: "Oswald";
- font-style: normal;
- font-weight: 500;
- src: local("Oswald Medium"), local("Oswald-Medium"),
- url("assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-500.woff")
- format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-/* oswald-600 - vietnamese_cyrillic_latin_latin-ext */
-@font-face {
- font-family: "Oswald";
- font-style: normal;
- font-weight: 600;
- src: local("Oswald SemiBold"), local("Oswald-SemiBold"),
- url("assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-600.woff")
- format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
-/* oswald-700 - vietnamese_cyrillic_latin_latin-ext */
-@font-face {
- font-family: "Oswald";
- font-style: normal;
- font-weight: 700;
- src: local("Oswald Bold"), local("Oswald-Bold"),
- url("assets/fonts/oswald-v17-vietnamese_cyrillic_latin_latin-ext-700.woff")
- format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-}
-
body {
width: 1920px;
height: 1080px;
- /*box-sizing: border-box;*/
- /*border: 2px solid red;*/
overflow: hidden;
padding: 0;
margin: 0;
position: relative;
- font-weight: 600;
+ font-family: "Jura";
+ font-weight: 700;
}
#scoreboard {
@@ -67,71 +22,80 @@ #p1country,
#p2country,
#p1team,
#p2team,
-#description {
+#description,
+#subtitle {
position: absolute;
top: 0;
bottom: 0;
color: white;
- font-family: "Oswald", sans-serif;
text-transform: uppercase;
}
#p1team,
#p2team {
font-size: 32px;
- font-family: "Oswald", sans-serif;
text-shadow: 0px 0px 20px black;
}
#description {
left: 0;
right: 0;
- top: 6px;
+ top: 3px;
text-transform: uppercase;
- font-size: 23px;
+ font-size: 20px;
+}
+
+#subtitle {
+ text-align: center;
+ left: 0;
+ right: 0;
+ top: 178px;
+ font-size: 20px;
}
#p1country,
#p2country {
- font-size: 2em;
- top: -3px;
+ font-family: "Noto Color Emoji";
+ font-size: 1.8em;
+ top: 8px;
}
#p1country {
- left: 340px;
+ left: 317px;
}
#p2country {
- right: 340px;
+ right: 317px;
}
#p1score,
#p2score {
- top: 2px;
- color: black;
- font-size: 32px;
+ top: -5px;
+ font-size: 56px;
+ width: 2em;
+ text-align: center;
}
#p1score {
- left: 285px;
+ left: 226px;
}
#p2score {
- right: 285px;
+ right: 226px;
}
#p1name,
#p2name {
- top: 1px;
- font-size: 28px;
+ top: 8px;
+ font-size: 32px;
}
#p1name {
- left: 390px;
+ left: 360px;
}
#p2name {
- right: 390px;
+ right: 360px;
}
#p1team {
diff --git a/web/index.html b/web/index.html
index d6c0e05..aaf1b91 100644
--- a/web/index.html
+++ b/web/index.html
@@ -7,6 +7,7 @@
<img src="assets/scoreboard.png" />
<div id="description"></div>
+ <div id="subtitle"></div>
<div id="p1score"></div>
<span id="p1country"></span>
@@ -21,6 +22,7 @@
<img id="logo" src="assets/logo-sfgc.png" />
</body>
+<link href="fonts.css" rel="stylesheet" />
<link href="index.css" rel="stylesheet" />
<link href="animation.css" rel="stylesheet" />
<script src="index.js"></script>