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

General: update colors to match upcoming WP 5.7 color changes #18916

Merged
merged 1 commit into from
Feb 25, 2021
Merged

General: update colors to match upcoming WP 5.7 color changes #18916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 projects/packages/jitm/src/css/jetpack-admin-jitm.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
}

// New JITMS - modified calypso banner styles
$blue-grey-light: #f3f5f6;
$blue-medium-dark: #0071a1;
$blue-grey-light: #f6f7f7;
$blue-medium-dark: #2271b1;

.jitm-button {
background: $blue-grey-light;
Expand All @@ -52,9 +52,9 @@ $blue-medium-dark: #0071a1;
appearance: none;
text-align: center;
min-width: 90px;

&:hover {
background: #f1f1f1;
background: #f0f0f1;
border-color: $blue-grey-dark;
color: $blue-grey-dark;
}
Expand Down
12 changes: 6 additions & 6 deletions projects/plugins/beta/admin/admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ html {
}

.dops-card-title {
background-color: #f9f9f9;
background-color: #f6f7f7;
color: black;
font-family: Helvetica, Arial, sans-serif;
font-size: 12px;
font-weight: normal;
text-transform: uppercase;
border-bottom: 1px solid #dddddd;
border-bottom: 1px solid #dcdcde;
padding: 10px 16px;
margin: 0;
}
Expand All @@ -132,14 +132,14 @@ html {
}

.dops-card-title .dops-card-meta {
color: #aaaaaa;
color: #a7aaad;
float: right;
}

.dops-card-section {
font-size: 14px;
padding: 16px;
border-bottom: 1px solid #dddddd;
border-bottom: 1px solid #dcdcde;
}

.dops-card-section:after {
Expand Down Expand Up @@ -197,7 +197,7 @@ html {
}

.dops-card-footer {
background: #f9f9f9;
background: #f6f7f7;
padding: 15px 20px;
}

Expand Down Expand Up @@ -548,7 +548,7 @@ button.dops-foldable-card__action {
.dops-foldable-card__header-text {
font-size: 1.125rem;
width: 100%;
color: #23282d;
color: #1d2327;
}

.dops-foldable-card__header-text small {
Expand Down
4 changes: 2 additions & 2 deletions projects/plugins/jetpack/_inc/client/at-a-glance/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,14 @@
&.is-current,
&:visited.is-current,
&:focus.is-current {
color: #23282d;
color: #1d2327;
text-decoration: none;
}
}

.jp-at-a-glance__stats-view-link:focus {
outline: 0;
box-shadow: 0 0 0 1px #5b9dd9, 0 0 2px 1px rgba(30, 140, 190, 0.8);
box-shadow: 0 0 0 1px #4f94d4, 0 0 2px 1px rgba(30, 140, 190, 0.8);

}

Expand Down
4 changes: 2 additions & 2 deletions projects/plugins/jetpack/_inc/client/components/about-page/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$color__border: #e5e5e5;
$color__back-link: #6c7781;
$color__border: #dcdcde;
$color__back-link: #787c82;

.jetpack-about__link-back,
.jetpack-about__main,
Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/_inc/client/components/button/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
appearance: none;

&:hover {
background: #f1f1f1;
background: #f0f0f1;
border-color: $blue-grey-dark;
color: $blue-grey-dark;
}
Expand Down
8 changes: 4 additions & 4 deletions projects/plugins/jetpack/_inc/client/components/card/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
@import '../../scss/calypso-colors';
@import '../../scss/functions/rem';

$title: #f9f9f9;
$meta: #AAAAAA;
$border: #DDDDDD;
$section-border: #DDDDDD;
$title: #f6f7f7;
$meta: #a7aaad;
$border: #dcdcde;
$section-border: #dcdcde;

/* Card */

Expand Down
10 changes: 5 additions & 5 deletions projects/plugins/jetpack/_inc/client/components/form/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ input[type=radio] + span {
.dops-form-section-title {
font-weight: bold;
color: #333;
border-bottom: 1px solid #DDD;
border-bottom: 1px solid #dcdcde;
padding-bottom: 3px;
margin-bottom: 5px;
margin-top: 15px;
Expand Down Expand Up @@ -93,7 +93,7 @@ input[type=radio] + span {

.dops-form-errormessage {
border: 1px solid #dd3d36;
color: #a00;
color: #d63638;
display: block;
margin: 5px 0 0 0;
padding: 5px;
Expand Down Expand Up @@ -123,7 +123,7 @@ input[type=radio] + span {
padding: 10px 12px;
margin: 0;
}

&.floating--floated {
color: #333;
z-index: 0;
Expand All @@ -149,8 +149,8 @@ input[type=radio] + span {
}

.dops-form-actionbar {
background: #f9f9f9;
color: #aaa;
background: #f6f7f7;
color: #a7aaad;
padding: 15px 20px 15px 20px;
}

Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/_inc/client/components/masthead/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
}

#sandbox-domain-badge {
background: #d54e21;
background: #d63638;
text-transform: uppercase;
letter-spacing: 0.2em;
text-shadow: none;
Expand Down
4 changes: 2 additions & 2 deletions projects/plugins/jetpack/_inc/client/components/popover/docs/example.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ const Popovers = createReactClass( {
lineHeight: `${ width / 3 }px`,
textAlign: 'center',
float: 'left',
backgroundColor: '#eee',
border: '1px solid #ddd',
backgroundColor: '#f0f0f1',
border: '1px solid #dcdcde',
boxSixing: 'border-box',
} }
key={ `rubic-${ i }` }
Expand Down
12 changes: 6 additions & 6 deletions projects/plugins/jetpack/_inc/client/dashboard-widget/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
}

#stats-info {
border-top: 1px solid #dfdfdf;
border-top: 1px solid #dcdcde;
margin: 7px -10px 0 -10px;
padding: 10px;
background: #fcfcfc;
Expand All @@ -71,7 +71,7 @@
border-radius: 0 0 2px 2px;

div#active {
border-top: 1px solid #dfdfdf;
border-top: 1px solid #dcdcde;
margin: 0 -10px;
padding: 10px 10px 0 10px;
-moz-box-shadow:inset 0 1px 0 #fff;
Expand Down Expand Up @@ -132,7 +132,7 @@
}

.wpcom-connect {
background: #fafafa;
background: #f6f7f7;
text-align: center;

.jp-emblem {
Expand Down Expand Up @@ -192,7 +192,7 @@

&:focus {
box-shadow: inset 0 1px 0 lighten( $green-primary, 10% ),
0 0 0 1px #5b9dd9,
0 0 0 1px #4f94d4,
0 0 2px 1px rgba( 30, 140, 190, .8 );
}

Expand All @@ -201,7 +201,7 @@
border-color: darken( $green-primary, 15% );
color: $white;
box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 ),
0 0 0 1px #5b9dd9,
0 0 0 1px #4f94d4,
0 0 2px 1px rgba( 30, 140, 190, .8 );
}

Expand All @@ -217,7 +217,7 @@
}

footer {
background: #fafafa;
background: #f6f7f7;
padding: .75em .75em 0 .75em;
overflow: hidden;
border-top: 1px solid #ccc;
Expand Down
12 changes: 6 additions & 6 deletions projects/plugins/jetpack/_inc/client/scss/calypso-colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Blues
$blue-wordpress: #0087be;
$blue-light: #78dcfa;
$blue-medium: #007cba;
$blue-medium: #3582c4;
$blue-dark: #005082;
$blue-medium-dark: #0071a1;
$blue-grey-light: #f3f5f6;
$blue-grey-dark: #016087;
$light-gray-700: #ccd0d4;
$blue-medium-dark: #2271b1;
$blue-grey-light: #f6f7f7;
$blue-grey-dark: #0a4b78;
$light-gray-700: #c3c4c7;


// Grays
Expand Down Expand Up @@ -42,7 +42,7 @@ $gray-darken-30: darken( $gray, 30% ); // #3d596d

// Oranges
$orange-jazzy: #f0821e;
$orange-fire: #d54e21;
$orange-fire: #d63638;

// Alerts
$alert-yellow: #f0b849;
Expand Down
10 changes: 5 additions & 5 deletions projects/plugins/jetpack/_inc/client/scss/variables/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// Primary Accent (Blues)
$blue-wordpress: #0087be;
$blue-light: #78dcfa;
$blue-medium: #007cba;
$blue-medium: #3582c4;
$blue-dark: #005082;

// Grays
Expand Down Expand Up @@ -45,7 +45,7 @@ $color-plan-dark: #007117; // $studio-jetpack-green-60

// Secondary Accent (Oranges)
$orange-jazzy: #f0821e;
$orange-fire: #d54e21;
$orange-fire: #d63638;

// Alerts
$alert-yellow: #f0b849;
Expand Down Expand Up @@ -107,6 +107,6 @@ $green-dark: #008b1d;
// full color list here: http://codepen.io/hugobaeta/full/RNOzoV/
// ==========================================================================

$wpui-gray-light: #f5f5f5;
$wpui-dark-medium-gray: #555d66;
$wpui-header-dark: #23282d;
$wpui-gray-light: #f6f7f7;
$wpui-dark-medium-gray: #50575e;
$wpui-header-dark: #1d2327;
6 changes: 3 additions & 3 deletions projects/plugins/jetpack/_inc/lib/debugger/class-jetpack-debugger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,10 @@ public static function jetpack_debug_admin_head() {
}

.formbox input[type="text"], .formbox input[type="email"], .formbox input[type="url"], .formbox textarea, #debug_info_div {
border: 1px solid #e5e5e5;
border: 1px solid #dcdcde;
border-radius: 11px;
box-shadow: inset 0 1px 1px rgba(0,0,0,0.1);
color: #666;
color: #646970;
font-size: 14px;
padding: 10px;
width: 97%;
Expand All @@ -339,7 +339,7 @@ public static function jetpack_debug_admin_head() {
height: auto !important;
margin: 0 0 2em 10px !important;
padding: 8px 16px !important;
background-color: #ddd;
background-color: #dcdcde;
border: 1px solid rgba(0,0,0,0.05);
border-top-color: rgba(255,255,255,0.1);
border-bottom-color: rgba(0,0,0,0.15);
Expand Down
8 changes: 4 additions & 4 deletions projects/plugins/jetpack/class.jetpack-gutenberg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,17 +1008,17 @@ public static function notice( $message, $status = 'info', $classes = '' ) {
$color = '';
switch ( $status ) {
case 'success':
$color = '#46b450';
$color = '#00a32a';
break;
case 'warning':
$color = '#ffb900';
$color = '#dba617';
break;
case 'error':
$color = '#dc3232';
$color = '#d63638';
break;
case 'info':
default:
$color = '#00a0d2';
$color = '#72aee6';
break;
}

Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/contact-form/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ input.components-text-control__input {
}
input.components-text-control__input,
textarea.components-textarea-control__input {
color: #72777c;
color: #787c82;
padding: 12px 8px;
border-color: rgba( 0, 0, 0, 0.4 );
box-shadow: unset;
Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/revue/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
}

.components-text-control__input {
color: #72777c;
color: #787c82;
}
}
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/revue/view.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

.required {
color: #aaaaaa;
color: #a7aaad;
font-weight: normal;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ects/plugins/jetpack/extensions/blocks/social-previews/upgrade-illustration.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.
6 changes: 3 additions & 3 deletions projects/plugins/jetpack/extensions/blocks/story/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
button {
width: 36px !important;
height: 36px !important;
color: #555d66;
border: 1px solid #555d66;
color: #50575e;
border: 1px solid #50575e;
outline: 0;
background-color: transparent;

&:hover {
border: 1px solid #555d66;
border: 1px solid #50575e;
background-color: transparent;
i {
color: rgb(51, 129, 184);
Expand Down
Loading