Skip to content

Dev: cleaned it up, fixes and more... #1

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

Merged
merged 8 commits into from
Apr 22, 2022
Merged

Dev: cleaned it up, fixes and more... #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b4da891
DEV: Make Guest Gate modal dismissable false
VaperinaDEV Apr 22, 2022
5d60d9b
Delete modal.hbs
VaperinaDEV Apr 22, 2022
4d8f304
Delete d-gate.js
VaperinaDEV Apr 22, 2022
4341284
Delete common.scss
VaperinaDEV Apr 22, 2022
bd59794
Move styles to common.scss, clean it up.
VaperinaDEV Apr 22, 2022
08e0137
Create common.scss
VaperinaDEV Apr 22, 2022
eab4c01
Remove unnecessary class from modal body
VaperinaDEV Apr 22, 2022
d030371
Update settings.yml
VaperinaDEV Apr 22, 2022
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
49 changes: 44 additions & 5 deletions common/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,47 @@
#discourse-modal {
&.discard-draft-modal,
&.dismiss-notification-confirmation-modal {
.modal-header {
display: none;
#discourse-modal.gate {
.custom-gate {
text-align: center;
img {
width: #{$custom_gate_image_width};
height: auto;
margin-bottom: 0.75em;
}
h2 {
color: #{$custom_gate_big_text_color};
}
p {
color: #{$custom_gate_little_text_color};
}
}
.modal-header {
border-bottom: none;
}
.modal-body {
padding: 0 1em;
}
.modal-footer {
color: #{$custom_gate_link_color};
justify-content: #{$gate_footer_position};
a {
color: #{$custom_gate_link_color};
outline: none;
margin: 0 0.25em;
}
}
.modal-inner-container {
background-color: #{$custom_gate_background_color};
}
#login-buttons {
margin-bottom: 0;
text-align: center;
.mobile-view & {
width: 100%;
}
}
.btn-social {
.mobile-view & {
width: 100%;
margin-top: 3px;
}
}
}
41 changes: 0 additions & 41 deletions javascripts/discourse/components/d-gate.js
View file
Open in desktop

This file was deleted.

105 changes: 33 additions & 72 deletions javascripts/discourse/templates/guest-gate.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,36 @@
{{#d-modal-body title=(theme-prefix 'guest_gate.title') class="guest-gate"}}
{{#if (theme-setting 'custom_gate_enabled') }}
<div class="custom-gate">
<img src="{{theme-setting 'custom_gate_image'}}"/>
<h2 style="color: {{theme-setting 'custom_gate_big_text_color'}};">
{{theme-i18n "custom_gate.big_text"}}
</h2>
<p style="color: {{theme-setting 'custom_gate_little_text_color'}};">
{{theme-i18n "custom_gate.little_text"}}
</p>
</div>
<style type="text/css">
.guest-gate {
padding: 0 1em !important;
}
.custom-gate {
text-align: center;
}
.custom-gate img {
width: {{theme-setting 'custom_gate_image_width'}};
height: auto;
margin-bottom: 0.75em;
}
.modal-footer {
color: {{theme-setting 'custom_gate_link_color'}} !important;
}
.modal-footer a {
color: {{theme-setting 'custom_gate_link_color'}} !important;
}
.modal-inner-container {
background-color: {{theme-setting 'custom_gate_background_color'}} !important;
}
</style>
{{else}}
<div>
<p>{{replace-emoji (i18n 'signup_cta.intro')}}</p>
<p>{{replace-emoji (i18n 'signup_cta.value_prop')}}</p>
</div>
{{/if}}
<style type="text/css">
.gate .modal-header {
border-bottom: none;
}
.gate .modal-header .close {
{{#if (theme-setting 'x_button_disabled')}}
display: none;
{{else}}
margin-top: 15px;
{{/if}}
}
#login-buttons {
margin-bottom: 0;
text-align: center;
}
.mobile-view #login-buttons {
width: 100%;
}
.mobile-view .btn-social {
width: 100%;
margin-top: 3px;
}
.modal-footer {
justify-content: {{theme-setting 'gate_footer_position'}};
}
.modal-footer a {
color: #787878;
margin: 0 0.25em;
outline: none;
}
</style>
{{login-buttons externalLogin=(action "externalLogin")}}
{{/d-modal-body}}
{{#if (theme-setting 'dismissable_false')}}
{{#d-modal-body title=(theme-prefix 'guest_gate.title') dismissable=false}}
{{#if (theme-setting 'custom_gate_enabled') }}
<div class="custom-gate">
<img src="{{theme-setting 'custom_gate_image'}}"/>
<h2>{{theme-i18n "custom_gate.big_text"}}</h2>
<p>{{theme-i18n "custom_gate.little_text"}}</p>
</div>
{{else}}
<div>
<p>{{replace-emoji (i18n 'signup_cta.intro')}}</p>
<p>{{replace-emoji (i18n 'signup_cta.value_prop')}}</p>
</div>
{{/if}}
{{login-buttons externalLogin=(action "externalLogin")}}
{{/d-modal-body}}
{{else}}
{{#d-modal-body title=(theme-prefix 'guest_gate.title')}}
{{#if (theme-setting 'custom_gate_enabled') }}
<div class="custom-gate">
<img src="{{theme-setting 'custom_gate_image'}}"/>
<h2>{{theme-i18n "custom_gate.big_text"}}</h2>
<p>{{theme-i18n "custom_gate.little_text"}}</p>
</div>
{{else}}
<div>
<p>{{replace-emoji (i18n 'signup_cta.intro')}}</p>
<p>{{replace-emoji (i18n 'signup_cta.value_prop')}}</p>
</div>
{{/if}}
{{login-buttons externalLogin=(action "externalLogin")}}
{{/d-modal-body}}
{{/if}}

<div class="modal-footer">
{{#if ssoEnabled}}
Expand Down
33 changes: 0 additions & 33 deletions javascripts/discourse/templates/modal.hbs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ guest_gate_enabled:
max_guest_topic_views:
type: string
default: "1"
x_button_disabled:
dismissable_false:
type: bool
default: false
use_gate_buttons:
Expand Down