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

Add emoji font-family #9956

Closed
wants to merge 5 commits into from
Closed

Add emoji font-family #9956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95a131e
Add emoji font-family
Apr 17, 2016
3df4cd9
Add emoji color to Beez3
Apr 17, 2016
e5e8efe
Add emoji color on H1,H2 ect
Apr 17, 2016
805cca9
Merge remote-tracking branch 'refs/remotes/joomla/staging' into emoji
Sep 6, 2016
1a4146b
fix closing
Sep 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions templates/beez3/css/template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ body {
text-align: center;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family: "Apple Color Emoji", "Segoe UI", "Segoe UI Emoji", "Segoe UI Symbol";
}

body.contentpane {
Expand Down
2 changes: 1 addition & 1 deletion templates/protostar/css/template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ textarea {
}
body {
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI", "Segoe UI Emoji", "Segoe UI Symbol";
font-size: 13px;
line-height: 18px;
color: #333;
Expand Down
2 changes: 1 addition & 1 deletion templates/protostar/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
$doc->addStyleSheet('//fonts.googleapis.com/css?family=' . $this->params->get('googleFontName'));
$doc->addStyleDeclaration("
h1, h2, h3, h4, h5, h6, .site-title {
font-family: '" . str_replace('+', ' ', $this->params->get('googleFontName')) . "', sans-serif;
font-family: '" . str_replace('+', ' ', $this->params->get('googleFontName')) . ", Apple Color Emoji, Segoe UI, Segoe UI Emoji, Segoe UI Symbol, sans-serif;'
}");
}

Expand Down
6 changes: 3 additions & 3 deletions templates/protostar/less/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@

// Typography
// -------------------------
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI", "Segoe UI Emoji", "Segoe UI Symbol";
@serifFontFamily: Georgia, "Times New Roman", Times, serif, "Apple Color Emoji", "Segoe UI", "Segoe UI Emoji", "Segoe UI Symbol";
@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace, "Apple Color Emoji", "Segoe UI", "Segoe UI Emoji", "Segoe UI Symbol";

// > Joomla JUI
@baseFontSize: 13px;
Expand Down