Skip to content

Brand color v2 74215 #48

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

Merged
merged 7 commits into from
Feb 19, 2025
Merged

Brand color v2 74215 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b673bb
Vars: tweak default list-view selected color to be a little darker th…
Dec 12, 2024
e0e43ab
List-View: reset hover and selected styles to use the gray color sche…
Dec 12, 2024
783af0d
Add compiled code
Dec 12, 2024
4ae4e4b
Merge branch 'master' into brand-color-v2-74215
Feb 5, 2025
b160239
Label: remove special treatment of the empty label in selected rows, …
Feb 5, 2025
db0db93
Add compiled code
Feb 5, 2025
fca7a7d
Merge branch 'master' into brand-color-v2-74215
novaxpro Feb 19, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions public/cui_fylr.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/scss/themes/fylr/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ $list-view-move-handle-width: 14px !default; // ! must be explicit size in px
$list-view-move-target-area-background: rgba(theme-color('focused'), 0.5) !default;
$list-view-selected-row-border-width: 1px !default;
$list-view-selected-row-border-color: theme-color('primary') !default;
$list-view-selected-row-background: rgba(gray('400'), 0.3) !default;
$list-view-selected-row-background: gray('300') !default;
$list-view-hover-row-background: gray('200') !default;
$list-view-scrolling-box-shadow: 0 1px 5px 0 rgb(0 0 0 / 11%) !default;

Expand Down
8 changes: 5 additions & 3 deletions src/scss/themes/fylr/components/_list-view.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
// selected
--list-view-selected-row-border-width: 0;
--list-view-selected-row-border-color: transparent;
--list-view-selected-row-background: var(--brand-color, #{$list-view-selected-row-background});
--list-view-selected-row-background: #{$list-view-selected-row-background};
// hover
--list-view-hover-row-background: var(--brand-color, #{$list-view-hover-row-background});
--list-view-hover-row-background: #{$list-view-hover-row-background};


min-height: 0;
Expand Down Expand Up @@ -180,7 +180,9 @@
cursor: default;

// be careful to apply a default select state, it's probably best to do this contextually in the theme
&.cui-selected {
&.cui-selected,
&.cui-selected:hover,
&.cui-selected:focus {
> .cui-lv-tr {
box-shadow: inset 0 0 0 var(--list-view-selected-row-border-width) var(--list-view-selected-row-border-color);
background-color: var(--list-view-selected-row-background);
Expand Down
5 changes: 0 additions & 5 deletions src/scss/themes/fylr/mixins/_labels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,6 @@
color: var(--brand-foreground-text-color, #{$white}); // e.g. Datamodel or Locationmanager when adding a new object type or mask in the left column
opacity: 0.8;
}

.cui-list-view-row-selectable:not(.cui-selected):hover & {
color: gray('900'); // e.g. Datamodel when adding a new object type or mask in the left column
opacity: 0.8;
}
}

// Label in a field
Expand Down