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

fix minor corrections. #5

Merged
merged 3 commits into from
Oct 10, 2023
Merged

fix minor corrections. #5

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
b2f7a23
fix minor corrections.
terabytesoftw Oct 10, 2023
a692cba
More rework code.
terabytesoftw Oct 10, 2023
9d135c9
More rework code.
terabytesoftw Oct 10, 2023
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ root
The web application contains:

- [x] Pages - [Screenshots]:
- [about](docs/about.jpg)
- [contact](docs/contact.jpg)
- [about](docs/about.png)
- [contact](docs/contact.png)

<p align="justify">
It includes all commonly used configurations that would allow you to focus on adding new
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"prefer-stable": true,
"require": {
"php": ">=8.1",
"npm-asset/fortawesome--fontawesome-free": "^6.0",
"npm-asset/fortawesome--fontawesome-free": "^6.4",
"sjaakp/yii2-icon": "^1.0",
"oomphinc/composer-installers-extender": "^2.0",
"yiisoft/yii2": "^2.2",
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/resource/js/site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
const svgOfActiveBtn = btnToActive.querySelector('svg use').getAttribute('href')

// Añade las siguientes líneas para mostrar el icono de verificación en el botón activo.
const activeCheckIcon = btnToActive.querySelector('.bi');
const activeCheckIcon = btnToActive.querySelector('.check');
activeCheckIcon.classList.remove('d-none');

document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
const checkIcon = element.querySelector('.bi');
const checkIcon = element.querySelector('.check');
if (element === btnToActive) {
checkIcon.classList.remove('d-none');
} else {
Expand Down
85 changes: 85 additions & 0 deletions src/Framework/resource/layout/component/toggle_dark.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?php

declare(strict_types=1);

use sjaakp\icon\Icon;
use yii\bootstrap5\Html;

?>
<?= Html::beginTag('li') ?>
<?= Html::beginTag('div', ['class' => 'dropdown bd-mode-toggle']) ?>
<?= Html::beginTag(
'button',
[
'aria-expanded' => 'false',
'aria-label' => 'Toggle theme (auto)',
'class' => 'btn btn-bd-primary dropdown-toggle d-flex align-items-center',
'data-bs-toggle' => 'dropdown',
'id' => 'bd-theme',
'type' => 'button'
],
) ?>
<?= Icon::renderIcon('solid', 'circle-half-stroke', ['class' => 'me-2 fa-solid fa-xl theme-icon-active']) ?>
<?= Html::tag('span', 'Toggle theme', ['class' => 'visually-hidden', 'id' => 'bd-theme-text']) ?>
<?= Html::endTag('button') ?>
<?= Html::beginTag(
'ul',
['aria-labelledby' => 'bd-theme-text', 'class' => 'dropdown-menu dropdown-menu-end shadow'],
) ?>
<?= Html::beginTag('li') ?>
<?= Html::beginTag(
'button',
[
'aria-pressed' => 'false',
'class' => 'dropdown-item d-flex align-items-center',
'data-bs-theme-value' => 'light',
],
) ?>
<?= Icon::renderIcon('solid', 'sun', ['class' => 'me-2 fa-solid theme-icon']) ?>
Light
<?= Icon::renderIcon(
'solid',
'check',
['class' => 'check ms-auto d-none', 'width' => '1em', 'height' => '1em'],
) ?>
<?= Html::endTag('button') ?>
<?= Html::endTag('li') ?>
<?= Html::beginTag('li') ?>
<?= Html::beginTag(
'button',
[
'aria-pressed' => 'false',
'class' => 'dropdown-item d-flex align-items-center',
'data-bs-theme-value' => 'dark',
],
) ?>
<?= Icon::renderIcon('solid', 'moon', ['class' => 'me-2 fa-solid theme-icon']) ?>
Dark
<?= Icon::renderIcon(
'solid',
'check',
['class' => 'check ms-auto d-none', 'width' => '1em', 'height' => '1em'],
) ?>
<?= Html::endTag('button') ?>
<?= Html::endTag('li') ?>
<?= Html::beginTag('li') ?>
<?= Html::beginTag(
'button',
[
'aria-pressed' => 'false',
'class' => 'dropdown-item d-flex align-items-center',
'data-bs-theme-value' => 'auto',
],
) ?>
<?= Icon::renderIcon('solid', 'circle-half-stroke', ['class' => 'me-2 fa-solid theme-icon']) ?>
Auto
<?= Icon::renderIcon(
'solid',
'check',
['class' => 'check ms-auto d-none', 'width' => '1em', 'height' => '1em'],
) ?>
<?= Html::endTag('button') ?>
<?= Html::endTag('li') ?>
<?= Html::endTag('ul') ?>
<?= Html::endTag('div') ?>
<?= Html::endTag('li');
43 changes: 5 additions & 38 deletions src/Framework/resource/layout/footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

use sjaakp\icon\Icon;
use yii\bootstrap5\Html;
use yii\web\View;

/**
* @var View $this
*/
?>
<?= Html::beginTag('div', ['class' => 'container']) ?>
<?= Html::beginTag('footer', ['class' => 'd-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top']) ?>
Expand Down Expand Up @@ -63,44 +67,7 @@
),
['class' => 'ms-3'],
) ?>
<li class="ms-1">
<!-- Inicio Toggle modo dark -->
<div class="dropdown bd-mode-toggle">
<button class="btn btn-bd-primary dropdown-toggle d-flex align-items-center"
id="bd-theme"
type="button"
aria-expanded="false"
data-bs-toggle="dropdown"
aria-label="Toggle theme (auto)">
<?= Icon::renderIcon('solid', 'circle-half-stroke', ['class' => 'me-2 fa-solid fa-xl theme-icon-active']) ?>
<span class="visually-hidden" id="bd-theme-text">Toggle theme</span>
</button>
<ul class="dropdown-menu dropdown-menu-end shadow" aria-labelledby="bd-theme-text">
<li>
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light" aria-pressed="false">
<?= Icon::renderIcon('solid', 'sun', ['class' => 'me-2 fa-solid theme-icon']) ?>
Light
<svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
</button>
</li>
<li>
<button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark" aria-pressed="false">
<?= Icon::renderIcon('solid', 'moon', ['class' => 'me-2 fa-solid theme-icon']) ?>
Dark
<svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
</button>
</li>
<li>
<button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto" aria-pressed="true">
<?= Icon::renderIcon('solid', 'circle-half-stroke', ['class' => 'me-2 fa-solid theme-icon']) ?>
Auto
<svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
</button>
</li>
</ul>
</div>
<!-- Fin Toggle modo dark -->
</li>
<?= $this->render('component/toggle_dark') ?>
<?= Html::endTag('ul') ?>
<?= Html::endTag('footer') ?>
<?= Html::endTag('div') ?>
5 changes: 0 additions & 5 deletions src/Framework/resource/layout/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
<?= $this->render('head') ?>
<?= Html::beginTag('body') ?>
<?php $this->beginBody() ?>
<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
<symbol id="check2" viewBox="0 0 16 16">
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
</symbol>
</svg>
<?= Html::beginTag('wrapper', ['class' => 'd-flex flex-column']) ?>
<?= $this->render('component/menu') ?>
<?= Html::beginTag(
Expand Down