From 2c87fb19d34739e5f6a91b43a29f338ee766e9b3 Mon Sep 17 00:00:00 2001
From: Robert Mayr
Date: Jul 29 2016 21:20:54 +0000
Subject: merge conflicting commits and we are ready to go - thx ryanlerch
---
diff --git a/fedoraproject.org/data/content/join-fedora.html b/fedoraproject.org/data/content/join-fedora.html
index 172f74b..569941b 100644
--- a/fedoraproject.org/data/content/join-fedora.html
+++ b/fedoraproject.org/data/content/join-fedora.html
@@ -3,10 +3,10 @@
fpp = feedparse('http://fedoraplanet.org/rss20.xml')
# Announce List
-fda = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedora.core.announce')
+# fda = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedora.core.announce')
# Devel List
-fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedora.devel.announce')
+# fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedora.devel.announce')
?>
${_('Latest Fedora Planet posts')}
diff --git a/flocktofedora.org/data/content/index.html b/flocktofedora.org/data/content/index.html
index 2dd937b..0d649b4 100644
--- a/flocktofedora.org/data/content/index.html
+++ b/flocktofedora.org/data/content/index.html
@@ -10,19 +10,33 @@
-
+
-
-
-
-
Welcome to Flock 2016
+
Welcome to Flock 2016 in Krakow! Now in its fourth year, Flock is a fun and productive
event which brings the Fedora community together to discuss new ideas — and to put
those ideas into practice in hackfests and workshops.
+
+
+
+
+
+
+
+
+ Attendance at Flock is free and open to all. Pre-registration is closed but
+ anyone is still welcome to attend. However, unregistered attendees may miss out on swag
+ or the evening events as these are booked based on pre-registration. If you did pre-register, can view
+ your information on the registration page.
+
@@ -92,7 +106,7 @@
-
+
diff --git a/flocktofedora.org/data/content/sponsorship/index.html b/flocktofedora.org/data/content/sponsorship/index.html
index 3c41bb1..7adbf43 100644
--- a/flocktofedora.org/data/content/sponsorship/index.html
+++ b/flocktofedora.org/data/content/sponsorship/index.html
@@ -52,7 +52,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -103,7 +103,13 @@
-
+
+
+
+
+
+
+
diff --git a/flocktofedora.org/static/css/flock.css b/flocktofedora.org/static/css/flock.css
index dd7b221..96cb7fc 100644
--- a/flocktofedora.org/static/css/flock.css
+++ b/flocktofedora.org/static/css/flock.css
@@ -1,6 +1,6 @@
body{
position:relative;
- margin-top:70px;
+ margin-top:55px;
}
.flock-groupimg {
@@ -15,13 +15,21 @@ body{
}
.flock-navbar ul.nav {
- margin-top:0.4em;
+ margin-top:0.6em;
}
.navbar {
margin-bottom: 0 !important;
}
+.nav > li > a {
+ padding: 5px 10px;
+}
+
+.navbar-brand{
+ padding: 10px 15px;
+}
+
.flock-info-item {
text-align: center;
}
@@ -58,7 +66,7 @@ font-size: 50px;
}
.non-jumbo p{
- font-size: 1.3em;
+ font-size: 1.1em;
}
@@ -86,3 +94,8 @@ hr
border-top: 2px solid white;
}
+
+#welcome
+{
+ padding-top: 1em;
+}