revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-27 01:02:42 +01:00
Code Issues Releases Wiki Activity

Make base font a Celerity CSS variable

Browse source 
Summary: For consistency, we switch back to base font in a few places when using alternate fonts like source-sans or monospace, this makes sure the base font is consistently reset.

Test Plan: Review a Document, a Diff, and a Legalpad form

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D11891
This commit is contained in:
Chad Little 2015-02-26 09:26:36 -08:00
parent 2d4d79d171
commit 1236043472
8 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
resources/celerity/map.php
View file

@ -7,10 +7,10 @@
*/
return array(
'names' => array(
'core.pkg.css' => 'ba9b6450',
'core.pkg.css' => '4e2c8d53',
'core.pkg.js' => '23d653bb',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '380f07e5',
'differential.pkg.css' => '14f0fa92',
'differential.pkg.js' => '7b5a4aa4',
'diffusion.pkg.css' => '591664fa',
'diffusion.pkg.js' => 'bfc0737b',
@ -41,7 +41,7 @@ return array(
'rsrc/css/application/base/standard-page-view.css' => '60d0df9a',
'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
'rsrc/css/application/config/config-options.css' => '7fedf08b',
'rsrc/css/application/config/config-template.css' => '25d446d6',
'rsrc/css/application/config/config-template.css' => '8e6c6fcd',
'rsrc/css/application/config/config-welcome.css' => 'b0d16200',
'rsrc/css/application/config/setup-issue.css' => '22270af2',
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
@ -55,7 +55,7 @@ return array(
'rsrc/css/application/dashboard/dashboard.css' => 'c0062064',
'rsrc/css/application/diff/inline-comment-summary.css' => 'eb5f8e8c',
'rsrc/css/application/differential/add-comment.css' => 'c478bcaa',
'rsrc/css/application/differential/changeset-view.css' => 'b2b71e76',
'rsrc/css/application/differential/changeset-view.css' => '8244e5a8',
'rsrc/css/application/differential/core.css' => '7ac3cabc',
'rsrc/css/application/differential/results-table.css' => '181aa9d9',
'rsrc/css/application/differential/revision-comment.css' => '48186045',
@ -104,7 +104,7 @@ return array(
'rsrc/css/application/slowvote/slowvote.css' => '266df6a1',
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
'rsrc/css/application/uiexample/example.css' => '528b19de',
'rsrc/css/core/core.css' => '8f9b9588',
'rsrc/css/core/core.css' => 'c8c5ecd2',
'rsrc/css/core/remarkup.css' => 'e8e5a324',
'rsrc/css/core/syntax.css' => '56c1ba38',
'rsrc/css/core/z-index.css' => '8239495e',
@ -124,14 +124,14 @@ return array(
'rsrc/css/phui/phui-action-list.css' => '9ee9910a',
'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5',
'rsrc/css/phui/phui-box.css' => '7b3a2eed',
'rsrc/css/phui/phui-button.css' => 'ffe12633',
'rsrc/css/phui/phui-button.css' => '21cb97f9',
'rsrc/css/phui/phui-crumbs-view.css' => '594d719e',
'rsrc/css/phui/phui-document.css' => '8240b0b1',
'rsrc/css/phui/phui-error-view.css' => '41518665',
'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5',
'rsrc/css/phui/phui-fontkit.css' => '9b345998',
'rsrc/css/phui/phui-fontkit.css' => 'bd111278',
'rsrc/css/phui/phui-form-view.css' => '8b78a986',
'rsrc/css/phui/phui-form.css' => '9aecbda1',
'rsrc/css/phui/phui-form.css' => 'f535f938',
'rsrc/css/phui/phui-header-view.css' => '083669db',
'rsrc/css/phui/phui-icon.css' => 'd35aa857',
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
@ -520,7 +520,7 @@ return array(
'conpherence-notification-css' => '04a6e10a',
'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => '3d575438',
'differential-changeset-view-css' => 'b2b71e76',
'differential-changeset-view-css' => '8244e5a8',
'differential-core-view-css' => '7ac3cabc',
'differential-inline-comment-editor' => 'f2441746',
'differential-results-table-css' => '181aa9d9',
@ -715,12 +715,12 @@ return array(
'phabricator-busy' => '6453c869',
'phabricator-chatlog-css' => '852140ff',
'phabricator-content-source-view-css' => '4b8b05d4',
'phabricator-core-css' => '8f9b9588',
'phabricator-core-css' => 'c8c5ecd2',
'phabricator-countdown-css' => '86b7b0a0',
'phabricator-dashboard-css' => 'c0062064',
'phabricator-drag-and-drop-file-upload' => '8c49f386',
'phabricator-draggable-list' => 'a16ec1c6',
'phabricator-fatal-config-template-css' => '25d446d6',
'phabricator-fatal-config-template-css' => '8e6c6fcd',
'phabricator-feed-css' => 'b513b5f4',
'phabricator-file-upload' => 'a4ae61bf',
'phabricator-filetree-view-css' => 'fccf9f82',
@ -773,7 +773,7 @@ return array(
'phui-action-header-view-css' => '89c497e7',
'phui-action-panel-css' => '3ee9afd5',
'phui-box-css' => '7b3a2eed',
'phui-button-css' => 'ffe12633',
'phui-button-css' => '21cb97f9',
'phui-calendar-css' => '8675968e',
'phui-calendar-day-css' => 'de035c8a',
'phui-calendar-list-css' => 'c1d0ca59',
@ -783,8 +783,8 @@ return array(
'phui-error-view-css' => '41518665',
'phui-feed-story-css' => 'c9f3a0b5',
'phui-font-icon-base-css' => '3dad2ae3',
'phui-fontkit-css' => '9b345998',
'phui-form-css' => '9aecbda1',
'phui-fontkit-css' => 'bd111278',
'phui-form-css' => 'f535f938',
'phui-form-view-css' => '8b78a986',
'phui-header-view-css' => '083669db',
'phui-icon-view-css' => 'd35aa857',

4
src/applications/celerity/CelerityResourceTransformer.php
View file

@ -171,6 +171,10 @@ final class CelerityResourceTransformer {
public static function getCSSVariableMap() {
return array(
// Fonts
'basefont' => "13px/1.231 'Segoe UI', 'Segoe UI Web Regular', ".
"'Segoe UI Symbol', 'Helvetica Neue', Helvetica, Arial, sans-serif",
// Base Colors
'red' => '#c0392b',
'lightred' => '#f4dddb',

3
webroot/rsrc/css/application/config/config-template.css
View file

@ -6,7 +6,8 @@ body {
background: #f9f9f9;
margin: 0;
padding: 0;
font: 13px/1.231 'Helvetica Neue', Arial, sans-serif;
font: 13px/1.231 'Segoe UI', 'Segoe UI Web Regular', 'Segoe UI Symbol',
'Helvetica Neue', Helvetica, Arial, sans-serif;
text-align: left;
-webkit-text-size-adjust: none;
}

4
webroot/rsrc/css/application/differential/changeset-view.css
View file

@ -178,7 +178,7 @@ td.cov-I {
.differential-diff td.show-more,
.differential-diff td.differential-shield {
font-family: "Helvetica Neue", "Arial", sans-serif;
font: {$basefont};
font-size: 12px;
white-space: normal;
}
@ -255,7 +255,7 @@ td.cov-I {
.differential-inline-comment-edit {
background: #ffffee;
border: 1px solid #ccccaa;
font-family: "Helvetica Neue", "Arial", sans-serif;
font: {$basefont};
font-size: 12px;
margin: 6px 0px;
padding: 8px 10px;

3
webroot/rsrc/css/core/core.css
View file

@ -51,8 +51,7 @@ h1, h2, h3, h4, h5, h6 {
}
body {
font: 13px/1.231 'Segoe UI', 'Segoe UI Web Regular', 'Segoe UI Symbol',
'Helvetica Neue', Helvetica, Arial, sans-serif;
font: {$basefont};
direction: ltr;
text-align: left;
unicode-bidi: embed;

2
webroot/rsrc/css/phui/phui-button.css
View file

@ -5,7 +5,7 @@
button,
a.button {
font: 13px/1.231 'Helvetica Neue', Helvetica, Arial, sans-serif;
font: {$basefont};
-webkit-font-smoothing: antialiased;
-webkit-user-select: none;
-moz-user-select: none;

8
webroot/rsrc/css/phui/phui-fontkit.css
View file

@ -50,13 +50,13 @@
.phui-font-source-sans .phui-property-list-container {
padding-bottom: 6px;
font-family: 'Helvetica Neue', Arial, sans-serif;
font-size: 13px;
font: {$basefont};
line-height: 16px;
}
.phui-font-source-sans .phabricator-action-view {
font-family: 'Helvetica Neue', Arial, sans-serif;
font: {$basefont};
font-size: 12px;
}
.phui-font-source-sans a.atom-ref,
@ -70,7 +70,7 @@ body .phui-font-source-sans
}
.phui-font-source-sans .phui-form-view {
font: 13px/1.231 'Helvetica Neue', Helvetica, Arial, sans-serif;
font: {$basefont};
font-weight: normal;
}

2
webroot/rsrc/css/phui/phui-form.css
View file

@ -24,7 +24,7 @@ div.jx-tokenizer-container {
line-height: 18px;
color: #333;
vertical-align: middle;
font: 13px 'Helvetica Neue', Helvetica, Arial, sans-serif;
font: {$basefont};
-webkit-font-smoothing: antialiased;
}