Skip to content
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.

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

CSS - Material Symbols / Dark Mode plugin. #1859

Closed
wants to merge 94 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
b81f236
Initial;
cityremade Jan 20, 2025
4ac385a
Admin - icon replaced with material symbols;
cityremade Jan 20, 2025
6ffa7ec
Fullscreen map icon replaced with material symbol;
cityremade Jan 20, 2025
ffa0985
material symbol css + minor adjustments on default view;
cityremade Jan 20, 2025
7485c9e
Locator - now using material symbol;
cityremade Jan 20, 2025
48012af
Link button - now using material symbol;
cityremade Jan 20, 2025
12d7a29
Zoom buttons - now using material symbols;
cityremade Jan 20, 2025
aa6e76c
Zoom to area - now using material symbols;
cityremade Jan 20, 2025
b776c9b
Listview - expander and hide grouped layers now material symbols;
cityremade Jan 20, 2025
01946ed
Toggle icon now a material symbol;
cityremade Jan 20, 2025
a763188
Expander chevrons - now material symbols;
cityremade Jan 20, 2025
513d506
Location toolbar - now using material symbols;
cityremade Jan 20, 2025
ee26829
Boolean - now using material symbols;
cityremade Jan 20, 2025
4ef2141
Cloudinary - icons now material symbols;
cityremade Jan 20, 2025
5283b27
Reports - missing closing tag;
cityremade Jan 20, 2025
5be74eb
Link - icons now material symbols;
cityremade Jan 20, 2025
01c2921
image preview - icon now material symbol;
cityremade Jan 20, 2025
6bce8d3
Card - material symbol;
cityremade Jan 20, 2025
d16578a
Dialog - now material symbols;
cityremade Jan 20, 2025
46ee412
Title and tooltip - now with material symbols;
cityremade Jan 20, 2025
e50de65
Btn panel - now using material symbols;
cityremade Jan 20, 2025
987309d
Feature info - now material symbol in use;
cityremade Jan 20, 2025
edc4247
Fullscreen icon;
cityremade Jan 20, 2025
ffd54a7
View - location header icons now material symbols;
cityremade Jan 20, 2025
18e873b
css - clean up;
cityremade Jan 20, 2025
ab75987
css - ui - cleanup;
cityremade Jan 20, 2025
4f7a82b
Layer view header - symbol adjustment.
cityremade Jan 20, 2025
a488870
ui - altered button.active style.
cityremade Jan 20, 2025
e2f4e0f
Layerview - reduced padding;
cityremade Jan 21, 2025
8301840
Dialog - removed duplicated icon name;
cityremade Jan 21, 2025
0b4d1bf
Merge branch 'minor' into material_icons_included
cityremade Jan 21, 2025
0893103
css - line-height property on expander;
cityremade Jan 21, 2025
de1eb8a
'expander' class renamed to 'caret'
cityremade Jan 22, 2025
6401f2a
Added legacy stylesheet which will hold classes for older plugins
cityremade Jan 22, 2025
d1df952
Dropdown - pointer events restored;
cityremade Jan 22, 2025
7d92efc
Dark mode css restructured;
cityremade Jan 23, 2025
941aa99
Merge branch 'minor' into material_icons_included
RobAndrewHurst Jan 23, 2025
1025119
Fix eslint issue and commit css build
RobAndrewHurst Jan 23, 2025
9bbc8e2
Merge branch 'minor' into material_icons_included
RobAndrewHurst Jan 23, 2025
7ee3b6b
css build
RobAndrewHurst Jan 23, 2025
b33e095
Merge branch 'minor' into material_icons_included
RobAndrewHurst Jan 23, 2025
41e9e0c
Fix eslint
RobAndrewHurst Jan 23, 2025
af56896
Test
RobAndrewHurst Jan 23, 2025
f75c5c1
Fix eslint
RobAndrewHurst Jan 23, 2025
9234540
Fix eslint
RobAndrewHurst Jan 23, 2025
a323979
Eslint
RobAndrewHurst Jan 23, 2025
fc3843d
eslint fix
RobAndrewHurst Jan 23, 2025
650cb7d
Tabview - dark mode css;
cityremade Jan 23, 2025
066437d
Boolean entry - css class update;
cityremade Jan 23, 2025
cbc87dd
Merge branch 'material_icons_included' into dark_mode_plugin
cityremade Jan 23, 2025
d7483d4
Material symbols - removed redundant class;
cityremade Jan 23, 2025
c4beb02
Removed redundant clause;
cityremade Jan 23, 2025
c20491c
Merge minor;
cityremade Jan 24, 2025
eaca7e6
Merge branch 'minor' into material_icons_included
RobAndrewHurst Jan 24, 2025
08ec38c
Merge branch 'material_icons_included' into dark_mode_plugin
cityremade Jan 24, 2025
ea4d9c8
Hidden on mobile classes moved to common stylesheet.
cityremade Jan 24, 2025
7112d13
Selector typo;
cityremade Jan 24, 2025
a83357d
Default view - removed classes;
cityremade Jan 24, 2025
baee527
Classes relocated;
cityremade Jan 24, 2025
e0d2952
Common - added media queries;
cityremade Jan 24, 2025
bda32a8
Test view css;
cityremade Jan 24, 2025
5f75e2a
Resolved conflicts with minor;
cityremade Jan 27, 2025
b6d6f3b
Dark mode added to dictionary;
cityremade Jan 27, 2025
1203486
Merge branch 'minor' into dark_mode_plugin
RobAndrewHurst Jan 27, 2025
d509250
Merge branch 'minor' into dark_mode_plugin
cityremade Jan 27, 2025
d0c7413
Merge branch 'dark_mode_plugin' of https://github.com/cityremade/xyz …
cityremade Jan 27, 2025
85f069b
cookie - resolved merge with minor;
cityremade Jan 27, 2025
254a16f
Listview - class replaced;
cityremade Jan 28, 2025
600cb9f
Link button - remove redundant class;
cityremade Jan 28, 2025
2fddd1d
Listview - inline class fix;
cityremade Jan 28, 2025
549fa00
Button - removed classes stored in legacy stylesheet.
cityremade Jan 28, 2025
203281f
Tabview css;
cityremade Jan 28, 2025
34f8435
Tabview - removed bold button font from dark mode;
cityremade Jan 28, 2025
d4e40b9
close button now a class with immediate content and styling.
cityremade Jan 29, 2025
901d291
Default view - active box shadow removed;
cityremade Jan 29, 2025
7868a48
Link button doc;
cityremade Jan 29, 2025
e24f746
Link button icon;
cityremade Jan 29, 2025
f1ec521
alert-confirm - removed excessive padding on <p> tags.
cityremade Jan 30, 2025
c290df8
Merge minor;
cityremade Jan 30, 2025
61424e1
pl - dictionary update;
cityremade Jan 30, 2025
75d0935
Rebuilt css;
cityremade Jan 30, 2025
619033c
Checkbox element clean up;
cityremade Jan 30, 2025
b7514cd
Dropdown - now arrow flips;
cityremade Jan 30, 2025
3c11a85
Dropdown - arrow colour;
cityremade Jan 30, 2025
ad12317
btnPanel - icon argument renamed to icon_name;
cityremade Jan 30, 2025
cc60340
Link button - material icons now not replacable;
cityremade Jan 30, 2025
c58fb62
Mapp css rebuilt;
cityremade Jan 30, 2025
5e854cb
All colour variables in one stylesheet.
cityremade Jan 30, 2025
ccef7b9
Dark mode moved into one stylesheet;
cityremade Jan 30, 2025
878cec2
Removed duplicate selector;
cityremade Jan 30, 2025
8e1c2aa
Removed legacy stylesheet as no longer needed.
cityremade Jan 30, 2025
b4bed09
Locationview cleanup;
cityremade Jan 30, 2025
a019142
Update dark_mode module reference for docoumentation
dbauszus-glx Jan 31, 2025
cb21af2
Link button - default icon changed;
cityremade Jan 31, 2025
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
Prev Previous commit
Next Next commit
Dropdown - now arrow flips;
cityremade committed Jan 30, 2025
commit b7514cd15593c13a822cecd6c98beeb0aa9038f9
2 changes: 1 addition & 1 deletion lib/ui/elements/dropdown.mjs
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ export default (params) => {
class="dropdown">
<div class="head" onclick=${params.headerOnClick}>
<span>${headerSpan}</span>
<div class="icon"></div>
<span class="material-symbols-outlined"/>
</div>
${params.ul}`;

36 changes: 25 additions & 11 deletions public/css/elements/_dropdown.css
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
width: 100%;
overflow: visible;
position: relative;
background-color: white;
background-color: var(--color-light);
box-shadow: var(--color-mid) 0px 8px 24px;

&:disabled {
@@ -22,11 +22,15 @@
text-overflow: ellipsis;
}

& > .icon {
> .material-symbols-outlined {
pointer-events: none;
margin-left: auto;
width: 1.5em;
content: url('../../icons/icon-drop-down.svg');

&:after {
color: var(--color-primary);
content: 'arrow_drop_down';
}
}
}

@@ -40,7 +44,7 @@
box-shadow: 1px 1px 3px var(--color-primary-light);
margin-top: -1px;
text-align: left;
background-color: white;
background-color: var(--color-light);
z-index: 997;

& > li {
@@ -67,11 +71,13 @@
}
}

&.active > ul {
display: block;
&.active {
& > ul {
display: block;
}

& > .head > .icon {
content: url('../../icons/icon-drop-up.svg');
& > .head > .material-symbols-outlined:after {
content: 'arrow_drop_up';
}
}

@@ -84,7 +90,7 @@
.dropdown {
box-shadow: none;

& > .head > .icon {
& > .head > .material-symbols-outlined {
display: none;
}
}
@@ -97,14 +103,22 @@ html.dark-mode {
&.active .head {
background: var(--dm-color-on);
}
ul .label {
background-color: var(--dm-color-dark-faded);

ul {
&.label {
background-color: var(--dm-color-dark-faded);
}
}

ul > li,
.head {
background: var(--dm-color-medium);
color: var(--dm-color-light);
border-color: var(--dm-color-dark-faded);

> .material-symbols-outlined:after {
color: var(--color-light);
}
}

ul > li {
32 changes: 21 additions & 11 deletions public/css/ui.css
Original file line number Diff line number Diff line change
@@ -1444,7 +1444,7 @@ html.dark-mode {
width: 100%;
overflow: visible;
position: relative;
background-color: white;
background-color: var(--color-light);
box-shadow: var(--color-mid) 0px 8px 24px;
&:disabled {
pointer-events: none;
@@ -1460,11 +1460,14 @@ html.dark-mode {
white-space: nowrap;
text-overflow: ellipsis;
}
& > .icon {
> .material-symbols-outlined {
pointer-events: none;
margin-left: auto;
width: 1.5em;
content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">%0A<path d="M7 10l5 5 5-5z"/>%0A</svg>');
&:after {
color: var(--color-primary);
content: "arrow_drop_down";
}
}
}
& > ul {
@@ -1477,7 +1480,7 @@ html.dark-mode {
box-shadow: 1px 1px 3px var(--color-primary-light);
margin-top: -1px;
text-align: left;
background-color: white;
background-color: var(--color-light);
z-index: 997;
& > li {
padding: 5px;
@@ -1499,10 +1502,12 @@ html.dark-mode {
background-color: var(--color-primary);
}
}
&.active > ul {
display: block;
& > .head > .icon {
content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">%0A<path d="M7 14l5-5 5 5z"/>%0A</svg>');
&.active {
& > ul {
display: block;
}
& > .head > .material-symbols-outlined:after {
content: "arrow_drop_up";
}
}
&.dropdown-reverse > ul {
@@ -1512,7 +1517,7 @@ html.dark-mode {
@media print {
.dropdown {
box-shadow: none;
& > .head > .icon {
& > .head > .material-symbols-outlined {
display: none;
}
}
@@ -1523,14 +1528,19 @@ html.dark-mode {
&.active .head {
background: var(--dm-color-on);
}
ul .label {
background-color: var(--dm-color-dark-faded);
ul {
&.label {
background-color: var(--dm-color-dark-faded);
}
}
ul > li,
.head {
background: var(--dm-color-medium);
color: var(--dm-color-light);
border-color: var(--dm-color-dark-faded);
> .material-symbols-outlined:after {
color: var(--color-light);
}
}
ul > li {
&:hover {