From 53c20025d3ba949e06fe87400d32fdcb082e62a1 Mon Sep 17 00:00:00 2001 From: Aurelien Labate Date: Fri, 27 Dec 2019 11:02:50 +0100 Subject: [PATCH] Move fonts and clean usage --- Polices/Crete_Round/demo.html | 38 --- Polices/Crete_Round/stylesheet.css | 28 -- aide.css | 12 +- design_forum/style.css | 2 +- exemples.css | 4 +- menu.css | 10 +- .../fonts}/Action_Man/Action_Man-webfont.eot | Bin .../fonts}/Action_Man/Action_Man-webfont.svg | 0 .../fonts}/Action_Man/Action_Man-webfont.ttf | Bin .../fonts}/Action_Man/Action_Man-webfont.woff | Bin .../Action_Man/Iconian Fonts License.txt | 0 .../Crete Round SIL OFL Font License 1.1.txt | 0 .../Crete_Round/CreteRound-Italic-webfont.eot | Bin .../Crete_Round/CreteRound-Italic-webfont.svg | 0 .../Crete_Round/CreteRound-Italic-webfont.ttf | Bin .../CreteRound-Italic-webfont.woff | Bin .../CreteRound-Regular-webfont.svg | 0 .../CreteRound-Regular-webfont.woff | Bin style.css | 268 ------------------ stylesheet.css | 54 ++-- 20 files changed, 42 insertions(+), 374 deletions(-) delete mode 100644 Polices/Crete_Round/demo.html delete mode 100644 Polices/Crete_Round/stylesheet.css rename {Polices => ressources/fonts}/Action_Man/Action_Man-webfont.eot (100%) rename {Polices => ressources/fonts}/Action_Man/Action_Man-webfont.svg (100%) rename {Polices => ressources/fonts}/Action_Man/Action_Man-webfont.ttf (100%) rename {Polices => ressources/fonts}/Action_Man/Action_Man-webfont.woff (100%) rename {Polices => ressources/fonts}/Action_Man/Iconian Fonts License.txt (100%) rename {Polices => ressources/fonts}/Crete_Round/Crete Round SIL OFL Font License 1.1.txt (100%) rename {Polices => ressources/fonts}/Crete_Round/CreteRound-Italic-webfont.eot (100%) rename {Polices => ressources/fonts}/Crete_Round/CreteRound-Italic-webfont.svg (100%) rename {Polices => ressources/fonts}/Crete_Round/CreteRound-Italic-webfont.ttf (100%) rename {Polices => ressources/fonts}/Crete_Round/CreteRound-Italic-webfont.woff (100%) rename {Polices => ressources/fonts}/Crete_Round/CreteRound-Regular-webfont.svg (100%) rename {Polices => ressources/fonts}/Crete_Round/CreteRound-Regular-webfont.woff (100%) delete mode 100644 style.css diff --git a/Polices/Crete_Round/demo.html b/Polices/Crete_Round/demo.html deleted file mode 100644 index ffe6478..0000000 --- a/Polices/Crete_Round/demo.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - Font Face Demo - - - - - -
-

Font-face Demo for the Crete Round Font

- - - -

Crete Round Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- - - -

Crete Round Regular - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- -
- - diff --git a/Polices/Crete_Round/stylesheet.css b/Polices/Crete_Round/stylesheet.css deleted file mode 100644 index 12855ce..0000000 --- a/Polices/Crete_Round/stylesheet.css +++ /dev/null @@ -1,28 +0,0 @@ -/* Generated by Font Squirrel (http://www.fontsquirrel.com) on November 9, 2012 01:39:30 PM America/New_York */ - - - -@font-face { - font-family: 'CreteRoundItalic'; - src: url('CreteRound-Italic-webfont.eot'); - src: url('CreteRound-Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('CreteRound-Italic-webfont.woff') format('woff'), - url('CreteRound-Italic-webfont.ttf') format('truetype'), - url('CreteRound-Italic-webfont.svg#CreteRoundItalic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'CreteRoundRegular'; - src: url('CreteRound-Regular-webfont.eot'); - src: url('CreteRound-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('CreteRound-Regular-webfont.woff') format('woff'), - url('CreteRound-Regular-webfont.ttf') format('truetype'), - url('CreteRound-Regular-webfont.svg#CreteRoundRegular') format('svg'); - font-weight: normal; - font-style: normal; - -} - diff --git a/aide.css b/aide.css index 4b96319..261f35d 100644 --- a/aide.css +++ b/aide.css @@ -13,7 +13,7 @@ article h2 { - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 24px; font-style: bold; color: black; @@ -35,7 +35,7 @@ h2 border-width: 4px; border-radius: 5px; border-color: #FAC801; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 16px; font-style: none; color: black; @@ -102,7 +102,7 @@ h2 .type_algo { - font-family: Normal, Arial; + font-family: 'Crete Round', serif; position: relative; right: 30px; top: -6px; @@ -135,7 +135,7 @@ h2 .type_casio { - font-family: Normal, Arial; + font-family: 'Crete Round', serif; position: relative; right: 31px; top: -6px; @@ -163,7 +163,7 @@ h2 .type_ti { - font-family: Normal, Arial; + font-family: 'Crete Round', serif; position: relative; right: -19px; top: -6px; @@ -180,7 +180,7 @@ h2 border-width: 4px; border-radius: 14px; border-color: #D2A124; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; padding: 0px 0px 8px 12px; padding-left: 6px; } diff --git a/design_forum/style.css b/design_forum/style.css index 7fcab94..e9aa341 100644 --- a/design_forum/style.css +++ b/design_forum/style.css @@ -133,7 +133,7 @@ td, th border: solid; border-width: 4px; border-color: #FAC801; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; margin-left: 45px; margin-right: 45px; border-radius:20px; diff --git a/exemples.css b/exemples.css index f90d5b8..5f84165 100644 --- a/exemples.css +++ b/exemples.css @@ -34,7 +34,7 @@ h4 border-width: 4px; border-radius: 5px; border-color: #FAC801; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 16px; font-style: none; color: black; @@ -74,7 +74,7 @@ h4 width: 400px; padding: 3px 0px 4px 8px; margin-left: 198px; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; color: rgb(206, 133, 4); text-align: left; border: solid; diff --git a/menu.css b/menu.css index c43ad25..7fa670f 100644 --- a/menu.css +++ b/menu.css @@ -1,10 +1,10 @@ @font-face { font-family: 'Navig'; - src: url('Polices/Action_Man/Action_Man-webfont.eot'); - src: url('Polices/Action_Man/Action_Man-webfont.eot?#iefix') format('embedded-opentype'), - url('Polices/Action_Man/Action_Man-webfont.woff') format('woff'), - url('Polices/Action_Man/Action_Man-webfont.ttf') format('truetype'), - url('Polices/Action_Man/Action_Man-webfont.svg#ActionManRegular') format('svg'); + src: url('ressources/fonts/Action_Man/Action_Man-webfont.eot'); + src: url('ressources/fonts/Action_Man/Action_Man-webfont.eot?#iefix') format('embedded-opentype'), + url('ressources/fonts/Action_Man/Action_Man-webfont.woff') format('woff'), + url('ressources/fonts/Action_Man/Action_Man-webfont.ttf') format('truetype'), + url('ressources/fonts/Action_Man/Action_Man-webfont.svg#ActionManRegular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/Polices/Action_Man/Action_Man-webfont.eot b/ressources/fonts/Action_Man/Action_Man-webfont.eot similarity index 100% rename from Polices/Action_Man/Action_Man-webfont.eot rename to ressources/fonts/Action_Man/Action_Man-webfont.eot diff --git a/Polices/Action_Man/Action_Man-webfont.svg b/ressources/fonts/Action_Man/Action_Man-webfont.svg similarity index 100% rename from Polices/Action_Man/Action_Man-webfont.svg rename to ressources/fonts/Action_Man/Action_Man-webfont.svg diff --git a/Polices/Action_Man/Action_Man-webfont.ttf b/ressources/fonts/Action_Man/Action_Man-webfont.ttf similarity index 100% rename from Polices/Action_Man/Action_Man-webfont.ttf rename to ressources/fonts/Action_Man/Action_Man-webfont.ttf diff --git a/Polices/Action_Man/Action_Man-webfont.woff b/ressources/fonts/Action_Man/Action_Man-webfont.woff similarity index 100% rename from Polices/Action_Man/Action_Man-webfont.woff rename to ressources/fonts/Action_Man/Action_Man-webfont.woff diff --git a/Polices/Action_Man/Iconian Fonts License.txt b/ressources/fonts/Action_Man/Iconian Fonts License.txt similarity index 100% rename from Polices/Action_Man/Iconian Fonts License.txt rename to ressources/fonts/Action_Man/Iconian Fonts License.txt diff --git a/Polices/Crete_Round/Crete Round SIL OFL Font License 1.1.txt b/ressources/fonts/Crete_Round/Crete Round SIL OFL Font License 1.1.txt similarity index 100% rename from Polices/Crete_Round/Crete Round SIL OFL Font License 1.1.txt rename to ressources/fonts/Crete_Round/Crete Round SIL OFL Font License 1.1.txt diff --git a/Polices/Crete_Round/CreteRound-Italic-webfont.eot b/ressources/fonts/Crete_Round/CreteRound-Italic-webfont.eot similarity index 100% rename from Polices/Crete_Round/CreteRound-Italic-webfont.eot rename to ressources/fonts/Crete_Round/CreteRound-Italic-webfont.eot diff --git a/Polices/Crete_Round/CreteRound-Italic-webfont.svg b/ressources/fonts/Crete_Round/CreteRound-Italic-webfont.svg similarity index 100% rename from Polices/Crete_Round/CreteRound-Italic-webfont.svg rename to ressources/fonts/Crete_Round/CreteRound-Italic-webfont.svg diff --git a/Polices/Crete_Round/CreteRound-Italic-webfont.ttf b/ressources/fonts/Crete_Round/CreteRound-Italic-webfont.ttf similarity index 100% rename from Polices/Crete_Round/CreteRound-Italic-webfont.ttf rename to ressources/fonts/Crete_Round/CreteRound-Italic-webfont.ttf diff --git a/Polices/Crete_Round/CreteRound-Italic-webfont.woff b/ressources/fonts/Crete_Round/CreteRound-Italic-webfont.woff similarity index 100% rename from Polices/Crete_Round/CreteRound-Italic-webfont.woff rename to ressources/fonts/Crete_Round/CreteRound-Italic-webfont.woff diff --git a/Polices/Crete_Round/CreteRound-Regular-webfont.svg b/ressources/fonts/Crete_Round/CreteRound-Regular-webfont.svg similarity index 100% rename from Polices/Crete_Round/CreteRound-Regular-webfont.svg rename to ressources/fonts/Crete_Round/CreteRound-Regular-webfont.svg diff --git a/Polices/Crete_Round/CreteRound-Regular-webfont.woff b/ressources/fonts/Crete_Round/CreteRound-Regular-webfont.woff similarity index 100% rename from Polices/Crete_Round/CreteRound-Regular-webfont.woff rename to ressources/fonts/Crete_Round/CreteRound-Regular-webfont.woff diff --git a/style.css b/style.css deleted file mode 100644 index 7fcab94..0000000 --- a/style.css +++ /dev/null @@ -1,268 +0,0 @@ -/*****************************************************/ -/****General****/ -/** -{ - margin:0px; - padding:0px; -}*/ - -a -{ - text-decoration:none; - color:#333333; -} -a:hover -{ - color:#000000; -} -img, table, tr, td -{ - border:0px; -} -h1 -{ - text-align:center; - margin:0px; - padding:0px; -} -.clean -{ - clear:both; -} -.left -{ - text-align:left; -} -.center -{ - text-align:center; -} -input[type=text], input[type=submit], input[type=button], input[type=password] -{ - width:150px; -} -input[type=submit] -{ - margin-top: 10px; -} -label -{ - width: 200px; - display: inline-block; - vertical-align: top; - text-align: left; - margin-bottom: 8px; -} -#se_souvenir -{ - width: 351px; -} -.message_buttons input -{ - width:auto; - padding:0px 5px; -} -.button -{ - padding:5px 15px; - vertical-align:middle; - border:1px solid #aaaaaa; - font-weight:bold; - background:url('Images/button.png') repeat-x; - -moz-border-radius:6px; - -webkit-border-radius:6px; - border-radius:6px; - display:inline-block; -} - -#content table -{ - border-spacing:0px; - background:#ffffff; - padding:0px; - width:95%; - margin:5px auto 18px auto; - background-color: rgb(241, 189, 23); - border: solid; - border-width: 4px; - border-radius: 10px; - border-color: rgb(233, 153, 10); -} -tr -{ - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - margin:0px; -} -td, th -{ - margin:0px; - border:0px; - padding:3px; - text-align:center; -} -/*****************************************************/ -/****Blocks****/ -.header -{ - margin:auto; - margin-top:10px; - padding:15px; - background:url('Images/bluec_30p.png'); - width:60%; - -moz-border-radius:20px; - -webkit-border-radius:20px; - border-radius:20px; - text-align:center; -} -.foot -{ - text-align:center; - background:url('Images/bluec_30p.png'); - width:60%; - -moz-border-radius:15px; - -webkit-border-radius:15px; - border-radius:15px; - padding:10px; - margin:20px auto; -} -.content -{ - background-color: #FFD745; - border: solid; - border-width: 4px; - border-color: #FAC801; - font-family: Normal, Arial; - margin-left: 45px; - margin-right: 45px; - border-radius:20px; - padding:20px; - margin-top:10px; -} -.box_left -{ - float:left; -} -.box_right -{ - float:right; -} -.box -{ - border: solid; - border-width: 4px; - border-radius: 10px; - border-color: #FAC801; - margin:5px auto 30px auto; - padding: 5px 10px 5px 10px; -} -.login -{ - width:355px; - margin:auto; - text-align:left; -} -.box_login -{ - background-color: rgb(250, 184, 43); - border: solid; - border-width: 4px; - border-color: rgb(247, 154, 14); - width:360px; - -moz-border-radius:10px; - -webkit-border-radius:10px; - border-radius:10px; - margin:auto; - padding:20px; - margin-top:20px; - margin-bottom: 38px; - color:#ffffff; -} -/*****************************************************/ -/****Content****/ - -.champs -{ - margin-bottom: 8px; -} - -#memorize -{ - position: absolute; - top: 419px; - left: 510px; -} - -.big -{ - font-size:1.2em; -} -.small -{ - font-size:0.7em; -} -.message -{ - -moz-border-radius:20px; - -webkit-border-radius:20px; - border-radius:20px; - padding:20px; - margin:auto; - width:500px; - background:url('Images/black_40p.png'); - color:#ffffff; - text-align:center; - font-weight:bold; - margin-top:20px; -} -.messages_table td -{ - border-top:1px solid #cccccc; - vertical-align:top; -} -.author -{ - width:150px; - border-right:1px solid #cccccc; -} -.title_cell -{ - width:45%; -} -.date -{ - font-style:italic; - text-align:right; - font-size:0.9em; - margin-right:10px; -} -.edit -{ - float:left; -} -.forum_ntop, .forum_nrep, .forum_act, .forum_auth -{ - width:100px; -} -td.forum_cat, td.forum_tops -{ - padding-left:15px; - text-align:left; -} -.categories_table td, .categories_table th, .topics_table td, .topics_table th, .list_pm td, .list_pm th -{ - border-bottom:1px solid #cccccc; -} -.categories_table tr:last-child td, .topics_table tr:last-child td, .list_pm tr:last-child td -{ - border-bottom:0px; -} -td.forum_cat .title -{ - font-weight:bold; -} -td.forum_cat .description -{ - padding-left:5px; -} diff --git a/stylesheet.css b/stylesheet.css index ec2274d..d71e826 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -1,26 +1,26 @@ -/*---------Téléchargement des polices---------*/ +/*---------Download fonts---------*/ @font-face { - font-family: 'Normal'; - src: url('Polices/Crete_Round/CreteRound-Regular-webfont.eot'); - src: url('Polices/Crete_Round/CreteRound-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('Polices/Crete_Round/CreteRound-Regular-webfont.woff') format('woff'), - url('Polices/Crete_Round/CreteRound-Regular-webfont.ttf') format('truetype'), - url('Polices/Crete_Round/CreteRound-Regular-webfont.svg#CreteRoundRegular') format('svg'); + font-family: 'Crete Round'; + src: url('ressources/fonts/Crete_Round/CreteRound-Regular-webfont.eot'); + src: url('ressources/fonts/Crete_Round/CreteRound-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('ressources/fonts/Crete_Round/CreteRound-Regular-webfont.woff') format('woff'), + url('ressources/fonts/Crete_Round/CreteRound-Regular-webfont.ttf') format('truetype'), + url('ressources/fonts/Crete_Round/CreteRound-Regular-webfont.svg#CreteRoundRegular') format('svg'); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Italic'; - src: url('Polices/Crete_Round/CreteRound-Italic-webfont.eot'); - src: url('Polices/Crete_Round/CreteRound-Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('Polices/Crete_Round/CreteRound-Italic-webfont.woff') format('woff'), - url('Polices/Crete_Round/CreteRound-Italic-webfont.ttf') format('truetype'), - url('Polices/Crete_Round/CreteRound-Italic-webfont.svg#CreteRoundItalic') format('svg'); + font-family: 'Crete Round'; + src: url('ressources/fonts/Crete_Round/CreteRound-Italic-webfont.eot'); + src: url('ressources/fonts/Crete_Round/CreteRound-Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('ressources/fonts/Crete_Round/CreteRound-Italic-webfont.woff') format('woff'), + url('ressources/fonts/Crete_Round/CreteRound-Italic-webfont.ttf') format('truetype'), + url('ressources/fonts/Crete_Round/CreteRound-Italic-webfont.svg#CreteRoundItalic') format('svg'); font-weight: normal; - font-style: normal; + font-style: italic; } @@ -170,7 +170,7 @@ mark { position: absolute; left: 470px; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 16px; color: #9B7606; cursor: pointer; @@ -228,7 +228,7 @@ mark #vous_programmez_en, .langage_actuel { - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 16px; position: relative; color: #D70404; @@ -272,7 +272,7 @@ mark position: absolute; top: -194px; right: 43px; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; color: #D70404; font-size: 14px; font-style: normal; @@ -295,7 +295,7 @@ mark { color: #D70404; font-size: 16px; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; } .indications @@ -303,7 +303,8 @@ mark color: #C17700; font-size: 14px; - font-family: Italic, Arial; + font-family: 'Crete Round', serif; + font-style: italic; } #syntaxe_titre @@ -327,7 +328,7 @@ mark position: absolute; top: 374px; right: 22px; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 12px; color: #C17700; font-style: normal; @@ -432,7 +433,7 @@ mark position: absolute; top: 2px; left: 55px; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 16px; color: #AC0000; } @@ -448,14 +449,15 @@ mark #description_erreur { - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 14px; color: #771A1A; } #suggestion_erreur { - font-family: Italic, Arial; + font-family: 'Crete Round', serif; + font-style: italic; font-size: 14px; color: #1B6618; } @@ -575,7 +577,7 @@ mark position: absolute; bottom: -496px; left: 42px; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-style: normal; text-decoration: none; text-align: left; @@ -638,7 +640,7 @@ mark position: absolute; top: 383px; right: 53px; - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-style: normal; text-decoration: none; text-align: left; @@ -720,7 +722,7 @@ footer #avertissement { - font-family: Normal, Arial; + font-family: 'Crete Round', serif; font-size: 14px; text-align: left; margin-left: 200px;