Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-18 00:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of github.com:wekan/wekan

Browse source
This commit is contained in:
Lauri Ojansivu 2021-01-27 19:03:46 +02:00
commit 2d1e4e8a1d
2 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

23
client/components/main/header.jade
View file

@ -7,16 +7,21 @@ template(name="header")
if currentUser if currentUser
#header-quick-access(class=currentBoard.colorClass) #header-quick-access(class=currentBoard.colorClass)
if isMiniScreen if isMiniScreen
ul span
li a(href="{{pathFor 'home'}}")
a(href="{{pathFor 'home'}}") span.fa.fa-home
span.fa.fa-home
ul
if currentList if currentList
each currentBoard.lists each currentBoard.lists
li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}") li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
a.js-select-list a.js-select-list
= title = title
else
each currentUser.starredBoards
li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
a(href="{{pathFor 'board' id=_id slug=slug}}")
= title
#header-new-board-icon #header-new-board-icon
else else
//- //-
@ -32,18 +37,16 @@ template(name="header")
img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0") img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0")
unless currentSetting.customTopLeftCornerLogoImageUrl unless currentSetting.customTopLeftCornerLogoImageUrl
img(src="{{pathFor '/logo-header.png'}}" alt="") img(src="{{pathFor '/logo-header.png'}}" alt="")
span
a(href="{{pathFor 'home'}}")
span.fa.fa-home
| {{_ 'all-boards'}}
ul ul
li
a(href="{{pathFor 'home'}}")
span.fa.fa-home
| {{_ 'all-boards'}}
li.separator -
//li //li
// a(href="{{pathFor 'public'}}") // a(href="{{pathFor 'public'}}")
// span.fa.fa-globe // span.fa.fa-globe
// | {{_ 'public'}} // | {{_ 'public'}}
each currentUser.starredBoards each currentUser.starredBoards
li.separator -
li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}") li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
a(href="{{pathFor 'board' id=_id slug=slug}}") a(href="{{pathFor 'board' id=_id slug=slug}}")
= title = title

34
client/components/main/header.styl
View file

@ -100,6 +100,7 @@
font-size: 12px font-size: 12px
display: flex display: flex
z-index: 21 z-index: 21
padding: 10px 0px
#header-user-bar, #header-user-bar,
#header-new-board-icon, #header-new-board-icon,
@ -114,15 +115,22 @@
ul ul
transition: opacity 0.2s transition: opacity 0.2s
margin: 4px 0 0 5px overflow-x: auto
overflow: hidden overflow-y: hidden
white-space: nowrap
padding: 10px
margin: -10px
li li
display: block display: inline
float: left
width: auto width: auto
color: darken(white, 15%) color: darken(white, 15%)
padding: 2px 5px 0 padding: 12px 0px
margin: -10px 0px
a
padding: 12px 10px
margin: -10px 0px
&.current &.current
color: darken(white, 5%) color: darken(white, 5%)
@ -186,37 +194,31 @@
#header-quick-access #header-quick-access
transition: background-color 0.4s transition: background-color 0.4s
width: 100% width: 100%
padding: 10px 0px
z-index: 30 z-index: 30
ul ul
width: calc(100% - 60px) width: calc(100% - 60px)
overflow: ellipsis margin-right: 10px
padding: 10px
margin: -10px
li li
height: 100% height: 100%
padding: 12px 0px
margin: -10px 0px
a a
height: 100% height: 100%
padding: 12px 10px
margin: -10px 0px
.fa-home span
.fa-home
font-size: 26px font-size: 26px
margin-top: -2px margin-top: -2px
margin-right: 20px
#header-new-board-icon #header-new-board-icon
display: none display: none
#header-user-bar #header-user-bar
position: absolute
right: 0px right: 0px
padding: 10px padding: 10px
margin: -10px 0 -10px -10px margin: -8px 0 -10px -10px
.announcement .viewer .announcement .viewer
display: inline-block display: inline-block