Skip to content

Commit e1b4071

Browse files
author
rakeshAlgo
committed
table UI fixes for merge cell and tutorials
1 parent 3898291 commit e1b4071

File tree

6 files changed

+70
-42
lines changed

6 files changed

+70
-42
lines changed

‎preview-src/index.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
= Monitoring Statistics
22
:doctype: book
33
:page-edition: enterprise
4-
:page-status: beta
54
// The following should be global document attributes
65
:url-edition: https://www.couchbase.com/products/editions
76
:enterprise: {url-edition}[ENTERPRISE EDITION]

‎src/css/base.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ html code {
7575

7676
b,
7777
strong {
78-
font-weight: var(--weight-bold);
78+
font-weight: var(--weight-semibold);
7979
}
8080

8181
small {

‎src/css/contributor.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
display: flex;
33
align-items: center;
44
flex-wrap: wrap;
5-
margin: 15px 0;
5+
margin: 15px 0 0;
66
visibility: hidden;
77
}
88

‎src/css/doc.css‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
2828

2929
.doc h2 {
3030
font-size: var(--heading-h2);
31-
margin: 2.25rem 0 2.5rem;
31+
margin: 1.5rem 0 1.5rem;
3232
max-width: fit-content;
33+
display: inline-block;
34+
width: 100%;
3335
/* NOTE used to restrict width of key line */
3436
}
3537

@@ -142,7 +144,7 @@
142144
font-weight: var(--weight-semibold);
143145
letter-spacing: -0.025em;
144146
line-height: 1.2;
145-
margin-bottom: 0.25rem;
147+
margin-bottom: 0.75rem;
146148
color: var(--color-brand-gray3);
147149
}
148150

@@ -630,7 +632,7 @@ code.language-console.hljs.shell {
630632

631633
.doc .sidebarblock > .content {
632634
border: 1px solid var(--color-border);
633-
padding: 3rem;
635+
padding: 2.5rem;
634636
}
635637

636638
.doc .sidebarblock > .content > .title {

‎src/css/labels.css‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
position: relative;
1616
}
1717

18-
.doc span.edition,
19-
.doc span.status,
20-
.doc span.community {
18+
.doc .labels .edition,
19+
.doc .labels .status,
20+
.doc .labels .community {
2121
max-width: fit-content;
2222
font-size: var(--labels-font-size);
2323
font-weight: var(--weight-bold);
@@ -44,10 +44,10 @@
4444
top: -1rem;
4545
} */
4646

47-
.doc .labels li > *,
48-
.doc span.edition,
49-
.doc span.status,
50-
.doc span.community {
47+
.doc .labels li,
48+
.doc .labels .edition,
49+
.doc .labels .status,
50+
.doc .labels .community {
5151
color: #fff;
5252
display: inline-block;
5353
padding: 6px;
@@ -57,62 +57,63 @@
5757
}
5858

5959
.doc .labels li a,
60-
.doc span.edition a,
61-
.doc span.status a,
62-
.doc span.community a {
60+
.doc .labels .edition a,
61+
.doc .labels .status a,
62+
.doc .labels .community a {
6363
text-decoration: none;
6464
font-family: "Source Sans Pro", sans-serif;
6565
}
6666

67-
.doc span.edition *,
68-
.doc span.status * {
67+
.doc .labels .edition *,
68+
.doc .labels .status * {
6969
color: inherit;
7070
}
7171

72-
.doc .labels li.edition {
72+
/* .doc .labels li.edition {
7373
background-color: var(--color-brand-light-blue);
74-
}
74+
} */
7575

76-
.doc span.edition {
76+
.doc .labels .edition {
7777
color: var(--color-brand-blue-secondary);
7878
border: 1px solid var(--color-brand-blue-secondary);
7979
border-radius: 3px;
8080
opacity: 0.6;
8181
}
8282

83-
.doc span.status {
83+
.doc .labels .status {
8484
color: var(--color-brand-caution);
8585
border: 1px solid var(--color-brand-caution);
8686
border-radius: 3px;
8787
opacity: 0.6;
8888
}
8989

90-
.doc span.community {
90+
.doc .labels .community {
9191
color: #999;
9292
border: 1px solid #999;
9393
border-radius: 3px;
9494
opacity: 0.6;
9595
}
9696

97-
.doc span.edition a {
97+
.doc .labels .edition a {
9898
color: var(--color-brand-blue-secondary);
9999
}
100100

101-
.doc span.status a {
101+
.doc .labels .status a {
102102
color: var(--color-brand-caution);
103103
}
104104

105-
.doc span.community a {
105+
.doc .labels .community a {
106106
color: #999;
107107
}
108108

109-
.doc span.edition:hover,
110-
.doc span.status:hover,
111-
.doc span.community:hover {
109+
.doc .labels .edition:hover,
110+
.doc .labels .status:hover,
111+
.doc .labels .community:hover {
112112
opacity: 1;
113113
}
114114

115-
.doc .labels span:first-child {
115+
.doc .labels span:first-child,
116+
.doc .labels li:first-child {
116117
opacity: 1;
117118
}
118119

@@ -125,9 +126,9 @@
125126
border-bottom-color: var(--color-brand-light-blue);
126127
} */
127128

128-
.doc .labels li.status {
129+
/* .doc .labels li.status {
129130
background-color: var(--color-brand-orange);
130-
}
131+
} */
131132

132133
/* .doc .labels li.status:first-child::before,
133134
.doc .labels span.status:first-child::before {

‎src/css/table.css‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ table.tableblock th {
4747
border-bottom: 2px solid var(--color-brand-blue-secondary);
4848
font-size: 1rem;
4949
line-height: 1.25rem;
50-
font-weight: var(--weight-bold);
50+
font-weight: var(--weight-semibold);
5151
}
5252

5353
table.tableblock tbody tr {
@@ -60,15 +60,15 @@ table.tableblock tbody tr {
6060

6161
table.tableblock > tbody td {
6262
display: block;
63-
border-bottom: 1px solid var(--color-brand-gray7);
63+
border-bottom: 1px solid var(--color-brand-gray8);
6464
padding-left: var(--base-small-space);
6565
padding-top: var(--base-space);
6666
padding-bottom: var(--base-space);
6767
}
6868

6969
table.tableblock tbody td p {
70-
font-size: 0.875rem;
71-
line-height: 1.125rem;
70+
font-size: var(--font-base);
71+
line-height: var(--line-height-base);
7272
color: var(--color-brand-gray1);
7373
font-weight: var(--weight-medium);
7474
}
@@ -95,27 +95,39 @@ table.tableblock .title {
9595
margin-bottom: 10px;
9696
}
9797

98-
/* Responsive css */
99-
10098
.doc .admonitionblock td.icon {
10199
border-bottom: none;
102100
}
103101

102+
/* table.merged-cells-table tr:hover {
103+
background-color: var(--color-brand-gray7);
104+
}
105+
*/
106+
107+
table.description-cell-table tr th:last-child,
108+
table.description-cell-table tr td:last-child {
109+
background-color: var(--color-brand-gray7);
110+
}
111+
112+
/* Responsive css */
113+
104114
@media screen and (min-width: 768px) {
105115
table.tableblock {
106116
display: table;
107117
position: relative;
108-
margin-top: 2.5rem;
118+
/* margin-top: 2.5rem; */
109119
}
110120

111121
table.tableblock .title {
112122
position: absolute;
113123
left: 0;
114-
top: -35px;
124+
top: -30px;
115125
}
116126

117-
div.paragraph + table.tableblock {
118-
margin-top: 40px;
127+
div.paragraph + table.tableblock,
128+
div.ulist + table.tableblock,
129+
table.tableblock + table.tableblock {
130+
margin-top: 2.5rem;
119131
}
120132

121133
table.tableblock thead {
@@ -132,6 +144,10 @@ table.tableblock .title {
132144
display: table-row;
133145
}
134146

147+
table.merged-cells-table tbody tr:nth-child(even) {
148+
background-color: var(--color-brand-gray7);
149+
}
150+
135151
table.tableblock th,
136152
table.tableblock tbody td {
137153
display: table-cell;
@@ -141,6 +157,16 @@ table.tableblock .title {
141157
table.tableblock th {
142158
width: auto;
143159
}
160+
161+
table.merged-cells-table tr td:first-child,
162+
table.description-cell-table tr td:first-child {
163+
border-left: 0;
164+
}
165+
166+
table.merged-cells-table tr td,
167+
table.description-cell-table tr td {
168+
border-left: 1px solid var(--color-brand-gray8);
169+
}
144170
}
145171

146172
@media screen and (max-width: 767px) {

0 commit comments

Comments
 (0)