Skip to content

Commit

Permalink
Merge pull request #408 from Sanofi-IADC/bugfix/bold-font-table
Browse files Browse the repository at this point in the history
fix: WEB-98 Paragraphs and h3 in tables have the same font-weight as in Confluence
  • Loading branch information
kiru42 authored Apr 19, 2022
2 parents 5febc48 + c3ff7d3 commit 9fdfab2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
14 changes: 9 additions & 5 deletions src/assets/scss/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ table.confluenceTable th.confluenceTh {
z-index: 2;
box-shadow: 0 3px 2px -1px rgba(0, 0, 0, 0.4);
font-size: var(--main-font-size);
font-weight: bold;

p {
font-weight: initial;
}
}

.confluenceTh,
Expand All @@ -29,6 +34,10 @@ table.confluenceTable th.confluenceTh {
vertical-align: top;
min-width: 8px; /* CONF-39943: set table cell min-width to which cursor can be focused */
word-wrap: break-word;

h1, h2, h3 {
font-weight: 600;
}
}

/* Lists in tables */
Expand Down Expand Up @@ -340,11 +349,6 @@ table.confluenceTable td.confluenceTd[data-highlight-colour='\#000000'] {
}
/* ADG3 colors end */

table.confluenceTable th.confluenceTh,
table.confluenceTable th.confluenceTh > p {
font-weight: bold;
}

table.confluenceTable th.confluenceTh.nohighlight, /* deprecated */
table.confluenceTable th.confluenceTh.nohighlight > p {
/* deprecated */
Expand Down
15 changes: 9 additions & 6 deletions src/assets/scss/iadc/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ table.confluenceTable th.confluenceTh {
z-index: 2;
box-shadow: 0 3px 2px -1px rgba(0, 0, 0, 0.4);
font-size: var(--main-font-size);
font-weight: bold;

p {
font-weight: initial;
}
}

.confluenceTh,
Expand All @@ -29,6 +34,10 @@ table.confluenceTable th.confluenceTh {
vertical-align: top;
min-width: 8px; /* CONF-39943: set table cell min-width to which cursor can be focused */
word-wrap: break-word;

h1, h2, h3 {
font-weight: 600;
}
}

/* Lists in tables */
Expand All @@ -43,7 +52,6 @@ table.confluenceTable th.confluenceTh {
.table-wrap {
margin: auto;
margin-top: 20px;
// overflow-x: auto;
}

/* an exception to above rule for tables that are first child */
Expand Down Expand Up @@ -341,11 +349,6 @@ table.confluenceTable td.confluenceTd[data-highlight-colour='\#000000'] {
}
/* ADG3 colors end */

table.confluenceTable th.confluenceTh,
table.confluenceTable th.confluenceTh > p {
font-weight: bold;
}

table.confluenceTable th.confluenceTh.nohighlight, /* deprecated */
table.confluenceTable th.confluenceTh.nohighlight > p {
/* deprecated */
Expand Down

0 comments on commit 9fdfab2

Please sign in to comment.