-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
Colour Scheming: Update External Brand Variables #30084
Changes from all commits
761318e
ded970e
14a8074
64ab268
4d926d2
be256cd
f098ba2
4e1f001
4bcd76c
61a7d17
2d50a28
78c91eb
4db6d98
a32fb17
c10ecb9
8580748
3eae19a
359ef38
82d8a29
58550d1
af39539
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -9,49 +9,49 @@ | |||||||||||
&.facebook { | ||||||||||||
h2, | ||||||||||||
.sharing-service__logo { | ||||||||||||
color: $color-facebook; | ||||||||||||
color: var( --color-facebook ); | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
&.twitter { | ||||||||||||
h2, | ||||||||||||
.sharing-service__logo { | ||||||||||||
color: $color-twitter; | ||||||||||||
color: var( --color-twitter ); | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
&.google_plus { | ||||||||||||
h2, | ||||||||||||
.sharing-service__logo { | ||||||||||||
color: $color-gplus; | ||||||||||||
color: var( --color-gplus ); | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
&.linkedin { | ||||||||||||
h2, | ||||||||||||
.sharing-service__logo { | ||||||||||||
color: $color-linkedin; | ||||||||||||
color: var( --color-linkedin ); | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
&.tumblr { | ||||||||||||
h2, | ||||||||||||
.sharing-service__logo { | ||||||||||||
color: $color-tumblr; | ||||||||||||
color: var( --color-tumblr ); | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
&.eventbrite { | ||||||||||||
h2, | ||||||||||||
.sharing-service__logo { | ||||||||||||
color: $color-eventbrite; | ||||||||||||
color: var( --color-eventbrite ); | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
&.instagram { | ||||||||||||
h2, | ||||||||||||
.sharing-service__logo { | ||||||||||||
color: $color-instagram; | ||||||||||||
color: var( --color-instagram ); | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
|
@@ -264,14 +264,13 @@ | |||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
@include sharing-service( 'facebook', $color-facebook ); | ||||||||||||
@include sharing-service( 'twitter', $color-twitter ); | ||||||||||||
@include sharing-service( 'google_plus', $color-gplus ); | ||||||||||||
@include sharing-service( 'tumblr', $color-tumblr ); | ||||||||||||
@include sharing-service( 'linkedin', $color-linkedin ); | ||||||||||||
@include sharing-service( 'path', $color-path ); | ||||||||||||
@include sharing-service( 'instagram', $color-instagram ); | ||||||||||||
@include sharing-service( 'eventbrite', $color-eventbrite ); | ||||||||||||
@include sharing-service( 'facebook', var( --color-facebook )); | ||||||||||||
@include sharing-service( 'twitter', var( --color-twitter )); | ||||||||||||
@include sharing-service( 'google_plus', var( --color-gplus )); | ||||||||||||
@include sharing-service( 'tumblr', var( --color-tumblr )); | ||||||||||||
@include sharing-service( 'linkedin', var( --color-linkedin )); | ||||||||||||
@include sharing-service( 'instagram', var( --color-instagram )); | ||||||||||||
@include sharing-service( 'eventbrite', var( --color-eventbrite )); | ||||||||||||
|
||||||||||||
.sharing-service__name { | ||||||||||||
clear: none; | ||||||||||||
|
@@ -895,29 +894,28 @@ | |||||||||||
background: $color; | ||||||||||||
|
||||||||||||
&:hover { | ||||||||||||
background: rgba( $color, 0.9 ); | ||||||||||||
background: $color; | ||||||||||||
} | ||||||||||||
} | ||||||||||||
} | ||||||||||||
|
||||||||||||
@include sharing-button-service( 'facebook', $color-facebook ); | ||||||||||||
@include sharing-button-service( 'twitter', $color-twitter ); | ||||||||||||
@include sharing-button-service( 'press-this', $blue-wordpress ); | ||||||||||||
@include sharing-button-service( 'path', $color-path ); | ||||||||||||
@include sharing-button-service( 'google-plus-1', $color-gplus ); | ||||||||||||
@include sharing-button-service( 'instagram', $color-instagram ); | ||||||||||||
@include sharing-button-service( 'eventbrite', $color-eventbrite ); | ||||||||||||
@include sharing-button-service( 'linkedin', $color-linkedin ); | ||||||||||||
@include sharing-button-service( 'stumbleupon', $color-stumbleupon ); | ||||||||||||
@include sharing-button-service( 'tumblr', $color-tumblr ); | ||||||||||||
@include sharing-button-service( 'reddit', $color-reddit ); | ||||||||||||
@include sharing-button-service( 'pinterest', $color-pinterest ); | ||||||||||||
@include sharing-button-service( 'pocket', $color-pocket ); | ||||||||||||
@include sharing-button-service( 'email', $color-email ); | ||||||||||||
@include sharing-button-service( 'print', $color-print ); | ||||||||||||
@include sharing-button-service( 'skype', $color-skype ); | ||||||||||||
@include sharing-button-service( 'telegram', $color-telegram ); | ||||||||||||
@include sharing-button-service( 'jetpack-whatsapp', $color-whatsapp ); | ||||||||||||
@include sharing-button-service( 'facebook', var( --color-facebook )); | ||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think those won't work. The You could either define a Let me know if that makes sense to you. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think so, but just to confirm. Something like this?
Suggested change
That looks like a confusing number of brackets though and just doesn't look right, so just want to be sure. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sorry, I think it would've been more clear from my side if I provided a code example. What I meant is the following: /* _color-schemes.scss */
--color-facebook: #{$color-facebook};
--color-facebook-rgb: #{hex-to-rgb( $color-facebook )};
// this file
@include sharing-button-service( 'facebook', var( --color-facebook-rgb )); This is necessary because the wp-calypso/client/my-sites/sharing/style.scss Lines 897 to 899 in 2d50a28
and the above There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks, that helps a ton! Just one more question, since
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think that'd work. Only notice that we need both There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you! I've added a commit which intends to address this. Do you know if that's the same case here too? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The color values are directly used in the mentioned mixin so we can use the normal variables (without the |
||||||||||||
@include sharing-button-service( 'twitter', var( --color-twitter )); | ||||||||||||
@include sharing-button-service( 'press-this', var( --color-wpcom )); | ||||||||||||
@include sharing-button-service( 'google-plus-1', var( --color-gplus )); | ||||||||||||
@include sharing-button-service( 'instagram', var( --color-instagram )); | ||||||||||||
@include sharing-button-service( 'eventbrite', var( --color-eventbrite )); | ||||||||||||
@include sharing-button-service( 'linkedin', var( --color-linkedin )); | ||||||||||||
@include sharing-button-service( 'stumbleupon', var( --color-stumbleupon )); | ||||||||||||
@include sharing-button-service( 'tumblr', var( --color-tumblr )); | ||||||||||||
@include sharing-button-service( 'reddit', var( --color-reddit )); | ||||||||||||
@include sharing-button-service( 'pinterest', var( --color-pinterest )); | ||||||||||||
@include sharing-button-service( 'pocket', var( --color-pocket )); | ||||||||||||
@include sharing-button-service( 'email', var( --color-email )); | ||||||||||||
@include sharing-button-service( 'print', var( --color-print )); | ||||||||||||
@include sharing-button-service( 'skype', var( --color-skype )); | ||||||||||||
@include sharing-button-service( 'telegram', var( --color-telegram )); | ||||||||||||
@include sharing-button-service( 'jetpack-whatsapp', var( --color-whatsapp )); | ||||||||||||
|
||||||||||||
.sharing-buttons-preview__panel { | ||||||||||||
position: relative; | ||||||||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I noticed that these use HEX codes...is there a specific reason why? I'm assuming it can just be set to variables too.
(cc @floor, @blowery, @drw158)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. Are all the hex values the same?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These ones are, but the ones here are a bit different. The HEX code seem are identical visually to the actual social media icons though, so I'm assuming they also should use a variable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sure this works it IE11 and that the fallback hex codes get properly inserted.