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: Gave warning boxes background colours, fixed pale red shade. #4986

Merged
merged 7 commits into from
Mar 27, 2021
Merged

style: Gave warning boxes background colours, fixed pale red shade. #4986

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9dea00f
style: Gave warning boxes background colours, fixed pale red shade.
mgrhm Mar 19, 2021
36e8209
style: Added 'warning' button class CSS, code on page.
mgrhm Mar 21, 2021
b3f7bac
style: Added code to make 'Delete' button red.
mgrhm Mar 21, 2021
9242a34
style: Actually added CSS code for warning button this time.
mgrhm Mar 21, 2021
bd3bf04
style: Regenerated CSS and JSON manifest for button changes.
mgrhm Mar 21, 2021
b66a844
Merge remote-tracking branch 'origin/master' into warning-boxes-backg…
asbiin Mar 27, 2021
1bb93b0
Merge remote-tracking branch 'origin/master' into warning-boxes-backg…
asbiin Mar 27, 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
2 changes: 1 addition & 1 deletion public/css/app-ltr.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/app-rtl.css
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
Expand Up @@ -2,8 +2,8 @@
"/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
"/js/vendor.js": "/js/vendor.js?id=42b9a4e3ae6d14fed279",
"/js/app.js": "/js/app.js?id=d50cd08fa76231e8e22d",
"/css/app-ltr.css": "/css/app-ltr.css?id=c060239b19c6a9f55d0d",
"/css/app-rtl.css": "/css/app-rtl.css?id=dba410c268f83eab2638",
"/css/app-ltr.css": "/css/app-ltr.css?id=bccb68051a565ce860fd",
"/css/app-rtl.css": "/css/app-rtl.css?id=da95e6da83393449b261",
"/css/stripe.css": "/css/stripe.css?id=04066fb482310d18299c",
"/js/stripe.js": "/js/stripe.js?id=8ef2e658e80670420943"
}
10 changes: 7 additions & 3 deletions resources/sass/app-ltr.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ $bg-hover-monica: #d7e3ec;
}
}

.bg-pale-red {
background-color: #f4c8b9;
}

.box-shadow {
background: #fff;
border: 1px solid #d0d0d0;
Expand All @@ -81,7 +85,7 @@ $bg-hover-monica: #d7e3ec;

.form-error-message {
border-top: 1px solid #d9534f;
background-color: #e9967a;
background-color: #f4c8b9;
box-shadow: inset 0 3px 0 0 #d9534f, inset 0 0 0 0 transparent, 0 0 0 1px rgba(63,63,68,.05), 0 1px 3px 0 rgba(63,63,68,.15);
}

Expand Down Expand Up @@ -648,8 +652,8 @@ svg {
}

.form-group-error .error {
border-color: #e9967a !important;
color:#e9967a;
border-color: #d9534f !important;
color:#f4c8b9;
}

// Shake animation
Expand Down
4 changes: 2 additions & 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 @@ -147,15 +147,15 @@
</div>
</div>

<form method="POST" action="{{ route('settings.reset') }}" class="settings-reset bg-white" onsubmit="return confirm('{{ trans('settings.reset_notice') }}')">
<form method="POST" action="{{ route('settings.reset') }}" class="settings-reset bg-washed-yellow" onsubmit="return confirm('{{ trans('settings.reset_notice') }}')">
@csrf

<h2>{{ trans('settings.reset_title') }}</h2>
<p>{{ trans('settings.reset_desc') }}</p>
<button type="submit" class="btn">{{ trans('settings.reset_cta') }}</button>
</form>

<form method="POST" action="{{ route('settings.delete') }}" class="settings-delete bg-white" onsubmit="return confirm('{{ trans('settings.delete_notice') }}')">
<form method="POST" action="{{ route('settings.delete') }}" class="settings-delete bg-pale-red" onsubmit="return confirm('{{ trans('settings.delete_notice') }}')">
@csrf

<h2>{{ trans('settings.delete_title') }}</h2>
Expand Down