diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-13 02:15:19 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-02-13 02:15:19 +0200 |
| commit | 1e98f6b781a27cce4bb2867f3afa65c22a25cdad (patch) | |
| tree | 69aa64b1c7a9f9747abcd389def0b0ab72c7d927 | |
| parent | f53e8fbd2111b7ce2e3377b1aea85a5a76bfb6d6 (diff) | |
| parent | 2ca98e477d0b282e7fbc7fc95130bea3e1e5444e (diff) | |
| download | wekan-1e98f6b781a27cce4bb2867f3afa65c22a25cdad.tar.gz wekan-1e98f6b781a27cce4bb2867f3afa65c22a25cdad.tar.bz2 wekan-1e98f6b781a27cce4bb2867f3afa65c22a25cdad.zip | |
Merge branch 'edge' into devel
| -rw-r--r-- | client/components/lists/list.styl | 4 | ||||
| -rw-r--r-- | i18n/pt-BR.i18n.json | 2 | ||||
| -rwxr-xr-x | start-wekan.sh | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index 70502083..7e4550a4 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -84,6 +84,7 @@ padding-left: 10px color: #a6a6a6 + .list-header-menu position: absolute padding: 27px 19px @@ -155,6 +156,9 @@ float: left @media screen and (max-width: 800px) + .list-header-menu + margin-right: 30px + .mini-list flex: 0 0 60px height: 60px diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 49c2eea3..2fb9c420 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -654,7 +654,7 @@ "authentication-method": "Método de autenticação", "authentication-type": "Tipo de autenticação", "custom-product-name": "Nome Customizado do Produto", - "layout": "Leiaute", + "layout": "Layout", "hide-logo": "Esconder Logo", "add-custom-html-after-body-start": "Adicionar HTML Customizado depois do início do <body>", "add-custom-html-before-body-end": "Adicionar HTML Customizado antes do fim do </body>", diff --git a/start-wekan.sh b/start-wekan.sh index dd639aae..1de75aa4 100755 --- a/start-wekan.sh +++ b/start-wekan.sh @@ -72,7 +72,7 @@ function wekan_repo_check(){ # Example: export WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId export WEBHOOKS_ATTRIBUTES='' #--------------------------------------------- - # ==== OAUTH2 AZURE ==== + # ==== OAUTH2 AZURE ==== # https://github.com/wekan/wekan/wiki/Azure # 1) Register the application with Azure. Make sure you capture # the application ID as well as generate a secret key. |