From b4086b26022f83f35c7546e2ad30280d19fc3009 Mon Sep 17 00:00:00 2001 From: Samantha Baker <38532587+samanthabaker@users.noreply.github.com> Date: Wed, 23 Oct 2019 17:21:13 -0400 Subject: [PATCH 1/4] new datatable styles --- sam-styles/table/_structure.scss | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sam-styles/table/_structure.scss b/sam-styles/table/_structure.scss index 532bbc7e5..a6734e3b3 100644 --- a/sam-styles/table/_structure.scss +++ b/sam-styles/table/_structure.scss @@ -206,6 +206,46 @@ sam-header-cell{ border-radius: 2px; } +/** +* sam-styles custom for tertiary datatable +*/ +sam-datatable.sam-datatable--light { + overflow-x: scroll; + overflow-y: scroll; + + width: inherit; + height: 400px; + + .sam-header-row { + background-color: #f5f6f7; + + th { + color: black; + + &:hover { + color: black; + } + &:active { + color: primary; + } + } + + th:hover { + color: black; + } + } + + tr { + border: 1px solid #999; + } + + sam-cell{ + border-right: 1px solid #999; + text-align: left; + height: 100%; + } +} + /** * BASIC SAM TABLE */ From ff67b38c000b965b1f552a6c693d54f5c0399608 Mon Sep 17 00:00:00 2001 From: Samantha Baker <38532587+samanthabaker@users.noreply.github.com> Date: Thu, 24 Oct 2019 14:14:04 -0400 Subject: [PATCH 2/4] table styles --- sam-styles/table/_structure.scss | 43 ++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/sam-styles/table/_structure.scss b/sam-styles/table/_structure.scss index a6734e3b3..77cb425c6 100644 --- a/sam-styles/table/_structure.scss +++ b/sam-styles/table/_structure.scss @@ -212,12 +212,13 @@ sam-header-cell{ sam-datatable.sam-datatable--light { overflow-x: scroll; overflow-y: scroll; - - width: inherit; + width: 100%; height: 400px; .sam-header-row { background-color: #f5f6f7; + overflow-x: auto; + position: sticky; th { color: black; @@ -237,12 +238,44 @@ sam-datatable.sam-datatable--light { tr { border: 1px solid #999; + height: 60px; } - sam-cell{ - border-right: 1px solid #999; + td { + display: block; + border: 0.5px solid #999; text-align: left; - height: 100%; + height: 60px; + width: max-content; + } +} + +.datatable-container { + .sam-datatable-title { + .title { + width: inherit; + height: 70px; + background-color: #EFF6FB; + border: 1px solid #999; + padding: 5px; + + span { + font-size: 14px; + font-style: italic; + } + div { + font-size: 16px; + font-weight: bold; + color: #0172BC; + } + } + input { + display: none; + } + } + + sam-pagination { + display: none !important; } } From 5de0ea7b1100b0c4c7a1eef3ce6f2db9a5883c6a Mon Sep 17 00:00:00 2001 From: Samantha Baker <38532587+samanthabaker@users.noreply.github.com> Date: Tue, 29 Oct 2019 17:02:07 -0400 Subject: [PATCH 3/4] datatable: --- sam-styles/table/_structure.scss | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sam-styles/table/_structure.scss b/sam-styles/table/_structure.scss index 77cb425c6..07f3ea4a9 100644 --- a/sam-styles/table/_structure.scss +++ b/sam-styles/table/_structure.scss @@ -250,7 +250,11 @@ sam-datatable.sam-datatable--light { } } +sam-datatable--light__data { + width: max-content; +} .datatable-container { + .sam-datatable-title { .title { width: inherit; @@ -313,3 +317,25 @@ sam-datatable.sam-datatable--light { .sam-detial-table { color: lightgray; } + +//column widths +.cdk-column-agency, .cdk-column-cfdaNumber, .cdk-column-title, .cdk-column-cost, .cdk-column-lastUpdatedDate{ + word-wrap: break-word !important; + white-space: unset !important; + flex: 1 1 auto !important; + width: 100px !important; + overflow-wrap: break-word; + word-wrap: break-word; + + -ms-word-break: break-all; + /* This is the dangerous one in WebKit, as it breaks things wherever */ + word-break: break-all; + /* Instead use this non-standard one: */ + word-break: break-word; + + /* Adds a hyphen where the word breaks, if supported (No Blink) */ + -ms-hyphens: auto; + -moz-hyphens: auto; + -webkit-hyphens: auto; + hyphens: auto; +} From 8b1c211ec74f8ee9a14d3356489df6cd9549f406 Mon Sep 17 00:00:00 2001 From: Samantha Baker <38532587+samanthabaker@users.noreply.github.com> Date: Tue, 29 Oct 2019 17:14:54 -0400 Subject: [PATCH 4/4] code clean up --- sam-styles/table/_structure.scss | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/sam-styles/table/_structure.scss b/sam-styles/table/_structure.scss index 07f3ea4a9..9beda6e1c 100644 --- a/sam-styles/table/_structure.scss +++ b/sam-styles/table/_structure.scss @@ -249,10 +249,6 @@ sam-datatable.sam-datatable--light { width: max-content; } } - -sam-datatable--light__data { - width: max-content; -} .datatable-container { .sam-datatable-title { @@ -317,25 +313,3 @@ sam-datatable--light__data { .sam-detial-table { color: lightgray; } - -//column widths -.cdk-column-agency, .cdk-column-cfdaNumber, .cdk-column-title, .cdk-column-cost, .cdk-column-lastUpdatedDate{ - word-wrap: break-word !important; - white-space: unset !important; - flex: 1 1 auto !important; - width: 100px !important; - overflow-wrap: break-word; - word-wrap: break-word; - - -ms-word-break: break-all; - /* This is the dangerous one in WebKit, as it breaks things wherever */ - word-break: break-all; - /* Instead use this non-standard one: */ - word-break: break-word; - - /* Adds a hyphen where the word breaks, if supported (No Blink) */ - -ms-hyphens: auto; - -moz-hyphens: auto; - -webkit-hyphens: auto; - hyphens: auto; -}