Browse Source

fonts en local + déclarées avant main.css pour y faire le moins de retouche possible (seulement commenter la ligne de fonts distantes)

+ longueur introduction + entête des pages article et rubrique + styles
svn/attic/html5up_massively/117919
chankalan@choc0.net 3 years ago
parent
commit
f582835302
  1. 11
      .gitattributes
  2. 15
      article.html
  3. 35
      css/fonts.css
  4. 14
      css/spip.css
  5. BIN
      fonts/merriweather-bold-webfont.woff
  6. BIN
      fonts/merriweather-bold-webfont.woff2
  7. BIN
      fonts/merriweather-bolditalic-webfont.woff
  8. BIN
      fonts/merriweather-bolditalic-webfont.woff2
  9. BIN
      fonts/merriweather-italic-webfont.woff
  10. BIN
      fonts/merriweather-italic-webfont.woff2
  11. BIN
      fonts/merriweather-regular-webfont.woff
  12. BIN
      fonts/merriweather-regular-webfont.woff2
  13. BIN
      fonts/opensans-bold-webfont.woff
  14. BIN
      fonts/opensans-bold-webfont.woff2
  15. 1
      inclure/head.html
  16. 2
      inclure/resume/article.html
  17. 12
      rubrique.html
  18. 9
      styles_config.css.html

11
.gitattributes vendored

@ -3,6 +3,7 @@
/article.html -text
base/massively.php -text
css/font-awesome.min.css -text
css/fonts.css -text
css/main.css -text
css/noscript.css -text
css/spip.css -text
@ -12,6 +13,16 @@ fonts/fontawesome-webfont.svg -text
fonts/fontawesome-webfont.ttf -text
fonts/fontawesome-webfont.woff -text
fonts/fontawesome-webfont.woff2 -text
fonts/merriweather-bold-webfont.woff -text
fonts/merriweather-bold-webfont.woff2 -text
fonts/merriweather-bolditalic-webfont.woff -text
fonts/merriweather-bolditalic-webfont.woff2 -text
fonts/merriweather-italic-webfont.woff -text
fonts/merriweather-italic-webfont.woff2 -text
fonts/merriweather-regular-webfont.woff -text
fonts/merriweather-regular-webfont.woff2 -text
fonts/opensans-bold-webfont.woff -text
fonts/opensans-bold-webfont.woff2 -text
formulaires/configurer_html5up.html -text
formulaires/recherche.html -text
formulaires/recherche.php -text

15
article.html

@ -15,10 +15,11 @@
<body class="page_article is-preload">
<!-- Wrapper -->
<div id="wrapper">
<!-- Intro -->
<header id="header">
[<span class="h1">(#NOM_SITE_SPIP)</span>]
</header>
<!-- Header -->
[<header id="header">
<a href="#URL_SITE_SPIP" class="logo">(#NOM_SITE_SPIP)</a>
</header>]
<!-- Menu -->
<INCLURE{fond=inclure/nav,env} />
@ -27,9 +28,9 @@
<div id="main">
<section class="post">
<header class="major">
[<p class="surtitre">(#SURTITRE)</p>]
[<h1>(#TITRE)</h1>]
[<p class="soustitre">(#SOUSTITRE)</p>]
[<p class="surtitre #EDIT{surtitre}">(#SURTITRE)</p>]
[<h1 class="#EDIT{titre}">(#TITRE)</h1>]
[<p class="soustitre #EDIT{soustitre}">(#SOUSTITRE)</p>]
</header>
[<div class="chapo #EDIT{chapo}">(#CHAPO|image_reduire{1400})</div>]

35
css/fonts.css

@ -0,0 +1,35 @@
/* open sans remplace avantageusement source sans pro */
@font-face {
font-family: "Open Sans";
src: url("../fonts/OpenSans-bold-webfont.woff2") format("woff2"),
url("../fonts/opensans-bold-webfont.woff") format("woff");
}
/* merriweather */
@font-face {
font-family: "Merriweather";
src: url("../fonts/merriweather-regular-webfont.woff2") format("woff2"),
url("../fonts/merriweather-regular-webfont.woff") format("woff");
font-style:normal;
font-weight:400;
}
@font-face {
font-family: "Merriweather";
src: url("../fonts/merriweather-italic-webfont.woff2") format("woff2"),
url("../fonts/merriweather-italic-webfont.woff") format("woff");
font-style:italic;
font-weight:400;
}
@font-face {
font-family: "Merriweather";
src: url("../fonts/merriweather-bold-webfont.woff2") format("woff2"),
url("../fonts/merriweather-bold-webfont.woff") format("woff");
font-style:normal;
font-weight:700;
}
@font-face {
font-family: "Merriweather";
src: url("../fonts/merriweather-bolditalic-webfont.woff2") format("woff2"),
url("../fonts/merriweather-bolditalic-webfont.woff") format("woff");
font-style:italic;
font-weight:700;
}

14
css/spip.css

@ -1,5 +1,11 @@
/* font */
h1, h2, h3, h4, h5, h6,
input[type="submit"], input[type="reset"],
input[type="button"], button, .button,
label, table th, .pagination a, .pagination span,
#header .logo, #nav ul.links, #copyright,
#navPanelToggle, #navPanel .links li a { font-family: "Open Sans", Helvetica, sans-serif; }
html, body { height:100%; }
@ -11,10 +17,6 @@ img { height: auto; }
#intro + #header .logo { opacity:0 !important; display:none; }
#intro.hidden + #header .logo { opacity:1 !important; display:block; }
/* .page_rubrique #main > div > .posts { border:0; padding-top:2rem; } */
.h1 { font-size: 4rem; line-height: 1.1; margin: 0 0 2rem 0; font-family: "Source Sans Pro", Helvetica, sans-serif; font-weight: 900; letter-spacing: 0.075em; text-transform: uppercase; }
/* on veut ajaxer la liste/articles donc on prend en compte une div de + dans les styles */
#main > * {
@ -90,6 +92,8 @@ img { height: auto; }
border-top-width: 0;
}
.introduction { margin: 0 0 2rem 0; }
/* pagination */
.pagination > strong { display:inline-block; border:2px solid #eeeeee; min-width:3rem; text-align:center; margin-left:-2px; background-color: #eeeeee;

BIN
fonts/merriweather-bold-webfont.woff

Binary file not shown.

BIN
fonts/merriweather-bold-webfont.woff2

Binary file not shown.

BIN
fonts/merriweather-bolditalic-webfont.woff

Binary file not shown.

BIN
fonts/merriweather-bolditalic-webfont.woff2

Binary file not shown.

BIN
fonts/merriweather-italic-webfont.woff

Binary file not shown.

BIN
fonts/merriweather-italic-webfont.woff2

Binary file not shown.

BIN
fonts/merriweather-regular-webfont.woff

Binary file not shown.

BIN
fonts/merriweather-regular-webfont.woff2

Binary file not shown.

BIN
fonts/opensans-bold-webfont.woff

Binary file not shown.

BIN
fonts/opensans-bold-webfont.woff2

Binary file not shown.

1
inclure/head.html

@ -5,6 +5,7 @@
#INSERT_HEAD_CSS
[<link rel="stylesheet" href="(#CHEMIN{css/fonts.css}|direction_css)" type="text/css" />]
[<link rel="stylesheet" href="(#CHEMIN{css/main.css}|direction_css)" type="text/css" />]
[<link rel="stylesheet" href="(#CHEMIN{css/spip.css}|direction_css)" type="text/css" />]
<link rel="stylesheet" href="/spip.php?page=styles_config.css" type="text/css" />

2
inclure/resume/article.html

@ -5,7 +5,7 @@
<h2><a href="#URL_ARTICLE">#TITRE</a></h2>
</header>
[<a href="#URL_ARTICLE" class="image fit">(#LOGO_ARTICLE|image_reduire{1200,*}|vider_attribut{class})</a>]
[<div class="introduction">(#INTRODUCTION|couper{200})</div>]
[<div class="introduction">(#INTRODUCTION|couper{160})</div>]
<a href="#URL_ARTICLE" class="button"><:massively:lire_la_suite:></a>
</article>
</BOUCLE_article>

12
rubrique.html

@ -17,10 +17,11 @@
<body class="page_rubrique is-preload">
<!-- Wrapper -->
<div id="wrapper">
<!-- Intro -->
<header id="header">
[<span class="h1">(#NOM_SITE_SPIP)</span>]
</header>
<!-- Header -->
[<header id="header">
<a href="#URL_SITE_SPIP" class="logo">(#NOM_SITE_SPIP)</a>
</header>]
<!-- Menu -->
<INCLURE{fond=inclure/nav,env} />
@ -29,8 +30,7 @@
<div id="main">
<section class="post">
<header class="major">
[<span class="date">(#DATE|affdate)</span>]
[<h1>(#TITRE)</h1>]
[<h1 class="#EDIT{titre}">(#TITRE)</h1>]
</header>
[<div class="texte #EDIT{texte}">(#TEXTE|image_reduire{1400})</div>]

9
styles_config.css.html

@ -14,7 +14,7 @@ c'est du text/html et iso-8859-15 car bug vieux navigateurs
#wrapper {[ background-color:(#CONFIG{html5up/couleur_bkg});][ color:(#CONFIG{html5up/couleur_typo});] }
a, #footer input[type="submit"] {[ color:(#CONFIG{html5up/couleur_typo}); ]}
a, #footer input[type="submit"], h1, h2, h3, h4, h5, h6, #nav ul.links li.active a {[ color:(#CONFIG{html5up/couleur_typo}); ]}
/* hover */
a:hover, a:active, a:focus, a.on, .formulaire_contact form > fieldset.previsu > legend,
@ -23,19 +23,20 @@ a:hover, a:active, a:focus, a.on, .formulaire_contact form > fieldset.previsu >
button:hover, .button:hover, #footer input[type="submit"]:hover, #footer input[type="reset"]:hover,
#footer input[type="button"]:hover, #footer button:hover, #footer .button:hover, #footer a:hover, .pagination a:hover,
#footer ul.icons li a.icon:hover:before, #nav ul.icons li a.icon:hover:before, #nav a:hover, #header .logo:hover,
#copyright a:hover {[ color:(#CONFIG{html5up/couleur_accent}) !important; ]}
#copyright a:hover, ul.icons li a.icon:hover::before {[ color:(#CONFIG{html5up/couleur_accent}) !important; ]}
/* box-shadow */
#intro input[type="submit"]:hover, #intro input[type="reset"]:hover, #intro input[type="button"]:hover, #intro button:hover, #intro .button:hover,
input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hover, button:hover, .button:hover,
#footer input[type="submit"]:hover, #footer input[type="reset"]:hover, #footer input[type="button"]:hover,
#footer button:hover, #footer .button:hover, #footer ul.icons.alt li a.icon:hover:before {[ box-shadow:inset 0 0 0 2px (#CONFIG{html5up/couleur_accent}); ]}
#footer button:hover, #footer .button:hover, #footer ul.icons.alt li a.icon:hover:before,
ul.icons.alt li a.icon:hover::before {[ box-shadow:inset 0 0 0 2px (#CONFIG{html5up/couleur_accent}); ]}
.pagination a:hover, #header .logo:hover, #footer input[type="text"]:focus, #footer input[type="password"]:focus, #footer input[type="email"]:focus, #footer select:focus, #footer textarea:focus {[ border-color:(#CONFIG{html5up/couleur_accent}) !important; ]}
[#footer { background-color:(#CONFIG{html5up/couleur_bkg_footer}); }]
#footer, #footer h1, #footer h2, #footer h3, #footer h4, #footer h5, #footer h6,
#footer input, #footer select, #footer textarea, #footer label {[ color:(#CONFIG{html5up/couleur_typo_footer}); ]}
#footer input, #footer select, #footer textarea, #footer label, #footer strong, #footer b {[ color:(#CONFIG{html5up/couleur_typo_footer}); ]}
<BOUCLE_bg(DOCUMENTS){role=arriereplan}{0,1}{!par date}{tout}>
#wrapper .bg { background-image:url("#CHEMIN{images/overlay.png}"), linear-gradient(0deg, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)), url("#FICHIER"); }

Loading…
Cancel
Save