Backports r23387 to 6.0-stable (#41957).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23390 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 18 insertions, 21 deletions

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 19112d01f..822442bf4 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1745,10 +1745,11 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
   display: inline-flex;
   align-items: center;
   vertical-align: middle;
+}
 
-  svg {
-    flex-shrink: 0;
-  }
+.icon svg, .icon-only svg {
+  flex-shrink: 0;
+}
 }
 
 a.icon:hover svg, a.icon-only:hover svg {
diff --git a/app/assets/stylesheets/wiki_syntax.css b/app/assets/stylesheets/wiki_syntax.css
index 868dbe4cc..d326a3293 100644
--- a/app/assets/stylesheets/wiki_syntax.css
+++ b/app/assets/stylesheets/wiki_syntax.css
@@ -24,24 +24,20 @@ h1 { font-family: var(--fonts-main); font-size: 0.875rem; text-align: center; co
 body { font-family: var(--fonts-main); font-size: 0.75rem; color: #444; }
 pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; }
 table th { padding-top: 1em; }
-table th {
-  img {
-    border: 1px solid #bbb;
-    opacity: 0.7;
-  }
-
-  .syntax-pre {
-    display: inline-block;
-    border: 1px solid #bbb;
-    width: 18px;
-    height: 18px;
-
-    &:before {
-      content: "pre";
-      font-size: 0.625rem;
-      color: #666;
-    }
-  }
+table th img {
+  border: 1px solid #bbb;
+  opacity: 0.7;
+}
+table th .syntax-pre {
+  display: inline-block;
+  border: 1px solid #bbb;
+  width: 18px;
+  height: 18px;
+}
+table th .syntax-pre:before {
+  content: "pre";
+  font-size: 0.625rem;
+  color: #666;
 }
 table td { background-color: #f5f5f5; height: 2em; vertical-align: middle;}
 table td code { font-size: 1.2em; }