Skip to content

Commit 8fe502f

Browse files
sethladdsethladd
committed
Merge pull request #735 from dart-lang/sl-title-in-left-nav
put the title of the parent in the left nav
2 parents 4ae2a3c + 87190f4 commit 8fe502f

14 files changed

+44
-50
lines changed

‎lib/resources/styles.css

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -489,30 +489,31 @@ span.top-level-variable-type {
489489
background-color: #f7f7f7;
490490
}
491491

492-
ol.sidebar {
492+
.sidebar ol {
493493
list-style: none;
494494
padding: 16px 0 16px 0;
495495
font-size: 14px;
496496
line-height: 24px;
497+
margin-bottom: 0;
497498
}
498499

499-
ol.sidebar li {
500+
.sidebar ol li {
500501
text-overflow: ellipsis;
501502
overflow: hidden;
502503
}
503504

504-
ol.sidebar li.section-title a {
505+
.sidebar ol li.section-title a {
505506
color: inherit;
506507
}
507508

508-
ol.sidebar li.section-title {
509+
.sidebar ol li.section-title {
509510
font-size: 12px;
510511
text-transform: uppercase;
511512
line-height: 20px;
512513
margin-top: 24px;
513514
}
514515

515-
ol.sidebar li:first-child {
516+
.sidebar ol li:first-child {
516517
padding-top: 0;
517518
margin-top: 0;
518519
}
@@ -575,38 +576,19 @@ button {
575576
}
576577
}
577578

578-
.sidebar-offcanvas-right h5 {
579+
.sidebar h5 {
579580
color: #727272;
580581
}
581582

582-
/* the right nav disappears out of view */
583-
/* THIS IS TOTALLY BROKEN... WILL REDO RIGHT-NAV */
583+
.sidebar-offcanvas-left h5 {
584+
margin-top: 16px;
585+
}
586+
587+
/* the right nav disappears out of view when the window shrinks */
584588
@media screen and (max-width: 992px) {
585589
.sidebar-offcanvas-right{
586-
right:-66%;
587-
position:fixed;
588-
-webkit-transition:all .25s ease-out;
589-
-o-transition:all .25s ease-out;
590-
transition:all .25s ease-out;
591-
z-index: 2000;
592-
top:0;
593-
width:50%;
594-
padding: 0;
595-
}
596-
597-
/* this mumbo jumbo disables scroll bars */
598-
.sidebar-offcanvas-right {
599-
overflow-y: auto;
600-
visibility: hidden;
601-
}
602-
603-
.sidebar-offcanvas-right ol {
604-
visibility: visible;
605-
background-color: white;
606-
}
607-
/* /insanity */
608-
609-
.sidebar-offcanvas-right.active{right:0;}
590+
display: none;
591+
}
610592
}
611593

612594
/* source code method bodies */

‎lib/templates/_sidebar_for_class.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ol class="sidebar">
1+
<ol>
22
{{#class.hasConstants}}
33
<li class="section-title"><a href="{{class.href}}#constants">Constants</a></li>
44
{{#class.constants}}

‎lib/templates/_sidebar_for_library.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ol class="sidebar">
1+
<ol>
22
{{#library.hasConstants}}
33
<li class="section-title"><a href="{{library.href}}#constants">Constants</a></li>
44
{{#library.constants}}

‎lib/templates/class.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{{>head}}
22

3-
<div class="col-xs-6 col-sm-3 col-md-3 sidebar-offcanvas-left">
3+
<div class="col-xs-6 col-sm-3 col-md-3 sidebar sidebar-offcanvas-left">
4+
<h5>{{library.name}}</h5>
45
{{>sidebar_for_library}}
56
</div>
67

@@ -158,7 +159,7 @@ <h2>Methods</h2>
158159

159160
</div> <!-- /.main-content -->
160161

161-
<div class="col-xs-6 col-sm-6 col-md-3 sidebar-offcanvas-right">
162+
<div class="col-xs-6 col-sm-6 col-md-3 sidebar sidebar-offcanvas-right">
162163
<h5>{{self.name}}</h5>
163164
{{>sidebar_for_class}}
164165
</div><!--/.sidebar-offcanvas-->

‎lib/templates/constant.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{{>head}}
22

3-
<div class="col-xs-6 col-sm-3 sidebar-offcanvas-left">
3+
<div class="col-xs-6 col-sm-3 sidebar sidebar-offcanvas-left">
4+
5+
<h5>{{class.name}}</h5>
46

57
{{>sidebar_for_class}}
68

7-
</div><!--/.sidebar-offcanvas-->
9+
</div><!--/.sidebar-offcanvas-left-->
810

911
<div class="col-xs-12 col-sm-9 col-md-6 main-content">
1012

‎lib/templates/constructor.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{>head}}
22

3-
<div class="col-xs-6 col-sm-3 sidebar-offcanvas-left">
3+
<div class="col-xs-6 col-sm-3 sidebar sidebar-offcanvas-left">
4+
5+
<h5>{{class.name}}</h5>
46

57
{{>sidebar_for_class}}
68

‎lib/templates/function.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{{>head}}
22

3-
<div class="col-xs-6 col-sm-3 sidebar-offcanvas-left">
3+
<div class="col-xs-6 col-sm-3 sidebar sidebar-offcanvas-left">
4+
<h5>{{library.name}}</h5>
45
{{>sidebar_for_library}}
56
</div><!--/.sidebar-offcanvas-left-->
67

‎lib/templates/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ <h2>Libraries</h2>
2323

2424
</div> <!-- /.main-content -->
2525

26-
<div class="col-xs-6 col-sm-6 col-md-3 sidebar-offcanvas-right">
26+
<div class="col-xs-6 col-sm-6 col-md-3 sidebar sidebar-offcanvas-right">
2727

2828
<h5>{{self.name}}</h5>
2929

30-
<ol class="sidebar">
30+
<ol>
3131
<li class="section-title"><a href="{{package.href}}#libraries">Libraries</a></li>
3232
{{#package.libraries}}
3333
<li><a href="{{href}}">{{name}}</a></li>

‎lib/templates/library.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{{>head}}
22

3-
<div class="col-xs-6 col-sm-3 col-md-3 sidebar-offcanvas-left">
4-
<ol class="sidebar">
3+
<div class="col-xs-6 col-sm-3 col-md-3 sidebar sidebar-offcanvas-left">
4+
<h5>{{package.name}}</h5>
5+
<ol>
56
<li class="section-title"><a href="index.html">Libraries</a></li>
67
{{#package.libraries}}
78
<li><a href="{{href}}">{{name}}</a></li>
@@ -116,7 +117,7 @@ <h2>Exceptions / Errors</h2>
116117

117118
</div> <!-- /.main-content -->
118119

119-
<div class="col-xs-6 col-sm-6 col-md-3 sidebar-offcanvas-right">
120+
<div class="col-xs-6 col-sm-6 col-md-3 sidebar sidebar-offcanvas-right">
120121
<h5>{{self.name}}</h5>
121122
{{>sidebar_for_library}}
122123
</div><!--/sidebar-offcanvas-right-->

‎lib/templates/method.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{{>head}}
22

3-
<div class="col-xs-6 col-sm-3 sidebar-offcanvas-left">
3+
<div class="col-xs-6 col-sm-3 sidebar sidebar-offcanvas-left">
4+
<h5>{{class.name}}</h5>
45

56
{{>sidebar_for_class}}
67

0 commit comments

Comments
 (0)