Skip to content

Commit

Permalink
Merge pull request #16182 from opf/fix/56463-font-color-for-primary-b…
Browse files Browse the repository at this point in the history
…uttons

[56463] Apply calcualted font color of primary buttons also on the primer buttons
  • Loading branch information
ulferts authored Jul 18, 2024
2 parents e2e1fb7 + 4c66a90 commit d88c6f5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
1 change: 1 addition & 0 deletions app/views/custom_styles/_primer_color_mapping.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
--control-checked-bgColor-active: var(--control-checked-color) !important;
--control-checked-bgColor-hover: var(--control-checked-color--major1) !important;
--controlKnob-borderColor-checked: var(--control-checked-color) !important;
--button-primary-fgColor-rest: var(--button--primary-font-color) !important;
--button-primary-bgColor-rest: var(--button--primary-background-color) !important;
--button-primary-bgColor-hover: var(--button--primary-background-hover-color) !important;
--button-primary-bgColor-disabled: var(--button--primary-background-disabled-color) !important;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,21 @@
margin-bottom: 20px

.group-head
color: var(--font-color-on-primary-dark)
color: var(--fgColor-white)
padding: 7px 4px 8px 0px
text-transform: uppercase
.group-handle
cursor: -webkit-grab
cursor: grab
color: var(--font-color-on-primary-dark)
color: var(--fgColor-white)
font-size: 12px
op-group-edit-in-place
display: inline-block
.group-edit-in-place--input
color: var(--fgColor-white)
.delete-group:before
vertical-align: bottom
color: var(--font-color-on-primary-dark)
color: var(--fgColor-white)
.attributes
min-height: 29px

Expand All @@ -30,8 +32,7 @@
&:hover
cursor: text
border-color: var(--inplace-edit--border-color)
background: white
color: #222222
background: var(--control-bgColor-activ)

.delete-group,
.delete-attribute
Expand All @@ -43,7 +44,7 @@
border-color: var(--content-form-error-color)
.group-handle,
.delete-group:before
color: var(--font-color-on-primary)
color: var(--fgColor-white)


#type-form-conf-inactive-group
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
--accent-color--minor2: #a3c2da;
--accent-color--dark-mode: #4493f8;
--font-color-on-primary: #FFFFFF;
--font-color-on-primary-dark: #FFFFFF;
--font-color-on-secondary: #FFFFFF;
--font-color-on-alternative: #FFFFFF;
--list-side-margin: 40px;
--header-height: 55px;
--header-bg-color: #1A67A3;
Expand Down

0 comments on commit d88c6f5

Please sign in to comment.