Skip to content

Commit 298701f

Browse files
AlecRustAlecRust
authored
Refactor icon colouring CSS (hestiacp#3155)
And reorganise some other CSS.
1 parent 4ff49d0 commit 298701f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+641
-622
lines changed

‎func/upgrade.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ upgrade_send_notification_to_panel() {
186186
# Add notification to panel if variable is set to true or is not set
187187
if [[ "$new_version" =~ "alpha" ]]; then
188188
# Send notifications for development releases
189-
$BIN/v-add-user-notification admin 'Development snapshot installed' '<b>Version:</b> '$new_version'<br><b>Code Branch:</b> '$RELEASE_BRANCH'<br><br>Please tell us about any bugs or issues by opening an issue report on <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a> and feel free to share your feedback on our <a href="https://forum.hestiacp.com" target="_new">discussion forum</a>.<br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
189+
$BIN/v-add-user-notification admin 'Development snapshot installed' '<b>Version:</b> '$new_version'<br><b>Code Branch:</b> '$RELEASE_BRANCH'<br><br>Please tell us about any bugs or issues by opening an issue report on <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a> and feel free to share your feedback on our <a href="https://forum.hestiacp.com" target="_new">discussion forum</a>.<br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
190190
elif [[ "$new_version" =~ "beta" ]]; then
191191
# Send feedback notification for beta releases
192-
$BIN/v-add-user-notification admin 'Thank you for testing Hestia Control Panel '$new_version'.' '<b>Please share your feedback with our development team through our <a href="https://forum.hestiacp.com" target="_new">discussion forum</a>.<br><br>Found a bug? Report it on <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
192+
$BIN/v-add-user-notification admin 'Thank you for testing Hestia Control Panel '$new_version'.' '<b>Please share your feedback with our development team through our <a href="https://forum.hestiacp.com" target="_new">discussion forum</a>.<br><br>Found a bug? Report it on <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
193193
else
194194
# Send normal upgrade complete notification for stable releases
195-
$BIN/v-add-user-notification admin 'Upgrade complete' 'Hestia Control Panel has been updated to <b>v'$new_version'</b>.<br><a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md" target="_new">View release notes</a><br><br>Please tell us about any bugs or issues by opening a new issue report on <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
195+
$BIN/v-add-user-notification admin 'Upgrade complete' 'Hestia Control Panel has been updated to <b>v'$new_version'</b>.<br><a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md" target="_new">View release notes</a><br><br>Please tell us about any bugs or issues by opening a new issue report on <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
196196
fi
197197
}
198198

‎install/hst-install-debian.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2133,7 +2133,7 @@ cat $tmpfile
21332133
rm -f $tmpfile
21342134

21352135
# Add welcome message to notification panel
2136-
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://docs.hestiacp.com/" target="_new">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_new">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
2136+
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://docs.hestiacp.com/" target="_new">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_new">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
21372137

21382138
# Clean-up
21392139
# Sort final configuration file

‎install/hst-install-ubuntu.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2201,7 +2201,7 @@ cat $tmpfile
22012201
rm -f $tmpfile
22022202

22032203
# Add welcome message to notification panel
2204-
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://docs.hestiacp.com/" target="_new">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_new">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart status-icon red"></i> The Hestia Control Panel development team'
2204+
$HESTIA/bin/v-add-user-notification admin 'Welcome to Hestia Control Panel!' '<br>You are now ready to begin <a href="/add/user/">adding user accounts</a> and <a href="/add/web/">domains</a>. For help and assistance, view the <a href="https://docs.hestiacp.com/" target="_new">documentation</a> or visit our <a href="https://forum.hestiacp.com/" target="_new">user forum</a>.<br><br>Please report any bugs or issues via <a href="https://github.com/hestiacp/hestiacp/issues" target="_new"><i class="fab fa-github"></i> GitHub</a>.<br><br><b>Have a wonderful day!</b><br><br><i class="fas fa-heart icon-red"></i> The Hestia Control Panel development team'
22052205

22062206
# Clean-up
22072207
# Sort final configuration file

‎web/css/src/themes/dark.css‎

Lines changed: 60 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,37 @@ strong {
326326
text-shadow: 0 1px rgb(0 0 0 / 95%) !important;
327327
}
328328

329+
/* Server summary component
330+
========================================================================== */
331+
332+
.server-summary-icon {
333+
color: #707070;
334+
}
335+
336+
.server-summary-title {
337+
color: #fafafa;
338+
}
339+
340+
/* Panel component
341+
========================================================================== */
342+
343+
.panel {
344+
background-color: #454545;
345+
border-color: #606060;
346+
box-shadow: 0 1px 4px rgb(0 0 0 / 35%);
347+
}
348+
349+
/* Collapse component
350+
========================================================================== */
351+
352+
.collapse-header {
353+
background: #454545;
354+
border-color: #505050;
355+
text-shadow: 0 1px rgb(0 0 0 / 40%);
356+
box-shadow: inset 0 0 2px rgb(0 0 0 / 50%), 0 2px 6px rgb(0 0 0 / 40%);
357+
color: #fff;
358+
}
359+
329360
.l-unit {
330361
color: #dadada;
331362
}
@@ -734,64 +765,57 @@ form#vstobjects.suspended {
734765
box-shadow: 0 1px 2px rgb(25 25 25 / 30%);
735766
}
736767

737-
.status-icon.large {
738-
}
739-
740-
.status-icon.yellow,
741-
.status-icon.yellow:hover {
742-
color: #f3e72c;
743-
}
744-
745-
.status-icon.teal,
746-
.status-icon.teal:hover {
747-
color: #3cc;
748-
}
768+
/* Icon component
769+
========================================================================== */
749770

750-
.status-icon.purple,
751-
.status-icon.purple:hover {
771+
.icon-purple {
752772
color: #c364ff;
773+
774+
&:hover {
775+
color: #c364ff;
776+
}
753777
}
754778

755-
.status-icon.maroon,
756-
.status-icon.maroon:hover {
779+
.icon-maroon {
757780
color: #ff3478;
758-
}
759781

760-
.status-icon.red,
761-
.status-icon.red:hover {
782+
&:hover {
783+
color: #ff3478;
784+
}
762785
}
763786

764-
.status-icon.green,
765-
.status-icon.green:hover {
787+
.icon-green {
766788
color: #37cf39;
767-
}
768789

769-
.status-icon.orange,
770-
.status-icon.orange:hover {
790+
&:hover {
791+
color: #37cf39;
792+
}
771793
}
772794

773-
.status-icon.lightblue,
774-
.status-icon.lightblue:hover {
795+
.icon-blue {
796+
color: #0092f4;
797+
798+
&:hover {
799+
color: #0092f4;
800+
}
775801
}
776802

777-
.status-icon.highlight,
778-
.status-icon.highlight:hover {
803+
.icon-highlight {
779804
color: #dadada;
780-
}
781805

782-
.status-icon.blue,
783-
.status-icon.blue:hover {
784-
color: #0092f4;
806+
&:hover {
807+
color: #dadada;
808+
}
785809
}
786810

787-
.status-icon.dim {
811+
.icon-dim {
788812
color: #808080;
789813
text-shadow: 1px 1px rgb(0 0 0 / 30%);
790814
}
791815

792-
.l-unit--suspended .status-icon.dim {
793-
color: #808080 !important;
794-
text-shadow: 0 !important;
816+
.l-unit--suspended .icon-dim {
817+
color: #808080;
818+
text-shadow: 0;
795819
}
796820

797821
/* Modals
@@ -909,37 +933,6 @@ form#vstobjects.suspended {
909933
border-color: #454545;
910934
}
911935

912-
/* Server summary component
913-
========================================================================== */
914-
915-
.server-summary-icon {
916-
color: #707070;
917-
}
918-
919-
.server-summary-title {
920-
color: #fafafa;
921-
}
922-
923-
/* Panel component
924-
========================================================================== */
925-
926-
.panel {
927-
background-color: #454545;
928-
border-color: #606060;
929-
box-shadow: 0 1px 4px rgb(0 0 0 / 35%);
930-
}
931-
932-
/* Collapse component
933-
========================================================================== */
934-
935-
.collapse-header {
936-
background: #454545;
937-
border-color: #505050;
938-
text-shadow: 0 1px rgb(0 0 0 / 40%);
939-
box-shadow: inset 0 0 2px rgb(0 0 0 / 50%), 0 2px 6px rgb(0 0 0 / 40%);
940-
color: #fff;
941-
}
942-
943936
/* Inline alerts
944937
========================================================================== */
945938

0 commit comments

Comments
 (0)