Skip to content

Commit 0c408bf

Browse files
committed
Merge branch 'master' of https://github.com/couchbase/docs-ui-sandbox into ui-bug-fixes
2 parents 2876111 + 2007f6e commit 0c408bf

File tree

8 files changed

+257
-21
lines changed

8 files changed

+257
-21
lines changed

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= Couchbase Documentation UI
22
// Variables:
3-
:current-release: prod-66
3+
:current-release: prod-67
44
// Settings:
55
:!example-caption:
66
:experimental:

src/css/base.css

Lines changed: 207 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,217 @@ label::after {
207207
outline-width: 0;
208208
}
209209

210+
/* Common margin padding css class */
211+
/* margin-top */
212+
.mt-0 {
213+
margin-top: 0 !important;
214+
}
215+
216+
.mt-1 {
217+
margin-top: var(--base-extra-small-space) !important; /* 8px */
218+
}
219+
220+
.mt-2 {
221+
margin-top: var(--base-small-space) !important; /* 12px */
222+
}
223+
224+
.mt-3 {
225+
margin-top: var(--base-space) !important; /* 16px */
226+
}
227+
228+
.mt-4 {
229+
margin-top: var(--base-medium-space) !important; /* 24px */
230+
}
231+
232+
.mt-5 {
233+
margin-top: var(--base-large-space) !important; /* 32px */
234+
}
235+
236+
/* margin-bottom */
237+
.mb-0 {
238+
margin-bottom: 0 !important;
239+
}
240+
241+
.mb-1 {
242+
margin-bottom: var(--base-extra-small-space) !important; /* 8px */
243+
}
244+
245+
.mb-2 {
246+
margin-bottom: var(--base-small-space) !important; /* 12px */
247+
}
248+
249+
.mb-3 {
250+
margin-bottom: var(--base-space) !important; /* 16px */
251+
}
252+
253+
.mb-4 {
254+
margin-bottom: var(--base-medium-space) !important; /* 24px */
255+
}
256+
257+
.mb-5 {
258+
margin-bottom: var(--base-large-space) !important; /* 32px */
259+
}
260+
210261
/* Responsive css */
211-
@media screen and (min-width: 1024px) {
262+
/* For tablet,ipad Portrait view mode 1024px screen */
263+
@media screen and (min-width: 740px) {
264+
/* Spacing media query */
265+
.mt-sm-0 {
266+
margin-top: 0 !important;
267+
}
268+
269+
.mt-sm-1 {
270+
margin-top: var(--base-extra-small-space) !important; /* 8px */
271+
}
272+
273+
.mt-sm-2 {
274+
margin-top: var(--base-small-space) !important; /* 12px */
275+
}
276+
277+
.mt-sm-3 {
278+
margin-top: var(--base-space) !important; /* 16px */
279+
}
280+
281+
.mt-sm-4 {
282+
margin-top: var(--base-medium-space) !important; /* 24px */
283+
}
284+
285+
.mt-sm-5 {
286+
margin-top: var(--base-large-space) !important; /* 32px */
287+
}
288+
289+
/* margin-bottom */
290+
.mb-sm-0 {
291+
margin-bottom: 0 !important;
292+
}
293+
294+
.mb-sm-1 {
295+
margin-bottom: var(--base-extra-small-space) !important; /* 8px */
296+
}
297+
298+
.mb-sm-2 {
299+
margin-bottom: var(--base-small-space) !important; /* 12px */
300+
}
301+
302+
.mb-sm-3 {
303+
margin-bottom: var(--base-space) !important; /* 16px */
304+
}
305+
306+
.mb-sm-4 {
307+
margin-bottom: var(--base-medium-space) !important; /* 24px */
308+
}
309+
310+
.mb-sm-5 {
311+
margin-bottom: var(--base-large-space) !important; /* 32px */
312+
}
313+
}
314+
/* For tablet,ipad landscape mode 1024px screen */
315+
@media screen and (min-width: 993px) {
212316
.container-fluid {
213317
max-width: var(--width-container-fluid);
214318
padding: 0;
215319
margin: 0 auto;
216320
}
321+
322+
/* Spacing media query */
323+
.mt-md-0 {
324+
margin-top: 0 !important;
325+
}
326+
327+
.mt-md-1 {
328+
margin-top: var(--base-extra-small-space) !important; /* 8px */
329+
}
330+
331+
.mt-md-2 {
332+
margin-top: var(--base-small-space) !important; /* 12px */
333+
}
334+
335+
.mt-md-3 {
336+
margin-top: var(--base-space) !important; /* 16px */
337+
}
338+
339+
.mt-md-4 {
340+
margin-top: var(--base-medium-space) !important; /* 24px */
341+
}
342+
343+
.mt-md-5 {
344+
margin-top: var(--base-large-space) !important; /* 32px */
345+
}
346+
347+
/* margin-bottom */
348+
.mb-md-0 {
349+
margin-bottom: 0 !important;
350+
}
351+
352+
.mb-md-1 {
353+
margin-bottom: var(--base-extra-small-space) !important; /* 8px */
354+
}
355+
356+
.mb-md-2 {
357+
margin-bottom: var(--base-small-space) !important; /* 12px */
358+
}
359+
360+
.mb-md-3 {
361+
margin-bottom: var(--base-space) !important; /* 16px */
362+
}
363+
364+
.mb-md-4 {
365+
margin-bottom: var(--base-medium-space) !important; /* 24px */
366+
}
367+
368+
.mb-md-5 {
369+
margin-bottom: var(--base-large-space) !important; /* 32px */
370+
}
371+
}
372+
/* For large desktop to small desktop screen */
373+
@media screen and (min-width: 1200px) {
374+
/* Spacing media query */
375+
.mt-lg-0 {
376+
margin-top: 0 !important;
377+
}
378+
379+
.mt-lg-1 {
380+
margin-top: var(--base-extra-small-space) !important; /* 8px */
381+
}
382+
383+
.mt-lg-2 {
384+
margin-top: var(--base-small-space) !important; /* 12px */
385+
}
386+
387+
.mt-lg-3 {
388+
margin-top: var(--base-space) !important; /* 16px */
389+
}
390+
391+
.mt-lg-4 {
392+
margin-top: var(--base-medium-space) !important; /* 24px */
393+
}
394+
395+
.mt-lg-5 {
396+
margin-top: var(--base-large-space) !important; /* 32px */
397+
}
398+
399+
/* margin-bottom */
400+
.mb-lg-0 {
401+
margin-bottom: 0 !important;
402+
}
403+
404+
.mb-lg-1 {
405+
margin-bottom: var(--base-extra-small-space) !important; /* 8px */
406+
}
407+
408+
.mb-lg-2 {
409+
margin-bottom: var(--base-small-space) !important; /* 12px */
410+
}
411+
412+
.mb-lg-3 {
413+
margin-bottom: var(--base-space) !important; /* 16px */
414+
}
415+
416+
.mb-lg-4 {
417+
margin-bottom: var(--base-medium-space) !important; /* 24px */
418+
}
419+
420+
.mb-lg-5 {
421+
margin-bottom: var(--base-large-space) !important; /* 32px */
422+
}
217423
}

src/css/doc.css

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
font-weight: var(--weight-semibold);
1616
letter-spacing: -0.025rem;
1717
line-height: var(--line-height-heading);
18-
margin: 1.5rem 0 1rem;
18+
margin-bottom: 0;
1919
}
2020

2121
.doc h1 {
@@ -45,8 +45,9 @@
4545

4646
.doc h2 {
4747
font-size: var(--heading-h2);
48-
max-width: fit-content;
48+
/* max-width: fit-content; */
4949
width: 100%;
50+
margin-top: var(--base-extra-large-space);
5051
/* NOTE used to restrict width of key line */
5152
}
5253

@@ -61,14 +62,17 @@
6162

6263
.doc h3 {
6364
font-size: var(--heading-h3);
65+
margin-top: var(--base-extra-large-space);
6466
}
6567

6668
.doc h4 {
6769
font-size: var(--heading-h4);
70+
margin-top: var(--base-extra-large-space);
6871
}
6972

7073
.doc h5 {
7174
font-size: var(--heading-h5);
75+
margin-top: var(--base-extra-large-space);
7276
}
7377

7478
.doc h1 > a.anchor,
@@ -126,10 +130,20 @@
126130
word-spacing: inherit;
127131
}
128132

129-
.doc .paragraph,
133+
.doc .paragraph {
134+
margin-top: var(--base-space);
135+
}
136+
137+
.doc .paragraph + .paragraph {
138+
margin-top: var(--base-medium-space);
139+
}
140+
141+
.doc .admonitionblock {
142+
margin-top: var(--base-large-space);
143+
}
144+
130145
.doc .olist,
131146
.doc .ulist,
132-
.doc .admonitionblock,
133147
.doc .exampleblock,
134148
.doc .imageblock,
135149
.doc .listingblock,
@@ -138,7 +152,7 @@
138152
.doc .swagger-container,
139153
.doc .verseblock,
140154
.doc .videoblock {
141-
margin-top: 1rem;
155+
margin-top: var(--base-medium-space);
142156
}
143157

144158
.doc .paragraph .title,
@@ -149,11 +163,11 @@
149163
.doc .literalblock .title,
150164
.doc .openblock .title,
151165
.doc caption {
152-
font-size: 1rem;
166+
font-size: var(--font-base);
153167
font-weight: var(--weight-semibold);
154168
/* letter-spacing: -0.025em; */
155169
line-height: 1.2;
156-
margin-bottom: 0.75rem;
170+
margin-bottom: var(--base-space);
157171
color: var(--color-brand-gray3);
158172
}
159173

@@ -442,14 +456,22 @@ ul ul ul {
442456
width: auto;
443457
}
444458

445-
.doc blockquote {
459+
.doc .quoteblock {
460+
margin-top: var(--base-medium-space);
461+
}
462+
463+
.doc .abstract blockquote {
446464
font-size: 0.9375rem;
447-
margin: 1rem 0 1.5625rem 0;
465+
margin: 0;
448466
font-weight: var(--weight-light);
449467
border-left: 2px solid var(--color-brand-gray5);
450468
padding-left: 1.125rem;
451469
}
452470

471+
.doc .quoteblock + .paragraph {
472+
margin-top: var(--base-extra-large-space);
473+
}
474+
453475
.doc blockquote * {
454476
font-weight: inherit;
455477
}
@@ -615,32 +637,36 @@ table.tableblock pre code.language-bash.hljs {
615637
}
616638

617639
.doc .dlist {
618-
margin: 1.5rem 0;
640+
margin: 1.5rem 0 0;
619641
}
620642

621643
.doc .dlist dl {
622644
margin: 0;
623645
}
624646

625647
.doc .dlist dt {
626-
font-weight: var(--weight-medium);
648+
font-weight: var(--weight-semibold);
627649
}
628650

629651
.doc .dlist dd + dt {
630652
margin-top: 1.5rem;
631653
}
632654

655+
.doc .dlist dt + dt {
656+
margin-top: var(--base-extra-small-space);
657+
}
658+
633659
.doc .dlist dd {
634660
margin-left: 1.5rem;
635661
}
636662

637663
.doc .dlist dt + dd {
638-
margin-top: 0.125rem;
664+
margin-top: var(--base-small-space);
639665
}
640666

641-
.doc .dlist dd > .openblock > .content > :first-child {
667+
/* .doc .dlist dd > .openblock > .content > :first-child {
642668
margin-top: 0;
643-
}
669+
} */
644670

645671
.doc .sidebarblock > .content {
646672
border: 1px solid var(--color-border);
@@ -794,7 +820,7 @@ table.tableblock pre code.language-bash.hljs {
794820
padding: var(--base-space);
795821
border-radius: 8px;
796822
border: 1px solid var(--color-brand-gray8);
797-
margin-top: var(--base-space);
823+
margin-top: var(--base-extra-large-space);
798824
}
799825

800826
.doc .tabs.ulist {

0 commit comments

Comments
 (0)