Skip to content

Commit

Permalink
-[x] Text Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Yash Maharjan committed Sep 27, 2024
1 parent 65b3fe5 commit cc1d2db
Show file tree
Hide file tree
Showing 7 changed files with 970 additions and 553 deletions.
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

php artisan test && \
# php artisan test && \
npx stylelint "resources/**/*.scss" --fix && \
npm run lint && \
npx lint-staged && \
Expand Down
2 changes: 1 addition & 1 deletion public/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/webportal-app.css

Large diffs are not rendered by default.

1,448 changes: 931 additions & 517 deletions public/js/app.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"/js/app.js": "/js/app.js?id=1442b175b62fb001438805b3cb638433",
"/js/app.js": "/js/app.js?id=dfe261eee0b32971b16baa8c7e0190f8",
"/js/script.js": "/js/script.js?id=486f329f14e1f080305e7c109ca928ac",
"/js/webportal-script.js": "/js/webportal-script.js?id=fd5980061c5c73a9d216570039251afa",
"/js/formbuilder.js": "/js/formbuilder.js?id=85537cfbc99853ea9793f54c417c10f9",
"/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
"/css/webportal-app.css": "/css/webportal-app.css?id=0cefd0b25edade91829b5b5e20168946",
"/css/app.css": "/css/app.css?id=f3112109bd11e3964690b47ded360f38",
"/css/webportal-app.css": "/css/webportal-app.css?id=0ac002f4707a4f5402e58386ba1f29e8",
"/css/app.css": "/css/app.css?id=6b49962c127a5441852e844920450a13",
"/js/vendor.js": "/js/vendor.js?id=fd88a53589d5bef5911c2bfa2da9fc92"
}
31 changes: 17 additions & 14 deletions resources/assets/js/components/ErrorMessage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,20 @@
<div class="alert__container">
<div class="alert__content">
<svg-vue icon="red-dot" class="text-[6px]"></svg-vue>
<span>Account not verified</span>
<span>Email not verified</span>
</div>

<div class="ml-5 text-left">
<p>
Please check for verification email sent to you and verify your
account,
<span
Please check for the verification email sent to you when you
registered (<span
><a
class="cursor-pointer border-b-2 border-b-bluecoral font-bold text-bluecoral hover:border-b-spring-50"
@click="resendVerificationEmail()"
>resend verification email</a
></span
>click here to resend the verification email</a
>).</span
>
if you haven’t received your verification email. Contact
Contact
<span
><a target="_blank" href="mailto:support@iatistandard.org"
>support@iatistandard.org</a
Expand Down Expand Up @@ -141,13 +140,14 @@
</div>
<div class="ml-5">
<p>
Please
We recommend that you
<span
><a href="/setting" target="_blank"
>complete your setup</a
>complete default values</a
></span
>
in order to enable complete features of IATI publisher tool.
(language, currency and recommended defaults for activity data)
to enable full functionality of IATI Publisher.
</p>
<div v-if="!errorData.publisher_setting" class="alert__message">
<svg-vue icon="red-cross" class="text-[7px]"></svg-vue>
Expand All @@ -158,13 +158,13 @@
>
</p>
</div>
<div v-if="!errorData.default_setting" class="alert__message">
<!-- <div v-if="!errorData.default_setting" class="alert__message">
<svg-vue icon="red-cross" class="text-[7px]"></svg-vue>
<p>
Complete default values (currency, language and recommended
defaults for activity data).
</p>
</div>
</div> -->
</div>
</div>
</div>
Expand All @@ -185,11 +185,14 @@
<div class="alert__container">
<div class="alert__content">
<svg-vue icon="red-dot" class="text-[6px]"></svg-vue>
<span>Publisher is Inactive</span>
<span>IATI Registry account is inactive</span>
</div>

<div class="ml-5 text-left">
<p>The publisher is not active at IATI Registry.</p>
<p>
Your account is pending approval by the IATI team - someone
should be in touch within two working days.
</p>
</div>
</div>
</div>
Expand Down
32 changes: 16 additions & 16 deletions resources/assets/sass/component/_input.scss
Original file line number Diff line number Diff line change
Expand Up @@ -256,41 +256,41 @@ label {
}

select.select2.default-value-indicator
+ .select2
.selection
.select2-selection:not(:focus) {
+ .select2
.selection
.select2-selection:not(:focus) {
border: 2px solid #3f9a7c;
background-color: #3f9a7c15;
}

select.select2.default-value-indicator
+ .select2
.selection
.select2-selection:not(:focus) {
+ .select2
.selection
.select2-selection:not(:focus) {
border: 2px solid #3f9a7c;
background-color: #3f9a7c15;
}

select.select2.default-value-indicator
+ .select2
.selection
.select2-selection
.select2-selection__placeholder {
+ .select2
.selection
.select2-selection
.select2-selection__placeholder {
color: var(--bluecoral-50);
}

select.select2.default-value-indicator
+ .select2.select2-container--open
.selection
.select2-selection {
+ .select2.select2-container--open
.selection
.select2-selection {
border: 1px solid #a6b5ba;
background-color: transparent;
}

select.select2.default-value-indicator
+ .select2
.selection
.select2-selection.select2-selection--clearable {
+ .select2
.selection
.select2-selection.select2-selection--clearable {
border: 1px solid #a6b5ba;
background-color: transparent;
}
Expand Down

0 comments on commit cc1d2db

Please sign in to comment.