Skip to content

Commit f680c72

Browse files
author
Kristan Kenney
committed
Merge branch 'ui-panel'
2 parents 8687cb3 + 115c0d7 commit f680c72

File tree

5 files changed

+25
-32
lines changed

5 files changed

+25
-32
lines changed

‎install/deb/themes/dark.css‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,8 @@ a {
160160
float: right;
161161
}
162162

163-
.l-profile__username {
164-
font-size: 1.2rem !important;
165-
}
166-
167-
.l-profile__help {
168-
font-size: 1.2rem !important;
169-
}
170-
171163
.l-profile__logout {
172164
color: #e7e7e7 !important;
173-
font-size: 1.2rem !important;
174165
}
175166

176167
.l-profile__server {

‎web/css/styles.min.css‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ a {
823823
color: #f7f7f7;
824824
position: relative;
825825
line-height: 39px;
826-
padding: 11px 14px;
826+
padding: 11px 10px;
827827
border-left: 1px solid transparent;
828828
border-right: 1px solid transparent;
829829
}
@@ -861,22 +861,24 @@ a {
861861
color: #fff;
862862
}
863863

864+
.panel-icon {
865+
font-size: 1rem;
866+
vertical-align: middle;
867+
margin-top: -4px;
868+
}
869+
864870
.l-profile {
865871
overflow: hidden;
866872
float: right;
867873
}
868874

869-
.l-profile__username {
870-
font-size: 1.2rem !important;
871-
}
872-
873-
.l-profile__help {
874-
font-size: 1.2rem !important;
875+
.l-profile__username, .l-profile__logout,
876+
.l-profile__help, .l-profile__serversettings {
877+
font-size: 1.1rem !important;
875878
}
876879

877880
.l-profile__logout {
878881
color: #dbf94e !important;
879-
font-size: 1.2rem !important;
880882
}
881883

882884
.l-profile__server {
@@ -920,7 +922,7 @@ a {
920922
padding-left: 0;
921923
position: fixed;
922924
top: 34px;
923-
width: 393px;
925+
width: 390px;
924926
z-index: 300;
925927
font-size: 0.8rem;
926928
padding: 0;

‎web/js/init.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ $(document).ready(function(){
580580
if(!$('.l-profile__notifications').hasClass('active')){
581581
VE.notifications.get_list();
582582
$('.l-profile__notifications').addClass('active');
583-
left = $('.l-profile__notifications').offset().left - $('.notification-container').outerWidth() + 28;
583+
left = $('.l-profile__notifications').offset().left - $('.notification-container').outerWidth() + 22;
584584
$('.notification-container').css({left: left+'px'});
585585

586586
} else {

‎web/templates/admin/panel.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
<a href="/list/user/" class="l-logo"></a>
1212
<!-- /.l-logo -->
1313
<div class="l-menu clearfix noselect">
14-
<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?><?php if($TAB == 'PACKAGE' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'USER' ) echo 'l-menu__item--active' ?>"><a href="/list/user/"><i class="fas fa-tasks"></i>&nbsp;&nbsp;&nbsp;<?=__('Records')?></a></div>
15-
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
16-
<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
17-
<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
18-
<div class="l-menu__item <?php if($TAB == 'SERVER' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'UPDATES' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'IP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'RRD' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'FIREWALL' ) echo 'l-menu__item--active' ?>"><a href="/list/server/"><i class="fas fa-server"></i>&nbsp;&nbsp;&nbsp;<?=__('Server')?></a></div>
14+
<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?><?php if($TAB == 'PACKAGE' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'USER' ) echo 'l-menu__item--active' ?>"><a href="/list/user/"><i class="fas fa-tasks panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Records')?></a></div>
15+
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
16+
<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
17+
<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
1918
</div>
2019
<!-- /.l-menu -->
2120
<div class="l-profile noselect">
@@ -31,9 +30,10 @@
3130
<i class="fas fa-bell <?if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " animated extended swing status-icon orange"; ?>"></i>
3231
</a>
3332
</div>
34-
<div class="l-menu__item"><a href="https://github.com/hestiacp/hestiacp/issues/" target="_new" alt="Submit a bug report" class="l-profile__help"><i class="fas fa-flag"></i></a></div>
33+
<div class="l-menu__item"><a href="/list/server/" class="l-profile__serversettings"><i class="fas fa-cog"></i></a></div>
34+
<div class="l-menu__item"><a href="/edit/user/?user=<?php echo $user; ?>" alt="<?=$user?>" class="l-profile__username"><i class="fas fa-user-edit"></i></a></div>
35+
<div class="l-menu__item"><a href="https://github.com/hestiacp/hestiacp/issues/" target="_new" alt="Submit a bug report" class="l-profile__help"><i class="fas fa-exclamation-triangle"></i></a></div>
3536
<div class="l-menu__item"><a href="https://docs.hestiacp.com/" alt="<?=__('Help')?>" class="l-profile__help" target="_blank"><i class="fas fa-question-circle"></i></a></div>
36-
<div class="l-menu__item"><a href="/edit/user/?user=<?php echo $user; ?>" alt="<?=$user?>" class="l-profile__username"><i class="fas fa-user-circle"></i></a></div>
3737
<div class="l-menu__item"><a href="/logout/" alt="<?=__('Log out')?>" class="l-profile__logout"><i class="fas fa-sign-out-alt"></i></a></div>
3838
</div>
3939
<!-- /.l-profile -->

‎web/templates/user/panel.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<a href="/list/web/" class="l-logo"></a>
1212
<!-- /.l-logo -->
1313
<div class="l-menu clearfix noselect">
14-
<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?>"><a href="/list/web/"><i class="fas fa-tasks"></i>&nbsp;&nbsp;&nbsp;<?=__('Records')?></a></div>
15-
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
16-
<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
17-
<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
14+
<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?>"><a href="/list/web/"><i class="fas fa-tasks panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Records')?></a></div>
15+
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
16+
<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
17+
<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
1818
</div>
1919
<!-- /.l-menu -->
2020
<div class="l-profile noselect">
@@ -26,9 +26,9 @@
2626
</span>
2727
</div>
2828
<div class="l-menu__item"><a alt="<?=__('Notifications')?>" class="l-profile__notifications <? if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " updates"; ?>"><i class="fas fa-bell <?if($panel[$user]['NOTIFICATIONS'] == 'yes') echo " status-icon orange"; ?>"></i></a></div>
29-
<div class="l-menu__item"><a href="https://github.com/hestiacp/hestiacp/issues/" target="_new" alt="Submit a bug report" class="l-profile__help"><i class="fas fa-flag"></i></a></div>
29+
<div class="l-menu__item"><a href="/edit/user/?user=<?php echo $user; ?>" alt="<?=$user?>" class="l-profile__username"><i class="fas fa-user-edit"></i></a></div>
30+
<div class="l-menu__item"><a href="https://github.com/hestiacp/hestiacp/issues/" target="_new" alt="Submit a bug report" class="l-profile__help"><i class="fas fa-exclamation-triangle"></i></a></div>
3031
<div class="l-menu__item"><a href="https://docs.hestiacp.com/" alt="<?=__('Help')?>" class="l-profile__help" target="_blank"><i class="fas fa-question-circle"></i></a></div>
31-
<div class="l-menu__item"><a href="/edit/user/?user=<?php echo $user; ?>" alt="<?=$user?>" class="l-profile__username"><i class="fas fa-user-circle"></i></a></div>
3232
<div class="l-menu__item"><a href="/logout/" alt="<?=__('Log out')?>" class="l-profile__logout"><i class="fas fa-sign-out-alt"></i></a></div>
3333
</div>
3434
<!-- /.l-profile -->

0 commit comments

Comments
 (0)