Merge #16547 - Remove metro fonts and clean some unused css

Pull-request: #16547

- Removed some useless css
- Removed all Apache-2.0 non GPL-2.0 compatible fonts files
- Clarified vendor files

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2021-01-19 18:03:17 +01:00
commit 50bb6d82ba
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
29 changed files with 35 additions and 2970 deletions

View File

@ -30,3 +30,20 @@ js/vendor
vendor/
The download kit includes various Composer packages as
dependencies.
Specific files LICENSES
-----------------------
phpMyAdmin distributed themes contain some content that is under licenses.
- `themes/*/img/b_rename.svg` Is a `Icons8 <https://thenounproject.com/Icons8/>`_, icon from the `Android L Icon Pack Collection <https://thenounproject.com/Icons8/collection/android-l-icon-pack/>`_. The icon `rename <https://thenounproject.com/term/rename/61456/>`_.
- `themes/metro/img/user.svg` Is a IcoMoon the `user <https://github.com/Keyamoon/IcoMoon-Free/blob/master/SVG/114-user.svg>`_
CC BY 4.0 or GPL
Licenses for vendors
--------------------
- `rename` from `Icons8` is under the `"public domain" <https://creativecommons.org/publicdomain/zero/1.0/>`_ (CC0 1.0) license.
- IcoMoon Free is under `"CC BY 4.0 or GPL" <https://github.com/Keyamoon/IcoMoon-Free/blob/master/License.txt>`_.

View File

@ -1 +1 @@
<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="m14 4v2h4v20h-4v2h10v-2h-4v-20h4v-2zm-12 4v16h14v-2h-12v-12h12v-2zm20 0v2h6v12h-6v2h8v-16z"/><path d="m6 12v8h10v-8z"/></svg>
<svg height='100px' width='100px' fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" x="0px" y="0px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"><polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="17,16 21,16 21,8 17,8 "></polyline><polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="12,8 3,8 3,16 12,16 "></polyline><line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="6" y1="12" x2="11" y2="12"></line><path fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="10" d="M20,4h-2c-1.1,0-2,0.9-2,2 v12c0,1.1,0.9,2,2,2h2"></path><path fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="10" d="M12,20h2c1.1,0,2-0.9,2-2V6 c0-1.1-0.9-2-2-2h-2"></path></svg>

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 911 B

View File

@ -931,15 +931,6 @@ span {
}
}
fieldset.caution a {
color: #f00;
&:hover {
color: #fff;
background-color: #f00;
}
}
// zoom search
div#dataDisplay {
input,

Binary file not shown.

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 423 KiB

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="m14 4v2h4v20h-4v2h10v-2h-4v-20h4v-2zm-12 4v16h14v-2h-12v-12h12v-2zm20 0v2h6v12h-6v2h8v-16z"/><path d="m6 12v8h10v-8z"/></svg>
<svg height='100px' width='100px' fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" x="0px" y="0px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"><polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="17,16 21,16 21,8 17,8 "></polyline><polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="12,8 3,8 3,16 12,16 "></polyline><line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="6" y1="12" x2="11" y2="12"></line><path fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="10" d="M20,4h-2c-1.1,0-2,0.9-2,2 v12c0,1.1,0.9,2,2,2h2"></path><path fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="10" d="M12,20h2c1.1,0,2-0.9,2-2V6 c0-1.1-0.9-2-2-2h-2"></path></svg>

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 911 B

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generated by IcoMoon.io -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
<path fill="#000000" d="M9 11.041v-0.825c1.102-0.621 2-2.168 2-3.716 0-2.485 0-4.5-3-4.5s-3 2.015-3 4.5c0 1.548 0.898 3.095 2 3.716v0.825c-3.392 0.277-6 1.944-6 3.959h14c0-2.015-2.608-3.682-6-3.959z"></path>
</svg>

After

Width:  |  Height:  |  Size: 527 B

View File

@ -14,11 +14,11 @@
.breadcrumb-item {
+ .breadcrumb-item::before,
&::before {
/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
font-family: "IcoMoon";
font-size: 10px;
width: 10px;
color: #eee;
content: "";
/* The arrow "U+0203A" (SINGLE RIGHT-POINTING ANGLE QUOTATION MARK) */
content: "\203A";
}
+ .breadcrumb-comment {

View File

@ -39,15 +39,15 @@ body#loginform {
margin-#{$right}: auto;
&::before {
/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
font-family: 'IcoMoon';
font-size: 220px;
color: $body-bg;
content: "a";
background: url('../img/user.svg');/* The user avatar icon */
content: "";
float: $left;
margin-#{$right}: 20px;
margin-bottom: 10px;
background-color: $th-color;
background-repeat: no-repeat;
background-size: cover;
overflow: hidden;
height: 240px;
width: 240px;
@ -519,58 +519,6 @@ div.tools {
}
}
.chrome {
input[type="checkbox"] {
#{$left}: -9999px;
position: relative;
&::before {
/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
font-family: 'IcoMoon';
content: "";
color: $th-color;
cursor: default;
position: absolute;
padding: 4px;
top: 0;
#{$left}: 9995px;
}
&:indeterminate::before {
content: "";
}
&:checked::before {
content: "";
}
}
.navigation input[type="checkbox"]::before {
color: #fff;
}
input[type="radio"] {
#{$left}: -9999px;
position: relative;
&::before {
/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
font-family: 'IcoMoon';
content: "";
color: $th-color;
cursor: default;
position: absolute;
padding: 4px;
top: 0;
#{$left}: 9995px;
}
&:checked::before {
content: "";
}
}
}
.pma-table tr.noclick td:first-child::before {
content: "";
}
@ -943,44 +891,6 @@ span {
}
}
fieldset.caution {
background: $browse-warning-color;
border: 1px solid $browse-warning-color;
legend {
background-color: #fff;
}
a {
font-family: $font-family-bold;
text-transform: uppercase;
color: $button-color;
font-weight: normal;
}
ul {
padding: 0;
}
}
fieldset.caution li {
display: block;
}
fieldset.caution li {
&::before {
/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
font-family: "IcoMoon";
content: "";
color: $button-color;
margin-#{$right}: 10px;
}
a:nth-child(2) img {
background: url('../img/s_info.png') !important;
}
}
/* zoom search */
div#dataDisplay {
input,

View File

@ -1,24 +1,6 @@
@font-face {
font-family: 'IcoMoon';
src: local('');
src: url('../fonts/IcoMoon.eot');
src:
url('../fonts/IcoMoon.eot?#iefix') format('embedded-opentype'),
url('../fonts/IcoMoon.svg#IcoMoon') format('svg'),
url('../fonts/IcoMoon.woff') format('woff'),
url('../fonts/IcoMoon.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: local(''), local('Open Sans'), local('OpenSans');
src: url('../fonts/opensans-regular-webfont.eot');
src:
url('../fonts/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/opensans-regular-webfont.woff') format('woff'),
url('../fonts/opensans-regular-webfont.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@ -26,11 +8,6 @@
@font-face {
font-family: 'Open Sans Light';
src: local(''), local('Open Sans Light'), local('OpenSans-Light');
src: url('../fonts/opensans-light-webfont.eot');
src:
url('../fonts/opensans-light-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/opensans-light-webfont.woff') format('woff'),
url('../fonts/opensans-light-webfont.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@ -38,11 +15,6 @@
@font-face {
font-family: 'Open Sans Bold';
src: local(''), local('Open Sans Bold'), local('OpenSans-Bold');
src: url('../fonts/opensans-bold-webfont.eot');
src:
url('../fonts/opensans-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/opensans-bold-webfont.woff') format('woff'),
url('../fonts/opensans-bold-webfont.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@ -50,11 +22,6 @@
@font-face {
font-family: 'Open Sans Extrabold';
src: local(''), local('Open Sans Extrabold'), local('OpenSans-Extrabold');
src: url('../fonts/opensans-extrabold-webfont.eot');
src:
url('../fonts/opensans-extrabold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/opensans-extrabold-webfont.woff') format('woff'),
url('../fonts/opensans-extrabold-webfont.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}

View File

@ -120,20 +120,6 @@
}
}
div#left_tableList li {
a:first-child::before {
color: $navi-pointer-color;
/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
font-family: "IcoMoon";
content: "";
margin: 10px;
}
&:hover a:first-child::before {
color: $button-color;
}
}
img {
&.ic_b_home,
&.ic_s_loggoff,

View File

@ -1 +1 @@
<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="m14 4v2h4v20h-4v2h10v-2h-4v-20h4v-2zm-12 4v16h14v-2h-12v-12h12v-2zm20 0v2h6v12h-6v2h8v-16z"/><path d="m6 12v8h10v-8z"/></svg>
<svg height='100px' width='100px' fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" x="0px" y="0px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"><polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="17,16 21,16 21,8 17,8 "></polyline><polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="12,8 3,8 3,16 12,16 "></polyline><line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="6" y1="12" x2="11" y2="12"></line><path fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="10" d="M20,4h-2c-1.1,0-2,0.9-2,2 v12c0,1.1,0.9,2,2,2h2"></path><path fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="10" d="M12,20h2c1.1,0,2-0.9,2-2V6 c0-1.1-0.9-2-2-2h-2"></path></svg>

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 911 B

View File

@ -734,15 +734,6 @@ span {
}
}
fieldset.caution a {
color: #f00;
&:hover {
color: #fff;
background-color: #f00;
}
}
/* zoom search */
div#dataDisplay {
input,

View File

@ -1 +1 @@
<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="m14 4v2h4v20h-4v2h10v-2h-4v-20h4v-2zm-12 4v16h14v-2h-12v-12h12v-2zm20 0v2h6v12h-6v2h8v-16z"/><path d="m6 12v8h10v-8z"/></svg>
<svg height='100px' width='100px' fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" x="0px" y="0px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"><polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="17,16 21,16 21,8 17,8 "></polyline><polyline fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" points="12,8 3,8 3,16 12,16 "></polyline><line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="6" y1="12" x2="11" y2="12"></line><path fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="10" d="M20,4h-2c-1.1,0-2,0.9-2,2 v12c0,1.1,0.9,2,2,2h2"></path><path fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-miterlimit="10" d="M12,20h2c1.1,0,2-0.9,2-2V6 c0-1.1-0.9-2-2-2h-2"></path></svg>

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 911 B

View File

@ -986,15 +986,6 @@ span {
}
}
fieldset.caution a {
color: #f00;
&:hover {
color: #fff;
background-color: #f00;
}
}
// zoom search
div#dataDisplay {
input,