Merged r23800 from trunk to 6.0-stable (#42773).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23801 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2025-05-27 01:16:07 +00:00
parent ff6c0bd184
commit 1b7645aa63

View File

@@ -1057,17 +1057,14 @@ input#months { width: 46px; }
.jstBlock .jstTabs { padding-right: 6px; }
.jstBlock .wiki-preview { padding: 2px; }
.jstBlock .wiki-preview p:first-child { padding-top: 0 !important; margin-top: 0 !important;}
.jstBlock .wiki-preview p:last-child { padding-bottom: 0 !important; margin-bottom: 0 !important;}
.jstBlock .wiki-preview > p:first-child { padding-top: 0 !important; margin-top: 0 !important;}
.jstBlock .wiki-preview > p:last-child { padding-bottom: 0 !important; margin-bottom: 0 !important;}
.tabular .wiki-preview, .tabular .jstTabs {width: 95%;}
.tabular.settings .wiki-preview, .tabular.settings .jstTabs { width: 99%; }
.tabular.settings .wiki-preview p {padding-left: 0 !important}
.tabular .wiki-preview p {
min-height: initial;
padding: 0;
padding-top: 1em !important;
padding-bottom: 1em !important;
overflow: initial;
}
@@ -1532,7 +1529,12 @@ div.wiki .external {
div.wiki a {word-wrap: break-word;}
div.wiki a.new {color: #b73535;}
div.wiki p {line-height: 1.6;}
div.wiki p {
line-height: 1.6;
margin-top: 1em;
margin-bottom: 1em;
padding: 0;
}
div.wiki ul, div.wiki ol {margin-bottom:1em;}
div.wiki li {line-height: 1.6; margin-bottom: 0.125rem;}
div.wiki li>ul, div.wiki li>ol {margin-bottom: 0;}