File tree Expand file tree Collapse file tree 3 files changed +10
-25
lines changed Expand file tree Collapse file tree 3 files changed +10
-25
lines changed Original file line number Diff line number Diff line change 1
1
const React = require ( 'react' ) ;
2
2
3
- function Navbar ( props ) {
3
+ function Navbar ( props ) {
4
4
return (
5
5
< nav className = "doc-navbar" >
6
6
{ props . children }
7
7
</ nav >
8
8
) ;
9
9
}
10
10
11
- function Logo ( { page, url_for} ) {
11
+ function Logo ( { page, url_for} ) {
12
12
var homePath = page . lang === 'zh-cn' ? 'zh-cn/' : '/' ;
13
13
14
14
return (
@@ -246,16 +246,13 @@ function SidebarTocItem ({item, visibleHeaderId}) {
246
246
247
247
function SidebarToggle ( { className, onClick} ) {
248
248
return (
249
- < i className = { 'dc-icon dc-icon--menu dc-icon--interactive doc-sidebar-toggle ' + ( className || '' ) }
250
- onClick = { onClick } >
251
- </ i > ) ;
249
+ < i className = { 'dc-icon dc-icon--menu dc-icon--interactive doc-sidebar-toggle ' + ( className || '' ) } onClick = { onClick } />
250
+ ) ;
252
251
}
253
252
254
253
function SidebarClose ( { className, onClick} ) {
255
254
return (
256
- < i className = { 'dc-icon dc-icon--close dc-icon--interactive doc-sidebar-close ' + ( className || '' ) }
257
- onClick = { onClick } >
258
- </ i >
255
+ < i className = { 'dc-icon dc-icon--close dc-icon--interactive doc-sidebar-close ' + ( className || '' ) } onClick = { onClick } />
259
256
) ;
260
257
}
261
258
Original file line number Diff line number Diff line change @@ -214,20 +214,11 @@ class Navigation extends React.Component {
214
214
render ( ) {
215
215
return (
216
216
< div className = "doc-navigation" >
217
- < Navbar
218
- config = { this . props . config }
219
- data = { this . props . data }
220
- url_for = { this . url_for } >
217
+ < Navbar >
218
+ < SidebarToggle className = "doc-navbar__sidebar-toggle" onClick = { this . toggleSidebar . bind ( this ) } />
221
219
< Logo page = { this . props . page } url_for = { this . url_for } />
222
- < SidebarClose
223
- className = "doc-navbar__sidebar-close doc-navbar__sidebar-close--desktop"
224
- onClick = { this . collapseSidebar . bind ( this ) } />
225
- < SidebarToggle
226
- className = "doc-navbar__sidebar-toggle"
227
- onClick = { this . toggleSidebar . bind ( this ) } />
228
- < LangSwitcher
229
- page = { this . props . page }
230
- url_for = { this . url_for } />
220
+ < SidebarClose className = "doc-navbar__sidebar-close" onClick = { this . collapseSidebar . bind ( this ) } />
221
+ < LangSwitcher page = { this . props . page } url_for = { this . url_for } />
231
222
</ Navbar >
232
223
233
224
< Sidebar
Original file line number Diff line number Diff line change 71
71
}
72
72
73
73
& __sidebar-close {
74
+ float : right ;
74
75
display : table ;
75
76
height : 100% ;
76
77
font-size : 12px ;
80
81
display : table-cell ;
81
82
vertical-align : middle ;
82
83
}
83
- }
84
-
85
- & __sidebar-close--desktop {
86
- float : right ;
87
84
88
85
@media screen and (max-width : $doc-breakpoint ) {
89
86
display : none
You can’t perform that action at this time.
0 commit comments