Skip to content

Commit 95a58ad

Browse files
committed
use list-unstyled helper, fix some whitespace
1 parent d57560e commit 95a58ad

File tree

7 files changed

+26
-31
lines changed

7 files changed

+26
-31
lines changed

app/styles/base/_lists.scss

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ ol {
1919
margin-bottom: $base-spacing;
2020

2121
> li {
22-
counter-increment: customlistcounter;
2322
clear: both;
2423
padding: $small-spacing 0 $small-spacing 2em;
2524
position: relative;
@@ -28,30 +27,17 @@ ol {
2827
&::before {
2928
@include position(absolute, ($small-spacing + 0.5em) null null 0);
3029
@include size(2em);
31-
content: counter(customlistcounter) " ";
32-
border: 2px solid $base-border-color;
30+
border: 2px solid #74B0CE;
3331
border-radius: 50%;
3432
float: left;
3533
line-height: calc(2em - 4px);
3634
overflow: hidden;
3735
text-align: center;
3836
}
3937
}
40-
41-
&:first-child {
42-
counter-reset: customlistcounter;
43-
}
4438
}
4539
}
4640

47-
dl {
48-
margin-bottom: $small-spacing;
49-
50-
dt {
51-
margin-top: $small-spacing;
52-
}
53-
54-
dd {
55-
margin: 0;
56-
}
41+
dd {
42+
margin: 0;
5743
}

app/styles/components/_highlight.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
font-family: $monospace-font-family;
66
font-size: 0.8em;
77
line-height: 1.5em;
8-
margin: $small-spacing 0 $large-spacing;
98
overflow: hidden;
109
position: relative;
1110

app/styles/components/_sidebar.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,12 @@ label[for="toc-toggle"] {
8888
}
8989

9090
ol.toc-level-1 {
91-
border-left: $base-border;
91+
border-left: 1px solid #74B0CE;
92+
93+
// override ember-styleguide link color
94+
a {
95+
color: #42474f;
96+
}
9297

9398
&:not(.selected) {
9499
display: none;
@@ -97,10 +102,12 @@ ol.toc-level-1 {
97102
li {
98103
border-left: 3px solid transparent;
99104
transition: border-width $duration, margin-right $duration;
105+
padding-top: 0.3em;
106+
padding-bottom: 0.3em;
100107

101108
&.selected,
102109
&:hover {
103-
border-left-color: $base-border-color;
110+
border-left-color: #74B0CE;
104111
}
105112

106113
&:hover {

app/styles/components/_toc.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ a.toc-anchor {
2323
margin-top: -5px;
2424
}
2525

26-
.toc-level-0 > a {
26+
.toc-level-0 > a, .toc-spacing {
2727
transition: color 0.1s linear;
28+
margin-bottom: 0.5em;
29+
margin-top:0.5em;
30+
display: block;
2831
}

app/templates/components/import-example.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="highlight javascript">
1+
<div class="highlight javascript margin-vertical-small">
22
<div class="ribbon"></div>
33
{{#if (is-clipboard-supported)}}
44
<div class="import-copy">

app/templates/components/table-of-contents.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<ol class="toc-level-0">
2-
<li class="toc-level-0 large">
2+
<li class="toc-level-0 large list-unstyled">
33
<a {{action 'toggle' 'modules'}} href="#">Packages</a>
44
<ol class="toc-level-1 medium regular modules" style="display: block">
55
{{#each moduleIDs as |moduleID|}}
@@ -17,7 +17,7 @@
1717
</li>
1818

1919
{{#if isShowingNamespaces}}
20-
<li class="toc-level-0 large">
20+
<li class="toc-level-0 large list-unstyled">
2121
<a {{action 'toggle' 'namespaces'}} href="#">Namespaces</a>
2222
<ol class="toc-level-1 medium regular namespaces" style="display: block">
2323
{{#each namespaceIDs as |namespaceID|}}
@@ -29,7 +29,7 @@
2929
</li>
3030
{{/if}}
3131

32-
<li class="toc-level-0 large">
32+
<li class="toc-level-0 large list-unstyled">
3333
<a {{action 'toggle' 'classes'}} href="#">Classes</a>
3434
<ol class="toc-level-1 medium regular classes" style="display: block">
3535
{{#each classesIDs as |classID|}}
@@ -40,7 +40,7 @@
4040
</ol>
4141
</li>
4242
</ol>
43-
<label class="toc-private-toggle">
43+
<label class="toc-private-toggle regular padding-top-small">
4444
{{input type="checkbox" checked=showPrivateClasses class='private-deprecated-toggle'}}
4545
Show Private / Deprecated
4646
</label>

app/templates/project-version.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<aside class="sidebar">
22
<ol class="toc-level-0">
3-
<li class="toc-level-0" data-test-home>
3+
<li class="toc-level-0 large margin-bottom-small" data-test-home>
44
{{#link-to 'project' 'ember'}}Home{{/link-to}}
55
</li>
6-
<li class="toc-level-0">
7-
Projects
6+
<li class="toc-level-0 large margin-vertical-small">
7+
<span class="toc-spacing">Projects</span>
88
<ol class="toc-level-1 selected" style="display: block;">
9-
<li class="toc-level-1">{{#link-to 'project' 'ember' active=(eq activeProject 'ember') class="spec-ember"}}Ember{{/link-to}}</li>
10-
<li class="toc-level-1">{{#link-to 'project' 'ember-data' active=(eq activeProject 'ember-data') class="spec-ember-data"}}Ember Data{{/link-to}}</li>
9+
<li class="toc-level-1 medium regular padding-left-small">{{#link-to 'project' 'ember' active=(eq activeProject 'ember') class="spec-ember"}}Ember{{/link-to}}</li>
10+
<li class="toc-level-1 medium regular padding-left-small">{{#link-to 'project' 'ember-data' active=(eq activeProject 'ember-data') class="spec-ember-data"}}Ember Data{{/link-to}}</li>
1111
</ol>
1212
</li>
1313
</ol>

0 commit comments

Comments
 (0)