Skip to content

Commit

Permalink
style: change text and padding on settings page (#4889)
Browse files Browse the repository at this point in the history
  • Loading branch information
djaiss authored Feb 19, 2021
1 parent d467951 commit ff9a71d
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Enhancements:

* Use Unknown as default gender
* Better padding and text about Me as a contact on Settings page

### Fixes:

Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/langs/en.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/vendor.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
"/js/vendor.js": "/js/vendor.js?id=51cb953f8199af1ecf6c",
"/js/app.js": "/js/app.js?id=4c6f22e4801d6288c3a7",
"/js/vendor.js": "/js/vendor.js?id=f1d25cdb9c04fd1afc64",
"/js/app.js": "/js/app.js?id=31d08b4436b3badfb87c",
"/css/app-ltr.css": "/css/app-ltr.css?id=71731471a70e00efa5b7",
"/css/app-rtl.css": "/css/app-rtl.css?id=f2be1f77bfcee838c94f",
"/css/stripe.css": "/css/stripe.css?id=04066fb482310d18299c",
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/people/MeContact.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ div >>> .avatar-small {
</span>
</span>
</div>
<div v-else class="dib pointer ml2 fl">
<div v-else class="dib pointer fl">
{{ $t('settings.me_no_contact') }}<br />
<a v-if="!limited" href="" @click.prevent="openModal">{{ $t('settings.me_select_click') }}</a>
<div v-else v-html="$t('settings.personalisation_paid_upgrade_vue', {url: 'settings/subscriptions' })"></div>
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/en/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
'title_i18n' => 'International settings',
'title_layout' => 'Layout',

'me_title' => 'My contact',
'me_title' => 'Me as a contact',
'me_help' => 'This is the contact that represents <em>you</em> in Monica',
'me_select' => 'Select a contact',
'me_no_contact' => 'No contact selected yet.',
Expand Down
3 changes: 1 addition & 2 deletions resources/views/settings/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
:existing-contacts="{{ \Safe\json_encode($existingContacts) }}"
:contact="{{ \Safe\json_encode($meContact) }}"
:limited="{{ \Safe\json_encode($accountHasLimitations) }}"
>
</me-contact>
/>
<small class="form-text text-muted">@lang('settings.me_help')</small>
</div>
</div>
Expand Down

0 comments on commit ff9a71d

Please sign in to comment.