Merge pull request hestiacp#497 from Lupul/dev-0707

Dev 0707

Author: Kristan Kenney

bin/v-restart-service

@@ -28,15 +28,19 @@ check_args '1' "$#" 'SERVICE'
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Run the restart rules for iptables firewall
 if [ "$service" = "iptables" ]; then
+    # Run the restart rules for iptables firewall
     $BIN/v-stop-firewall
     $BIN/v-update-firewall
-fi
-
-if [ "$service" = "hestia" ] || [ "$service" = "iptables" ] || [ "$service" = "mariadb" ] || [ "$service" = "mysql" ] || [ "$service" = "postgresql" ] || [ "$service" = "cron" ]; then
-    systemctl restart $service > /dev/null 2>&1
-elif [ -z "$force" ] || [ "$force" = "no" ]; then
+elif [ -z "$force" -o "$force" = "no" ] && [ \
+        "$service" = "nginx" -o     \
+        "$service" = "apache2" -o   \
+        "$service" = "exim4" -o     \
+        "$service" = "dovecot" -o   \
+        "$service" = "bind9" -o     \
+        "$service" = "vsftpd" -o    \
+        "$service" = "ssh" -o       \
+        "$service" = "fail2ban" ]; then
     systemctl reload $service > /dev/null 2>&1
 else
     systemctl restart $service > /dev/null 2>&1

web/css/styles.min.css

@@ -1205,7 +1205,7 @@ a {
 .l-separator.selected,
 .l-separator {
   height: 1px;
-  background-color: #ddd;
+  border-top: 1px solid #ddd;
 }
 
 div.l-content > div.l-separator:nth-of-type(2) {
@@ -1220,6 +1220,8 @@ div.l-content > div.l-separator:nth-of-type(4) {
   width: 100%;
   position: fixed;
   z-index: 110;
+  border-top: none;
+  border-bottom: 1px solid #ddd;
 }
 
 .l-sort {

web/js/app.js

@@ -1009,15 +1009,13 @@ hover_menu = function() {
         nav_a.css({'min-height': 111 - st + 'px'});
         nav_context.css({'margin-top': 181 - st + 'px'});
         sep_2.css({'box-shadow':'none'});
-        sep_2.css({'background-color': '#ddd'});
         sep_2.css({'height': '1px'});
     }
 
     if(st > 112){
         sep_1.css({'margin-top': '100px'});
         sep_2.css({'margin-top': '130px'});
         sep_2.css({'height': '15px'});
-        sep_2.css({'background-color': '#fff'});
         nav_a.css({'height': '0'});
         nav_a.css({'min-height': '0'});
         nav_context.css({'margin-top': '101px'});