Skip to content

Commit a52c494

Browse files
authored
Merge pull request #35 from couchbase/ui-bug-fixes
Resolved Eslint errors & Added collapse button
2 parents fb1cbab + 5a0f508 commit a52c494

File tree

12 files changed

+70
-77
lines changed

12 files changed

+70
-77
lines changed

preview-src/landing-page-tutorials.adoc

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,41 @@
44
:!sectids:
55

66

7+
= Couchbase Tutorials
8+
++++
9+
<div class="card-row">
10+
++++
11+
12+
[.column]
13+
====== {empty}
14+
[.content]
15+
The Couchbase SDK allows applications to access a Couchbase cluster. It offers traditional synchronous APIs as well as scalable asynchronous APIs to maximize performance
16+
17+
[.column]
18+
====== {empty}
19+
[.media-left]
20+
icon:book-reader[set= fas]
21+
22+
++++
23+
</div>
24+
++++
25+
26+
27+
== Tutorials
28+
++++
29+
<div class="card-row two-column-row">
30+
++++
731
[.column]
832
[.data-filter-column]
933
====== {empty}
1034
++++
11-
<div data-level="advanced" data-category="advanced java swift javascript developer" class="sub-heading two-column-heading">
35+
<div data-category="advanced java swift javascript developer" class="sub-heading two-column-heading">
1236
<h3 class="text-color-brand-blue-secondary">Lorem ipsum</h3>
1337
<div class="filter-info">
1438
<h5 >
1539
<img src="_/img/landing-page-icon/advanced-icon.svg" alt="" />
1640
Advanced</h5>
17-
<span data-role="advanced">Developer</span>
41+
<span>Developer</span>
1842
</div>
1943
</div>
2044
++++
@@ -59,7 +83,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu
5983
[.data-filter-column]
6084
====== {empty}
6185
++++
62-
<div data-level="intermediate" data-category="intermediate c# node Python devOps" class="sub-heading two-column-heading">
86+
<div data-category="intermediate c# node Python devOps" class="sub-heading two-column-heading">
6387
<h3 class="text-color-brand-blue-secondary">Lorem ipsum</h3>
6488
<div class="filter-info">
6589
<h5 >
@@ -101,7 +125,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu
101125
[.data-filter-column]
102126
====== {empty}
103127
++++
104-
<div data-level="intermediate" data-category="intermediate .net developer" class="sub-heading two-column-heading">
128+
<div data-category="intermediate .net developer" class="sub-heading two-column-heading">
105129
<h3 class="text-color-brand-blue-secondary">Lorem ipsum</h3>
106130
<div class="filter-info">
107131
<h5 >
@@ -142,7 +166,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu
142166
[.data-filter-column]
143167
====== {empty}
144168
++++
145-
<div data-level="beginner" data-category="beginner ascidoc java php architect" class="sub-heading two-column-heading">
169+
<div data-category="beginner ascidoc java php architect" class="sub-heading two-column-heading">
146170
<h3 class="text-color-brand-blue-secondary">Lorem ipsum</h3>
147171
<div class="filter-info">
148172
<h5 >
@@ -184,7 +208,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu
184208
[.data-filter-column]
185209
====== {empty}
186210
++++
187-
<div data-level="intermediate" data-category="intermediate react developer" class="sub-heading two-column-heading">
211+
<div data-category="intermediate react developer" class="sub-heading two-column-heading">
188212
<h3 class="text-color-brand-blue-secondary">Lorem ipsum</h3>
189213
<div class="filter-info">
190214
<h5 >
@@ -225,7 +249,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu
225249
[.data-filter-column]
226250
====== {empty}
227251
++++
228-
<div data-level="advanced" data-category="advanced angular react vue architect" class="sub-heading two-column-heading">
252+
<div data-category="advanced angular react vue architect" class="sub-heading two-column-heading">
229253
<h3 class="text-color-brand-blue-secondary">Lorem ipsum</h3>
230254
<div class="filter-info">
231255
<h5 >
@@ -259,6 +283,10 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras accumsan mi a ligu
259283
* React
260284
* Vue
261285

286+
++++
287+
</div>
288+
++++
289+
262290
++++
263291
</div>
264292
++++

src/css/landing-page.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@
154154
padding: 0;
155155
}
156156

157+
.media-left .icon {
158+
font-size: 90px;
159+
color: var(--color-brand-blue-secondary);
160+
}
161+
157162
.doc.landing-page-doc .column .paragraph,
158163
.doc.landing-page-doc .column .videoblock,
159164
.doc.landing-page-doc .column .imageblock {

src/css/nav.css

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
height: var(--height-nav-with-version);
2929
}
3030

31-
@media screen and (max-width: 768px) {
31+
/* @media screen and (max-width: 768px) {
3232
.left-sidebar-menu {
3333
top: 0;
3434
bottom: 0;
3535
left: 0;
3636
transform: translateX(-100%);
3737
z-index: var(--z-index-nav-mobile);
3838
}
39-
}
39+
} */
4040

4141
@media screen and (min-width: 769px) {
4242
.left-sidebar-menu {
@@ -432,7 +432,7 @@ html.is-clipped--nav {
432432
433433
*/
434434

435-
a.menu-expand-toggle {
435+
a.menu-expand-toggle {
436436
display: inline-block;
437437
position: absolute;
438438
top: 15px;
@@ -448,7 +448,7 @@ html.is-clipped--nav {
448448

449449
@media screen and (min-width: 993px) {
450450
.nav.collapse-menu {
451-
width: 0rem;
451+
width: 0;
452452
}
453453

454454
.nav.collapse-menu .frame-body .title,
@@ -485,16 +485,17 @@ html.is-clipped--nav {
485485
border-left: 2px solid #eee;
486486
border-right: 2px solid #eee;
487487
}
488+
488489
.nav-control {
489490
display: none;
490491
}
491492
}
492493

493494
@media screen and (max-width: 992px) {
494495
.left-sidebar-menu {
495-
left: 0;
496-
z-index: 9;
497-
transform: translate(-100%, 0);
496+
left: 0;
497+
z-index: 9;
498+
transform: translate(-100%, 0);
498499
}
499500

500501
.nav.collapse-menu a.menu-expand-toggle {
@@ -518,23 +519,4 @@ html.is-clipped--nav {
518519
.nav-menu {
519520
height: calc(100vh - 8.5rem) !important;
520521
}
521-
522-
/* .nav.collapse-menu {
523-
width: 0rem;
524-
}
525-
526-
.nav.collapse-menu .frame-body .title,
527-
.nav.collapse-menu .version-control-box,
528-
.nav.collapse-menu .nav-menu {
529-
font-size: 0;
530-
display: none;
531-
}
532-
533-
.nav.collapse-menu .left-sidebar-menu {
534-
border: 0;
535-
background-color: transparent;
536-
}
537-
538-
*/
539-
540522
}

src/js/01-nav.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
var navMenu = {}
77
if (!(navMenu.element = nav && nav.querySelector('.nav-menu'))) return
88
var navControl
9-
var currentPageItem = navMenu.element.querySelector('.is-current-page')
9+
// var currentPageItem = navMenu.element.querySelector('.is-current-page')
1010

1111
// NOTE prevent text from being selected by double click
1212
navMenu.element.addEventListener('mousedown', function (e) {
@@ -63,6 +63,7 @@
6363

6464
// function fitNavMenu (preferredHeight, availableHeight, encroachingElement) {
6565
// var reclaimedHeight = availableHeight - encroachingElement.getBoundingClientRect().top
66+
/*eslint max-len: ["error", { "code": 180 }]*/
6667
// navMenu.element.style.height = reclaimedHeight > 0 ? Math.max(0, preferredHeight - reclaimedHeight) + 'px' : ''
6768
// }
6869

@@ -139,7 +140,7 @@
139140
nav.classList.add('show-nav')
140141
}
141142

142-
menuExpandToggle.addEventListener('click', function(e) {
143+
menuExpandToggle.addEventListener('click', function (e) {
143144
e.preventDefault()
144145
// var navBarHeight = nav.querySelector('.nav-menu')
145146
// navBarHeight.style.height = '100vh'
@@ -149,9 +150,8 @@
149150
} else {
150151
nav.classList.add('collapse-menu')
151152
}
152-
153153
})
154-
}, 500)
154+
}, 100)
155155
// has children in li
156156
// $('ul.nav-list li.nav-item ul.nav-list .nav-item').has('ul.nav-list').addClass('has-children')
157157
function concealEvent (e) {

src/js/05-tabset.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ setTimeout(function () {
103103
e.preventDefault()
104104
})
105105
}
106-
107106
}, 1000)
108107

109108
function getPane (id, tabset) {

src/js/06-page-rating.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
// dialogBox.style.display = 'block'
2323
this.classList.add('active')
2424
helpNoBtn.classList.remove('active')
25-
// console.log(yesBtnData, 16)
25+
console.log(yesBtnData, 16)
2626
})
2727
helpNoBtn.addEventListener('click', function (e) {
2828
// dialogBox.style.display = 'block'
2929
this.classList.add('active')
3030
helpYesBtn.classList.remove('active')
31-
// console.log(noBtnData, 27)
31+
console.log(noBtnData, 27)
3232
})
3333
skipBtnMsg.addEventListener('click', function (e) {
3434
dialogBox.style.display = 'none'

src/js/08-contributor-bot.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
'use strict'
33
var showData = false
44
var contributors
5+
if (document.getElementById('contributorList')) {
56
var contributorList = document.getElementById('contributorList')
67
var commitdateTag = document.getElementById('commitdate')
78
var otherContributor = document.getElementById('otherContributor')
@@ -82,4 +83,5 @@
8283
.catch(function (err) {
8384
console.log(err, 13)
8485
})
86+
}
8587
})()

src/js/09-table-responsive.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
if (ele[i] !== undefined) {
2323
var maxHeight = ele[i].offsetHeight
2424
}
25-
2625
for (var j = 1; j <= columns; j++) {
27-
2826
if (
2927
elem.querySelector('tr:nth-child(' + j + ') td:nth-child(' + i + ')') != null &&
3028
elem.querySelector(' tr:nth-child(' + j + ') td:nth-child(' + i + ')') !== undefined

src/js/vendor/docsearch.bundle.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
algoliaOptions: { hitsPerPage: 25 },
1717
debug: false,
1818
})
19-
document.querySelector('button.search').addEventListener('click', function (e) {
20-
if (document.querySelector('.navbar-start').classList.toggle('reveal-search-input')) {
21-
ds.autocomplete.autocomplete.setVal('')
22-
ds.input.focus()
23-
}
24-
})
19+
ds.input.focus()
20+
// document.querySelector('button.search').addEventListener('click', function (e) {
21+
// if (document.querySelector('.navbar-start').classList.toggle('reveal-search-input')) {
22+
// ds.autocomplete.autocomplete.setVal('')
23+
// ds.input.focus()
24+
// }
25+
// })
2526
})
2627
})()
Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,8 @@
11

2-
<main class="article" data-ceiling="topbar">
3-
<article class="doc landing-page-doc">
4-
{{!-- <h1 class="page"> Couchbase Tutorials </h1>
5-
<div class="card-row">
6-
<div class="column">
7-
<div class="paragraph">
8-
<p>
2+
<main class="article" data-ceiling="topbar">
3+
<article class="doc landing-page-doc">
94

10-
The Couchbase SDK allows applications to access a Couchbase cluster. It offers traditional synchronous APIs as well as scalable asynchronous APIs to maximize performance.
11-
12-
</p>
13-
</div>
14-
</div>
15-
<div class="column">
16-
<figure class="media-left">
17-
<img src="_/img/landing-page-icon/book-reader-icon.svg" alt="" />
18-
</figure>
19-
</div>
20-
</div>
21-
<div class="heading">
22-
<h2> Tutorials </h2>
23-
</div> --}}
24-
25-
<div class="card-row two-column-row ">
265
{{{page.contents}}}
27-
</div>
28-
{{!-- <div class="no-record hide">
29-
<h3> No Record found </h3>
30-
</div> --}}
316

32-
</article>
33-
</main>
7+
</article>
8+
</main>

0 commit comments

Comments
 (0)