diff --git a/module/build.gradle.kts b/module/build.gradle.kts index 0619b5ef..2b869b15 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -201,15 +201,14 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/js/smallPage/language.js").asFile, null)) set.add(Pair(root.file("webroot/js/smallPage/theme.js").asFile, null)) - - set.add(Pair(root.file("webroot/js/modal/errorHistory.js").asFile, null)) + set.add(Pair(root.file("webroot/js/smallPage/errorHistory.js").asFile, null)) set.add(Pair(root.file("webroot/css/index.css").asFile, null)) set.add(Pair(root.file("webroot/css/icons.css").asFile, null)) set.add(Pair(root.file("webroot/css/error.css").asFile, null)) - set.add(Pair(root.file("webroot/fonts/font.ttf").asFile, null)) - set.add(Pair(root.file("webroot/fonts/outfit.css").asFile, null)) + set.add(Pair(root.file("webroot/fonts/poppins.ttf").asFile, null)) + set.add(Pair(root.file("webroot/fonts/header.css").asFile, null)) set.add(Pair(root.file("webroot/assets/mark.svg").asFile, null)) set.add(Pair(root.file("webroot/assets/tick.svg").asFile, null)) diff --git a/module/src/customize.sh b/module/src/customize.sh index e6fddd26..5ee28d78 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -139,10 +139,9 @@ extract "$ZIPFILE" 'webroot/js/themes/lightNavbar.js' "$MODPATH/webroot/js/theme extract "$ZIPFILE" 'webroot/js/themes/lightIcon.js' "$MODPATH/webroot/js/themes" true extract "$ZIPFILE" 'webroot/js/themes/monochrome.js' "$MODPATH/webroot/js/themes" true -extract "$ZIPFILE" 'webroot/js/modal/errorHistory.js' "$MODPATH/webroot/js/modal" true - extract "$ZIPFILE" 'webroot/js/smallPage/language.js' "$MODPATH/webroot/js/smallPage" true extract "$ZIPFILE" 'webroot/js/smallPage/theme.js' "$MODPATH/webroot/js/smallPage" true +extract "$ZIPFILE" 'webroot/js/smallPage/errorHistory.js' "$MODPATH/webroot/js/smallPage" true extract "$ZIPFILE" 'webroot/js/switcher/fontChanger.js' "$MODPATH/webroot/js/switcher" true @@ -150,8 +149,8 @@ extract "$ZIPFILE" 'webroot/css/index.css' "$MODPATH/webroot/css" true extract "$ZIPFILE" 'webroot/css/icons.css' "$MODPATH/webroot/css" true extract "$ZIPFILE" 'webroot/css/error.css' "$MODPATH/webroot/css" true -extract "$ZIPFILE" 'webroot/fonts/font.ttf' "$MODPATH/webroot/fonts" true -extract "$ZIPFILE" 'webroot/fonts/outfit.css' "$MODPATH/webroot/fonts" true +extract "$ZIPFILE" 'webroot/fonts/poppins.ttf' "$MODPATH/webroot/fonts" true +extract "$ZIPFILE" 'webroot/fonts/header.css' "$MODPATH/webroot/fonts" true for lang in en_US ja_JP pt_BR ro_RO ru_RU vi_VN zh_CN zh_TW; do extract "$ZIPFILE" "webroot/lang/${lang}.json" "$MODPATH/webroot/lang" true diff --git a/webroot/css/index.css b/webroot/css/index.css index 38e45165..c2384dae 100644 --- a/webroot/css/index.css +++ b/webroot/css/index.css @@ -14,7 +14,7 @@ /* Locked Color */ --lock-desc: #c9c9c9; --lock: #fff; - --font-family: 'Outfit', sans-serif; + --font-family: 'Poppins', sans-serif; } * { @@ -231,15 +231,44 @@ a { } .errorh_textarea { - field-sizing: content; resize: none; - height: 100%; - width: 100%; border: none; outline: none; font-size: 14px; padding-bottom: 25px; font-family: monospace, monospace; + position: fixed; + bottom: 7em; + top: 15.2em; + left: 1em; + right: 1em; +} + +.errorh_button_container { + position: fixed; + top: 5.75em; + left: 1em; + right: 1em; + display: grid; + grid-template-columns: 1fr; + column-gap: 1em; +} + +.errorh_button { + border-radius: 25px; + background: var(--small-card); + display: flex; + padding: 0.7em; + align-items: center; + justify-content: center; + margin-bottom: 1em; + cursor: pointer; + transition: transform 0.05s ease-in-out; + user-select: none; +} + +.errorh_button:active { + transform: scale(80%) } /* Card type */ @@ -351,6 +380,13 @@ input:checked + .slider:before { animation: fade-in 0.2s; } +.panel.showback { + margin-bottom: 119px; + display: block; + animation: fade-in 0.2s; + z-index: 30; +} + .navicon.show { width: 65px; animation: openNav 0.15s; @@ -388,6 +424,15 @@ input:checked + .slider:before { .nav_dimc { background: var(--desktop-navbar); } + .errorh_button_container { + grid-template-columns: 1fr 1fr; + } + .errorh_textarea { + top: 11em; + } + .errorh_button { + margin-bottom: 0; + } } /* Animation KeyFrames */ diff --git a/webroot/fonts/font.ttf b/webroot/fonts/font.ttf deleted file mode 100644 index 826899cf..00000000 Binary files a/webroot/fonts/font.ttf and /dev/null differ diff --git a/webroot/fonts/header.css b/webroot/fonts/header.css new file mode 100644 index 00000000..3ebd2e3c --- /dev/null +++ b/webroot/fonts/header.css @@ -0,0 +1,4 @@ +@font-face { + font-family: "Poppins"; + src: url("./poppins.ttf"); +} \ No newline at end of file diff --git a/webroot/fonts/outfit.css b/webroot/fonts/outfit.css deleted file mode 100644 index 6e94c867..00000000 --- a/webroot/fonts/outfit.css +++ /dev/null @@ -1,4 +0,0 @@ -@font-face { - font-family: "Outfit"; - src: url("./font.ttf"); -} \ No newline at end of file diff --git a/webroot/fonts/poppins.ttf b/webroot/fonts/poppins.ttf new file mode 100644 index 00000000..9f0c71b7 Binary files /dev/null and b/webroot/fonts/poppins.ttf differ diff --git a/webroot/index.html b/webroot/index.html index 0abf2c41..56a0d179 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -7,9 +7,9 @@ - + - + @@ -18,12 +18,12 @@ + + - - @@ -53,30 +53,6 @@
- -
-
-
-
- -
-
-
-

Error History

-
-
- -
-
- -
-
-
-
- -
-
-
ReZygisk
@@ -209,7 +185,7 @@

Error History

-
+
Error History @@ -306,9 +282,27 @@

Error History

- + + +
+
+
+ +
+
Error History
+
+
+
+
COPY
+
CLEAR ALL LOG
+
+ +
+
+ + -