archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Tighten Remarkup and Fontkit CSS rules in Phabricator

Browse Source 
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
This commit is contained in:
epriestley
2014-06-27 09:39:13 -07:00
parent b84454699c
commit e42e8aa618
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
webroot/rsrc/css/core/remarkup.css
View File

@@ -48,7 +48,7 @@
background-color: {$lightred};
}
.phabricator-remarkup tt {
.phabricator-remarkup tt.remarkup-monospaced {
color: #333333;
background: #ebebeb;
padding: 0 4px;
@@ -57,16 +57,16 @@
/* NOTE: You can currently produce this with [[link | `name`]]. Restore the
link color. */
.phabricator-remarkup a tt {
.phabricator-remarkup a tt.remarkup-monospaced {
color: #18559d;
}
.phabricator-remarkup ul {
.phabricator-remarkup ul.remarkup-list {
list-style: disc;
margin: 12px 0 12px 30px;
}
.phabricator-remarkup ol {
.phabricator-remarkup ol.remarkup-list {
list-style: decimal;
margin: 12px 0 12px 30px;
}
@@ -84,10 +84,10 @@
color: {$greytext};
}
.phabricator-remarkup ul ol,
.phabricator-remarkup ul ul,
.phabricator-remarkup ol ol,
.phabricator-remarkup ol ul {
.phabricator-remarkup ul.remarkup-list ol.remarkup-list,
.phabricator-remarkup ul.remarkup-list ul.remarkup-list,
.phabricator-remarkup ol.remarkup-list ol.remarkup-list,
.phabricator-remarkup ol.remarkup-list ul.remarkup-list {
margin: 4px 0 4px 24px;
}
@@ -96,55 +96,55 @@
list-style-type: none;
}
.phabricator-remarkup h1:first-child,
.phabricator-remarkup h2:first-child,
.phabricator-remarkup h3:first-child,
.phabricator-remarkup h4:first-child,
.phabricator-remarkup h5:first-child,
.phabricator-remarkup h6:first-child {
.phabricator-remarkup h1.remarkup-header:first-child,
.phabricator-remarkup h2.remarkup-header:first-child,
.phabricator-remarkup h3.remarkup-header:first-child,
.phabricator-remarkup h4.remarkup-header:first-child,
.phabricator-remarkup h5.remarkup-header:first-child,
.phabricator-remarkup h6.remarkup-header:first-child {
margin-top: 0;
}
.phabricator-remarkup h1:last-child,
.phabricator-remarkup h2:last-child,
.phabricator-remarkup h3:last-child,
.phabricator-remarkup h4:last-child,
.phabricator-remarkup h5:last-child,
.phabricator-remarkup h6:last-child {
.phabricator-remarkup h1.remarkup-header:last-child,
.phabricator-remarkup h2.remarkup-header:last-child,
.phabricator-remarkup h3.remarkup-header:last-child,
.phabricator-remarkup h4.remarkup-header:last-child,
.phabricator-remarkup h5.remarkup-header:last-child,
.phabricator-remarkup h6.remarkup-header:last-child {
margin-bottom: 0;
}
.phabricator-remarkup h1 {
.phabricator-remarkup h1.remarkup-header {
font-size: 1.625em;
line-height: 1.625em;
margin: 8px 0;
}
.phabricator-remarkup h2 {
.phabricator-remarkup h2.remarkup-header {
font-size: 1.5em;
line-height: 1.5em;
margin: 8px 0;
}
.phabricator-remarkup h3 {
.phabricator-remarkup h3.remarkup-header {
font-size: 1.375em;
line-height: 1.375em;
margin: 8px 0;
}
.phabricator-remarkup h4 {
.phabricator-remarkup h4.remarkup-header {
font-size: 1.25em;
line-height: 1.25em;
margin: 8px 0;
}
.phabricator-remarkup h5 {
.phabricator-remarkup h5.remarkup-header {
font-size: 1.125em;
line-height: 1.125em;
margin: 4px 0;
}
.phabricator-remarkup h6 {
.phabricator-remarkup h6.remarkup-header {
font-size: 1em;
line-height: 1em;
margin: 4px 0;

10
webroot/rsrc/css/phui/phui-fontkit.css
View File

@@ -9,7 +9,7 @@
line-height: 20px;
}
.phui-font-source-sans .phabricator-remarkup h2 {
.phui-font-source-sans .phabricator-remarkup h2.remarkup-header {
padding: 8px 24px 8px 0;
border-bottom: 1px solid {$thinblueborder};
font-size: 20px;
@@ -18,12 +18,12 @@
margin: 0 0 16px;
}
.phui-font-source-sans .phabricator-remarkup ol li,
.phui-font-source-sans .phabricator-remarkup ul li {
.phui-font-source-sans .phabricator-remarkup ol li.remarkup-list-item,
.phui-font-source-sans .phabricator-remarkup ul li.remarkup-list-item {
margin-bottom: 4px;
}
.phui-font-source-sans .phabricator-remarkup tt {
.phui-font-source-sans .phabricator-remarkup tt.remarkup-monospaced {
font-size: 13px;
padding: 1px 3px 2px;
}
@@ -38,7 +38,7 @@
padding-bottom: 6px;
}
.phui-font-source-sans a {
.phui-font-source-sans a.remarkup-link {
color: {$blue};
}