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

[stable10] Change the styling of the active settings navigation menu item #34561

Merged
merged 1 commit into from
Feb 20, 2019
Merged

[stable10] Change the styling of the active settings navigation menu item #34561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions core/css/apps.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@
opacity: 1;
}

#app-navigation .active {
background-color: rgba(240, 240, 240, .9);
font-weight: bold;
}

#app-navigation li.divider {
display: block;
width: 100%;
Expand Down
6 changes: 4 additions & 2 deletions settings/templates/settingsPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@

<div id="app-navigation">
<ul class="with-icon">
<!-- Personal Navigation Settings -->
<li class="divider"><?php p($l->t('Personal')); ?></li>
<?php foreach ($_['personalNav'] as $item): ?>
<li>
<li class="<?php $item['active'] ? p(' active ') : p('') ?>">
<?php if (\strpos($item['icon'], '/', 1) !== false): ?>
<a class="svg <?php $item['active'] ? p(' active ') : p('') ?>" style="background-image: url(<?php p($item['icon']) ?>)" href='<?php p($item['link']); ?>'><?php p($item['name']) ?></a>
<?php else: ?>
Expand All @@ -31,10 +32,11 @@
</li>
<?php endforeach; ?>

<!-- Admin Navigation Settings -->
<?php if (!empty($_['adminNav'])): ?>
<li class="divider"><?php p($l->t('Admin')); ?></li>
<?php foreach ($_['adminNav'] as $item): ?>
<li>
<li class="<?php $item['active'] ? p(' active ') : p('') ?>">
<?php if (\strpos($item['icon'], '/', 1) !== false): ?>
<a class="svg <?php $item['active'] ? p(' active ') : p('') ?>" style="background-image: url(<?php p($item['icon']) ?>)" href='<?php p($item['link']); ?>'><?php p($item['name']) ?></a>
<?php else: ?>
Expand Down