Skip to content

Commit 51689aa

Browse files
author
rakeshAlgo
committed
Work on Eric's feedback for header,navbar & right sidebar
1 parent 5d28cdd commit 51689aa

File tree

9 files changed

+48
-25
lines changed

9 files changed

+48
-25
lines changed

src/css/doc.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.doc {
2-
padding: var(--base-space) 0;
2+
padding-top: 1.25rem;
33
}
44

55
.doc p {

src/css/header.css

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
flex-wrap: wrap;
1414
align-items: center;
1515
justify-content: space-between;
16-
padding: 0.75rem var(--width-container-gutter);
16+
padding: 0.5rem var(--width-container-gutter);
1717
}
1818

1919
.navbar-toggler {
@@ -48,18 +48,22 @@
4848
}
4949

5050
.navbar-new-bottom .nav-item {
51-
margin: 0 15px;
51+
margin: 0 var(--base-space);
5252
}
5353

5454
.navbar-nav .nav-link {
5555
color: #ffffffbf;
5656
text-transform: uppercase;
5757
opacity: 1;
5858
font-size: 1.125rem;
59-
line-height: 23px;
59+
line-height: 24px;
6060
font-family: "Source Sans Pro", sans-serif;
6161
}
6262

63+
.navbar-nav .nav-link .arrow {
64+
margin-left: 0.5rem;
65+
}
66+
6367
.active .nav-link {
6468
font-weight: var(--weight-semibold);
6569
text-decoration: none;
@@ -78,6 +82,13 @@
7882
align-items: center;
7983
}
8084

85+
.primary-action .btn:hover {
86+
background-color: var(--color-link-hover);
87+
color: var(--color-brand-white);
88+
text-decoration: none;
89+
border-color: var(--color-link-hover);
90+
}
91+
8192
.primary-action > * {
8293
display: inline-block;
8394
}
@@ -89,13 +100,14 @@
89100
.parent-site {
90101
margin: 0 10px;
91102
padding: 0 10px;
92-
border-right: 1px solid var(--color-brand-gray5);
93-
border-left: 1px solid var(--color-brand-gray5);
103+
/* border-right: 1px solid var(--color-brand-gray5);
104+
border-left: 1px solid var(--color-brand-gray5); */
94105
}
95106

96107
.parent-site a {
97108
color: var(--color-brand-gray4);
98109
font-size: 1rem;
110+
font-family: "Source Sans Pro", sans-serif;
99111
}
100112

101113
.search .query {
@@ -190,32 +202,34 @@
190202

191203
.primary-action {
192204
position: absolute;
193-
right: 1.875rem;
194-
top: -110%;
205+
right: 1.25rem;
206+
top: -116%;
195207
}
196208

197209
.navbar.navbar-new-bottom,
198210
.navbar-nav {
199211
display: flex;
212+
line-height: 1;
200213
}
201214

202215
.navbar-new-bottom .nav-item:first-child {
203216
margin-left: 0;
204217
}
205218
}
206219

207-
@media screen and (min-width: 1024px) {
220+
@media screen and (min-width: 993px) {
208221
.search .query {
209222
width: 283px;
210223
}
211224

212225
.parent-site {
213-
margin: 0 20px;
214-
padding: 0 25px;
226+
margin: 0;
227+
padding: 0 var(--column-space);
215228
}
216229

217-
.navbar {
218-
padding: 0.75rem 1.875rem;
230+
.navbar.navbar-new-top {
231+
padding: 1.25rem;
232+
line-height: 1;
219233
}
220234
}
221235

src/css/is-this-helpful.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
display: inline-block;
1010
width: 100%;
1111
margin-bottom: 25px;
12-
border-top: 1px solid #ccc;
12+
/* border-top: 1px solid #ccc; */
1313
padding-top: 25px;
1414
font-family: "Source Sans Pro", sans-serif;
1515
}

src/css/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ main p {
5050
color: var(--color-brand-blue-secondary);
5151
display: flex;
5252
line-height: 1;
53-
margin: var(--base-small-space) 0 var(--base-space);
53+
margin: 1.25rem 0 0;
5454
/* margin: calc(-1 * var(--height-spacer)) calc(-1 * var(--width-container-gutter)) var(--height-spacer); */
5555
padding: var(--base-space);
5656
border-radius: 3px;

src/css/toc.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
}
44

55
.toc-menu {
6-
margin-bottom: 1.5rem;
6+
margin-top: var(--column-space);
7+
line-height: 1;
78
}
89

910
.sidebar-box {
@@ -55,11 +56,10 @@
5556
line-height: 1.2;
5657
}
5758

58-
.toc .toc-menu h3,
59+
/* .toc .toc-menu h3,
5960
.toc .toc-menu ul {
6061
margin-left: 0.75rem;
61-
}
62-
62+
} */
6363
.toc .toc-menu li {
6464
margin: 0;
6565
}

src/css/toolbar.css

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

66
.tools .edit {
77
/* width: 1.5em;
@@ -23,5 +23,13 @@
2323
vertical-align: top;
2424
color: #999;
2525
padding-left: 25px;
26+
padding-top: 0;
27+
padding-bottom: 0;
2628
font-family: "Source Sans Pro", sans-serif;
2729
}
30+
31+
.sidebar-box .tools {
32+
padding-top: 1.25rem;
33+
display: inline-block;
34+
width: 100%;
35+
}

src/css/vars.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
--hljs-string: #295d1e;
6565
--hljs-number: #0711ba;
6666
/* --height-navbar: 4rem; */
67-
--height-spacer: 1rem;
67+
--height-spacer: 1.2rem;
6868
--height-navbar: 6rem;
6969
--height-version-control: 4.5rem;
7070
--height-to-body: calc(var(--height-navbar) + var(--height-spacer));

src/partials/header-content.hbs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
<a class="nav-link" href="{{relativize site.components.tutorials.url}}">
4040
Tutorials
4141
<span class="arrow">
42-
->
42+
<i class="fas fa-arrow-right"></i>
43+
<i class="fal fa-arrow-right"></i>
4344
</span>
4445
</a>
4546
</li>

src/partials/toolbar.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{#with (or (and (not env.CI) page.fileUri) (and (not page.origin.private) page.editUrl))}}
22
<div class="tools" role="navigation">
33
<ul>
4-
<li class="tool edit"><a href="{{this}}" title="Edit Page" target="_blank" rel="noopener">Edit</a></li>
4+
<li class="tool edit"><a href="{{this}}" title="Edit Page" target="_blank" rel="noopener">Edit on GitHub</a></li>
55
</ul>
66
</div>
77
{{/with}}

0 commit comments

Comments
 (0)