diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd5ae6e..0e664f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,23 +45,6 @@ build:
- dist/*
expire_in: 7 days
-build_logo:
- image: ubuntu:20.04
- stage: test
- before_script:
- - export DEBIAN_FRONTEND=noninteractive
- - apt update && apt install -y inkscape make wget unzip
- - wget 'https://github.com/be5invis/Iosevka/releases/download/v2.3.3/01-iosevka-2.3.3.zip'
- - unzip -d iosevka 01-iosevka-2.3.3.zip
- - mkdir -p ~/.fonts && cp -r iosevka/* ~/.fonts && fc-cache -f
- script:
- - cd docs/logo
- - make
- artifacts:
- paths:
- - docs/logo
- - sublime-music.desktop
-
build_flatpak:
image: registry.gitlab.com/sumner/sublime-music/flatpak-build:latest
stage: build
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 14902f7..c1e2074 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -112,7 +112,6 @@ application to PyPi. A brief description of each of the stages is as follows:
``build``
* Builds the Python dist tar file
- * Compiles the logo to multiple different sizes
* Builds the flatpak.
``deploy``
diff --git a/README.rst b/README.rst
index dcb892d..eb442e2 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-.. image:: https://gitlab.com/sumner/sublime-music/-/raw/master/docs/logo/logo.png
+.. image:: https://gitlab.com/sumner/sublime-music/-/raw/master/logo/logo.png
:alt: Sublime Music Logo
Sublime Music is a GTK3
diff --git a/docs/index.rst b/docs/index.rst
index 7076852..acf523b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,4 @@
-.. image:: ./logo/logo.png
+.. image:: ../logo/logo.png
:width: 800px
:alt: Sublime Music logo
diff --git a/docs/logo/Makefile b/docs/logo/Makefile
deleted file mode 100644
index 608d7ea..0000000
--- a/docs/logo/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-RAW_DIMENS=16 22 24 32 36 48 64 72 96 128 192 512 1024
-DIMENS=$(join $(RAW_DIMENS:%=%x), $(RAW_DIMENS))
-PNGFILES=$(patsubst %, build/%.png, $(DIMENS))
-
-all: $(PNGFILES)
-
-builddir:
- mkdir -p build
-
-build/%.png: icon.svg | builddir
- inkscape -z -e $@ -w $(*F) $<
-
-clean:
- rm -rf build
diff --git a/docs/logo/icon.png b/docs/logo/icon.png
deleted file mode 100644
index 91c424a..0000000
Binary files a/docs/logo/icon.png and /dev/null differ
diff --git a/flatpak/com.sumnerevans.SublimeMusic.json b/flatpak/com.sumnerevans.SublimeMusic.json
index 066e06e..2f24b89 100644
--- a/flatpak/com.sumnerevans.SublimeMusic.json
+++ b/flatpak/com.sumnerevans.SublimeMusic.json
@@ -42,22 +42,22 @@
"name": "icons",
"buildsystem": "simple",
"build-commands": [
- "install -Dm644 16x16.png /app/share/icons/hicolor/16x16/apps/sublime-music.png",
- "install -Dm644 22x22.png /app/share/icons/hicolor/22x22/apps/sublime-music.png",
- "install -Dm644 32x32.png /app/share/icons/hicolor/32x32/apps/sublime-music.png",
- "install -Dm644 36x36.png /app/share/icons/hicolor/36x36/apps/sublime-music.png",
- "install -Dm644 48x48.png /app/share/icons/hicolor/48x48/apps/sublime-music.png",
- "install -Dm644 64x64.png /app/share/icons/hicolor/64x64/apps/sublime-music.png",
- "install -Dm644 72x72.png /app/share/icons/hicolor/72x72/apps/sublime-music.png",
- "install -Dm644 96x96.png /app/share/icons/hicolor/96x96/apps/sublime-music.png",
- "install -Dm644 128x128.png /app/share/icons/hicolor/128x128/apps/sublime-music.png",
- "install -Dm644 192x192.png /app/share/icons/hicolor/192x192/apps/sublime-music.png",
- "install -Dm644 512x512.png /app/share/icons/hicolor/512x512/apps/sublime-music.png"
+ "install -Dm644 16.png /app/share/icons/hicolor/16x16/apps/sublime-music.png",
+ "install -Dm644 22.png /app/share/icons/hicolor/22x22/apps/sublime-music.png",
+ "install -Dm644 32.png /app/share/icons/hicolor/32x32/apps/sublime-music.png",
+ "install -Dm644 36.png /app/share/icons/hicolor/36x36/apps/sublime-music.png",
+ "install -Dm644 48.png /app/share/icons/hicolor/48x48/apps/sublime-music.png",
+ "install -Dm644 64.png /app/share/icons/hicolor/64x64/apps/sublime-music.png",
+ "install -Dm644 72.png /app/share/icons/hicolor/72x72/apps/sublime-music.png",
+ "install -Dm644 96.png /app/share/icons/hicolor/96x96/apps/sublime-music.png",
+ "install -Dm644 128.png /app/share/icons/hicolor/128x128/apps/sublime-music.png",
+ "install -Dm644 192.png /app/share/icons/hicolor/192x192/apps/sublime-music.png",
+ "install -Dm644 512.png /app/share/icons/hicolor/512x512/apps/sublime-music.png"
],
"sources": [
{
"type": "dir",
- "path": "../docs/logo/build"
+ "path": "../logo/rendered"
}
]
},
diff --git a/logo/Makefile b/logo/Makefile
new file mode 100644
index 0000000..be51ca1
--- /dev/null
+++ b/logo/Makefile
@@ -0,0 +1,13 @@
+DIMENS=16 22 24 32 36 48 64 72 96 128 192 512 1024
+PNGFILES=$(patsubst %, rendered/%.png, $(DIMENS))
+
+all: $(PNGFILES)
+
+rendereddir:
+ mkdir -p rendered
+
+rendered/%.png: icon.svg | rendereddir
+ inkscape --export-filename=$@ -w $(*F) $<
+
+clean:
+ rm -rf rendered
diff --git a/logo/icon.png b/logo/icon.png
new file mode 100644
index 0000000..c18c3ae
Binary files /dev/null and b/logo/icon.png differ
diff --git a/docs/logo/icon.svg b/logo/icon.svg
similarity index 89%
rename from docs/logo/icon.svg
rename to logo/icon.svg
index a639a60..7b5064a 100644
--- a/docs/logo/icon.svg
+++ b/logo/icon.svg
@@ -7,17 +7,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:export-ydpi="287.20221"
- inkscape:export-xdpi="287.20221"
- inkscape:export-filename="/home/sumner/projects/sublime-music/docs/logo/icon.png"
- height="190.5"
- width="190.5"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- sodipodi:docname="icon.svg"
- version="1.1"
- viewBox="0 0 190.5 190.49999"
+ id="Layer_1"
data-name="Layer 1"
- id="Layer_1">
+ viewBox="0 0 190.5 190.49999"
+ version="1.1"
+ sodipodi:docname="icon.svg"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ width="190.5"
+ height="190.5"
+ inkscape:export-filename="/home/sumner/projects/sublime-music/logo/icon.png"
+ inkscape:export-xdpi="287.20221"
+ inkscape:export-ydpi="287.20221">
@@ -31,30 +31,30 @@
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1196"
+ inkscape:window-height="926"
+ id="namedview35"
+ showgrid="false"
+ inkscape:zoom="3.776"
+ inkscape:cx="-37.909753"
+ inkscape:cy="52.632917"
+ inkscape:window-x="2560"
+ inkscape:window-y="992"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="Layer_1"
+ fit-margin-top="11.61"
+ fit-margin-left="5"
+ fit-margin-right="5"
+ fit-margin-bottom="11.61"
+ inkscape:document-rotation="0" />