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

[FIX] Wrong font-family order #11191

Merged
merged 9 commits into from
Jun 20, 2018
Merged

[FIX] Wrong font-family order #11191

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d408337
Merge pull request #1 from RocketChat/master
myfonj Jun 7, 2018
b281362
fix body font family order
myfonj Jun 7, 2018
54a6bb9
Merge branch 'develop' into fix-body-font-family
myfonj Jun 7, 2018
276b235
Update variables.js
engelgabriel Jun 7, 2018
469adcd
Merge branch 'develop' into fix-body-font-family
engelgabriel Jun 7, 2018
ac58985
Merge branch 'develop' into fix-body-font-family
myfonj Jun 13, 2018
198c5ad
Merge commit 'refs/pull/11038/head' of github.com:RocketChat/Rocket.C…
pierre-lehnen-rc Jun 19, 2018
def7326
Set new font stack where the old one is still used
pierre-lehnen-rc Jun 19, 2018
074b0a0
Merge branch 'develop' into fix.body-font-family
Hudell Jun 19, 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
2 changes: 1 addition & 1 deletion packages/rocketchat-theme/server/variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Object.keys(minorColors).forEach((key) => {
RocketChat.theme.addPublicColor(key, value, 'Old Colors (minor)', 'expression');
});

RocketChat.theme.addPublicFont('body-font-family', '-apple-system, BlinkMacSystemFont, Roboto, \'Helvetica Neue\', Arial, sans-serif, \'Apple Color Emoji\', \'Segoe UI\', \'Segoe UI Emoji\', \'Segoe UI Symbol\', \'Meiryo UI\'');
RocketChat.theme.addPublicFont('body-font-family', '-apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen, Ubuntu, Cantarell, \'Helvetica Neue\', \'Apple Color Emoji\', \'Segoe UI Emoji\', \'Segoe UI Symbol\', \'Meiryo UI\', Arial, sans-serif');

RocketChat.settings.add('theme-custom-css', '', {
group: 'Layout',
Expand Down
14 changes: 14 additions & 0 deletions server/startup/migrations/v128.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
RocketChat.Migrations.add({
version: 128,
up() {
const _id = 'theme-font-body-font-family';
const oldValue = '-apple-system, BlinkMacSystemFont, Roboto, \'Helvetica Neue\', Arial, sans-serif, \'Apple Color Emoji\', \'Segoe UI\', \'Segoe UI Emoji\', \'Segoe UI Symbol\', \'Meiryo UI\'';
const newValue = '-apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen, Ubuntu, Cantarell, \'Helvetica Neue\', \'Apple Color Emoji\', \'Segoe UI Emoji\', \'Segoe UI Symbol\', \'Meiryo UI\', Arial, sans-serif';

RocketChat.models.Settings.update({ _id, value: oldValue }, {
$set: {
value: newValue
}
});
}
});