Skip to content

Commit 8023c84

Browse files
author
rakeshAlgo
committed
work on Eric’s feedback fixes
1 parent 51689aa commit 8023c84

File tree

8 files changed

+61
-42
lines changed

8 files changed

+61
-42
lines changed

src/css/component-frame.css

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,47 @@
88
}
99

1010
.frame-body {
11-
margin-left: 10px;
11+
margin-left: var(--base-extra-small-space);
1212
position: relative;
1313
}
1414

1515
.frame-body .title {
1616
margin: 0;
17-
font-size: 1.125rem;
17+
font-size: var(--font-medium);
1818
line-height: 1.5rem;
1919
font-weight: var(--weight-semibold);
2020
color: var(--color-brand-gray1);
21+
display: inline-block;
2122
}
2223

23-
.frame-body .frame-link {
24-
position: relative;
24+
.component-frame .frame-link-dropdowns {
25+
display: inline-block;
2526
}
2627

27-
.frame-body .frame-link::after {
28-
width: 0;
29-
height: 0;
30-
border-left: 4px solid transparent;
31-
border-right: 4px solid transparent;
32-
border-top: 8px solid var(--color-brand-gray4);
33-
top: 0;
34-
position: absolute;
35-
content: '';
36-
cursor: pointer;
37-
right: -15px;
38-
bottom: 0;
39-
margin: auto;
28+
.frame-body .frame-link {
29+
position: relative;
4030
}
4131

42-
.frame-body .frame-link-dropdowns:hover .frame-dropdown {
32+
.frame-body:hover .frame-dropdown {
4333
display: block;
4434
}
4535

4636
.frame-dropdown {
4737
position: absolute;
4838
display: none;
49-
left: 0;
50-
top: 45px;
39+
left: 56%;
40+
top: 0;
5141
z-index: 1;
52-
padding: 17px 0 0;
42+
padding: 47px 0 0;
43+
}
44+
45+
.frame-link-dropdowns .frame-link {
46+
color: var(--color-brand-gray1);
47+
font-weight: var(--weight-semibold);
48+
}
49+
50+
.frame-link-dropdowns .frame-link svg {
51+
color: var(--color-brand-black);
5352
}
5453

5554
.frame-dropdown .frame-dropdown-list,
@@ -72,6 +71,18 @@
7271
padding: 8px 0.625rem;
7372
display: inline-block;
7473
width: 100%;
74+
color: var(--color-brand-primary);
75+
font-weight: var(--weight-semibold);
76+
}
77+
78+
.frame-dropdown ul li a:hover,
79+
.frame-dropdown .related li a:hover {
80+
background-color: var(--color-brand-gray7);
81+
}
82+
83+
.frame-link-dropdowns .version {
84+
font-family: "Source Sans Pro", sans-serif;
85+
font-size: var(--font-medium);
7586
}
7687

7788
.frame-dropdown .related {

src/css/doc.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@
147147
margin-left: -10px;
148148
}
149149

150+
.ulist {
151+
padding-left: var(--base-extra-small-space);
152+
}
153+
150154
.doc hr {
151155
margin: 1rem 0;
152156
border: 0 solid var(--color-border);

src/css/labels.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
opacity: 1;
113113
}
114114

115-
.doc .labels span:first-child,
115+
/* .doc .labels span:first-child,
116116
.doc .labels li:first-child {
117117
opacity: 1;
118-
}
118+
} */
119119

120120
/* .doc .labels span.edition::before{
121121
color: var(--color-brand-blue-secondary);

src/css/nav.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
/* height: var(--height-nav); */
4747
z-index: var(--z-index-nav);
4848
border-left: 2px solid #eee;
49-
border-right: 2px solid #eee;
5049
}
5150
}
5251

src/css/toolbar.css

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/* .sidebar-box .tools {
22
margin-left: 0.75rem;
33
} */
4-
.tools ul { margin: 0; padding: 0; }
4+
.tools ul {
5+
margin: 0;
6+
padding: 0;
7+
}
58

69
.tools .edit {
710
/* width: 1.5em;
@@ -32,4 +35,4 @@
3235
padding-top: 1.25rem;
3336
display: inline-block;
3437
width: 100%;
35-
}
38+
}

src/css/vars.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
/* New design font style */
102102

103103
--font-base: 1rem; /* ~16px */
104+
--font-medium: 1.25rem; /* ~20px */
104105
--font-small: 0.875rem; /* ~14px */
105106
--labels-font-size: 0.75rem; /* ~12px */
106107
--labels-line-height: 1;
@@ -119,6 +120,7 @@
119120
/* Spacing variables */
120121
--base-space: 1rem; /* ~ 16px */
121122
--base-small-space: 0.75rem; /* ~ 12px */
123+
--base-extra-small-space: 0.5rem; /* ~ 8px */
122124
--base-medium-space: 1.5rem; /* ~ 24px */
123125
--base-large-space: 2rem; /* ~ 32px */
124126
--column-space: 2.5rem; /* ~ 40px */

src/js/01-nav.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,23 +134,23 @@
134134

135135
// hide left nav on top level landing page
136136

137-
if (nav.innerText === '') {
138-
nav.classList.add('hide-nav')
137+
if (nav.innerText === '') {
138+
nav.classList.add('hide-nav')
139+
} else {
140+
nav.classList.add('show-nav')
141+
}
142+
143+
menuExpandToggle.addEventListener('click', function (e) {
144+
e.preventDefault()
145+
// var navBarHeight = nav.querySelector('.nav-menu')
146+
// navBarHeight.style.height = '100vh'
147+
// console.log(navBarHeight.style.height)
148+
if (nav.classList.contains('collapse-menu')) {
149+
nav.classList.remove('collapse-menu')
139150
} else {
140-
nav.classList.add('show-nav')
151+
nav.classList.add('collapse-menu')
141152
}
142-
143-
menuExpandToggle.addEventListener('click', function (e) {
144-
e.preventDefault()
145-
// var navBarHeight = nav.querySelector('.nav-menu')
146-
// navBarHeight.style.height = '100vh'
147-
// console.log(navBarHeight.style.height)
148-
if (nav.classList.contains('collapse-menu')) {
149-
nav.classList.remove('collapse-menu')
150-
} else {
151-
nav.classList.add('collapse-menu')
152-
}
153-
})
153+
})
154154
// has children in li
155155
// $('ul.nav-list li.nav-item ul.nav-list .nav-item').has('ul.nav-list').addClass('has-children')
156156
function concealEvent (e) {

src/partials/nav-version-control.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="frame-body">
1111
<h4 class="title"><span class="title">{{{page.component.title}}}</span></h4>
1212
<div class="frame-link-dropdowns">
13-
<a class="frame-link component" href="{{relativize page.componentVersion.url}}"><span class="version">{{page.componentVersion.displayVersion}}</span></a>
13+
<a class="frame-link component" href="{{relativize page.componentVersion.url}}"><span class="version">{{page.componentVersion.displayVersion}}</span> <i class="fas fa-chevron-down"></i></a>
1414
<div class="frame-dropdown versions">
1515
<div class="column">
1616
<ul class="frame-dropdown-list">

0 commit comments

Comments
 (0)