Font files update

1. Restore clear-sans font
2. Update bitstream font
3. Cleanup font files, use only woff format
4. Adjust css settings
This commit is contained in:
bergware
2022-05-13 14:39:27 +02:00
parent 77cf6c4bb6
commit 1d52701d02
28 changed files with 58 additions and 68 deletions

View File

@@ -11,19 +11,17 @@
<style>
/************************
/
/ Fonts: original font-family names are kept for backward compatibility
/ clear-sans --> source-sans-pro
/ bitstream --> source-code-pro
/ Fonts
/
/************************/
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff?20220513') format('woff')}
html{font-family:clear-sans;font-size:62.5%;height:100%}
body{font-size:1.2rem;color:#1c1c1c;background:#f2f2f2;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}

View File

@@ -11,19 +11,17 @@
<style>
/************************
/
/ Fonts: original font-family names are kept for backward compatibility
/ clear-sans --> source-sans-pro
/ bitstream --> source-code-pro
/ Fonts
/
/************************/
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff?20220513') format('woff')}
html{font-family:clear-sans;font-size:62.5%;height:100%}
body{font-size:1.3rem;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}

View File

@@ -51,7 +51,7 @@ function writeToFile($file, $text): void {
// Source: https://stackoverflow.com/a/2524761
function isValidTimeStamp($timestamp)
{
return ((string) (int) $timestamp === $timestamp)
return ((string) (int) $timestamp === $timestamp)
&& ($timestamp <= PHP_INT_MAX)
&& ($timestamp >= ~PHP_INT_MAX);
}
@@ -257,19 +257,17 @@ $theme_dark = in_array($display['theme'], ['black', 'gray']);
<style>
/************************
/
/ Fonts: original font-family names are kept for backward compatibility
/ clear-sans --> source-sans-pro
/ bitstream --> source-code-pro
/ Fonts
/
/************************/
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff?20220513') format('woff')}
/************************
/

View File

@@ -59,19 +59,17 @@ $THEME_DARK = in_array($display['theme'],['black','gray']);
<style>
/************************
/
/ Fonts: original font-family names are kept for backward compatibility
/ clear-sans --> source-sans-pro
/ bitstream --> source-code-pro
/ Fonts
/
/************************/
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff?20220513') format('woff')}
/************************
/

View File

@@ -1,4 +1,4 @@
@font-face{font-family:cases;font-weight:normal;font-style:normal;src:url('/webGui/styles/font-cases.woff2?20220508') format('woff2'),url('/webGui/styles/font-cases.woff?20220508') format('woff')}
@font-face{font-family:cases;font-weight:normal;font-style:normal;src:url('/webGui/styles/font-cases.woff?20220508') format('woff')}
[class^='case-'],[class*=' case-']{font-family:cases!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none}
.case-1u-disks:before{content:'\e90d'}
.case-1u-vents:before{content:'\e90e'}

View File

@@ -1,13 +1,13 @@
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:docker-icon;font-weight:normal;font-style:normal;src:url('/webGui/styles/docker-icon.woff2?20220508') format('woff2'),url('/webGui/styles/docker-icon.woff?20220508') format('woff')}
@font-face{font-family:unraid;font-weight:normal;font-style:normal;src:url('/webGui/styles/font-unraid.woff2?20220508') format('woff2'),url('/webGui/styles/font-unraid.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff?20220513') format('woff')}
@font-face{font-family:docker-icon;font-weight:normal;font-style:normal;src:url('/webGui/styles/docker-icon.woff?20220513') format('woff')}
@font-face{font-family:unraid;font-weight:normal;font-style:normal;src:url('/webGui/styles/font-unraid.woff?20220513') format('woff')}
[data-icon]:before{content:attr(data-icon)}
[data-icon]:before,.fa-docker:before{font-family:docker-icon!important;content:'\f100'}
[class^='icon-'],[class*=' icon-']{font-family:unraid!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none}

File diff suppressed because one or more lines are too long

View File

@@ -11,19 +11,17 @@
<style>
/************************
/
/ Fonts: original font-family names are kept for backward compatibility
/ clear-sans --> source-sans-pro
/ bitstream --> source-code-pro
/ Fonts
/
/************************/
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/clear-sans-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-italic.woff?20220508') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff2?20220508') format('woff2'),url('/webGui/styles/bitstream-bold-italic.woff?20220508') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff?20220513') format('woff')}
@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff?20220513') format('woff')}
@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff?20220513') format('woff')}
html{font-family:clear-sans;font-size:62.5%;height:100%}
body{font-size:1.3rem;color:#1c1c1c;background:#f2f2f2;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}