mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix font-weight of <strong> element for CJK fonts (#5914)

Browse Source 
* Fix font-weight for CJK fonts

* Use `font-weight: 700;` for mobile support

* Fix indentation

* Remove trailing whitespace

* Remove trailing whitespace
This commit is contained in:
SerCom_KC 2017-12-07 23:01:52 +08:00 committed by Eugen Rochko
parent 9a6fc03332
commit a1fc626e57
9 changed files with 129 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/styles/mastodon/about.scss
View File

@ -381,6 +381,12 @@
font-weight: 500;
font-size: 32px;
line-height: 48px;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
}

6
app/javascript/styles/mastodon/accounts.scss
View File

@ -473,6 +473,12 @@
strong {
font-weight: 500;
color: $ui-base-color;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
span {

18
app/javascript/styles/mastodon/admin.scss
View File

@ -121,6 +121,12 @@
strong {
color: $primary-text-color;
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
}
@ -222,6 +228,12 @@
font-weight: 500;
text-transform: uppercase;
font-size: 12px;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
a {
@ -265,6 +277,12 @@
font-size: 14px;
line-height: 18px;
color: $ui-secondary-color;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
.account-card {

36
app/javascript/styles/mastodon/components.scss
View File

@ -280,6 +280,12 @@
strong {
color: darken($ui-secondary-color, 65%);
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
a {
@ -959,6 +965,12 @@
strong {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
a {
@ -1060,6 +1072,12 @@
font-size: 15px;
font-weight: 500;
color: $primary-text-color;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
abbr {
@ -2980,6 +2998,12 @@ button.icon-button.active i.fa-retweet {
font-weight: 500;
display: block;
color: $ui-base-color;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
}
@ -3414,6 +3438,12 @@ button.icon-button.active i.fa-retweet {
border-radius: 4px;
font-size: 14px;
padding: 3px 6px;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
}
}
@ -3744,6 +3774,12 @@ button.icon-button.active i.fa-retweet {
strong {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
}

30
app/javascript/styles/mastodon/forms.scss
View File

@ -56,6 +56,12 @@ code {
strong {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
.label_input {
@ -395,6 +401,12 @@ code {
strong {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
@media screen and (max-width: 740px) and (min-width: 441px) {
@ -430,6 +442,12 @@ code {
strong {
color: $ui-secondary-color;
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
@media screen and (max-width: 740px) and (min-width: 441px) {
@ -474,6 +492,12 @@ code {
strong {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
}
}
@ -506,6 +530,12 @@ code {
display: block;
margin-bottom: 5px;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
.fa {
font-weight: 400;
}

12
app/javascript/styles/mastodon/landing_strip.scss
View File

@ -12,6 +12,12 @@
strong,
a {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
a {
@ -46,6 +52,12 @@
strong,
a {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
a {

12
app/javascript/styles/mastodon/stream_entries.scss
View File

@ -119,6 +119,12 @@
strong {
font-weight: 500;
color: $ui-base-color;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
span {
@ -170,6 +176,12 @@
strong {
font-weight: 500;
color: $ui-base-color;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
span {

6
app/javascript/styles/mastodon/tables.scss
View File

@ -40,6 +40,12 @@
strong {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
&.inline-table > tbody > tr:nth-child(odd) > td,

3
app/javascript/styles/mastodon/variables.scss
View File

@ -27,3 +27,6 @@ $ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkes
$ui-primary-color: $classic-primary-color !default; // Lighter
$ui-secondary-color: $classic-secondary-color !default; // Lightest
$ui-highlight-color: $classic-highlight-color !default; // Vibrant
// Language codes that uses CJK fonts
$cjk-langs: zh-CN, zh-HK, zh-TW;