From e1913511b0dca547d8ae4c368b7ccd9c352e638f Mon Sep 17 00:00:00 2001 From: Cyril ANNETTE Date: Fri, 15 Apr 2022 11:54:02 +0200 Subject: [PATCH 1/3] fix: WEB-98 Paragraphs and h3 in tables have the same font-weight as in Confluence --- src/assets/scss/_tables.scss | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/assets/scss/_tables.scss b/src/assets/scss/_tables.scss index 7ef572ae2..a7b965ea0 100644 --- a/src/assets/scss/_tables.scss +++ b/src/assets/scss/_tables.scss @@ -29,6 +29,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 */ @@ -340,9 +344,12 @@ table.confluenceTable td.confluenceTd[data-highlight-colour='\#000000'] { } /* ADG3 colors end */ -table.confluenceTable th.confluenceTh, -table.confluenceTable th.confluenceTh > p { +table.confluenceTable th.confluenceTh { font-weight: bold; + + p { + font-weight: initial; + } } table.confluenceTable th.confluenceTh.nohighlight, /* deprecated */ From abe99da07f7ba142ffd32226f8603b56e9d0e95b Mon Sep 17 00:00:00 2001 From: Cyril ANNETTE Date: Fri, 15 Apr 2022 12:04:36 +0200 Subject: [PATCH 2/3] fix: WEB-98 mirrored the iadc stylesheet --- src/assets/scss/iadc/_tables.scss | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/assets/scss/iadc/_tables.scss b/src/assets/scss/iadc/_tables.scss index fe2465582..a7b965ea0 100644 --- a/src/assets/scss/iadc/_tables.scss +++ b/src/assets/scss/iadc/_tables.scss @@ -29,6 +29,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 */ @@ -43,7 +47,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 */ @@ -341,9 +344,12 @@ table.confluenceTable td.confluenceTd[data-highlight-colour='\#000000'] { } /* ADG3 colors end */ -table.confluenceTable th.confluenceTh, -table.confluenceTable th.confluenceTh > p { +table.confluenceTable th.confluenceTh { font-weight: bold; + + p { + font-weight: initial; + } } table.confluenceTable th.confluenceTh.nohighlight, /* deprecated */ From e8ae598e26ca998eadb1d554a9209a6495474775 Mon Sep 17 00:00:00 2001 From: Cyril ANNETTE Date: Fri, 15 Apr 2022 15:36:04 +0200 Subject: [PATCH 3/3] feat: WEB-98 fixed code smells --- src/assets/scss/_tables.scss | 13 +++++-------- src/assets/scss/iadc/_tables.scss | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/assets/scss/_tables.scss b/src/assets/scss/_tables.scss index a7b965ea0..be157282c 100644 --- a/src/assets/scss/_tables.scss +++ b/src/assets/scss/_tables.scss @@ -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, @@ -344,14 +349,6 @@ table.confluenceTable td.confluenceTd[data-highlight-colour='\#000000'] { } /* ADG3 colors end */ -table.confluenceTable th.confluenceTh { - font-weight: bold; - - p { - font-weight: initial; - } -} - table.confluenceTable th.confluenceTh.nohighlight, /* deprecated */ table.confluenceTable th.confluenceTh.nohighlight > p { /* deprecated */ diff --git a/src/assets/scss/iadc/_tables.scss b/src/assets/scss/iadc/_tables.scss index a7b965ea0..be157282c 100644 --- a/src/assets/scss/iadc/_tables.scss +++ b/src/assets/scss/iadc/_tables.scss @@ -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, @@ -344,14 +349,6 @@ table.confluenceTable td.confluenceTd[data-highlight-colour='\#000000'] { } /* ADG3 colors end */ -table.confluenceTable th.confluenceTh { - font-weight: bold; - - p { - font-weight: initial; - } -} - table.confluenceTable th.confluenceTh.nohighlight, /* deprecated */ table.confluenceTable th.confluenceTh.nohighlight > p { /* deprecated */