Commit e9ff127

bencodezenphanan

authored and

committed

2299 duplicate mobile menu items (vuejs#2300)

* fix (vuejs#2299): Remove duplicate entries on non-home pages * fix (vuejs#2299): Improve spacing for sponsors on mobile * fix (vuejs#2299): Align sponsors with content on desktop * refactor (vuejs#2299): Standardize content padding vertical * fix (vuejs#2299): Improve spacing for clicking on mobile for last sidebar item

1 parent fd85e12 commit e9ff127Copy full SHA for e9ff127

File tree

5 files changed

+13

-12

lines changed

themes/vue
- layout/partials
  - sidebar.ejs
- source/css

5 files changed

+13

-12

lines changed

`‎themes/vue/layout/partials/sidebar.ejs‎`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,12 @@`
	`1`	`+<% var isHomePage = page.path === 'index.html' %>`
	`2`	`+`
`1`	`3`	`<div class="sidebar">`
`2`	`4`	`<div class="sidebar-inner">`
`3`		`- <ul class="main-menu">`
`4`		`- <%- partial('partials/main_menu', { context: 'sidebar' }) %>`
`5`		`- </ul>`
	`5`	`+ <% if (isHomePage) { %>`
	`6`	`+ <ul class="main-menu">`
	`7`	`+ <%- partial('partials/main_menu', { context: 'sidebar' }) %>`
	`8`	`+ </ul>`
	`9`	`+ <% } %>`
`6`	`10`	`<div class="list">`
`7`	`11`	`<%- partial('partials/sponsors_sidebar') %>`
`8`	`12`	`<% if (type !== 'search') { %>`

`‎themes/vue/source/css/_settings.styl‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,16 @@ $red = #ff6666`
`18`	`18`	`$info = #1C90F3`
`19`	`19`
`20`	`20`	`$radius = 2px`
`21`		`-$content-padding-top = 30px`
	`21`	`+$content-padding-vertical = 35px`
`22`	`22`
`23`	`23`	`// header settings`
`24`	`24`	`$header-inner-height = 41px`
`25`	`25`	`$heading-padding-vertical = 10px`
`26`	`26`	`$header-height = $header-inner-height + $heading-padding-vertical * 2`
`27`	`27`	`$mobile-header-height = 40px`
`28`	`28`	`// prevent headers from being covered by the top nav upon navigation`
`29`		`-$heading-link-padding-top = $header-height + $content-padding-top`
`30`		`-$mobile-heading-link-padding-top = $mobile-header-height + $content-padding-top`
	`29`	`+$heading-link-padding-top = $header-height + $content-padding-vertical`
	`30`	`+$mobile-heading-link-padding-top = $mobile-header-height + $content-padding-vertical`
`31`	`31`	`$h2-margin-top = 45px`
`32`	`32`	`$h3-margin-top = 52px`
`33`	`33`

`‎themes/vue/source/css/_sidebar.styl‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`margin-top: .5em`
`22`	`22`	`.sidebar-inner`
`23`	`23`	`width: 260px`
`24`		`- padding: $content-padding-top+40px 0px 60px 20px`
	`24`	`+ padding: $content-padding-vertical 0px 60px 20px`
`25`	`25`	`.version-select`
`26`	`26`	`vertical-align: middle`
`27`	`27`	`margin-left: 5px`
`@@ -74,7 +74,7 @@`
`74`	`74`	`-webkit-transform: translate(-280px, 0)`
`75`	`75`	`transform: translate(-280px, 0)`
`76`	`76`	`.sidebar-inner`
`77`		`- padding: 50px 10px 10px 20px`
	`77`	`+ padding: 60px 10px 30px 20px`
`78`	`78`	`box-sizing: border-box`
`79`	`79`	`.sidebar-inner-index`
`80`	`80`	`padding: 10px 10px 10px 20px`

`‎themes/vue/source/css/_sponsors-sidebar.styl‎`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@`
`25`	`25`	`text-align: center`
`26`	`26`	`margin-bottom: 20px`
`27`	`27`
`28`		`-#sidebar-sponsors-special`
`29`		`- margin-top -10px`
`30`		`-`
`31`	`28`	`#sidebar-sponsors-platinum-left`
`32`	`29`	`display block`
`33`	`30`

`‎themes/vue/source/css/page.styl‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`.content`
`25`	`25`	`position: relative`
`26`		`- padding: 2.2em 0`
	`26`	`+ padding: $content-padding-vertical 0`
`27`	`27`	`max-width: 700px`
`28`	`28`	`margin: 0 auto`
`29`	`29`	`padding-left: 50px`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e9ff127

File tree

5 files changed

5 files changed

`‎themes/vue/layout/partials/sidebar.ejs‎`

`‎themes/vue/source/css/_settings.styl‎`

`‎themes/vue/source/css/_sidebar.styl‎`

`‎themes/vue/source/css/_sponsors-sidebar.styl‎`

`‎themes/vue/source/css/page.styl‎`

0 commit comments