Skip to content

Commit

Permalink
AO3-6628 Reorder font family names (#4712)
Browse files Browse the repository at this point in the history
* update font family order

* 6628 - add new line to the end of tiny_mce_custom.css
  • Loading branch information
smclairecarden authored Mar 24, 2024
1 parent bf027f3 commit f07d729
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion public/help/skins-wizard-font.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>The default is: <code>'Lucida Grande', 'Lucida Sans Unicode', 'GNU Unifont', Verdana, Helvetica, sans-serif</code></p>
<p>The default is: <code>'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, sans-serif, 'GNU Unifont'</code></p>
<p>Put any font name in here, and if it's installed on your computer, it'll work for you. If you use several different devices, specify some fall-back fonts, with commas in between the names, in case one of your devices doesn't have the first font.</p>
<p>You can use either single or double quotation marks around fonts with multi-word names, e.g. <kbd>"Lucida Grande"</kbd> or <kbd>'Lucide Sans Unicode'</kbd>.</p>
2 changes: 1 addition & 1 deletion public/stylesheets/site/2.0/01-core.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ http://otwcode.github.com/docs/front_end_coding/css-shorthand*/
body, .toggled form, .dynamic form, .secondary, .dropdown {
background: #fff;
color: #2a2a2a;
font: 100%/1.125 'Lucida Grande', 'Lucida Sans Unicode', 'GNU Unifont', Verdana, Helvetica, sans-serif;
font: 100%/1.125 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, sans-serif, 'GNU Unifont';
margin: 0;
padding: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion public/stylesheets/site/2.0/02-elements.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
/* The global rules for normal elements */

body {
font: 100%/1.125 'Lucida Grande', 'Lucida Sans Unicode', 'GNU Unifont', Verdana, Helvetica, sans-serif;
font: 100%/1.125 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, sans-serif, 'GNU Unifont';
}

a, a:link, a:visited:hover {
Expand Down
2 changes: 1 addition & 1 deletion public/stylesheets/site/2.0/07-interactions.css
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ label {
}

input, textarea {
font: 100% 'Lucida Grande', 'Lucida Sans Unicode', 'GNU Unifont', Verdana, Helvetica, sans-serif;
font: 100% 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, sans-serif, 'GNU Unifont';
width: 100%;
border: 1px solid #bbb;
box-shadow: inset 0 1px 2px #ccc;
Expand Down
4 changes: 2 additions & 2 deletions public/stylesheets/site/2.0/08-actions.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ul.actions {
}

button {
font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'GNU Unifont', Verdana, Helvetica, sans-serif;
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, sans-serif, 'GNU Unifont';
box-sizing: content-box;
}

Expand Down Expand Up @@ -165,7 +165,7 @@ legend .action:link {

.heading .actions, .heading .action, .heading span.actions {
height: auto;
font: 100 75%/1.286 'Lucida Grande', 'Lucida Sans Unicode', 'GNU Unifont', Verdana, Helvetica, sans-serif;
font: 100 75%/1.286 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, sans-serif, 'GNU Unifont';
padding: 0.15em 0.375em;
}

Expand Down
2 changes: 1 addition & 1 deletion public/stylesheets/site/2.0/09-roles-states.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ span.unread, .replied, span.claimed, .actions span.defaulted {
background: #ccc;
color: #900;
width: auto;
font: 100 100%/1.286 'Lucida Grande', 'Lucida Sans Unicode', 'GNU Unifont', Verdana, Helvetica, sans-serif;
font: 100 100%/1.286 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, sans-serif, 'GNU Unifont';
height: 1.286em;
vertical-align: middle;
display: inline-block;
Expand Down
4 changes: 2 additions & 2 deletions public/stylesheets/tiny_mce_custom.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
body, td, th {
font: 87.5%/1.1286 'Lucida Grande', 'Lucida Sans Unicode', 'GNU Unifont', Verdana, Helvetica, sans-serif;
}
font: 87.5%/1.1286 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, sans-serif, 'GNU Unifont';
}

0 comments on commit f07d729

Please sign in to comment.