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.

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

renamed color var, added new color var, changed bg color of drawer #1007

Merged
merged 5 commits into from
Nov 21, 2023
Merged

renamed color var, added new color var, changed bg color of drawer #1007

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0baba3a
renamed color var, added new color var, changed bg color of drawer
eo-uk Nov 16, 2023
cabe7e9
Merge branch 'main' of github.com:GEOLYTIX/xyz into feat-color-palette
eo-uk Nov 17, 2023
03bf010
styled layer views
eo-uk Nov 17, 2023
18b4898
fixed contrast issues
eo-uk Nov 17, 2023
e6bc41e
fixed sc issue
eo-uk Nov 17, 2023
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
8 changes: 4 additions & 4 deletions public/css/_button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ button {

&.flat {
border-radius: 3px;
border-bottom: 1px solid var(--color-lighter);
border-bottom: 1px solid var(--color-light-secondary);
padding: 0.3em;

&.active {
Expand All @@ -44,8 +44,8 @@ button {

&.raised {
border-radius: 3px;
border: 1px solid var(--color-lighter);
box-shadow: 1px 1px 2px var(--color-lighter);
border: 1px solid var(--color-light-secondary);
box-shadow: 1px 1px 2px var(--color-light-secondary);
padding: 0.3em;

&.active {
Expand Down Expand Up @@ -92,7 +92,7 @@ button {
width: 100%;
padding: 0.3em 0.5em;
background-color: white;
border: 1px solid var(--color-lighter);
border: 1px solid var(--color-light-secondary);
border-radius: 3px;
box-shadow: 1px 1px 3px var(--color-primary-light);

Expand Down
8 changes: 6 additions & 2 deletions public/css/_colours.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@

--color-primary-light: #939faa;

--color-light: #E9E3DD;
--color-light: #ffffff;

--color-lighter: #D5E1E6;
--color-light-secondary: #f2f2f2;

--color-light-tertiary: #fafafa;

--color-mid: #e3e3e3;

--color-on: #E18335;

Expand Down
6 changes: 3 additions & 3 deletions public/css/_drawer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

.drawer {
padding: 5px;
background-color: white;
background-color: var(--color-light-tertiary);

&.expandable:not(.empty)>.header:hover {
cursor: pointer;
Expand Down Expand Up @@ -70,13 +70,13 @@

&.flat {
border-radius: 2px;
border: 1px solid var(--color-lighter);
border: 1px solid var(--color-light-secondary);
}

&.raised {
border-radius: 2px;
box-shadow: 1px 1px 3px var(--color-primary-light);
border: 1px solid var(--color-lighter);
border: 1px solid var(--color-light-secondary);
}

&.raised.empty {
Expand Down
2 changes: 1 addition & 1 deletion public/css/_inputs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ label.checkbox {
}

&>li.selected {
background-color: var(--color-lighter);
background-color: var(--color-light-secondary);
}

& .label {
Expand Down
17 changes: 17 additions & 0 deletions public/css/_layerview.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,21 @@
padding-left: 4px;
padding-right: 4px;
}
}

#layers>.drawer.layer-group .drawer.layer-view {
background: var(--color-light);
border: none;
box-shadow: none;
border-top: 2px solid var(--color-light-secondary);
}

#layers>.layer-view>.drawer,
#layers .drawer.layer-view .drawer {
border: none;
box-shadow: none;
}

#layers>.layer-view>.drawer {
background: var(--color-light);
}
5 changes: 4 additions & 1 deletion public/css/_locationview.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
grid-template-columns: 1fr 1fr;

& pre {
background-color: var(--color-lighter);
background-color: var(--color-light-secondary);
}

& .contents {
Expand Down Expand Up @@ -67,7 +67,10 @@
cursor: help;
border-radius: 2px;
font-weight: bold;
font-size: 0.8em;
color: black;
background-color: var(--color-light);
background: #e3e3e3;
}
}

Expand Down
2 changes: 1 addition & 1 deletion public/css/_tabview.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
height: 50px;
overflow-x: auto;
display: flex;
background-color: var(--color-light);
background-color: var(--color-light-secondary);

& > .tab > .header {
height: 100%;
Expand Down
2 changes: 1 addition & 1 deletion public/css/_ui.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
}

.lighter-background {
background-color: var(--color-lighter);
background-color: var(--color-light-secondary);
}

.off-black {
Expand Down
5 changes: 3 additions & 2 deletions public/css/mapp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
--color-off-black: #3f3f3f;
--color-primary: #003D57;
--color-primary-light: #939faa;
--color-light: #E9E3DD;
--color-lighter: #D5E1E6;
--color-light: #ffffff;
--color-light-secondary: #f2f2f2;
--color-light-tertiary: #fafafa;
--color-on: #E18335;
--color-no: #A21309;
}
Expand Down
413 changes: 216 additions & 197 deletions public/css/ui.css
View file
Open in desktop

Large diffs are not rendered by default.