diff --git a/scripts/bundle_icons.js b/scripts/bundle_icons.js index 296f951..40e4065 100755 --- a/scripts/bundle_icons.js +++ b/scripts/bundle_icons.js @@ -44,7 +44,16 @@ let icons = [ 'fluent:key-32-filled', 'majesticons:clipboard-copy', 'fa-regular:calendar-alt', - 'ph:books-bold' + 'ph:books-bold', + 'fa-solid:external-link-alt', + 'bx:bx-code-curly', + 'simple-icons:wakatime', + 'bx:bxs-heart', + 'heroicons-solid:light-bulb', + 'ion:rocket', + 'heroicons-solid:server', + 'eva:checkmark-circle-2-fill', + 'fluent:key-24-filled' ] const output = path.normalize(path.join(__dirname, '../static/assets/icons.js')) diff --git a/static/assets/app.css b/static/assets/app.css index 25ca624..88652e1 100644 --- a/static/assets/app.css +++ b/static/assets/app.css @@ -1,5 +1,5 @@ body { - font-family: 'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif; + font-family: 'Source Sans 3', 'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif; } .bg-gray-850 { @@ -22,4 +22,14 @@ body { .mt-14 { margin-top: 3.5rem; +} + +.text-7xl { + font-size: 4.5rem; + line-height: 1.1; +} + +.text-8xl { + font-size: 5rem; + line-height: 1.1; } \ No newline at end of file diff --git a/static/assets/app.js b/static/assets/app.js index 35410b8..2e3991c 100644 --- a/static/assets/app.js +++ b/static/assets/app.js @@ -39,6 +39,7 @@ let resizeCount = 0 Chart.defaults.color = "#E2E8F0" Chart.defaults.borderColor = "#242b3a" +Chart.defaults.font.family = 'Source Sans 3, Roboto, Helvetica Neue, Arial, sens-serif' String.prototype.toHHMMSS = function () { const sec_num = parseInt(this, 10) @@ -387,22 +388,8 @@ function hexToRgb(hex) { } : null; } -function showUserMenuPopup(event) { - const el = document.getElementById('user-menu-popup') - el.classList.remove('hidden') - el.classList.add('block') - event.stopPropagation() -} - -function hideUserMenuPopup(event) { - const el = document.getElementById('user-menu-popup') - el.classList.remove('block') - el.classList.add('hidden') - event.stopPropagation() -} - -function toggleTimePickerPopup(event) { - const el = document.getElementById('time-picker-popup') +function togglePopup(event, id) { + const el = document.getElementById(id) if (el.classList.contains('hidden')) { el.classList.remove('hidden') el.classList.add('block') @@ -413,13 +400,6 @@ function toggleTimePickerPopup(event) { event.stopPropagation() } -function showApiKeyPopup(event) { - const el = document.getElementById('api-key-popup') - el.classList.remove('hidden') - el.classList.add('block') - event.stopPropagation() -} - function copyApiKey(event) { const el = document.getElementById('api-key-container') el.select() diff --git a/static/assets/icons.js b/static/assets/icons.js index 613bcff..40cd2e7 100644 --- a/static/assets/icons.js +++ b/static/assets/icons.js @@ -5,14 +5,18 @@ Iconify.addCollection({"prefix":"ant-design","icons":{"check-square-filled":{"bo Iconify.addCollection({"prefix":"emojione-v1","icons":{"white-heavy-check-mark":{"body":""},"alarm-clock":{"body":""},"warning":{"body":""},"backhand-index-pointing-right":{"body":""}},"width":64,"height":64}); Iconify.addCollection({"prefix":"twemoji","icons":{"light-bulb":{"body":""},"gear":{"body":""}},"width":36,"height":36}); Iconify.addCollection({"prefix":"noto","icons":{"play-button":{"body":""},"stop-button":{"body":""}},"width":128,"height":128}); -Iconify.addCollection({"prefix":"eva","icons":{"corner-right-down-fill":{"body":""}},"width":24,"height":24}); +Iconify.addCollection({"prefix":"eva","icons":{"corner-right-down-fill":{"body":""},"checkmark-circle-2-fill":{"body":""}},"width":24,"height":24}); Iconify.addCollection({"prefix":"bi","icons":{"heart-fill":{"body":""},"people-fill":{"body":""}},"width":16,"height":16}); Iconify.addCollection({"prefix":"ic","icons":{"round-person":{"body":""},"round-dashboard":{"body":""}},"width":24,"height":24}); -Iconify.addCollection({"prefix":"bx","icons":{"bxs-bar-chart-alt-2":{"body":""}},"width":24,"height":24}); -Iconify.addCollection({"prefix":"fluent","icons":{"data-bar-horizontal-24-filled":{"body":""},"key-32-filled":{"body":"","width":32,"height":32}},"width":24,"height":24}); +Iconify.addCollection({"prefix":"bx","icons":{"bxs-bar-chart-alt-2":{"body":""},"bx-code-curly":{"body":""},"bxs-heart":{"body":""}},"width":24,"height":24}); +Iconify.addCollection({"prefix":"fluent","icons":{"data-bar-horizontal-24-filled":{"body":""},"key-32-filled":{"body":"","width":32,"height":32},"key-24-filled":{"body":""}},"width":24,"height":24}); Iconify.addCollection({"prefix":"ci","icons":{"settings-filled":{"body":""}},"width":24,"height":24}); Iconify.addCollection({"prefix":"akar-icons","icons":{"chevron-down":{"body":""}},"width":24,"height":24}); Iconify.addCollection({"prefix":"ls","icons":{"logout":{"body":"","height":672}},"width":717,"height":717,"inlineHeight":1086,"inlineTop":-205,"verticalAlign":-0.2}); Iconify.addCollection({"prefix":"majesticons","icons":{"clipboard-copy":{"body":""}},"width":24,"height":24}); Iconify.addCollection({"prefix":"fa-regular","icons":{"calendar-alt":{"body":"","width":448}},"width":512,"height":512}); Iconify.addCollection({"prefix":"ph","icons":{"books-bold":{"body":""}},"width":256,"height":256}); +Iconify.addCollection({"prefix":"fa-solid","icons":{"external-link-alt":{"body":""}},"width":512,"height":512}); +Iconify.addCollection({"prefix":"simple-icons","icons":{"wakatime":{"body":""}},"width":24,"height":24}); +Iconify.addCollection({"prefix":"heroicons-solid","icons":{"light-bulb":{"body":""},"server":{"body":""}},"width":20,"height":20}); +Iconify.addCollection({"prefix":"ion","icons":{"rocket":{"body":""}},"width":512,"height":512}); diff --git a/static/assets/vendor/roboto-latin-ext.woff2 b/static/assets/vendor/roboto-latin-ext.woff2 deleted file mode 100644 index de83f9c..0000000 Binary files a/static/assets/vendor/roboto-latin-ext.woff2 and /dev/null differ diff --git a/static/assets/vendor/roboto-latin.woff2 b/static/assets/vendor/roboto-latin.woff2 deleted file mode 100644 index 1a53701..0000000 Binary files a/static/assets/vendor/roboto-latin.woff2 and /dev/null differ diff --git a/static/assets/vendor/roboto.css b/static/assets/vendor/roboto.css deleted file mode 100644 index 4c0aa6c..0000000 --- a/static/assets/vendor/roboto.css +++ /dev/null @@ -1,18 +0,0 @@ -/* latin-ext */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(roboto-latin-ext.woff2) format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(roboto-latin.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} diff --git a/static/assets/vendor/source-sans-3.css b/static/assets/vendor/source-sans-3.css new file mode 100644 index 0000000..2d2c274 --- /dev/null +++ b/static/assets/vendor/source-sans-3.css @@ -0,0 +1,36 @@ +/* latin-ext */ +@font-face { + font-family: 'Source Sans 3'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(source-sans-3_latin-ext_400.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Source Sans 3'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(source-sans-3_latin_400.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* latin-ext */ +@font-face { + font-family: 'Source Sans 3'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(source-sans-3_latin-ext_600.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Source Sans 3'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(source-sans-3_latin_600.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/static/assets/vendor/source-sans-3_latin-ext_400.woff2 b/static/assets/vendor/source-sans-3_latin-ext_400.woff2 new file mode 100644 index 0000000..9304bf1 Binary files /dev/null and b/static/assets/vendor/source-sans-3_latin-ext_400.woff2 differ diff --git a/static/assets/vendor/source-sans-3_latin-ext_600.woff2 b/static/assets/vendor/source-sans-3_latin-ext_600.woff2 new file mode 100644 index 0000000..0e5c839 Binary files /dev/null and b/static/assets/vendor/source-sans-3_latin-ext_600.woff2 differ diff --git a/static/assets/vendor/source-sans-3_latin_400.woff2 b/static/assets/vendor/source-sans-3_latin_400.woff2 new file mode 100644 index 0000000..d7e9da9 Binary files /dev/null and b/static/assets/vendor/source-sans-3_latin_400.woff2 differ diff --git a/static/assets/vendor/source-sans-3_latin_600.woff2 b/static/assets/vendor/source-sans-3_latin_600.woff2 new file mode 100644 index 0000000..64bb981 Binary files /dev/null and b/static/assets/vendor/source-sans-3_latin_600.woff2 differ diff --git a/views/footer.tpl.html b/views/footer.tpl.html index 33686fc..1988bab 100644 --- a/views/footer.tpl.html +++ b/views/footer.tpl.html @@ -1,13 +1,13 @@ -