From 6c0ea9df4d50207feed10f51ba3583b2cdc56e9e Mon Sep 17 00:00:00 2001 From: Malwine Date: Mon, 12 Sep 2016 22:21:26 +0200 Subject: [PATCH 1/4] Fix some marhin in header and paypall button --- _includes/header.html | 48 ++++++++++++------------ _site/2016/08/15/Auckland.html | 68 +++++++++++++++++----------------- _site/2016/09/16/Berlin.html | 68 +++++++++++++++++----------------- _site/about/index.html | 68 +++++++++++++++++----------------- _site/css/main.css | 9 +++++ _site/donate/index.html | 68 +++++++++++++++++----------------- _site/feed.xml | 4 +- _site/get-involved/index.html | 68 +++++++++++++++++----------------- _site/index.html | 68 +++++++++++++++++----------------- css/main.css | 9 +++++ 10 files changed, 255 insertions(+), 223 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 31116e7..4f11bff 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,27 +1,29 @@ -
+
+
- {{ site.title }} + {{ site.title }} - + +
diff --git a/_site/2016/08/15/Auckland.html b/_site/2016/08/15/Auckland.html index 8558d8d..d3069b3 100644 --- a/_site/2016/08/15/Auckland.html +++ b/_site/2016/08/15/Auckland.html @@ -22,48 +22,50 @@ -
+
+
- ClojureBridge + ClojureBridge - +
diff --git a/_site/2016/09/16/Berlin.html b/_site/2016/09/16/Berlin.html index 24a2bf8..93acd1d 100644 --- a/_site/2016/09/16/Berlin.html +++ b/_site/2016/09/16/Berlin.html @@ -22,48 +22,50 @@ -
+
+
- ClojureBridge + ClojureBridge - +
diff --git a/_site/about/index.html b/_site/about/index.html index 01bce3c..240c12b 100644 --- a/_site/about/index.html +++ b/_site/about/index.html @@ -22,48 +22,50 @@ -
+
+
- ClojureBridge + ClojureBridge - +
diff --git a/_site/css/main.css b/_site/css/main.css index 572e0f7..86b1c3f 100644 --- a/_site/css/main.css +++ b/_site/css/main.css @@ -5,6 +5,13 @@ body { /* TODO: Change to id */ .site-header { + max-width: 62.5em; + margin-left: auto; + margin-right: auto; + width: 100%; +} + +.header-content { border-width: 5px 0 3px; border-style: solid; border-color: rgb(51, 52, 62); @@ -58,6 +65,7 @@ body { .content-wrapper { padding: 0 2em; + margin-top: 1em; } .content { @@ -147,4 +155,5 @@ img { #paypal-button { float: right; + margin-bottom: 0.8em; } diff --git a/_site/donate/index.html b/_site/donate/index.html index 70c7f34..7241ce5 100644 --- a/_site/donate/index.html +++ b/_site/donate/index.html @@ -22,48 +22,50 @@ -
+
+
- ClojureBridge + ClojureBridge - +
diff --git a/_site/feed.xml b/_site/feed.xml index a1c0e9f..b5f6ffc 100644 --- a/_site/feed.xml +++ b/_site/feed.xml @@ -5,8 +5,8 @@ ClojureBridge aims to increase diversity within the Clojure community by offering free, beginner-friendly Clojure programming workshops for women. http://clojurebridge.org/ - Tue, 16 Aug 2016 17:23:51 +0200 - Tue, 16 Aug 2016 17:23:51 +0200 + Mon, 12 Sep 2016 22:19:46 +0200 + Mon, 12 Sep 2016 22:19:46 +0200 Jekyll v3.1.6 diff --git a/_site/get-involved/index.html b/_site/get-involved/index.html index d6e6b6a..c0930b7 100644 --- a/_site/get-involved/index.html +++ b/_site/get-involved/index.html @@ -22,48 +22,50 @@ -
+
+
- ClojureBridge + ClojureBridge - +
diff --git a/_site/index.html b/_site/index.html index 9dc4667..14c38e6 100644 --- a/_site/index.html +++ b/_site/index.html @@ -22,48 +22,50 @@ -
+
+
- ClojureBridge + ClojureBridge - +
diff --git a/css/main.css b/css/main.css index 572e0f7..86b1c3f 100644 --- a/css/main.css +++ b/css/main.css @@ -5,6 +5,13 @@ body { /* TODO: Change to id */ .site-header { + max-width: 62.5em; + margin-left: auto; + margin-right: auto; + width: 100%; +} + +.header-content { border-width: 5px 0 3px; border-style: solid; border-color: rgb(51, 52, 62); @@ -58,6 +65,7 @@ body { .content-wrapper { padding: 0 2em; + margin-top: 1em; } .content { @@ -147,4 +155,5 @@ img { #paypal-button { float: right; + margin-bottom: 0.8em; } From 6fce42a2031f3bc1c1e54b61652272fbc00b68ff Mon Sep 17 00:00:00 2001 From: Malwine Date: Tue, 27 Sep 2016 22:26:34 +0200 Subject: [PATCH 2/4] Fix button on chrome and adjust headlines --- _site/css/main.css | 10 ++++++++-- _site/feed.xml | 4 ++-- _site/index.html | 9 --------- css/main.css | 10 ++++++++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/_site/css/main.css b/_site/css/main.css index 86b1c3f..af0159c 100644 --- a/_site/css/main.css +++ b/_site/css/main.css @@ -3,6 +3,12 @@ body { font: 16px/1.4 "freight-sans-pro", "Helvetica", "Arial", sans-serif; } +.content h1 { + font-size: 32px; + font-weight: 100; + margin-bottom: 0.8em; +} + /* TODO: Change to id */ .site-header { max-width: 62.5em; @@ -154,6 +160,6 @@ img { } #paypal-button { - float: right; - margin-bottom: 0.8em; + text-align: right; + margin-bottom: -2.0em; } diff --git a/_site/feed.xml b/_site/feed.xml index b5f6ffc..07653de 100644 --- a/_site/feed.xml +++ b/_site/feed.xml @@ -5,8 +5,8 @@ ClojureBridge aims to increase diversity within the Clojure community by offering free, beginner-friendly Clojure programming workshops for women. http://clojurebridge.org/ - Mon, 12 Sep 2016 22:19:46 +0200 - Mon, 12 Sep 2016 22:19:46 +0200 + Tue, 27 Sep 2016 22:25:04 +0200 + Tue, 27 Sep 2016 22:25:04 +0200 Jekyll v3.1.6 diff --git a/_site/index.html b/_site/index.html index 14c38e6..6e35752 100644 --- a/_site/index.html +++ b/_site/index.html @@ -92,15 +92,6 @@

-
  • -
    - -

    - Berlin, Germany -

    -

    16–17 September 2016

    • - - diff --git a/css/main.css b/css/main.css index 86b1c3f..af0159c 100644 --- a/css/main.css +++ b/css/main.css @@ -3,6 +3,12 @@ body { font: 16px/1.4 "freight-sans-pro", "Helvetica", "Arial", sans-serif; } +.content h1 { + font-size: 32px; + font-weight: 100; + margin-bottom: 0.8em; +} + /* TODO: Change to id */ .site-header { max-width: 62.5em; @@ -154,6 +160,6 @@ img { } #paypal-button { - float: right; - margin-bottom: 0.8em; + text-align: right; + margin-bottom: -2.0em; } From 40a99f6862870c4fc1931cc18e2a3a96bfec7145 Mon Sep 17 00:00:00 2001 From: Malwine Date: Tue, 27 Sep 2016 22:32:48 +0200 Subject: [PATCH 3/4] Button left on mobile --- _site/css/main.css | 11 +++++++++-- _site/feed.xml | 4 ++-- css/main.css | 11 +++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/_site/css/main.css b/_site/css/main.css index af0159c..8d827a0 100644 --- a/_site/css/main.css +++ b/_site/css/main.css @@ -160,6 +160,13 @@ img { } #paypal-button { - text-align: right; - margin-bottom: -2.0em; + text-align: left; + margin-bottom: 1.0em; +} + +@media screen and (min-width: 640px) { + #paypal-button { + text-align: right; + margin-bottom: -2.0em; + } } diff --git a/_site/feed.xml b/_site/feed.xml index 07653de..a4f8974 100644 --- a/_site/feed.xml +++ b/_site/feed.xml @@ -5,8 +5,8 @@ ClojureBridge aims to increase diversity within the Clojure community by offering free, beginner-friendly Clojure programming workshops for women. http://clojurebridge.org/ - Tue, 27 Sep 2016 22:25:04 +0200 - Tue, 27 Sep 2016 22:25:04 +0200 + Tue, 27 Sep 2016 22:31:38 +0200 + Tue, 27 Sep 2016 22:31:38 +0200 Jekyll v3.1.6 diff --git a/css/main.css b/css/main.css index af0159c..8d827a0 100644 --- a/css/main.css +++ b/css/main.css @@ -160,6 +160,13 @@ img { } #paypal-button { - text-align: right; - margin-bottom: -2.0em; + text-align: left; + margin-bottom: 1.0em; +} + +@media screen and (min-width: 640px) { + #paypal-button { + text-align: right; + margin-bottom: -2.0em; + } } From dd76563ec42922ca5aa3f11f2a11b8e5ce70d47b Mon Sep 17 00:00:00 2001 From: Malwine Date: Wed, 28 Sep 2016 12:38:16 +0200 Subject: [PATCH 4/4] Show button border --- css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 8d827a0..cc7eb60 100644 --- a/css/main.css +++ b/css/main.css @@ -150,7 +150,7 @@ img { border-radius: 6px; font-size: 13px; background: #fec348 none repeat scroll 0 0; - border-color: #feb215; + border: 1px solid #feb215; color: #002f86; }