Skip to content

Commit 0ae6e87

Browse files
committed
implement new UI / design
- add new design - update preview site - add Gotham fonts - remove old fonts - update icons - add fragment jumper script - configure build to not remove viewBox on SVG - configure build to copy images for preview site
1 parent b77f3e5 commit 0ae6e87

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1228
-1124
lines changed

preview-site-src/index.adoc

+18-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This section provides information on the server resources across the cluster.
3030

3131
The summary section is designed to provide a quick overview of the cluster activity.
3232

33-
image::web-console-server-stats-summary.png[]
33+
image::stats-summary.png[]
3434

3535
The following statistics are available:
3636

@@ -58,6 +58,20 @@ With the stream-based views, data returned when `stale` is set to `ok` is closer
5858

5959
The *Server Resources* statistics section displays the resource information on this server including swap usage, free RAM, CPU utilization percentage,and FTS RAM used.
6060

61+
[source,java]
62+
----
63+
// Query (fluent API)
64+
Observable<AsyncN1qlQueryResult> theAirline = bucket
65+
.async()
66+
.query(N1qlQuery.simple(
67+
select("name")
68+
.from("travel-sample")
69+
.as("Airline")
70+
.where(x("id")
71+
.eq(5209))));
72+
return thisAirline;
73+
----
74+
6175
[#vbucket_stats]
6276
== Monitoring vBucket Resources
6377

@@ -175,6 +189,7 @@ POST http://nodename:8091/settings/viewUpdateDaemon
175189
updateInterval=10000&updateMinChanges=7000
176190
----
177191

192+
[source,json]
178193
----
179194
{
180195
"_id": "_design/myddoc",
@@ -193,8 +208,9 @@ updateInterval=10000&updateMinChanges=7000
193208
You can set this information when creating and updating design documents through the design document REST API.
194209
To perform this operation using the `curl` tool:
195210

211+
[source,console]
196212
----
197-
> curl -X POST -v -d 'updateInterval=7000&updateMinChanges=7000' \
213+
$ curl -X POST -v -d 'updateInterval=7000&updateMinChanges=7000' \
198214
'http://Administrator:[email protected]:8091/settings/viewUpdateDaemon'
199215
----
200216

preview-site-src/stats-summary.png

64.2 KB
Loading

preview-site-src/ui-model.yml

+20-16
Original file line numberDiff line numberDiff line change
@@ -97,24 +97,28 @@ page:
9797
urlType: fragment
9898
- content: Managing Clusters
9999
items:
100-
- content: Monitor Using the REST API
101-
url: '#'
102-
urlType: fragment
103-
- content: Monitor Using the cbstats Utility
104-
url: '#'
105-
urlType: fragment
106-
- content: *page_title
107-
url: *page_url
108-
urlType: internal
109-
- content: Monitoring XDCR Timestamp-based Conflict Resolution
110-
url: '#'
111-
urlType: fragment
112-
- content: Monitoring Management
113-
url: '#'
114-
urlType: fragment
115-
- content: Monitoring N1QL Queries
100+
- content: Monitoring
116101
url: '#'
117102
urlType: fragment
103+
items:
104+
- content: Monitor Using the REST API
105+
url: '#'
106+
urlType: fragment
107+
- content: Monitor Using the cbstats Utility
108+
url: '#'
109+
urlType: fragment
110+
- content: *page_title
111+
url: *page_url
112+
urlType: internal
113+
- content: Monitoring XDCR Timestamp-based Conflict Resolution
114+
url: '#'
115+
urlType: fragment
116+
- content: Monitoring Management
117+
url: '#'
118+
urlType: fragment
119+
- content: Monitoring N1QL Queries
120+
url: '#'
121+
urlType: fragment
118122
- content: Troubleshooting
119123
url: '#'
120124
urlType: fragment

src/css/doc.css renamed to src/css/article.css

+28-40
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
.doc {
22
padding-bottom: 4rem;
3-
color: var(--color-text);
4-
font-size: 1.0625rem;
5-
}
6-
7-
@media screen and (max-width: 1024px) {
8-
.doc {
9-
margin: 0 auto;
10-
}
113
}
124

135
.doc h1,
@@ -16,7 +8,7 @@
168
.doc h4,
179
.doc h5,
1810
.doc h6 {
19-
font-weight: 400;
11+
font-weight: var(--weight-normal);
2012
line-height: 1.5;
2113
margin: 1.0625rem 0 calc(0.625rem - 1rem) 0;
2214
}
@@ -47,7 +39,6 @@
4739

4840
.doc h4 {
4941
font-size: 1.25rem;
50-
font-weight: var(--weight-bold);
5142
}
5243

5344
.doc h1 > a.anchor,
@@ -62,7 +53,7 @@
6253
width: 1.5ex;
6354
margin-left: -1.25ex;
6455
visibility: hidden;
65-
font-weight: 400;
56+
font-weight: var(--weight-normal);
6657
}
6758

6859
.doc h1 > a.anchor::before,
@@ -83,16 +74,6 @@
8374
visibility: visible;
8475
}
8576

86-
.doc a {
87-
text-decoration: underline;
88-
}
89-
90-
.doc a:focus,
91-
.doc a:hover {
92-
color: var(--color-link-focus);
93-
text-decoration: none;
94-
}
95-
9677
.doc i.fa {
9778
font-style: normal;
9879
}
@@ -101,6 +82,11 @@
10182
text-decoration: underline;
10283
}
10384

85+
.doc strong,
86+
.doc b {
87+
font-weight: var(--weight-medium);
88+
}
89+
10490
.doc code {
10591
font-size: 0.875em;
10692
color: #555;
@@ -163,6 +149,7 @@
163149

164150
.doc table.tableblock th {
165151
border-bottom: 2.5px solid #ddd;
152+
font-weight: var(--weight-medium);
166153
}
167154

168155
.doc table.tableblock td {
@@ -312,17 +299,21 @@ p.tableblock + p.tableblock {
312299
}
313300

314301
.quoteblock.abstract blockquote {
315-
display: table;
316-
color: #555;
317-
font-size: 0.95rem;
302+
/* color: var(--color-muted); */
303+
font-size: 0.9375rem;
318304
margin: 1rem 0 1.5625rem 0;
319-
text-align: justify;
305+
font-weight: var(--weight-light);
306+
}
307+
308+
.quoteblock.abstract blockquote * {
309+
font-weight: inherit;
320310
}
321311

322312
.quoteblock.abstract blockquote::before {
323313
content: "Abstract: ";
324-
color: #707070;
325-
font-weight: var(--weight-bold);
314+
/* color: #757575; */
315+
color: var(--color-muted);
316+
font-weight: var(--weight-medium);
326317
}
327318

328319
.doc ul {
@@ -422,19 +413,16 @@ p.tableblock + p.tableblock {
422413
margin-top: 0;
423414
}
424415

425-
/* NEEDS REVIEW prevent pre in table from causing article to exceed bounds */
426-
.doc .tableblock pre,
427-
.doc .listingblock.wrap pre {
428-
white-space: pre-wrap;
429-
}
430-
431416
.doc pre:not(.highlight),
432417
.doc pre.highlight code {
433-
background-color: #f5f2f0;
434-
outline: 1px solid #ccc;
418+
/* background-color: #333; */
419+
background-color: #28282f;
420+
color: #f8f8f2;
435421
display: block;
436422
white-space: pre-wrap;
437-
padding: 0.625rem 0.5rem;
423+
/* NOTE without word-break=break-word, listingblock causes article to overflow bounds */
424+
word-break: break-word;
425+
padding: 0.625rem;
438426
}
439427

440428
/* NOTE assume pre.highlight contains code[data-lang] */
@@ -444,10 +432,10 @@ p.tableblock + p.tableblock {
444432

445433
.doc .listingblock code[data-lang]::before {
446434
content: attr(data-lang);
447-
color: #909090;
435+
color: #f8f8f2;
448436
display: none;
449437
font-size: 0.75em;
450-
font-weight: 400;
438+
font-weight: var(--weight-light);
451439
letter-spacing: 1px;
452440
line-height: 1;
453441
text-transform: uppercase;
@@ -461,7 +449,7 @@ p.tableblock + p.tableblock {
461449
}
462450

463451
.doc .dlist dt {
464-
font-weight: 700;
452+
font-weight: var(--weight-medium);
465453
margin-top: 1.5rem;
466454
}
467455

@@ -559,5 +547,5 @@ p.tableblock + p.tableblock {
559547

560548
.doc .menuseq i.caret::before {
561549
content: ">";
562-
font-weight: var(--weight-bold);
550+
font-weight: var(--weight-medium);
563551
}

src/css/base.css

+25-20
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
:root {
2-
--color-text: #252525;
3-
--color-link: #ec1e2c;
4-
--color-link-focus: #cc2a2e;
2+
--color-brand: #ea2328;
3+
--color-muted: #666;
4+
--color-text: #333;
5+
--color-link: #00ace0;
56
--color-code: #555;
67
--color-border: #eaeaea;
78
--color-navbar-bg: #000;
89
--color-navbar-text: #fff;
9-
--color-navbar-text-focus: #fff;
10+
--color-footer-bg: #000;
11+
--color-footer-text: #fff;
12+
/* --height-navbar: 4rem; */
13+
--height-navbar: 4.875rem;
14+
--height-navbar-with-gap: calc(1.5rem + var(--height-navbar));
15+
--weight-light: 300;
16+
--weight-normal: 400;
17+
--weight-medium: 500;
1018
--weight-bold: 700;
1119
}
1220

@@ -23,11 +31,16 @@ body {
2331

2432
html {
2533
box-sizing: border-box;
26-
font-family: "Kievit OT", sans-serif;
27-
font-size: 1em;
2834
text-size-adjust: 100%;
2935
}
3036

37+
html,
38+
button,
39+
input,
40+
select {
41+
font-family: "Gotham", sans-serif;
42+
}
43+
3144
body {
3245
color: var(--color-text);
3346
line-height: 1.5;
@@ -39,22 +52,10 @@ strong {
3952
font-weight: var(--weight-bold);
4053
}
4154

42-
button,
43-
input,
44-
select {
45-
font-family: "Kievit OT", sans-serif;
46-
}
47-
4855
.container {
4956
margin: 0 auto;
50-
max-width: 68rem;
51-
padding: 0 0.9rem;
52-
}
53-
54-
@media screen and (min-width: 769px) {
55-
.container {
56-
padding: 0;
57-
}
57+
max-width: 80rem;
58+
padding: 0 1.25rem;
5859
}
5960

6061
a {
@@ -74,3 +75,7 @@ pre {
7475
font-family: "Roboto Mono", monospace;
7576
color: var(--color-code);
7677
}
78+
79+
img {
80+
border: 0;
81+
}

src/css/body.css

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
div.body {
2+
display: flex;
3+
margin-top: var(--height-navbar-with-gap);
4+
}
5+
6+
main.article {
7+
flex: 1;
8+
}
9+
10+
nav.nav {
11+
display: none;
12+
flex: 0 0 16rem;
13+
width: 16rem; /* width has to be set for fixed position child */
14+
order: -1;
15+
}
16+
17+
@media screen and (min-width: 769px) {
18+
nav.nav {
19+
display: block;
20+
}
21+
}
22+
23+
aside.toc.sidebar {
24+
display: none;
25+
flex: 0 0 12rem;
26+
}
27+
28+
@media screen and (min-width: 1200px) {
29+
aside.toc.embedded {
30+
display: none;
31+
}
32+
33+
aside.toc.sidebar {
34+
display: block;
35+
}
36+
}

0 commit comments

Comments
 (0)