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

Jump to bottom

Update Jetpack button and card styles to match WordPress 5.3 #13729

Merged
merged 4 commits into from
Oct 24, 2019
Merged

Update Jetpack button and card styles to match WordPress 5.3 #13729

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e3f856
Update Jetpack button and card styles to match WordPress 5.3
gravityrail Oct 11, 2019
f9554ac
Update button and card styles
MichaelArestad Oct 17, 2019
c276d4b
Updated buttons and cards in JITM and connect flows
MichaelArestad Oct 17, 2019
b8890a5
Add back RTL files
MichaelArestad Oct 23, 2019
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
22 changes: 12 additions & 10 deletions _inc/client/components/button/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
// ==========================================================================

.dops-button {
background: $white;
border-color: lighten( $gray, 20% );
background: $blue-grey-light;
border-color: $blue-medium-dark;
border-style: solid;
border-width: 1px 1px 2px;
color: $gray-dark;
border-width: 1px;
color: $blue-medium-dark;
cursor: pointer;
display: inline-block;
margin: 0;
Expand All @@ -23,15 +23,17 @@
vertical-align: top;
box-sizing: border-box;
font-size: 14px;
line-height: 21px;
border-radius: 4px;
padding: 7px 14px 9px;
-webkit-appearance: none;
appearance: none;

&:hover {
border-color: lighten( $gray, 10% );
color: $gray-dark;
// border-color: lighten( $gray, 10% );
// color: $gray-dark;
background: #f1f1f1;
border-color: $blue-grey-dark;
color: $blue-grey-dark;
}
&:active {
border-width: 2px 1px 1px;
Expand All @@ -54,7 +56,6 @@
}
&.is-compact {
padding: 7px;
color: darken( $gray, 10% );
font-size: 11px;
line-height: 1;
text-transform: uppercase;
Expand Down Expand Up @@ -94,12 +95,13 @@
// Primary buttons
.dops-button.is-primary {
background: $blue-medium;
border-color: $blue-wordpress;
border-color: $blue-medium;
color: $white;

&:hover,
&:focus {
border-color: $blue-dark;
border-color: $blue-medium-dark;
background: $blue-medium-dark;
color: $white;
}
&[disabled],
Expand Down
11 changes: 7 additions & 4 deletions _inc/client/components/card/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ $section-border: #DDDDDD;
padding: 16px;
box-sizing: border-box;
background: $white;
box-shadow: 0 0 0 1px transparentize( lighten( $gray, 20% ), .5 ),
0 1px 2px lighten( $gray, 30% );
/*box-shadow: 0 0 0 1px transparentize( lighten( $gray, 20% ), .5 ),
0 1px 2px lighten( $gray, 30% );*/
border: 1px solid $light-gray-700;
box-shadow: 0 1px 1px rgba(0,0,0,.04);
border-radius: 2px;

@include clear-fix;

Expand All @@ -29,10 +32,10 @@ $section-border: #DDDDDD;

// Compact Card
&.is-compact {
margin-bottom: 1px;
margin-bottom: -1px;

@include breakpoint( ">480px" ) {
margin-bottom: 1px;
margin-bottom: -1px;
padding: 16px 24px;
}
}
Expand Down
1 change: 1 addition & 0 deletions _inc/client/components/dash-item/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@

.jp-dash-item .dops-section-header {
width: 100%;
margin-bottom: -1px;

.dops-button {
font-style: normal;
Expand Down
16 changes: 10 additions & 6 deletions _inc/client/components/section-nav/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
margin: 0 0 17px 0;
background: $white;
box-sizing: border-box;
box-shadow: 0 0 0 1px transparentize( lighten( $gray, 20% ), .5 ),
0 1px 2px lighten( $gray, 30% );
border: 1px solid $light-gray-700;
box-shadow: 0 1px 1px rgba(0,0,0,.04);

&.is-empty .dops-section-nav__panel {
visibility: hidden;
Expand Down Expand Up @@ -280,7 +280,7 @@

.is-selected & {
color: $white;
background-color: $blue-medium;
background-color: $blue-medium-dark;
}

&:focus {
Expand All @@ -300,9 +300,13 @@
}
}

&:hover {
color: $blue-grey-dark;
}

.notouch & {
&:hover {
color: $blue-medium;
color: $blue-medium-dark;
}
}

Expand All @@ -316,11 +320,11 @@
display: block;
width: auto;
padding: 16px 16px 14px 16px;
color: $blue-wordpress;
color: $blue-medium-dark;
font-weight: 400;

&:visited {
color: $blue-wordpress;
color: $blue-medium-dark;
}

.is-selected & {
Expand Down
2 changes: 1 addition & 1 deletion _inc/client/components/settings-group/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.jp-form-settings-group {
position: relative;
margin-bottom: 0;
margin-bottom: -1px;

p {
font-size: rem( 14px );
Expand Down
7 changes: 6 additions & 1 deletion _inc/client/scss/calypso-colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
// Blues
$blue-wordpress: #0087be;
$blue-light: #78dcfa;
$blue-medium: #00aadc;
$blue-medium: #007cba;
$blue-dark: #005082;
$blue-medium-dark: #0071a1;
$blue-grey-light: #f3f5f6;
$blue-grey-dark: #016087;
$light-gray-700: #ccd0d4;


// Grays
$gray-original: #87a6bc;
Expand Down
2 changes: 1 addition & 1 deletion _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: #00aadc;
$blue-medium: #007cba;
$blue-dark: #005082;

// Grays
Expand Down
1 change: 1 addition & 0 deletions _inc/client/settings/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@
padding: 0;
background: none;
box-shadow: none;
border: none;
}
Loading