From 22fcf6b2054b2716ccdfc1d53de256b33b8acf90 Mon Sep 17 00:00:00 2001 From: samba Date: Mon, 11 Jun 2018 18:28:21 -0600 Subject: [PATCH] fix pre style --- call-for-nodes.html | 17 +++++++++-------- index.html | 11 ++++------- style.css | 29 ++++++++++------------------- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/call-for-nodes.html b/call-for-nodes.html index 014970f..abbf856 100644 --- a/call-for-nodes.html +++ b/call-for-nodes.html @@ -26,19 +26,20 @@ Reaction of President El Bechir to the movement of opposition, and its attempts at getting organised through the Internet in 2013: 
-"We noticed this last days the calls to topple the regime launched
-from persons hidden behind their keyboards"
+We noticed this last days the calls to topple the regime launched
+from persons hidden behind their keyboards
 
-" We tell them if you want to topple the regime face us directly in
+We tell them if you want to topple the regime face us directly in
 the street, I dare you to come down to the streets, but you will not
 come, since you havent forgotten what happened ...  This reigme will
-not be toppled by keyboards and whatsapp"
+not be toppled by keyboards and whatsapp
 
-" This is in your dreams, we didn't come trought the internet, we came
-through blood !"
+This is in your dreams, we didn't come trought the internet, we came
+through blood!
 
--- El Bechir announce on television.(in power since the military coup
-of 1989) declared in the village of Kasala.
+   -- El Bechir announce on television.
+   in power since the military coup of 1989
+   declared in the village of Kasala.
diff --git a/index.html b/index.html index 99d69cd..72ed4f0 100644 --- a/index.html +++ b/index.html @@ -10,15 +10,12 @@
-

español

+

+ español +

-<<<<<<< HEAD -

Trans Hackmeeting

-

August 9-13th 2018 @ Le Goutailloux, Tarnac (FR)

-=======

Trans Hackmeeting

-

August 9-13th 2018 @ Le Goutailloux, Tarnac (FR)

->>>>>>> 7f4cae7bdffea1d97bed3c5a6fe54ed5cfa6cf0d +

August 9-13th 2018 @ Le Goutailloux, Tarnac (FR)

diff --git a/style.css b/style.css index 5840e16..439d80d 100644 --- a/style.css +++ b/style.css @@ -1,4 +1,3 @@ -<<<<<<< HEAD body { font-family:sans-serif; font-size:12pt; @@ -6,11 +5,13 @@ body { p { font-family:serif; } -======= -body { font-family:sans-serif;font-size:12pt;} -body.cfn{background-color:black;color:lime} -p {font-family:serif;} ->>>>>>> 7f4cae7bdffea1d97bed3c5a6fe54ed5cfa6cf0d +body.cfn{ + background-color:black; + color:lime +} +p { + font-family:serif; +} a { text-decoration:none; color:#e12323; @@ -20,7 +21,6 @@ a:hover { font-size: large; color: blueviolet; } -<<<<<<< HEAD ul { list-style:none; } @@ -48,13 +48,6 @@ footer { transform:rotate(180deg); display:inline-block; } -======= - -ul { list-style:none;} -hr { border:0; border-top:1px dotted #000;} -.logo{float:right;} body { max-width: 800px; left: 50%; position: relative; transform: translate(-50%,0%); } -footer {text-align:center; font-size:0.7em; padding-top:30px;} -.copyleft {transform:rotate(180deg); display:inline-block;} section>h3 { text-align: right; @@ -69,12 +62,10 @@ section p:nth-child(2) { pre { margin: 8px 0px 8px 0px; padding: 8px 8px 8px 8px; - white-space: inherit; - border-width: 1px; + border-width: 3px; border-style: dotted; border-color: #000000; - - background-color: #F5F6F7; + background-color: #151513; font-family: "Mono"; + text-align: right; } ->>>>>>> 7f4cae7bdffea1d97bed3c5a6fe54ed5cfa6cf0d