From 60e0bf468267b060948f0e010a78d691d5b4d311 Mon Sep 17 00:00:00 2001 From: Johan GIRAUD Date: Wed, 21 Jan 2015 12:23:33 +0100 Subject: [PATCH] [CSS/HTML] statut des h1,h2 --- css/habillage.css | 87 ++++++++++---- css/habillage.scss | 92 +++++++++++---- front-page.html | 275 ++++++++++++++++++--------------------------- 3 files changed, 243 insertions(+), 211 deletions(-) diff --git a/css/habillage.css b/css/habillage.css index 5d2124c..ed2eca8 100644 --- a/css/habillage.css +++ b/css/habillage.css @@ -6,7 +6,8 @@ body { margin: 0; padding: 0; - font-family: sans-serif; } + font-family: sans-serif; + color: #1a0583; } header { margin: 0 auto; @@ -24,32 +25,30 @@ a { text-decoration: none; } h1 { - margin: 15px -15px 5px 15px; + margin: 0; padding: 0; - font-size: 2.0em; - color: #1d0b78; + padding-top: 15px; + padding-left: 15px; + font-size: 1.9em; display: inline-block; } h2 { margin: 15px 15px; font-size: 1.3em; - color: #1d0b78; display: inline-block; } h3 { margin: 15px; - display: inline-block; - color: #1d0b78; } + display: inline-block; } p { margin: 0 15px; - color: #1d0b78; - text-decoration: none; } + text-decoration: none; + text-align: justify; } /*1ERE COLONNE*/ #ateliers { - margin: 0 10px; - overflow: hidden; } + margin: 0 10px; } #ateliers:after { content: ""; @@ -67,23 +66,29 @@ p { margin-bottom: 15px; background-color: #2bc7cd; } +#ateliers p { + margin: 15px 15px; + font-size: 1em; + -webkit-margin-before: 1em; + -webkit-margin-after: 1em; + -webkit-margin-start: 0px; + -webkit-margin-end: 0px; + font-weight: bold; } + /*2EME COLONNE*/ #news { - background-color: #a51616; margin: 0 10px 10px 10px; overflow: hidden; } #news img { height: 350px; } -.article1, -.article2, -.article3, -.article4 { +.article { background-color: #ffaa7f; } .suite { - text-align: right; } + text-align: right; + padding-bottom: 20px; } /*3EME COLONNE*/ .map { @@ -92,9 +97,23 @@ p { margin: 0 0 15px 10px; } .agenda { - background-color: #ca52ae; - height: 300px; - margin: 0 0 0px 10px; } + background-color: #3ee88d; + height: 500px; + margin: 0 0 0px 10px; + padding-right: 10px; } + +.agenda p { + line-height: 120%; } + +.agenda ul { + list-style-type: none; + padding: 0; + margin: 0; + padding-top: 15px; } + +.date { + float: left; + font-size: 1.7em; } /*RESPONSIVE*/ .col-2, @@ -189,8 +208,6 @@ p { .col-m-12 { width: 100%; } } - - @media only screen and (min-width: 1024px) { .col-l-1 { width: 8.33333%; } @@ -227,5 +244,31 @@ p { .col-l-12 { width: 100%; } } +/*FOOTER*/ +footer { + clear: both; + height: 200px; + width: 100%; + background-color: #ffaa7f; } + +footer ul { + padding: 0; + margin: 0; + list-style-type: none; + padding-top: 70px; + margin-left: 100px; } + +footer li { + margin-left: 2px; + float: left; + /*pour IE*/ } + +footer ul li a { + display: block; + float: left; + text-decoration: none; } + +footer ul li a:hover { + border-bottom: solid #1d0b78; } /*# sourceMappingURL=habillage.css.map */ diff --git a/css/habillage.scss b/css/habillage.scss index 74cf4f3..eb4d417 100644 --- a/css/habillage.scss +++ b/css/habillage.scss @@ -8,6 +8,7 @@ body{ margin:0; padding:0; font-family: sans-serif; + color:#1a0583; } header{ @@ -29,40 +30,36 @@ a{ } h1{ - margin: 15px -15px 5px 15px; + margin: 0; padding:0; - font-size:2.0em; - color:#1d0b78; + padding-top:15px; + padding-left:15px; + font-size:1.9em; display:inline-block; } h2{ margin: 15px 15px; font-size:1.3em; - color:#1d0b78; display:inline-block; - } h3{ margin:15px; display:inline-block; - color:#1d0b78; } p{ margin:0 15px; - color:#1d0b78; text-decoration:none; + text-align: justify; } /*1ERE COLONNE*/ #ateliers{ - margin:0 10px; - overflow: hidden; - + margin:0 10px; } #ateliers:after { @@ -75,14 +72,22 @@ p{ padding:0; margin:0; list-style-type:none; - } #ateliers ul li{ height: 300px; margin-bottom:15px; background-color: #2bc7cd; - +} + +#ateliers p{ + margin: 15px 15px; + font-size:1em; + -webkit-margin-before: 1em; + -webkit-margin-after: 1em; + -webkit-margin-start: 0px; + -webkit-margin-end: 0px; + font-weight: bold; } @@ -90,26 +95,22 @@ p{ #news{ - background-color:#a51616; margin:0 10px 10px 10px; overflow: hidden; - } #news img{ height:350px; } -.article1, -.article2, -.article3, -.article4{ +.article{ background-color:#ffaa7f; } .suite{ text-align:right; + padding-bottom: 20px; } @@ -125,9 +126,27 @@ p{ } .agenda{ - background-color: #ca52ae; - height: 300px; - margin:0 0 0px 10px; + background-color: #3ee88d; + height:500px; + margin:0 0 0px 10px; + padding-right: 10px; +} + +.agenda p{ + line-height: 120%; +} + +.agenda ul{ + list-style-type:none; + padding:0; + margin:0; + padding-top:15px; +} + +.date{ + float:left; + font-size: 1.7em; + } /*RESPONSIVE*/ @@ -323,3 +342,34 @@ p{ } } +/*FOOTER*/ + +footer{ + clear:both; + height:200px; + width:100%; + background-color: #ffaa7f; + +} + +footer ul { + padding:0; + margin:0; + list-style-type:none; + padding-top:70px; + margin-left:100px; + +} +footer li { + margin-left:2px; + float:left; /*pour IE*/ +} +footer ul li a { + display:block; + float:left; + text-decoration:none; +} +footer ul li a:hover { + border-bottom: solid #1d0b78; +} + diff --git a/front-page.html b/front-page.html index 877b25a..7bd444c 100644 --- a/front-page.html +++ b/front-page.html @@ -3,186 +3,125 @@ - L'Heureux Cyclage - Clavette - - -
- - logo_heureux-cyclage - -
- -
- + +
+ logo_heureux-cyclage +
+
- - - - -
- - +
+ +
-
- - - - - + - - - - -
- - - - - - - - - - - -
- - - +
+ + \ No newline at end of file -- 2.20.1