Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: WIKI-19593: implementation of new table design #283

Merged
merged 4 commits into from
Aug 23, 2023
Merged

feat: WIKI-19593: implementation of new table design #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
282d7b7
feat: WIKI-19593: implementation of new table design
rusandorx Aug 21, 2023
1e6e6a7
fix: table styles
rusandorx Aug 22, 2023
4c57b8c
fix: changed border-radius styles back.
rusandorx Aug 22, 2023
1c10bdb
fix: left border fixed
rusandorx Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions src/scss/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
}

table {
color: #333333;
color: #333;

display: inline-block;
max-width: 100%;
Expand All @@ -155,22 +155,50 @@
position: relative;
z-index: 1;

border: 1px solid $borderColor;
box-sizing: border-box;
border-radius: 8px;
border-collapse: collapse;
border-collapse: separate;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should leave border-collapse: collapse;. Because if we have border-collapse: separate; than the border will be 2px wide.

border-spacing: 0;
background: $baseColor;

thead, tr:nth-child(2n) {
background-color: $tableRowBackgroundColor;
}

tr:first-child td:first-child {
border-top-left-radius: $tableBorderRadius;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this didn't fit you?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue is there are these weird looking double borders outside of the table:
Screenshot 2023-08-22 at 13 33 33

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, so let's leave as you did

}

tr:first-child td:last-child {
border-top-right-radius: $tableBorderRadius;
}

tr:last-child td:first-child {
border-bottom-left-radius: $tableBorderRadius;
}

tr:last-child td:last-child {
border-bottom-right-radius: $tableBorderRadius;
}

tr:first-child td {
border-top-style: solid;
}

tr td:first-child {
border-left: 1px solid $borderColor;
}

th, td {
padding: 10px 15px;
padding: 10px 20px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border: 1px solid $borderColor;

p {
padding: 0;
margin: 0;
}
}

th {
Expand All @@ -180,7 +208,8 @@

td {
white-space: normal;
vertical-align: baseline;
vertical-align: top;
border-style: none solid solid none;
}
}

Expand Down Expand Up @@ -266,7 +295,7 @@
margin-bottom: 0;
}

&:not(.yfm_no-list-reset){
&:not(.yfm_no-list-reset) {
ol {
list-style-type: none;
counter-reset: list;
Expand Down
2 changes: 2 additions & 0 deletions src/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ $tableRowBackgroundColor: rgba(0, 0, 0, 0.02);

$linkColor: $accentColor;
$linkHoverColor: #004080;

$tableBorderRadius: 8px;