Skip to content

Recolour hybrid nodes to avoid visually clashing with the darkened background of selecting a focus #1821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Purplegaze wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Recolour hybrid nodes to avoid visually clashing with the darkened background of selecting a focus #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c08a9a
yes
Purplegaze Oct 23, 2026
a6e86e5
revert accidental newline
Purplegaze Oct 23, 2026
a38c00e
fourmolu
Purplegaze Oct 23, 2026
b7e543f
remove redundant css rule
Purplegaze Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### ✨ New features/enhancements

- Changed the colour of hybrid nodes to avoid a visual clash with the darkened background when selecting a focus

### 🐛 Bug fixes

### 🔧 Internal changes
Expand Down Expand Up @@ -36,6 +38,7 @@
- Refactored `Database.Tables.MeetTime` into `Models.Meeting` and renamed it to `MeetingParsedData`; consolidated and refactored timetable JSON parsing helpers
- Restructured `courseography.cabal` to separate executable from library, extract shared settings, and remove `hlint`
- Refactored `createReqBody` in `app/Config.hs` to use session field from `config.yaml`
- Changed SVG parsing to leave the `fill` column empty when inserting hybrid nodes into the database

## [0.8.1] - 2026-08-10

Expand Down
11 changes: 7 additions & 4 deletions app/Svg/Parser.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ parseGraph key tags =
( not . \s ->
shapePos s `elem` map shapePos shapes
&& isEdge s
&& elem (shapeType_ s) [Node, Hybrid]
&& shapeType_ s == Node
)
shapes

Expand Down Expand Up @@ -736,9 +736,12 @@ updateShape ::
updateShape fill r =
r
{ shapeFill =
if T.null (shapeFill r) || shapeFill r == "none"
then fill
else shapeFill r
let fill' =
( if T.null (shapeFill r) || shapeFill r == "none"
then fill
else shapeFill r
)
in if fill' == "#888888" then "" else fill'
, shapeType_ =
if fill == "#888888"
then Hybrid
Expand Down
20 changes: 17 additions & 3 deletions style/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ $graph-overlay-side-margin: 15px;
// Graph / course-map paths and nodes
--main-path-color: var(--color-black);
--missing-path-color: #c01;
--hybrid-node-fill-color: #888;
--hybrid-node-fill-color: #b7b7b7;
--node-inactive-fill-color: #ccc;

// Course/timetable status colors
Expand Down Expand Up @@ -882,8 +882,9 @@ g.hybrid {
}

g.hybrid > text {
fill: var(--color-white);
fill: var(--color-black);
font-size: 9pt;
font-style: italic;
stroke: none;
text-anchor: middle;
}
Expand All @@ -893,8 +894,21 @@ g.hybrid > rect {
stroke: var(--color-black);
}

g.hybrid.active > rect {
opacity: 1;
}

g.hybrid.active > text {
opacity: 1;
}

g.hybrid.inactive > rect {
stroke-width: 0;
stroke-width: 1;
stroke-dasharray: none;
}

g.hybrid.inactive > text {
opacity: 0.45;
}

g.active > rect {
Expand Down
Loading