diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-01-03 16:02:31 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-01-03 16:02:31 +0200 |
commit | 27943796ade78ca3c503637a1340918bf06a1267 (patch) | |
tree | f5732aa18b55d49bb3933ddf65613b707329984c /client/components/settings | |
parent | 9b288475928627d76dd7c379caf2b0eede8d9e4a (diff) | |
download | wekan-27943796ade78ca3c503637a1340918bf06a1267.tar.gz wekan-27943796ade78ca3c503637a1340918bf06a1267.tar.bz2 wekan-27943796ade78ca3c503637a1340918bf06a1267.zip |
Revert to Wekan v3.57 version of client and models directories,
removing Worker role temporarily, because Worker role changes
broke saving card.
Thanks to xet7 !
Diffstat (limited to 'client/components/settings')
-rw-r--r-- | client/components/settings/informationBody.jade | 8 | ||||
-rw-r--r-- | client/components/settings/peopleBody.jade | 13 | ||||
-rw-r--r-- | client/components/settings/peopleBody.styl | 2 | ||||
-rw-r--r-- | client/components/settings/settingBody.jade | 25 | ||||
-rw-r--r-- | client/components/settings/settingBody.styl | 5 |
5 files changed, 13 insertions, 40 deletions
diff --git a/client/components/settings/informationBody.jade b/client/components/settings/informationBody.jade index 0f85dd9c..2c615ffd 100644 --- a/client/components/settings/informationBody.jade +++ b/client/components/settings/informationBody.jade @@ -4,16 +4,12 @@ template(name='information') | {{_ 'error-notAuthorized'}} else .content-title - span - i.fa.fa-info-circle - | {{_ 'info'}} + span {{_ 'info'}} .content-body .side-menu ul li.active - a.js-setting-menu(data-id="information-display") - i.fa.fa-info-circle - | {{_ 'info'}} + a.js-setting-menu(data-id="information-display") {{_ 'info'}} .main-body +statistics diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade index b8a94337..d8f672b0 100644 --- a/client/components/settings/peopleBody.jade +++ b/client/components/settings/peopleBody.jade @@ -5,22 +5,16 @@ template(name="people") else .content-title.ext-box .ext-box-left - span - i.fa.fa-users - | {{_ 'people'}} + span {{_ 'people'}} input#searchInput(placeholder="{{_ 'search'}}") - button#searchButton - i.fa.fa-search - | {{_ 'search'}} + button#searchButton {{_ 'search'}} .ext-box-right span {{_ 'people-number'}} #{peopleNumber} .content-body .side-menu ul li.active - a.js-setting-menu(data-id="people-setting") - i.fa.fa-users - | {{_ 'people'}} + a.js-setting-menu(data-id="people-setting") {{_ 'people'}} .main-body if loading.get +spinner @@ -96,7 +90,6 @@ template(name="peopleRow") td {{_ userData.authenticationMethod }} td a.edit-user - i.fa.fa-edit | {{_ 'edit'}} template(name="editUserPopup") diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl index c223e181..80387611 100644 --- a/client/components/settings/peopleBody.styl +++ b/client/components/settings/peopleBody.styl @@ -33,7 +33,7 @@ table padding: 0; button - min-width: 90px; + min-width: 60px; .content-wrapper margin-top: 10px diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade index 877fe6e2..04b635e8 100644 --- a/client/components/settings/settingBody.jade +++ b/client/components/settings/settingBody.jade @@ -4,35 +4,22 @@ template(name="setting") | {{_ 'error-notAuthorized'}} else .content-title - i.fa.fa-cog span {{_ 'settings'}} .content-body .side-menu ul li.active - a.js-setting-menu(data-id="registration-setting") - i.fa.fa-sign-in - | {{_ 'registration'}} + a.js-setting-menu(data-id="registration-setting") {{_ 'registration'}} li - a.js-setting-menu(data-id="email-setting") - i.fa.fa-envelope - | {{_ 'email'}} + a.js-setting-menu(data-id="email-setting") {{_ 'email'}} li - a.js-setting-menu(data-id="account-setting") - i.fa.fa-users - | {{_ 'accounts'}} + a.js-setting-menu(data-id="account-setting") {{_ 'accounts'}} li - a.js-setting-menu(data-id="announcement-setting") - i.fa.fa-bullhorn - | {{_ 'admin-announcement'}} + a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}} li - a.js-setting-menu(data-id="layout-setting") - i.fa.fa-object-group - | {{_ 'layout'}} + a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}} li - a.js-setting-menu(data-id="webhook-setting") - i.fa.fa-globe - | {{_ 'global-webhook'}} + a.js-setting-menu(data-id="webhook-setting") {{_ 'global-webhook'}} .main-body if loading.get +spinner diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl index d6ac32b2..bcbd2ea1 100644 --- a/client/components/settings/settingBody.styl +++ b/client/components/settings/settingBody.styl @@ -41,18 +41,15 @@ &:hover background #fff box-shadow 0 1px 2px rgba(0,0,0,0.15); - a @extends .flex padding: 1rem 0 1rem 1rem width: 100% - 5rem + span font-size: 13px - i - margin-right: 20px - .main-body padding: 0.1em 1em -webkit-user-select: text // Safari 3.1+ |