Skip to content

Commit 4342b9a

Browse files
novaxproStefanie Hein
and
Stefanie Hein
authored
Brand color v2 74215 (#48)
* Vars: tweak default list-view selected color to be a little darker than the hover color. See #74215 * List-View: reset hover and selected styles to use the gray color scheme. If hover/selected needs to be different override the variables in the theme. See #74215 * Add compiled code * Label: remove special treatment of the empty label in selected rows, we will just keep the default style. See #74215 * Add compiled code --------- Co-authored-by: Stefanie Hein <stefanie.hein@the-elements.de>
1 parent 0070cbc commit 4342b9a

File tree

4 files changed

+9
-16
lines changed

4 files changed

+9
-16
lines changed

public/cui_fylr.css

Lines changed: 3 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/scss/themes/fylr/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ $list-view-move-handle-width: 14px !default; // ! must be explicit size in px
514514
$list-view-move-target-area-background: rgba(theme-color('focused'), 0.5) !default;
515515
$list-view-selected-row-border-width: 1px !default;
516516
$list-view-selected-row-border-color: theme-color('primary') !default;
517-
$list-view-selected-row-background: rgba(gray('400'), 0.3) !default;
517+
$list-view-selected-row-background: gray('300') !default;
518518
$list-view-hover-row-background: gray('200') !default;
519519
$list-view-scrolling-box-shadow: 0 1px 5px 0 rgb(0 0 0 / 11%) !default;
520520

src/scss/themes/fylr/components/_list-view.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
// selected
2525
--list-view-selected-row-border-width: 0;
2626
--list-view-selected-row-border-color: transparent;
27-
--list-view-selected-row-background: var(--brand-color, #{$list-view-selected-row-background});
27+
--list-view-selected-row-background: #{$list-view-selected-row-background};
2828
// hover
29-
--list-view-hover-row-background: var(--brand-color, #{$list-view-hover-row-background});
29+
--list-view-hover-row-background: #{$list-view-hover-row-background};
3030

3131

3232
min-height: 0;
@@ -180,7 +180,9 @@
180180
cursor: default;
181181

182182
// be careful to apply a default select state, it's probably best to do this contextually in the theme
183-
&.cui-selected {
183+
&.cui-selected,
184+
&.cui-selected:hover,
185+
&.cui-selected:focus {
184186
> .cui-lv-tr {
185187
box-shadow: inset 0 0 0 var(--list-view-selected-row-border-width) var(--list-view-selected-row-border-color);
186188
background-color: var(--list-view-selected-row-background);

src/scss/themes/fylr/mixins/_labels.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@
101101
color: var(--brand-foreground-text-color, #{$white}); // e.g. Datamodel or Locationmanager when adding a new object type or mask in the left column
102102
opacity: 0.8;
103103
}
104-
105-
.cui-list-view-row-selectable:not(.cui-selected):hover & {
106-
color: gray('900'); // e.g. Datamodel when adding a new object type or mask in the left column
107-
opacity: 0.8;
108-
}
109104
}
110105

111106
// Label in a field

0 commit comments

Comments
 (0)