Skip to content

creative + product coloring #1356

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
snide merged 11 commits into from
Dec 11, 2018
Merged

creative + product coloring #1356

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1f4a48c
creative + product = synergy
snide Dec 7, 2018
ec18dea
fd images update
snide Dec 10, 2018
7ae3990
adjust popover titles, tabs and steps
snide Dec 10, 2018
10e0f98
fix tabs and badges
snide Dec 10, 2018
5fcf4d9
remove hues from switch/checkox. add placeholder coloring
snide Dec 10, 2018
bd4c1ae
palette coloring
snide Dec 10, 2018
c387965
forgot about steps
snide Dec 10, 2018
ac0f840
feedback
snide Dec 11, 2018
9bc63ce
revert bit of horiz steps
snide Dec 11, 2018
9d010da
Merge remote-tracking branch 'upstream/master' into brand/colors
snide Dec 11, 2018
e66f926
cl
snide Dec 11, 2018
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
7 changes: 4 additions & 3 deletions src-docs/src/images/buttons.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 15 additions & 14 deletions src-docs/src/images/cards.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src-docs/src/images/flexgrid.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions src-docs/src/images/forms.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src-docs/src/images/icons.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 7 additions & 6 deletions src-docs/src/images/tables.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/badge/_badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
// Modifier naming and colors.
$badgeTypes: (
default: $euiColorLightShade,
primary: lighten(desaturate($euiColorPrimary, 40%), 40%),
primary: lighten(desaturate($euiColorPrimary, 30%), 30%),
secondary: lighten(desaturate($euiColorSecondary, 40%), 40%),
warning: lighten(desaturate($euiColorWarning, 30%), 20%),
danger: lighten(desaturate($euiColorDanger, 40%), 40%),
Expand Down
9 changes: 7 additions & 2 deletions src/components/form/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@
font-family: $euiFontFamily;
line-height: 1em; // fixes text alignment in IE
color: $euiTextColor;

&::placeholder {
color: $euiColorDarkShade;
}
}


@mixin euiFormControlSize(
$height: $euiFormControlHeight,
$includeAlternates: false
Expand Down Expand Up @@ -212,8 +217,8 @@
}

@mixin euiCustomControlDisabled($type: null) {
border-color: $euiColorLightShade;
background-color: $euiColorLightShade;
border-color: desaturate($euiColorLightShade, 100%);
background-color: desaturate($euiColorLightShade, 100%);
Comment thread
snide marked this conversation as resolved.
Outdated
box-shadow: none;
@if $type != null {
@include euiIconBackground($type, $euiFormCustomControlDisabledIconColor);
Expand Down
4 changes: 2 additions & 2 deletions src/components/form/switch/_switch.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@

.euiSwitch__input:disabled ~ .euiSwitch__body,
.euiSwitch__input:checked:disabled ~ .euiSwitch__body {
background: $euiColorLightShade;
background-color: desaturate($euiColorLightShade, 100%);

.euiSwitch__thumb {
@include euiCustomControlDisabled;
background-color: $euiColorLightestShade;
background-color: desaturate($euiColorLightestShade, 100%);
Comment thread
cchaos marked this conversation as resolved.
Outdated
}

.euiSwitch__icon {
Expand Down
5 changes: 3 additions & 2 deletions src/components/popover/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@mixin euiPopoverTitle {
@include euiTitle('xs');
background-color: $euiColorLightestShade;
@include euiTitle('xxs');
padding: $euiSizeM;
text-transform: uppercase;
border-bottom: $euiBorderThin;

// Subtract 1px from the border radius since it's inside another container that also has the border radius
// -- makes for better rounded corners
Expand Down
16 changes: 0 additions & 16 deletions src/components/popover/_popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,22 +140,6 @@
}
}

.euiPopover__panel.euiPopover__panel-withTitle {
.euiPopover__panelArrow {
&.euiPopover__panelArrow--bottom:after {
border-bottom-color: $euiColorLightestShade;
}

&.euiPopover__panelArrow--right:after {
border-right-color: $euiColorLightestShade;
}

&.euiPopover__panelArrow--left:after {
border-left-color: $euiColorLightestShade;
}
}
}

.euiPopover__panel.euiPopover__panel-isOpen.euiPopover__panel--top {
transform: translateY($euiPopoverTranslateDistance) translateZ(0);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/steps/_steps_horizontal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
display: flex;
align-items: stretch;
flex-grow: 1;
background: transparentize($euiColorLightestShade, .5);
background: transparentize($euiColorLightestShade, .2);
Comment thread
snide marked this conversation as resolved.
Outdated
}

// Button containing item
Expand Down
24 changes: 22 additions & 2 deletions src/components/tabs/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,21 @@
@include euiScrollBar;

display: flex;
border-bottom: $euiBorderThin;
position: relative;
max-width: 100%;
overflow-x: auto;
overflow-y: hidden; // don't scroll vertically when scrolling horizontally

&:before {
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background-color: $euiColorLightShade;
content: '';
}

// Changing height of scrollbar so it sits flush with border
// sass-lint:disable no-vendor-prefixes
&::-webkit-scrollbar {
Expand Down Expand Up @@ -46,6 +56,16 @@
&:focus {
background-color: $euiFocusBackgroundColor;
text-decoration: underline;

&:before {
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background-color: $euiColorLightShade;
content: '';
}
}

&.euiTab-isDisabled {
Expand All @@ -64,7 +84,7 @@

&:after {
position: absolute;
bottom: -1px;
bottom: 0;
left: 0;
content: ' ';
width: 100%;
Expand Down
18 changes: 9 additions & 9 deletions src/global_styling/variables/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// Core

$euiColorPrimary: #0079A5 !default;
$euiColorSecondary: #017F75 !default;
$euiColorPrimary: #006BB4 !default;
$euiColorSecondary: #017D73 !default;
$euiColorAccent: #DD0A73 !default;
$euiColorHighlight: #FFFBF1 !default;
$euiColorGhost: #FFF !default;

// Status
$euiColorSuccess: $euiColorSecondary !default;
$euiColorDanger: #A30000 !default;
$euiColorWarning: #E5830E !default;
$euiColorDanger: #BD271E !default;
$euiColorWarning: #F5A700 !default;

// Grays
$euiColorEmptyShade: #FFF !default;
$euiColorLightestShade: #F5F5F5 !default;
$euiColorLightShade: #D9D9D9 !default;
$euiColorMediumShade: #999 !default;
$euiColorDarkShade: #666 !default;
$euiColorDarkestShade: #3F3F3F !default;
$euiColorLightestShade: #F5F7FA !default;
$euiColorLightShade: #D3DAE6 !default;
$euiColorMediumShade: #98A2B3 !default;
$euiColorDarkShade: #69707D !default;
$euiColorDarkestShade: #343741 !default;
$euiColorFullShade: #000 !default;
$euiColorSlightHue: #909AA1 !default;

Expand Down
8 changes: 4 additions & 4 deletions src/services/color/eui_palettes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ export const palettes = {
},
euiPaletteForLightBackground: {
colors: [
'#0079A5',
'#017F75',
'#E5830E',
'#A30000',
'#006BB4',
'#017D73',
'#F5A700',
'#BD271E',
'#DD0A73',
]
},
Expand Down