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

move options to card actions so menu doesn't overflow and use mdl-but… #306

Merged
merged 3 commits into from
Feb 6, 2025
Merged

move options to card actions so menu doesn't overflow and use mdl-but… #306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8d83df
more options to card actions so menu doesn't overflow and use mdl-but…
hobbitronics Feb 5, 2025
b1a6e7e
replace smartphone with authenticator
hobbitronics Feb 5, 2025
053a2b1
Merge pull request #307 from silinternational/remove-smartphone
hobbitronics Feb 5, 2025
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 modules/material/themes/material/default/other_mfas.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% if other_options|length > 0 %}
<div layout-children="column" child-spacing="center">
{# used type=button to avoid form submission on click since this is just used to display the ul #}
<button id="others" type="button" class="mdl-button mdl-js-button">
<button id="others" type="button" class="mdl-button mdl-js-button mdl-button--raised">
<span class="mdl-typography--caption">
{{ '{mfa:use_others}'|trans }}
</span>
Expand Down
5 changes: 3 additions & 2 deletions modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,14 @@
{% endif %}

<div class="mdl-card__actions" layout-children="row">
{{ include('other_mfas.twig') }}

<span flex></span>

<button name="submitMfa" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{mfa:button_verify}'|trans }}
</button>
</div>

{{ include('other_mfas.twig') }}
</div>

<div>
Expand Down
5 changes: 3 additions & 2 deletions modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,14 @@
{% endif %}

<div class="mdl-card__actions" layout-children="row">
{{ include('other_mfas.twig') }}

<span flex></span>

<button name="submitMfa" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{mfa:button_verify}'|trans }}
</button>
</div>

{{ include('other_mfas.twig') }}
</div>

<div>
Expand Down
5 changes: 3 additions & 2 deletions modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,14 @@
{% endif %}

<div class="mdl-card__actions" layout-children="row">
{{ include('other_mfas.twig') }}

<span flex></span>

<button name="submitMfa" type="submit" class="mdl-button mdl-button--raised mdl-button--primary">
{{ '{mfa:button_verify}'|trans }}
</button>
</div>

{{ include('other_mfas.twig') }}
</div>

<div>
Expand Down
7 changes: 4 additions & 3 deletions modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,20 @@
</div>

<div class="mdl-card__actions" layout-children="row">
{{ include('other_mfas.twig') }}

<span flex></span>

<!-- used type=button to avoid form submission on click -->
<button
id="verifyBtn"
type="button"
class="mdl-button {{ error_message is empty ? 'mdl-color-text--primary' : 'mdl-color-text--red' }}"
class="mdl-button mdl-button--raised {{ error_message is empty ? 'mdl-color-text--primary' : 'mdl-color-text--red' }}"
>
{{ error_message is empty ? 'ok' : '{mfa:button_try_again}'|trans }}
</button>

</div>

{{ include('other_mfas.twig') }}
</div>

<div>
Expand Down