@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Tighten Remarkup and Fontkit CSS rules in Phabricator
Summary: Fixes T5497. Scope these down a little bit so they don't bleed into `{W...}` embeds and such.
Test Plan:
- Viewed a Legalpad document with headers, monospaced stuff, and lists. Looked the same before/after.
- Viewed a comment with headers, monospace, and lists. Looked the same before/after.
- Viewed a `{W..}` embed, now looks sane.
{F171052}
Reviewers: chad
Reviewed By: chad
Subscribers: epriestley
Maniphest Tasks: T5497
Differential Revision: https://secure.phabricator.com/D9757
+39
-39
+7
-7
resources/celerity/map.php
+7
-7
resources/celerity/map.php
···
7
7
return array(
8
8
'names' =>
9
9
array(
10
-
'core.pkg.css' => '2151ff22',
10
+
'core.pkg.css' => 'a18bafdb',
11
11
'core.pkg.js' => '834b4eda',
12
12
'darkconsole.pkg.js' => 'df001cab',
13
13
'differential.pkg.css' => '4a93db37',
···
104
104
'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
105
105
'rsrc/css/application/uiexample/example.css' => '528b19de',
106
106
'rsrc/css/core/core.css' => '40151074',
107
-
'rsrc/css/core/remarkup.css' => '864d4f5e',
107
+
'rsrc/css/core/remarkup.css' => 'cc2d4ed8',
108
108
'rsrc/css/core/syntax.css' => '3c18c1cb',
109
109
'rsrc/css/core/z-index.css' => 'd1c137f2',
110
110
'rsrc/css/diviner/diviner-shared.css' => '38813222',
···
126
126
'rsrc/css/phui/phui-button.css' => 'c7412aa1',
127
127
'rsrc/css/phui/phui-document.css' => 'a5615198',
128
128
'rsrc/css/phui/phui-feed-story.css' => 'e2c9bc83',
129
-
'rsrc/css/phui/phui-fontkit.css' => '8246e56e',
129
+
'rsrc/css/phui/phui-fontkit.css' => '5d40a16b',
130
130
'rsrc/css/phui/phui-form-view.css' => 'ebac1b1d',
131
131
'rsrc/css/phui/phui-form.css' => 'b78ec020',
132
132
'rsrc/css/phui/phui-header-view.css' => '39594ac0',
···
136
136
'rsrc/css/phui/phui-list.css' => '43ed2d93',
137
137
'rsrc/css/phui/phui-object-box.css' => 'e9f7e938',
138
138
'rsrc/css/phui/phui-object-item-list-view.css' => '7ac40b5a',
139
-
'rsrc/css/phui/phui-pinboard-view.css' => '41e17476',
139
+
'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269',
140
140
'rsrc/css/phui/phui-property-list-view.css' => '2f7199e8',
141
141
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
142
142
'rsrc/css/phui/phui-spacing.css' => '042804d6',
···
732
732
'phabricator-phtize' => 'd254d646',
733
733
'phabricator-prefab' => '41ed7994',
734
734
'phabricator-profile-css' => 'b459416e',
735
-
'phabricator-remarkup-css' => '864d4f5e',
735
+
'phabricator-remarkup-css' => 'cc2d4ed8',
736
736
'phabricator-search-results-css' => 'f240504c',
737
737
'phabricator-shaped-request' => '7cbe244b',
738
738
'phabricator-side-menu-view-css' => 'a2ccd7bd',
···
772
772
'phui-document-view-css' => 'a5615198',
773
773
'phui-feed-story-css' => 'e2c9bc83',
774
774
'phui-font-icon-base-css' => 'eb84f033',
775
-
'phui-fontkit-css' => '8246e56e',
775
+
'phui-fontkit-css' => '5d40a16b',
776
776
'phui-form-css' => 'b78ec020',
777
777
'phui-form-view-css' => 'ebac1b1d',
778
778
'phui-header-view-css' => '39594ac0',
···
782
782
'phui-list-view-css' => '43ed2d93',
783
783
'phui-object-box-css' => 'e9f7e938',
784
784
'phui-object-item-list-view-css' => '7ac40b5a',
785
-
'phui-pinboard-view-css' => '41e17476',
785
+
'phui-pinboard-view-css' => '3dd4a269',
786
786
'phui-property-list-view-css' => '2f7199e8',
787
787
'phui-remarkup-preview-css' => '19ad512b',
788
788
'phui-spacing-css' => '042804d6',
+1
-1
src/infrastructure/markup/PhabricatorMarkupEngine.php
+1
-1
src/infrastructure/markup/PhabricatorMarkupEngine.php
+26
-26
webroot/rsrc/css/core/remarkup.css
+26
-26
webroot/rsrc/css/core/remarkup.css
···
48
48
background-color: {$lightred};
49
49
}
50
50
51
-
.phabricator-remarkup tt {
51
+
.phabricator-remarkup tt.remarkup-monospaced {
52
52
color: #333333;
53
53
background: #ebebeb;
54
54
padding: 0 4px;
···
57
57
58
58
/* NOTE: You can currently produce this with [[link | `name`]]. Restore the
59
59
link color. */
60
-
.phabricator-remarkup a tt {
60
+
.phabricator-remarkup a tt.remarkup-monospaced {
61
61
color: #18559d;
62
62
}
63
63
64
-
.phabricator-remarkup ul {
64
+
.phabricator-remarkup ul.remarkup-list {
65
65
list-style: disc;
66
66
margin: 12px 0 12px 30px;
67
67
}
68
68
69
-
.phabricator-remarkup ol {
69
+
.phabricator-remarkup ol.remarkup-list {
70
70
list-style: decimal;
71
71
margin: 12px 0 12px 30px;
72
72
}
···
84
84
color: {$greytext};
85
85
}
86
86
87
-
.phabricator-remarkup ul ol,
88
-
.phabricator-remarkup ul ul,
89
-
.phabricator-remarkup ol ol,
90
-
.phabricator-remarkup ol ul {
87
+
.phabricator-remarkup ul.remarkup-list ol.remarkup-list,
88
+
.phabricator-remarkup ul.remarkup-list ul.remarkup-list,
89
+
.phabricator-remarkup ol.remarkup-list ol.remarkup-list,
90
+
.phabricator-remarkup ol.remarkup-list ul.remarkup-list {
91
91
margin: 4px 0 4px 24px;
92
92
}
93
93
···
96
96
list-style-type: none;
97
97
}
98
98
99
-
.phabricator-remarkup h1:first-child,
100
-
.phabricator-remarkup h2:first-child,
101
-
.phabricator-remarkup h3:first-child,
102
-
.phabricator-remarkup h4:first-child,
103
-
.phabricator-remarkup h5:first-child,
104
-
.phabricator-remarkup h6:first-child {
99
+
.phabricator-remarkup h1.remarkup-header:first-child,
100
+
.phabricator-remarkup h2.remarkup-header:first-child,
101
+
.phabricator-remarkup h3.remarkup-header:first-child,
102
+
.phabricator-remarkup h4.remarkup-header:first-child,
103
+
.phabricator-remarkup h5.remarkup-header:first-child,
104
+
.phabricator-remarkup h6.remarkup-header:first-child {
105
105
margin-top: 0;
106
106
}
107
107
108
-
.phabricator-remarkup h1:last-child,
109
-
.phabricator-remarkup h2:last-child,
110
-
.phabricator-remarkup h3:last-child,
111
-
.phabricator-remarkup h4:last-child,
112
-
.phabricator-remarkup h5:last-child,
113
-
.phabricator-remarkup h6:last-child {
108
+
.phabricator-remarkup h1.remarkup-header:last-child,
109
+
.phabricator-remarkup h2.remarkup-header:last-child,
110
+
.phabricator-remarkup h3.remarkup-header:last-child,
111
+
.phabricator-remarkup h4.remarkup-header:last-child,
112
+
.phabricator-remarkup h5.remarkup-header:last-child,
113
+
.phabricator-remarkup h6.remarkup-header:last-child {
114
114
margin-bottom: 0;
115
115
}
116
116
117
-
.phabricator-remarkup h1 {
117
+
.phabricator-remarkup h1.remarkup-header {
118
118
font-size: 1.625em;
119
119
line-height: 1.625em;
120
120
margin: 8px 0;
121
121
}
122
122
123
-
.phabricator-remarkup h2 {
123
+
.phabricator-remarkup h2.remarkup-header {
124
124
font-size: 1.5em;
125
125
line-height: 1.5em;
126
126
margin: 8px 0;
127
127
}
128
128
129
-
.phabricator-remarkup h3 {
129
+
.phabricator-remarkup h3.remarkup-header {
130
130
font-size: 1.375em;
131
131
line-height: 1.375em;
132
132
margin: 8px 0;
133
133
}
134
134
135
-
.phabricator-remarkup h4 {
135
+
.phabricator-remarkup h4.remarkup-header {
136
136
font-size: 1.25em;
137
137
line-height: 1.25em;
138
138
margin: 8px 0;
139
139
}
140
140
141
-
.phabricator-remarkup h5 {
141
+
.phabricator-remarkup h5.remarkup-header {
142
142
font-size: 1.125em;
143
143
line-height: 1.125em;
144
144
margin: 4px 0;
145
145
}
146
146
147
-
.phabricator-remarkup h6 {
147
+
.phabricator-remarkup h6.remarkup-header {
148
148
font-size: 1em;
149
149
line-height: 1em;
150
150
margin: 4px 0;
+5
-5
webroot/rsrc/css/phui/phui-fontkit.css
+5
-5
webroot/rsrc/css/phui/phui-fontkit.css
···
9
9
line-height: 20px;
10
10
}
11
11
12
-
.phui-font-source-sans .phabricator-remarkup h2 {
12
+
.phui-font-source-sans .phabricator-remarkup h2.remarkup-header {
13
13
padding: 8px 24px 8px 0;
14
14
border-bottom: 1px solid {$thinblueborder};
15
15
font-size: 20px;
···
18
18
margin: 0 0 16px;
19
19
}
20
20
21
-
.phui-font-source-sans .phabricator-remarkup ol li,
22
-
.phui-font-source-sans .phabricator-remarkup ul li {
21
+
.phui-font-source-sans .phabricator-remarkup ol li.remarkup-list-item,
22
+
.phui-font-source-sans .phabricator-remarkup ul li.remarkup-list-item {
23
23
margin-bottom: 4px;
24
24
}
25
25
26
-
.phui-font-source-sans .phabricator-remarkup tt {
26
+
.phui-font-source-sans .phabricator-remarkup tt.remarkup-monospaced {
27
27
font-size: 13px;
28
28
padding: 1px 3px 2px;
29
29
}
···
38
38
padding-bottom: 6px;
39
39
}
40
40
41
-
.phui-font-source-sans a {
41
+
.phui-font-source-sans a.remarkup-link {
42
42
color: {$blue};
43
43
}
44
44