From eae4aaa2f6b228459a984d78130294cd05fb8dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20S=C3=A1=20Couto?= Date: Mon, 9 Dec 2019 17:08:31 +0100 Subject: [PATCH 1/7] Fonts --- 10/style.css | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/10/style.css b/10/style.css index 8fcd1b4..b6a93fd 100644 --- a/10/style.css +++ b/10/style.css @@ -11,10 +11,24 @@ font-weight: bold; font-style: normal;} -/* src: url("font/Roboto.otf") format("opentype"); - font-weight: 300; - font-style: normal; -*/ + @font-face { + font-family: "Roboto"; + src: url("font/Roboto-Regular.ttf") format("truetype"); + font-weight: regular; + font-style: normal;} + + @font-face { + font-family: "Roboto"; + src: url("font/Roboto-BoldItalic.ttf") format("truetype"); + font-weight: bold; + font-style: italic;} + + @font-face { + font-family: "Roboto"; + src: url("font/Roboto-Italic.ttf") format("truetype"); + font-weight: regular; + font-style: italic;} + /* style edits */ a{ @@ -47,6 +61,7 @@ a:visited{ body { + font-family: "Roboto", sans-serif; width:100%; background-color: white; font-size: calc(8px + 0.7vw); From ad0a56560ee4ca80f8498be041b01674f0db471d Mon Sep 17 00:00:00 2001 From: Castro0o Date: Mon, 9 Dec 2019 17:16:42 +0100 Subject: [PATCH 2/7] green in style --- 10/style.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/10/style.css b/10/style.css index 8fcd1b4..8e537bf 100644 --- a/10/style.css +++ b/10/style.css @@ -158,34 +158,34 @@ div#maingif{ div#define { max-width: 90%; - text-align: justify; + /*! text-align: justify; */ display: block; margin-left: auto; margin-right: auto; font-family: "OCRAStd"; font-size: 1.5vw; padding-top: 5%; - color:black; + color:#fff; } div#pzi { max-width: 90%; - text-align: justify; + /*! text-align: justify; */ display: block; margin-left: auto; margin-right: auto; - font-family: "Roboto"; + font-family: "OCRAStd"; font-size: 1.5vw; - color:black; + color:white; } div#names { max-width: 90%; - text-align: justify; + /*! text-align: justify; */ display: block; margin-left: auto; margin-right: auto; - font-family: "Helvetica"; + font-family: "OCRAStd"; font-style: "light"; color: white; font-size: 1.2vw; @@ -193,13 +193,13 @@ div#names { div#intro { max-width: 90%; - text-align: justify; + /*! text-align: justify; */ display: block; margin-left: auto; margin-right: auto; - font-family: "Roboto"; + font-family: "OCRAStd"; font-size: 1.2vw; - color: black; + color: white; } div.moduleimg{ From ac5bac04893a08af584d30c3b47fe7a4f9d17d14 Mon Sep 17 00:00:00 2001 From: Castro0o Date: Mon, 9 Dec 2019 17:22:42 +0100 Subject: [PATCH 3/7] corrected links for ioana's module<->text --- 10/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/10/index.html b/10/index.html index 02e3ffa..55bcb8d 100644 --- a/10/index.html +++ b/10/index.html @@ -211,7 +211,7 @@ Being sensibilized, gaining awareness and gradually understanding the structures -

Ioana Tomici

+

Ioana Tomici

As single modules perform one job and one job well, you will have to anticipate and even require the output of someone elses module in order for yours to work. Coinciding with your research we will create one or several 'outputs' consisting of an interface, electronics and a manual.

@@ -475,7 +475,7 @@ _ ⯐ LDR 🢒🢒 LDR
- + From 75e9dc5f8820b00b9f7f93f448836746c96c42b3 Mon Sep 17 00:00:00 2001 From: Castro0o Date: Mon, 9 Dec 2019 18:20:18 +0100 Subject: [PATCH 4/7] test (empty) commit --- 10/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/10/index.html b/10/index.html index 55bcb8d..3c7b7c4 100644 --- a/10/index.html +++ b/10/index.html @@ -210,7 +210,6 @@ Being sensibilized, gaining awareness and gradually understanding the structures Personal Website
-

Ioana Tomici

As single modules perform one job and one job well, you will have to anticipate and even require the output of someone elses module in order for yours to work. Coinciding with your research we will create one or several 'outputs' consisting of an interface, electronics and a manual.

From 6a6f704bdcab9dd73bd8e91e22737fa21753c3a0 Mon Sep 17 00:00:00 2001 From: ugrnm Date: Mon, 9 Dec 2019 19:20:40 +0100 Subject: [PATCH 5/7] push test --- test.html | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test.html diff --git a/test.html b/test.html deleted file mode 100644 index 1191a5b..0000000 --- a/test.html +++ /dev/null @@ -1 +0,0 @@ -“hi” From 0ea7dd0896d83599e9a3a6c6458dd843d97d87a6 Mon Sep 17 00:00:00 2001 From: ugrnm Date: Mon, 9 Dec 2019 19:22:08 +0100 Subject: [PATCH 6/7] push test --- test | 1 + 1 file changed, 1 insertion(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/test @@ -0,0 +1 @@ +test From f088d357090d27adbb400e007445eee95f85116b Mon Sep 17 00:00:00 2001 From: ugrnm Date: Mon, 9 Dec 2019 19:24:02 +0100 Subject: [PATCH 7/7] push test --- test | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index 9daeafb..0000000 --- a/test +++ /dev/null @@ -1 +0,0 @@ -test