diff options
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | SPEC.md | 6 | ||||
| -rw-r--r-- | icons/slackware.svg | 4 | ||||
| -rwxr-xr-x | install.sh | 12 | ||||
| -rw-r--r-- | styles/modules.css | 8 |
5 files changed, 24 insertions, 14 deletions
@@ -57,9 +57,11 @@ gradient and are not recolourable. That is intended here: icons match the rest of the desktop rather than the bar. The two icons this repo ships are the exception, because the icon theme has -neither. `icons/slackware.svg` (Simple Icons, CC0) is single-path monochrome -and takes the udt accent at install time. The two flags keep their national -colours. +neither. `icons/slackware.svg` (Simple Icons, CC0) is single-path monochrome, +so `install.sh` tints it from the palette. It is filled with the bar's +background colour rather than the accent, because it sits on the accent pill +and the accent would render it invisible against itself. The two flags keep +their national colours. ## Layout @@ -105,8 +105,10 @@ behaviour here: they match every other application on the desktop. The two icons this repo ships are the exception. `slackware.svg` (from Simple Icons) and the two flags are single-path monochrome, so `slackware.svg` -is tinted with the udt accent by a one-line `fill` substitution at install -time. The flags keep their national colours. +is tinted by a one-line `fill` substitution at install time. It takes the +bar's background colour, not the accent: it sits on the accent pill, and +filling it with the accent puts it on top of itself. The flags keep their +national colours. ## Repository layout diff --git a/icons/slackware.svg b/icons/slackware.svg index c0f42cf..0b1f633 100644 --- a/icons/slackware.svg +++ b/icons/slackware.svg @@ -1,5 +1,7 @@ <!-- Slackware logo, from Simple Icons (CC0 1.0 Universal). - @ACCENT@ is substituted by install.sh with the udt accent colour. --> + @ACCENT@ is substituted by install.sh. The mark sits on the accent pill, + so it is filled with the bar's background colour, not the accent: the + accent would put it on top of itself and render it invisible. --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"> <path fill="@ACCENT@" d="M12.924 1.228c-.584-.01-1.251 0-1.485.027-2.46.282-4.138 1.3-4.753 2.891-.218.552-.274 1.002-.243 1.772.048 1.21.419 2.004 1.262 2.742 1.225 1.06 2.98 1.508 5.998 1.508 2.737 0 3.71.413 3.916 1.675.313 1.867-1.57 3.07-4.414 2.827-1.878-.16-3.496-.912-4.223-1.967a7.772 7.772 0 01-.355-.62c-.382-.76-.64-.978-1.176-.978-.43.005-.732.165-.918.494l-.133.24v4.03l.137.296c.165.344.4.546.744.63.35.09.794-.036 1.42-.402l.5-.29.826.185c1.82.403 2.75.523 4.065.523 1.103.005 1.548-.046 2.455-.285 1.124-.297 1.974-.785 2.717-1.57.8-.844 1.15-1.853 1.097-3.147-.069-1.628-.695-2.698-2-3.414-.96-.525-2.292-.79-4.377-.88-2.042-.086-2.794-.155-3.515-.32-.51-.12-.785-.25-1.076-.515-.653-.589-.59-1.755.136-2.482.642-.637 1.511-.928 2.774-.928 1.432.005 2.393.27 3.412.955.185.127.721.62 1.193 1.092.886.902 1.135 1.082 1.506 1.082.244 0 .59-.163.732-.344.26-.329.303-.63.303-2.2 0-1.66-.043-1.91-.377-2.282-.387-.425-.848-.42-1.75.031l-.59.297-.63-.17c-1.496-.392-2.038-.477-3.178-.504zM0 13.775v9h24v-1H1v-8z"/> </svg> @@ -101,11 +101,13 @@ done sed -e "s|@ICONS@|$icons|g" -e "s|@CONFIG@|$target|g" \ "$repo/styles/modules.css" > "$target/styles/modules.css" -# The flags ship as they are; the Slackware mark is monochrome, so it takes -# the accent. Read from the generated palette rather than restated here. -accent="$(sed -n 's/^@define-color accent *\(.*\);$/\1/p' "$target/styles/theme.css" | head -1)" -accent="${accent:-#b7bdf8}" -sed "s|@ACCENT@|$accent|" "$repo/icons/slackware.svg" > "$target/slackware.svg" +# The flags ship as they are; the Slackware mark is monochrome, so it is +# tinted here. It sits ON the accent pill, so it takes the bar's background +# colour rather than the accent: filled with the accent it would be invisible +# against its own pill, which is exactly what the first version did. +mark="$(sed -n 's/^@define-color main-bg *\(.*\);$/\1/p' "$target/styles/theme.css" | head -1)" +mark="${mark:-#24273a}" +sed "s|@ACCENT@|$mark|" "$repo/icons/slackware.svg" > "$target/slackware.svg" install -Dm644 "$repo/icons/flag-it.svg" "$target/flag-it.svg" install -Dm644 "$repo/icons/flag-gb.svg" "$target/flag-gb.svg" diff --git a/styles/modules.css b/styles/modules.css index ade8a88..9cc3f5e 100644 --- a/styles/modules.css +++ b/styles/modules.css @@ -11,11 +11,13 @@ * ------------------------------------------------------------------ */ /* The mark itself is the image module's own content, so this only draws the - * pill it sits in. */ + * pill it sits in. The horizontal padding is wider than the vertical so the + * pill reads as a capsule like its neighbours rather than a circle: an image + * module sizes to its icon, where the others size to their text. */ #image.launcher { background: @accent; - padding: 2px 10px; - min-width: 22px; + padding: 2px 14px; + min-width: 20px; } /* The accent pill inverts on hover rather than lightening: it is already the |
