From b82a256b08edc879a2ec934cc8a332bdffb597fa Mon Sep 17 00:00:00 2001 From: ben-vilina Date: Fri, 27 Oct 2017 13:53:47 -0500 Subject: [PATCH 1/3] Updated index.html and style.css Updated the index with some containers and cleaned up the formatting. Updated some of the css and added some new fonts to match the logo. Hope this helps. -Cheers --- assets/css/style.css | 58 +++++++++-- index.html | 240 ++++++++++++++++++++----------------------- 2 files changed, 158 insertions(+), 140 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index 006aba6..06be480 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -1,8 +1,19 @@ +/* Additional Fonts */ +@import url('https://fonts.googleapis.com/css?family=Germania+One'); +@import url('https://fonts.googleapis.com/css?family=Rosarivo'); + body { /*background-color: #FAFAFA;*/ background-color: #293588; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-family: 'Rosarivo', serif; +} +.container { + width: 100%; + max-width: 1200px; + margin: 0 auto; } - header { box-sizing: border-box; background: ; @@ -13,6 +24,19 @@ header .logo { width: 100%; } +/* Headings */ +h1, +h2, +h3, +h4, +h5, +h6, +strong, +b { + font-family: 'Germania One', cursive; + font-weight: 400; +} + h1 a img { background-color:; } @@ -22,14 +46,17 @@ h1 a img { .markdown-body{ position: relative; padding: 40px; -margin-left: 250px; +} +.markdown-body img { + display: block; + margin: 0 auto; } .markdown-header { box-sizing: border-box; padding: 20px; width: 80%; color: white; - font-family: 'Open Sans', sans-serif; + font-family: 'Rosarivo', serif; /*background-color: white;*/ } .markdown-body img{ @@ -49,16 +76,17 @@ margin-left: 250px; padding: 40px; } #moz-niec p { - font-family: 'Nunito', sans-serif; - font-size: 20px; + font-family: 'Rosarivo', serif; + font-size: 16px; + line-height: 1.2; } #moz-heading { font-family: 'Abril Fatface', cursive; - padding: 20px; + padding: 20px 0; } h4{ - font-family: 'Varela Round', sans-serif; + color: #ff5e00; } #schedule { box-sizing: border-box; @@ -66,16 +94,25 @@ h4{ justify-content: space-around; flex-wrap: wrap; color: black; - padding: 80px + padding: 80px; } #venue { width: 20%; margin-right: 10px; background: #ff5e00; - font-family: 'Anton', sans-serif; +} +#schedule .btn { + display: inline-block; +} +.schedule-detail h3, +.schedule-detail p { + color: #fff; } +.schedule-detail p { + font-family: 'Rosarivo', serif; +} #data-time { width: 20%; background: #ff5e00; @@ -84,7 +121,7 @@ h4{ #register{ float: center; -margin-left: 600px; + font-family: 'Anton', sans-serif; } @@ -121,7 +158,6 @@ font-family: 'Poiret One', cursive; #org{ color: white; - margin-left: 100px; padding: 20px; } diff --git a/index.html b/index.html index 2e61092..48617d3 100644 --- a/index.html +++ b/index.html @@ -2,153 +2,135 @@ - - - - - Mozilla NIEC Hacktoberfest | Hacktoberfest - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + -
-
- - - -
-
- +
+
+
+ +
+
+
- -

- -

+
+

+
-
-
-

Mozilla NIEC Hacktoberfest

-

Support Open Source and earn a limited edition T-shirt

-
-

We’re hosting an in-person meetup at NIEC on 28th October, from 10 am - 3 pm, to gather all free and open source enthusiasts - from the Delhi city to contribute to open source projects together.

- -

Hacktoberfest is an annual month-long event to celebrate and encourage more developers to become involved with open - source software. It’s open for anyone, especially beginners just getting started with open source!

- -

In this meetup, we’ll take a beginner friendly session on Git and GitHub.

- -

The most active contributors, who make at least 4 PR’s merged, will receive T-shirts sponsored by Digital Ocean. +

+
+
+

Mozilla NIEC Hacktoberfest

+

Support Open Source and earn a limited edition T-shirt

+
+

We’re hosting an in-person meetup at NIEC on 28th October, from 10 am - 3 pm, to gather all free and open source enthusiasts from the Delhi city to contribute to open source projects together.

+

Hacktoberfest is an annual month-long event to celebrate and encourage more developers to become involved with open source software. It’s open for anyone, especially beginners just getting started with open source!

+

In this meetup, we’ll take a beginner friendly session on Git and GitHub.

+

The most active contributors, who make at least 4 PR’s merged, will receive T-shirts sponsored by Digital Ocean.

-
-
+
+
+
-

Venue:

-

Room No. 4202 , Northern India Engineering College

+

Venue:

+

Room No. 4202 , Northern India Engineering College

-
-

Date | Time

-

28th October | 10 am - 3 pm

+

Date | Time

+

28th October | 10 am - 3 pm

-
- -
-
- - - - - - - -
- -
- - +
+ + - + \ No newline at end of file From 3ddd9a284e730205f9e9ca01c5944251dac79778 Mon Sep 17 00:00:00 2001 From: ben-vilina Date: Fri, 27 Oct 2017 13:57:01 -0500 Subject: [PATCH 2/3] Replaced logo with SVG Logo Replaced Hacktoberfest logo with SVG logo code. --- assets/css/style.css | 3 +++ index.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/css/style.css b/assets/css/style.css index 06be480..90f2aa4 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -51,6 +51,9 @@ padding: 40px; display: block; margin: 0 auto; } +.markdown-body h1 { + text-align: center; +} .markdown-header { box-sizing: border-box; padding: 20px; diff --git a/index.html b/index.html index 48617d3..dcd2646 100644 --- a/index.html +++ b/index.html @@ -52,7 +52,7 @@
-

+

Hacktoberfest

From 0f76d88fef5b9b9b35d05d38f2610adee54c5906 Mon Sep 17 00:00:00 2001 From: ben-vilina Date: Fri, 27 Oct 2017 14:00:32 -0500 Subject: [PATCH 3/3] Logo : Made it an actual image file and replaced. Logo : Made it an actual image file and replaced. --- assets/css/style.css | 1 - assets/svg/logo.svg | 1 + index.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 assets/svg/logo.svg diff --git a/assets/css/style.css b/assets/css/style.css index 90f2aa4..128798a 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -63,7 +63,6 @@ padding: 40px; /*background-color: white;*/ } .markdown-body img{ - background-color: #ffffff1a; height: 150px; }; diff --git a/assets/svg/logo.svg b/assets/svg/logo.svg new file mode 100644 index 0000000..d108ae6 --- /dev/null +++ b/assets/svg/logo.svg @@ -0,0 +1 @@ +Hacktoberfest \ No newline at end of file diff --git a/index.html b/index.html index dcd2646..ee14eec 100644 --- a/index.html +++ b/index.html @@ -52,7 +52,7 @@
-

Hacktoberfest

+