From da88f48ec2809349b37608c606afb41494ce55aa Mon Sep 17 00:00:00 2001 From: davidml Date: Wed, 15 Dec 2021 12:48:17 +0000 Subject: [PATCH] Fixed Font --- sass/index.css | 42 ++++++++++-------------------------------- sass/index.css.map | 2 +- sass/index.sass | 30 ++---------------------------- 3 files changed, 13 insertions(+), 61 deletions(-) diff --git a/sass/index.css b/sass/index.css index 1adfce6..13ecc48 100644 --- a/sass/index.css +++ b/sass/index.css @@ -2,41 +2,24 @@ body { margin: 0; padding: 0; display: flex; -<<<<<<< HEAD - flex-direction: column; - background-color: #EAE2B7; } - -a { - color: #003049; - text-decoration: none; - font-weight: bold; - letter-spacing: 1px; } - -.greeting { - color: #F77F00; - font-size: 30px; - font-weight: 900; - display: flex; - justify-content: center; - align-items: center; - height: 50vh; - background-image: url("https://i1.wp.com/sirus.be/sirus_afbeeldingen/2020/04/Smartcities.png?fit=2560%2C1594&ssl=1"); - background-position: center center; - background-size: cover; - background-clip: border-box; } - -.header { - background-color: #F77F00; -======= flex-direction: column; background-color: #03071e; } a { color: #EAE2B7; + font-size: 150%; text-decoration: none; } +h3 { + font-size: 250%; +} + +p { + font-size: 175%; +} + .articles { margin: auto; width: 50%; @@ -52,9 +35,8 @@ a { background-color: #03071e; color: #EAE2B7; font-family: 'Roboto', sans-serif; ->>>>>>> 7ddc9cfeffce4ded1a67c3ad37cecec023c094bb width: 100%; - height: 50px; + height: 100px; display: flex; align-items: center; justify-content: flex-end; } @@ -72,8 +54,4 @@ ol { flex-direction: column; list-style: georgian; } -.content { - display: flex; - flex-direction: row; } - /*# sourceMappingURL=index.css.map */ diff --git a/sass/index.css.map b/sass/index.css.map index eea6796..1fd8388 100644 --- a/sass/index.css.map +++ b/sass/index.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAMA,IAAI;EACF,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,gBAAgB,EAXC,OAAO;;AAa1B,CAAC;EACG,KAAK,EAbI,OAAO;EAchB,eAAe,EAAE,IAAI;EACrB,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,GAAG;;AAEvB,SAAS;EACP,KAAK,EAlBgB,OAAO;EAmB5B,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,IAAI;EACZ,gBAAgB,EAAE,kGAAkG;EACpH,mBAAmB,EAAE,aAAa;EAClC,eAAe,EAAE,KAAK;EACtB,eAAe,EAAE,UAAU;;AAE7B,OAAO;EACL,gBAAgB,EA7BA,OAAO;EA8BvB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,QAAQ;;AAE3B,EAAE;EACA,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI;EAEhB,KAAE;IACA,aAAa,EAAE,IAAI;;AAEvB,EAAE;EACA,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,QAAQ;;AAEtB,QAAQ;EACN,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG", +"mappings": "AAMA,IAAI;EACF,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;;AAExB,OAAO;EACL,gBAAgB,EAbC,OAAO;EAcxB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,QAAQ;;AAE3B,EAAE;EACA,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI;EAEhB,KAAE;IACA,aAAa,EAAE,IAAI;;AAEvB,EAAE;EACA,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,QAAQ", "sources": ["index.sass"], "names": [], "file": "index.css" diff --git a/sass/index.sass b/sass/index.sass index b69c2b5..bd2a60a 100644 --- a/sass/index.sass +++ b/sass/index.sass @@ -9,31 +9,11 @@ body padding: 0 display: flex flex-direction: column - background-color: $background-color - -a - color: $text-color - text-decoration: none - font-weight: bold - letter-spacing: 1px - -.greeting - color: $secondary-text-color - font-size: 30px - font-weight: 900 - display: flex - justify-content: center - align-items: center - height: 50vh - background-image: url("https://i1.wp.com/sirus.be/sirus_afbeeldingen/2020/04/Smartcities.png?fit=2560%2C1594&ssl=1") - background-position: center center - background-size: cover - background-clip: border-box .header - background-color: $secondary-color + background-color: $background-color width: 100% - height: 50px + height: 100px display: flex align-items: center justify-content: flex-end @@ -51,9 +31,3 @@ ol display: flex flex-direction: column list-style: georgian - -.content - display: flex - flex-direction: row - - .navigation