diff --git a/README.md b/README.md index 5572cc7..b85163e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,33 @@ # landing-page +<<<<<<< HEAD +componenti da sviluppare +* Header +* Cover +======= Componenti da sviluppare: * Header * Cover +>>>>>>> 81fb6c0f4ab622ec70747c7bc7e9c8f5a3c63bef * Banner * Carousel * Card-section * Footer +<<<<<<< HEAD +Ogni studente apre il proprio branch: +nome_componente-nome_cognome + +Metodo di sviluppo: +- anallizzare assieme la grafica del componente +- bozza della struttura html (carta) +- sviluppo della struttura html con l'elemento delle classi principale e dei sottocomponenti +- sviluppo dello stile nel file scss della componente +- ottimizzare le proprieta css definite per ogni parte della componente +- sviluppo del componente responsive + +creare un commit ogni volta che viene chiusa una parte del task. +======= Ogni studente apre il prorpio branch: nome_componente-nome_cognome @@ -21,3 +41,4 @@ Metodo di sviluppo: - sviluppo del componente responsive Creare un commit ogni volta che viene chiusa una parte del task. +>>>>>>> 81fb6c0f4ab622ec70747c7bc7e9c8f5a3c63bef diff --git a/components/assets/Rectangle 2.1.jpg b/components/assets/Rectangle 2.1.jpg new file mode 100644 index 0000000..0d2dbe8 Binary files /dev/null and b/components/assets/Rectangle 2.1.jpg differ diff --git a/components/assets/icon-arrow-white.png b/components/assets/icon-arrow-white.png new file mode 100644 index 0000000..da220f4 Binary files /dev/null and b/components/assets/icon-arrow-white.png differ diff --git a/components/card_section.html b/components/card_section.html new file mode 100644 index 0000000..37ca0b0 --- /dev/null +++ b/components/card_section.html @@ -0,0 +1,57 @@ + + + + + + Document + + + + +
+
+
+

+ Lorem ipsum dolor sit amet consectetur adipisici +

+

Lorem ipsum dolor sit amet consectetur adipisicing elit. Eum quisquam quas eaq

+
+
+
Call to action
+
+
+

+ Contra legem facit qui id facit quod lex prohibet. +

+

+ Cum ceteris in veneratione tui montes, nascetur mus. At nos hinc posthac, sitientis piros Afros. A communi observantia + non est recedendum. +

+
Call to action
+
+
+

+ Contra legem facit qui id facit quod lex prohibet. +

+

+ Cum ceteris in veneratione tui montes, nascetur mus. At nos hinc posthac, sitientis piros Afros. A communi + observantia + non est recedendum. +

+
Call to action
+
+
+

+ Contra legem facit qui id facit quod lex prohibet. +

+

+ Cum ceteris in veneratione tui montes, nascetur mus. At nos hinc posthac, sitientis piros Afros. A communi + observantia + non est recedendum. +

+
Call to action
+
+
+
+ + \ No newline at end of file diff --git a/style.css b/style.css index bd66479..ce22883 100644 --- a/style.css +++ b/style.css @@ -51,4 +51,8 @@ html { background-color: #7521d5; } +.card-section { + font-family: Arial, Helvetica, sans-serif; +} + /*# sourceMappingURL=style.css.map */ diff --git a/style.css.map b/style.css.map index 06265ce..fb3f249 100644 --- a/style.css.map +++ b/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["styles/base/elements.scss","styles/base/mixin.scss","styles/layouts/container.scss","styles/variables.scss","styles/modules/header.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;;;AAGF;EACE;;;ACIA;EDDA;IACE;;;ACLF;EDSA;IACE;;;ACfF;EDmBA;IACE;;;AErBJ;EAaE,WCLQ;EDMR;;ADbA;ECDF;IAEI;IACA;;;ADGF;ECNF;IAMI;IACA;;;ADIF;ECXF;IAUI;IACA;;;;AEXJ;EACE,SDWY;ECVZ","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["styles/base/elements.scss","styles/base/mixin.scss","styles/layouts/container.scss","styles/variables.scss","styles/modules/header.scss","styles/modules/card_section.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;;;AAGF;EACE;;;ACIA;EDDA;IACE;;;ACLF;EDSA;IACE;;;ACfF;EDmBA;IACE;;;AErBJ;EAaE,WCLQ;EDMR;;ADbA;ECDF;IAEI;IACA;;;ADGF;ECNF;IAMI;IACA;;;ADIF;ECXF;IAUI;IACA;;;;AEXJ;EACE,SDWY;ECVZ;;;ACFF;EACE","file":"style.css"} \ No newline at end of file diff --git a/styles/base/mixin.scss b/styles/base/mixin.scss index 908b577..1a20cd1 100644 --- a/styles/base/mixin.scss +++ b/styles/base/mixin.scss @@ -12,4 +12,5 @@ @media (min-width: $tablet) and (max-width: $desktop - 1px) { @content; } -} \ No newline at end of file +} + diff --git a/styles/main.scss b/styles/main.scss index b1b4228..14a8e77 100644 --- a/styles/main.scss +++ b/styles/main.scss @@ -8,4 +8,6 @@ @import "./layouts/container.scss"; //modules -@import "./modules/header.scss"; \ No newline at end of file +@import "./modules/header.scss"; + +@import "./modules/card_section.scss"; \ No newline at end of file diff --git a/styles/modules/card_section.scss b/styles/modules/card_section.scss new file mode 100644 index 0000000..8b7bbdb --- /dev/null +++ b/styles/modules/card_section.scss @@ -0,0 +1,3 @@ +.card-section { + font-family: Arial, Helvetica, sans-serif; +} \ No newline at end of file