mirror of
https://github.com/jech/galene.git
synced 2024-11-09 18:25:58 +01:00
Move fontawesome to external, upgrade to 6.0.0.
This commit is contained in:
parent
62fb6d853c
commit
d2dff184d1
32 changed files with 62 additions and 47 deletions
|
@ -7,10 +7,9 @@
|
||||||
<link rel="stylesheet" href="/common.css">
|
<link rel="stylesheet" href="/common.css">
|
||||||
<link rel="stylesheet" type="text/css" href="/404.css"/>
|
<link rel="stylesheet" type="text/css" href="/404.css"/>
|
||||||
<link rel="author" href="https://www.irif.fr/~jch/"/>
|
<link rel="author" href="https://www.irif.fr/~jch/"/>
|
||||||
<!-- Font Awesome File -->
|
<link rel="stylesheet" type="text/css" href="/external/fontawesome/css/fontawesome.min.css"/>
|
||||||
<link rel="stylesheet" type="text/css" href="/css/fontawesome.min.css">
|
<link rel="stylesheet" type="text/css" href="/external/fontawesome/css/solid.min.css"/>
|
||||||
<link href="/css/solid.css" rel="stylesheet" type="text/css">
|
<link rel="stylesheet" type="text/css" href="/external/fontawesome/css/regular.min.css"/>
|
||||||
<link href="/css/regular.css" rel="stylesheet" type="text/css">
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
5
static/css/fontawesome.min.css
vendored
5
static/css/fontawesome.min.css
vendored
File diff suppressed because one or more lines are too long
|
@ -1,15 +0,0 @@
|
||||||
/*!
|
|
||||||
* Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com
|
|
||||||
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
|
||||||
*/
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Font Awesome 5 Free';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
font-display: block;
|
|
||||||
src: url("../webfonts/fa-regular-400.eot");
|
|
||||||
src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
|
|
||||||
|
|
||||||
.far {
|
|
||||||
font-family: 'Font Awesome 5 Free';
|
|
||||||
font-weight: 400; }
|
|
|
@ -1,16 +0,0 @@
|
||||||
/*!
|
|
||||||
* Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com
|
|
||||||
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
|
||||||
*/
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Font Awesome 5 Free';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 900;
|
|
||||||
font-display: block;
|
|
||||||
src: url("../webfonts/fa-solid-900.eot");
|
|
||||||
src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
|
|
||||||
|
|
||||||
.fa,
|
|
||||||
.fas {
|
|
||||||
font-family: 'Font Awesome 5 Free';
|
|
||||||
font-weight: 900; }
|
|
6
static/external/fontawesome/css/all.min.css
vendored
Normal file
6
static/external/fontawesome/css/all.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
6
static/external/fontawesome/css/brands.min.css
vendored
Normal file
6
static/external/fontawesome/css/brands.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
6
static/external/fontawesome/css/fontawesome.min.css
vendored
Normal file
6
static/external/fontawesome/css/fontawesome.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
6
static/external/fontawesome/css/regular.min.css
vendored
Normal file
6
static/external/fontawesome/css/regular.min.css
vendored
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
/*!
|
||||||
|
* Font Awesome Free 6.0.0 by @fontawesome - https://fontawesome.com
|
||||||
|
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
||||||
|
* Copyright 2022 Fonticons, Inc.
|
||||||
|
*/
|
||||||
|
:host,:root{--fa-font-regular:normal 400 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype")}.fa-regular,.far{font-family:"Font Awesome 6 Free";font-weight:400}
|
6
static/external/fontawesome/css/solid.min.css
vendored
Normal file
6
static/external/fontawesome/css/solid.min.css
vendored
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
/*!
|
||||||
|
* Font Awesome Free 6.0.0 by @fontawesome - https://fontawesome.com
|
||||||
|
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
||||||
|
* Copyright 2022 Fonticons, Inc.
|
||||||
|
*/
|
||||||
|
:host,:root{--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-family:"Font Awesome 6 Free";font-weight:900}
|
6
static/external/fontawesome/css/svg-with-js.min.css
vendored
Normal file
6
static/external/fontawesome/css/svg-with-js.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
6
static/external/fontawesome/css/v4-font-face.min.css
vendored
Normal file
6
static/external/fontawesome/css/v4-font-face.min.css
vendored
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
/*!
|
||||||
|
* Font Awesome Free 6.0.0 by @fontawesome - https://fontawesome.com
|
||||||
|
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
||||||
|
* Copyright 2022 Fonticons, Inc.
|
||||||
|
*/
|
||||||
|
@font-face{font-family:"FontAwesome";font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}@font-face{font-family:"FontAwesome";font-display:block;src:url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.ttf) format("truetype")}@font-face{font-family:"FontAwesome";font-display:block;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype");unicode-range:u+f003,u+f006,u+f014,u+f016-f017,u+f01a-f01b,u+f01d,u+f022,u+f03e,u+f044,u+f046,u+f05c-f05d,u+f06e,u+f070,u+f087-f088,u+f08a,u+f094,u+f096-f097,u+f09d,u+f0a0,u+f0a2,u+f0a4-f0a7,u+f0c5,u+f0c7,u+f0e5-f0e6,u+f0eb,u+f0f6-f0f8,u+f10c,u+f114-f115,u+f118-f11a,u+f11c-f11d,u+f133,u+f147,u+f14e,u+f150-f152,u+f185-f186,u+f18e,u+f190-f192,u+f196,u+f1c1-f1c9,u+f1d9,u+f1db,u+f1e3,u+f1ea,u+f1f7,u+f1f9,u+f20a,u+f247-f248,u+f24a,u+f24d,u+f255-f25b,u+f25d,u+f271-f274,u+f278,u+f27b,u+f28c,u+f28e,u+f29c,u+f2b5,u+f2b7,u+f2ba,u+f2bc,u+f2be,u+f2c0-f2c1,u+f2c3,u+f2d0,u+f2d2,u+f2d4,u+f2dc}@font-face{font-family:"FontAwesome";font-display:block;src:url(../webfonts/fa-v4compatibility.woff2) format("woff2"),url(../webfonts/fa-v4compatibility.ttf) format("truetype");unicode-range:u+f041,u+f047,u+f065-f066,u+f07d-f07e,u+f080,u+f08b,u+f08e,u+f090,u+f09a,u+f0ac,u+f0ae,u+f0b2,u+f0d0,u+f0d6,u+f0e4,u+f0ec,u+f10a-f10b,u+f123,u+f13e,u+f148-f149,u+f14c,u+f156,u+f15e,u+f160-f161,u+f163,u+f175-f178,u+f195,u+f1f8,u+f219,u+f250,u+f252,u+f27a}
|
6
static/external/fontawesome/css/v4-shims.min.css
vendored
Normal file
6
static/external/fontawesome/css/v4-shims.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
6
static/external/fontawesome/css/v5-font-face.min.css
vendored
Normal file
6
static/external/fontawesome/css/v5-font-face.min.css
vendored
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
/*!
|
||||||
|
* Font Awesome Free 6.0.0 by @fontawesome - https://fontawesome.com
|
||||||
|
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
||||||
|
* Copyright 2022 Fonticons, Inc.
|
||||||
|
*/
|
||||||
|
@font-face{font-family:"Font Awesome 5 Brands";font-display:block;font-weight:400;src:url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.ttf) format("truetype")}@font-face{font-family:"Font Awesome 5 Free";font-display:block;font-weight:900;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}@font-face{font-family:"Font Awesome 5 Free";font-display:block;font-weight:400;src:url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.ttf) format("truetype")}
|
BIN
static/external/fontawesome/webfonts/fa-brands-400.ttf
vendored
Normal file
BIN
static/external/fontawesome/webfonts/fa-brands-400.ttf
vendored
Normal file
Binary file not shown.
BIN
static/external/fontawesome/webfonts/fa-brands-400.woff2
vendored
Normal file
BIN
static/external/fontawesome/webfonts/fa-brands-400.woff2
vendored
Normal file
Binary file not shown.
BIN
static/external/fontawesome/webfonts/fa-regular-400.ttf
vendored
Normal file
BIN
static/external/fontawesome/webfonts/fa-regular-400.ttf
vendored
Normal file
Binary file not shown.
BIN
static/external/fontawesome/webfonts/fa-regular-400.woff2
vendored
Normal file
BIN
static/external/fontawesome/webfonts/fa-regular-400.woff2
vendored
Normal file
Binary file not shown.
BIN
static/external/fontawesome/webfonts/fa-solid-900.ttf
vendored
Normal file
BIN
static/external/fontawesome/webfonts/fa-solid-900.ttf
vendored
Normal file
Binary file not shown.
BIN
static/external/fontawesome/webfonts/fa-solid-900.woff2
vendored
Normal file
BIN
static/external/fontawesome/webfonts/fa-solid-900.woff2
vendored
Normal file
Binary file not shown.
BIN
static/external/fontawesome/webfonts/fa-v4compatibility.ttf
vendored
Normal file
BIN
static/external/fontawesome/webfonts/fa-v4compatibility.ttf
vendored
Normal file
Binary file not shown.
BIN
static/external/fontawesome/webfonts/fa-v4compatibility.woff2
vendored
Normal file
BIN
static/external/fontawesome/webfonts/fa-v4compatibility.woff2
vendored
Normal file
Binary file not shown.
|
@ -1198,7 +1198,7 @@ header .collapse {
|
||||||
|
|
||||||
#users > div::before {
|
#users > div::before {
|
||||||
content: "\f111";
|
content: "\f111";
|
||||||
font-family: 'Font Awesome 5 Free';
|
font-family: 'Font Awesome 6 Free';
|
||||||
color: #20b91e;
|
color: #20b91e;
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
font-weight: 900;
|
font-weight: 900;
|
||||||
|
|
|
@ -8,10 +8,9 @@
|
||||||
<link rel="stylesheet" type="text/css" href="/common.css"/>
|
<link rel="stylesheet" type="text/css" href="/common.css"/>
|
||||||
<link rel="stylesheet" type="text/css" href="/galene.css"/>
|
<link rel="stylesheet" type="text/css" href="/galene.css"/>
|
||||||
<link rel="author" href="https://www.irif.fr/~jch/"/>
|
<link rel="author" href="https://www.irif.fr/~jch/"/>
|
||||||
<!-- Font Awesome File -->
|
<link rel="stylesheet" type="text/css" href="/external/fontawesome/css/fontawesome.min.css"/>
|
||||||
<link href="/css/fontawesome.min.css" rel="stylesheet" type="text/css">
|
<link rel="stylesheet" type="text/css" href="/external/fontawesome/css/solid.min.css"/>
|
||||||
<link href="/css/solid.css" rel="stylesheet" type="text/css">
|
<link rel="stylesheet" type="text/css" href="/external/fontawesome/css/regular.min.css"/>
|
||||||
<link href="/css/regular.css" rel="stylesheet" type="text/css">
|
|
||||||
<link rel="stylesheet" type="text/css" href="/external/toastify/toastify.css"/>
|
<link rel="stylesheet" type="text/css" href="/external/toastify/toastify.css"/>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -155,8 +155,7 @@ func makeCachable(w http.ResponseWriter, p string, fi os.FileInfo, cachable bool
|
||||||
}
|
}
|
||||||
|
|
||||||
cc := normalCacheControl
|
cc := normalCacheControl
|
||||||
if strings.HasPrefix(p, "/external/") ||
|
if strings.HasPrefix(p, "/external/") {
|
||||||
strings.HasPrefix(p, "/css/") {
|
|
||||||
cc = veryCachableCacheControl
|
cc = veryCachableCacheControl
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue