diff --git a/README.md b/README.md index 0cff8b6..d868df4 100644 --- a/README.md +++ b/README.md @@ -76,3 +76,7 @@ _If no options are used, a user interface `dialog` will show up instead_ ### Slaze grub theme: ![Slaze](screenshots/grub-theme-slaze.jpg?raw=true) + +## Documents +http://wiki.rosalab.ru/en/index.php/Grub2_theme_/_reference +http://wiki.rosalab.ru/en/index.php/Grub2_theme_tutorial diff --git a/assets/assets-color/icons-1080p/artix.png b/assets/assets-color/icons-1080p/artix.png index ad8a1ce..e56357d 100644 Binary files a/assets/assets-color/icons-1080p/artix.png and b/assets/assets-color/icons-1080p/artix.png differ diff --git a/assets/assets-color/icons-1080p/kernel.png b/assets/assets-color/icons-1080p/kernel.png new file mode 100644 index 0000000..47a92fc Binary files /dev/null and b/assets/assets-color/icons-1080p/kernel.png differ diff --git a/assets/assets-color/icons-2k/artix.png b/assets/assets-color/icons-2k/artix.png index 6f75158..9802ed3 100644 Binary files a/assets/assets-color/icons-2k/artix.png and b/assets/assets-color/icons-2k/artix.png differ diff --git a/assets/assets-color/icons-2k/kernel.png b/assets/assets-color/icons-2k/kernel.png new file mode 100644 index 0000000..434e66a Binary files /dev/null and b/assets/assets-color/icons-2k/kernel.png differ diff --git a/assets/assets-color/icons-4k/artix.png b/assets/assets-color/icons-4k/artix.png index d880fe8..dc22b66 100644 Binary files a/assets/assets-color/icons-4k/artix.png and b/assets/assets-color/icons-4k/artix.png differ diff --git a/assets/assets-color/icons-4k/kernel.png b/assets/assets-color/icons-4k/kernel.png new file mode 100644 index 0000000..a5ab3cd Binary files /dev/null and b/assets/assets-color/icons-4k/kernel.png differ diff --git a/assets/assets-white/icons-1080p/kernel.png b/assets/assets-white/icons-1080p/kernel.png new file mode 100644 index 0000000..286f9d5 Binary files /dev/null and b/assets/assets-white/icons-1080p/kernel.png differ diff --git a/assets/assets-white/icons-2k/kernel.png b/assets/assets-white/icons-2k/kernel.png new file mode 100644 index 0000000..8173410 Binary files /dev/null and b/assets/assets-white/icons-2k/kernel.png differ diff --git a/assets/assets-white/icons-4k/kernel.png b/assets/assets-white/icons-4k/kernel.png new file mode 100644 index 0000000..30178e7 Binary files /dev/null and b/assets/assets-white/icons-4k/kernel.png differ diff --git a/assets/assets-whitesur/icons-1080p/artix.png b/assets/assets-whitesur/icons-1080p/artix.png new file mode 100644 index 0000000..a2dc106 Binary files /dev/null and b/assets/assets-whitesur/icons-1080p/artix.png differ diff --git a/assets/assets-whitesur/icons-1080p/kernel.png b/assets/assets-whitesur/icons-1080p/kernel.png new file mode 100644 index 0000000..a9f89fa Binary files /dev/null and b/assets/assets-whitesur/icons-1080p/kernel.png differ diff --git a/assets/assets-whitesur/icons-1080p/lang.png b/assets/assets-whitesur/icons-1080p/lang.png index a53e6ff..97d60a6 100644 Binary files a/assets/assets-whitesur/icons-1080p/lang.png and b/assets/assets-whitesur/icons-1080p/lang.png differ diff --git a/assets/assets-whitesur/icons-2k/artix.png b/assets/assets-whitesur/icons-2k/artix.png new file mode 100644 index 0000000..46fca0c Binary files /dev/null and b/assets/assets-whitesur/icons-2k/artix.png differ diff --git a/assets/assets-whitesur/icons-2k/kernel.png b/assets/assets-whitesur/icons-2k/kernel.png new file mode 100644 index 0000000..b858e0c Binary files /dev/null and b/assets/assets-whitesur/icons-2k/kernel.png differ diff --git a/assets/assets-whitesur/icons-2k/lang.png b/assets/assets-whitesur/icons-2k/lang.png index ab98a3f..0ed8ef0 100644 Binary files a/assets/assets-whitesur/icons-2k/lang.png and b/assets/assets-whitesur/icons-2k/lang.png differ diff --git a/assets/assets-whitesur/icons-4k/artix.png b/assets/assets-whitesur/icons-4k/artix.png new file mode 100644 index 0000000..ce37fa3 Binary files /dev/null and b/assets/assets-whitesur/icons-4k/artix.png differ diff --git a/assets/assets-whitesur/icons-4k/kernel.png b/assets/assets-whitesur/icons-4k/kernel.png new file mode 100644 index 0000000..8b7476a Binary files /dev/null and b/assets/assets-whitesur/icons-4k/kernel.png differ diff --git a/assets/assets-whitesur/icons-4k/lang.png b/assets/assets-whitesur/icons-4k/lang.png index 3c9c1d7..a66067b 100644 Binary files a/assets/assets-whitesur/icons-4k/lang.png and b/assets/assets-whitesur/icons-4k/lang.png differ diff --git a/assets/logos-color.svg b/assets/logos-color.svg index c25102c..2cb3039 100644 --- a/assets/logos-color.svg +++ b/assets/logos-color.svg @@ -23,7 +23,7 @@ image/svg+xml - + @@ -39,16 +39,16 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="706" + inkscape:window-width="1024" + inkscape:window-height="523" id="namedview373" showgrid="false" - inkscape:zoom="1.4142136" - inkscape:cx="96.568807" - inkscape:cy="238.23102" - inkscape:window-x="0" - inkscape:window-y="28" - inkscape:window-maximized="1" + inkscape:zoom="5.6568542" + inkscape:cx="-29.887724" + inkscape:cy="149.4913" + inkscape:window-x="480" + inkscape:window-y="326" + inkscape:window-maximized="0" inkscape:current-layer="svg371" inkscape:document-rotation="0"> + + + + diff --git a/assets/logos-white.svg b/assets/logos-white.svg index 38b4f98..d566592 100644 --- a/assets/logos-white.svg +++ b/assets/logos-white.svg @@ -35,18 +35,26 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1550" - inkscape:window-height="974" + inkscape:window-width="1366" + inkscape:window-height="708" id="namedview455" - showgrid="false" - inkscape:zoom="1.2993087" - inkscape:cx="284.46505" - inkscape:cy="173.67381" + showgrid="true" + inkscape:zoom="3.675" + inkscape:cx="41.009638" + inkscape:cy="187.98203" inkscape:window-x="0" - inkscape:window-y="31" - inkscape:window-maximized="0" + inkscape:window-y="28" + inkscape:window-maximized="1" inkscape:current-layer="svg453" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + inkscape:snap-bbox="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:snap-nodes="false"> + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/logos.txt b/assets/logos.txt index eeda24d..1d96ebb 100644 --- a/assets/logos.txt +++ b/assets/logos.txt @@ -40,6 +40,7 @@ SystemRescueCD regolith neon artix +kernel recovery restart diff --git a/assets/render-assets.sh b/assets/render-assets.sh index e0a78fa..5c8c44e 100755 --- a/assets/render-assets.sh +++ b/assets/render-assets.sh @@ -1,7 +1,6 @@ #!/bin/bash INKSCAPE="/usr/bin/inkscape" -OPTIPNG="/usr/bin/optipng" if [[ "$1" == "select" ]]; then EXPORT_TYPE="select" @@ -40,7 +39,6 @@ while read -r i; do "--export-dpi=$EXPORT_DPI" \ "--export-id-only" \ "--export-filename=$ASSETS_DIR/$i.png" "$SRC_FILE" >/dev/null - $OPTIPNG -o7 --quiet "$ASSETS_DIR/$i.png" fi done < "$INDEX" diff --git a/install.sh b/install.sh index f382480..de45975 100755 --- a/install.sh +++ b/install.sh @@ -127,8 +127,8 @@ install() { else #Append GRUB_FONT echo "GRUB_FONT=/boot/efi/EFI/fedora/fonts/unicode.pf2" >> /etc/default/grub - fi - fi + fi + fi if grep "GRUB_THEME=" /etc/default/grub 2>&1 >/dev/null; then #Replace GRUB_THEME @@ -555,4 +555,4 @@ elif [[ "${remove:-}" == 'true' ]]; then done fi -exit 0 +exit 1