Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style: change text and padding on settings page #4889

Merged
merged 3 commits into from
Feb 19, 2021
Merged

style: change text and padding on settings page #4889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9df8706
chore: change text and padding on settings page
djaiss Feb 19, 2021
44bbfd6
wip
djaiss Feb 19, 2021
2769706
compile production
djaiss Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/langs/en.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/vendor.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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