diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index 37c28c9..941770c 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -59,7 +59,7 @@ "model": "sitetree.treeitem", "pk": 7, "fields": { - "title": "Call for Proposals (Closed)", + "title": "Call for Proposals", "hint": "", "url": "/program/call-for-proposals", "urlaspattern": false, @@ -75,7 +75,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": 24, - "sort_order": 39, + "sort_order": 4, "access_permissions": [] } }, @@ -88,7 +88,7 @@ "url": "/attend", "urlaspattern": false, "tree": 1, - "hidden": false, + "hidden": true, "alias": null, "description": "", "inmenu": true, @@ -199,6 +199,54 @@ "access_permissions": [] } }, +{ + "model": "sitetree.treeitem", + "pk": 14, + "fields": { + "title": "Reporting an Incident", + "hint": "", + "url": "/code-of-conduct/harassment-incidents", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": false, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": 8, + "sort_order": 15, + "access_permissions": [] + } +}, +{ + "model": "sitetree.treeitem", + "pk": 15, + "fields": { + "title": "Staff Procedures", + "hint": "", + "url": "/code-of-conduct/harassment-staff-procedures", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": false, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": 8, + "sort_order": 17, + "access_permissions": [] + } +}, { "model": "sitetree.treeitem", "pk": 17, @@ -400,7 +448,7 @@ "url": "/wiki", "urlaspattern": false, "tree": 1, - "hidden": false, + "hidden": true, "alias": null, "description": "", "inmenu": true, @@ -472,7 +520,7 @@ "url": "/program/events", "urlaspattern": false, "tree": 1, - "hidden": false, + "hidden": true, "alias": null, "description": "", "inmenu": true, @@ -483,7 +531,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": 24, - "sort_order": 4, + "sort_order": 32, "access_permissions": [] } }, @@ -541,7 +589,7 @@ "fields": { "title": "How to Pitch Your Manager", "hint": "", - "url": "/attend/business-case", + "url": "/attend/business-cases", "urlaspattern": false, "tree": 1, "hidden": false, @@ -606,101 +654,5 @@ "sort_order": 36, "access_permissions": [] } -}, -{ - "model": "sitetree.treeitem", - "pk": 38, - "fields": { - "title": "Transparency Reports", - "hint": "", - "url": "/about/transparency", - "urlaspattern": false, - "tree": 1, - "hidden": true, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 1, - "sort_order": 38, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 39, - "fields": { - "title": "Accepted Talks", - "hint": "", - "url": "/schedule/general-sessions/list/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 24, - "sort_order": 32, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 40, - "fields": { - "title": "Financial Aid", - "hint": "", - "url": "/attend/finaid", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 8, - "sort_order": 40, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 42, - "fields": { - "title": "Guide Index", - "hint": "", - "url": "/guides", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 8, - "sort_order": 42, - "access_permissions": [] - } } ] diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index 73ebf60..be02d2c 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -9,10 +9,11 @@ + + + {% comment %} {% include "registrasion/dashboard_widget.html" %} - + {% endcomment %} +
diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index 6c52eeb..7221a58 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -31,7 +31,8 @@ {% block body_base %} -
+
+
@@ -54,13 +55,17 @@ {% block footer_base %} -
+
+ +
+
{% block footer %} {% include "_footer.html" %} {% endblock %}
+
{% endblock %} diff --git a/pinaxcon/templates/static_pages/about/petaluma.html b/pinaxcon/templates/static_pages/about/petaluma.html index 07a4e01..e63d0f0 100644 --- a/pinaxcon/templates/static_pages/about/petaluma.html +++ b/pinaxcon/templates/static_pages/about/petaluma.html @@ -9,7 +9,7 @@ {% block body_class %}about{% endblock %} {% block lede %} - The best town you probably haven't bothered visiting yet. + The best town you probably haven't bothered visiting yet. {% endblock %} @@ -24,6 +24,6 @@

The Golden Gate Bridge is well-known to San Franciscans as being approximately 8,000 miles long and shrouded in fog, so few ever cross up into the North Bay. Happily, the drive north is easy and it can be swift. There are many ways to get to Petaluma, we've covered driving, public transit, and flights on the How to Get Here page.

-

When you get here, you're sure to find a nice place to stay that fits your budget. You can find a range of options, and some special discounts, available on the Where to Stay page.

+

When you get here, you're sure to find a nice place to stay that fits your budget. {%comment %}You can find a range of options, and some special discounts, available on the Where to Stay page.{%endcomment%} We'll have group rates and discounts at local hotels when tickets are available.

{% endblock %} diff --git a/pinaxcon/templates/static_pages/about/team.html b/pinaxcon/templates/static_pages/about/team.html index 68cea27..78ac7a9 100644 --- a/pinaxcon/templates/static_pages/about/team.html +++ b/pinaxcon/templates/static_pages/about/team.html @@ -35,18 +35,18 @@ Our team of North Bay and Bay Area locals has years of experience building commu

Christopher Neugebauer, Conference Chair

-

Christopher NeugebauerChristopher is a Python developer who lives in glorious Petaluma, California, though he's originally from the the city of Hobart in Tasmania, Australia. A serial conference organizer, he has been a core organiser of PyCon Australia for a number of years, was director of linux.conf.au 2017, and a good number of his open source contributions help power the website this conference runs on. He was made a fellow of the Python Software Foundation in 2013 in recognition for his contributions to building the Australian Python community. (@chrisjrn on Twitter)

+

Christopher NeugebauerChristopher is a Python developer who lives in glorious Petaluma, California, though he's originally from the the city of Hobart in Tasmania, Australia. A serial conference organizer, he has been a core organiser of PyCon Australia for a number of years, was director of linux.conf.au 2017, and a good number of his open source contributions help power the website this conference runs on. He was made a fellow of the Python Software Foundation in 2013 in recognition for his contributions to building the Australian Python community. (@chrisjrn on Twitter)

Sam Kitajima-Kimbrel, Program Chair

-

Sam Kitajima-KimbrelSam is a Python developer and distributed-systems "enthusiast" hailing from Seattle by birth, New York by nurture, and the Bay Area by choice. Five years ago he attended his first PyCon US and hasn't been able to break the habit; after making the jump from audience to stage in 2014 and speaking regularly at events around the world, he was thrilled to join team when invited by Chris and Josh. Sam currently works at Nuna building healthcare data infrastructure for the U.S. Medicaid and Medicare programs and resides in Oakland with his husband Kameron. (@skimbrel on Twitter)

+

Sam Kitajima-KimbrelSam is a Python developer and distributed-systems "enthusiast" hailing from Seattle by birth, New York by nurture, and the Bay Area by choice. Five years ago he attended his first PyCon US and hasn't been able to break the habit; after making the jump from audience to stage in 2014 and speaking regularly at events around the world, he was thrilled to join the team when invited by Chris and Josh. Sam currently works at Nuna building healthcare data infrastructure for the U.S. Medicaid and Medicare programs and resides in Oakland with his husband Kameron. (@skimbrel on Twitter)

Andrew Godwin

-

Andrew GodwinAndrew is a Django and Python developer who originally hails from London but moved to the Bay Area four years ago. He's been writing open source software for over a decade as well as working in various different parts of the technology industry, and currently works at Eventbrite. He regularly speaks at Python (and other) events around the world, and has a keen interest in building communities and inclusivity. (@andrewgodwin on Twitter)

+

Andrew GodwinAndrew is a Django and Python developer who originally hails from London but moved to the Bay Area four years ago. He's been writing open source software for over a decade as well as working in various different parts of the technology industry, and currently works at Eventbrite. He regularly speaks at Python (and other) events around the world, and has a keen interest in building communities and inclusivity. (@andrewgodwin on Twitter)

Josh Simmons

-

Josh SimmonsJosh is a community organizer and web developer with a penchant for armchair philosophy who was born and raised in the North Bay. He spent 4.5 years building Web & Interactive Media Professionals (WIMP), a local community with over 600 members, before moving on to do community management for O'Reilly Media. These days Josh works on the Google Open Source outreach team and serves as a board member and volunteer CFO for Open Source Initiative. (@joshsimmons on Twitter)

+

Josh SimmonsJosh is a community organizer and web developer with a penchant for armchair philosophy who was born and raised in the North Bay. He spent 4.5 years building Web & Interactive Media Professionals (WIMP), a local community with over 600 members, before moving on to do community management for O'Reilly Media. These days Josh works on the Google Open Source outreach team and serves as a board member and volunteer CFO for Open Source Initiative. (@joshsimmons on Twitter)

Advisors

diff --git a/pinaxcon/templates/static_pages/attend/food.html b/pinaxcon/templates/static_pages/attend/food.html index 289efaf..cbeb35c 100644 --- a/pinaxcon/templates/static_pages/attend/food.html +++ b/pinaxcon/templates/static_pages/attend/food.html @@ -18,95 +18,95 @@

Nearby, Fast, and Cheap

    -
  • New Yorker Pizza: 3 Petaluma Blvd N (next door!)
  • -
  • Lunchette: 25 4th St (0.1 miles)
  • -
  • North Bay Cafe: 25 Petaluma Blvd S (0.1 miles)
  • -
  • Petaluma Pie Company: 125 Petaluma Blvd N (0.1 miles)
  • -
  • Petaluma Market: 210 Western Ave (0.2 miles)
  • -
  • Subway: 151 Petaluma Blvd S (0.2 miles)
  • +
  • New Yorker Pizza: 3 Petaluma Blvd N (next door!)
  • +
  • Lunchette: 25 4th St (0.1 miles)
  • +
  • North Bay Cafe: 25 Petaluma Blvd S (0.1 miles)
  • +
  • Petaluma Pie Company: 125 Petaluma Blvd N (0.1 miles)
  • +
  • Petaluma Market: 210 Western Ave (0.2 miles)
  • +
  • Subway: 151 Petaluma Blvd S (0.2 miles)

Coffee

    -
  • Acre Coffee: 21 4th St (0.1 miles)
  • -
  • Peets Coffee: 5 Petaluma Blvd S (0.1 miles)
  • -
  • Starbucks: 125 Petaluma Blvd N (0.1 miles)
  • +
  • Acre Coffee: 21 4th St (0.1 miles)
  • +
  • Peets Coffee: 5 Petaluma Blvd S (0.1 miles)
  • +
  • Starbucks: 125 Petaluma Blvd N (0.1 miles)

Diners

    -
  • North Bay Cafe: 25 Petaluma Blvd S (0.1 miles)
  • -
  • Topsy's Kitchen: 131 Kentucky St (0.1 miles)
  • -
  • Hallie's Diner: 125 Keller St (0.2 miles)
  • -
  • Sax's Joint: 317 Petaluma Blvd S (0.3 miles)
  • +
  • North Bay Cafe: 25 Petaluma Blvd S (0.1 miles)
  • +
  • Topsy's Kitchen: 131 Kentucky St (0.1 miles)
  • +
  • Hallie's Diner: 125 Keller St (0.2 miles)
  • +
  • Sax's Joint: 317 Petaluma Blvd S (0.3 miles)

Pizza and Italian

    -
  • New Yorker Pizza: 3 Petaluma Blvd N (next door!)
  • -
  • Old Chicago Pizza: 41 Petaluma Blvd N (next door!)
  • -
  • Brixx Pizzeria: 16 Kentucky St (0.1 miles)
  • -
  • Cucina Paradiso: 114 Petaluma Blvd N (0.1 miles)
  • -
  • Risibisi Restaurant: 154 Petaluma Blvd N (0.1 miles)
  • -
  • Sugo Trattoria: 5 Petaluma Blvd S (0.1 miles)
  • -
  • Rosso Pizzeria & Mozzarella Bar: 151 Petaluma Blvd S (0.2 miles)
  • -
  • Volpi's Ristorante & Bar: 124 E Washington St (0.3 miles)
  • -
  • Mary’s Pizza Shack: 359 E Washington St (0.4 miles)
  • +
  • New Yorker Pizza: 3 Petaluma Blvd N (next door!)
  • +
  • Old Chicago Pizza: 41 Petaluma Blvd N (next door!)
  • +
  • Brixx Pizzeria: 16 Kentucky St (0.1 miles)
  • +
  • Cucina Paradiso: 114 Petaluma Blvd N (0.1 miles)
  • +
  • Risibisi Restaurant: 154 Petaluma Blvd N (0.1 miles)
  • +
  • Sugo Trattoria: 5 Petaluma Blvd S (0.1 miles)
  • +
  • Rosso Pizzeria & Mozzarella Bar: 151 Petaluma Blvd S (0.2 miles)
  • +
  • Volpi's Ristorante & Bar: 124 E Washington St (0.3 miles)
  • +
  • Mary’s Pizza Shack: 359 E Washington St (0.4 miles)

Pubs

    -
  • McNear's Saloon & Dining House: 23 Petaluma Blvd N (next door!)
  • -
  • Speakeasy: 139 B Petaluma Blvd N (0.1 miles)
  • -
  • Brewsters Beer Garden: 229 Water Street N (0.2 miles)
  • -
  • 256 North: 256 Petaluma Blvd N (0.2 miles)
  • -
  • Sauced BBQ & Spirits: 151 Petaluma Blvd S (0.2 miles)
  • -
  • Maguire's Pub: 145 Kentucky St (0.3 miles)
  • -
  • Dempsey's Restaurant & Brewery: 50 E Washington St (0.4 miles)
  • -
  • Taps Beer Co & Kitchen: 54 E Washington St (0.4 miles)
  • +
  • McNear's Saloon & Dining House: 23 Petaluma Blvd N (next door!)
  • +
  • Speakeasy: 139 B Petaluma Blvd N (0.1 miles)
  • +
  • Brewsters Beer Garden: 229 Water Street N (0.2 miles)
  • +
  • 256 North: 256 Petaluma Blvd N (0.2 miles)
  • +
  • Sauced BBQ & Spirits: 151 Petaluma Blvd S (0.2 miles)
  • +
  • Maguire's Pub: 145 Kentucky St (0.3 miles)
  • +
  • Dempsey's Restaurant & Brewery: 50 E Washington St (0.4 miles)
  • +
  • Taps Beer Co & Kitchen: 54 E Washington St (0.4 miles)

Other

    -
  • Water Street Bistro (French): 100 Petaluma Blvd N (0.1 miles)
  • -
  • Sake 107 (Japanese): 107 Petaluma Blvd N (0.1 miles)
  • -
  • CBC Cafe: 21 Kentucky St (0.1 miles)
  • -
  • Slamburger: 5 Petaluma Blvd S (0.1 miles)
  • -
  • Wild Goat Bistro (Modern American): 6 Petaluma Blvd N (0.1 miles)
  • -
  • Mi Pueblo El Centro (Mexican): 108 Kentucky St (0.1 miles)
  • -
  • Graffiti (Modern American): 101 2nd St (0.1 miles)
  • -
  • Thistle Meats (Deli): 160 Petaluma Blvd N (0.1 miles)
  • -
  • Kabuki Japanese Restaurant: 17 Petaluma Blvd N (0.1 miles)
  • -
  • Chicken Pharm (Fried Chicken): 132 Keller St (0.2 miles)
  • -
  • Cafe Zazzle (Mexican, Asian): 121 Kentucky St (0.2 miles)
  • -
  • Tea Room Cafe: 316 Western Ave (0.2 miles)
  • -
  • Everest Indian Restaurant: 56 E Washington St (0.2 miles)
  • -
  • Jennie Low's Chinese Cuisine: 140 2nd St (0.2 miles)
  • -
  • Crocodile (French): 140 2nd St (0.2 miles)
  • -
  • Fourth and Sea (Seafood): 101 4th St (0.2 miles)
  • -
  • Paradise Sushi & Grill: 20 E Washington St (0.2 miles)
  • -
  • The Drawing Board (Modern American): 190 Kentucky St (0.2 miles)
  • -
  • Kitaru (Japenese): 212 Western Ave (0.2 miles)
  • -
  • Chinatown Restaurant: 157 Kentucky St (0.2 miles)
  • -
  • Seared (Steakhouse, Seafood): 170 Petaluma Blvd N (0.2 miles)
  • -
  • Tup Tim Thai Cuisine: 208 Petaluma Blvd N (0.2 miles)
  • -
  • Thai River: 35 E Washington St (0.3 miles)
  • -
  • The Block Petaluma (Pub, Food Trucks): 20 Grey St (0.3 miles)
  • -
  • Real Döner (Turkish): 307 F St (0.4 miles)
  • -
  • Quinua (Peruvian): 500 Petaluma Blvd S (0.4 miles)
  • -
  • Luma (Cafe): 500 1st St (0.5 miles)
  • -
  • Aqus Cafe: 189 H St (0.5 miles)
  • -
  • El Roy's Mexican Grill: 210 Edith St (0.7 miles)
  • -
  • In’n’Out Burger: 1010 Lakeville Hwy (1.3 miles)
  • -
  • Soban Korean Cuisine: 255 N McDowell Blvd (1.8 miles)
  • -
  • Simmer Vietnamese Kitchen: 299 N McDowell Blvd (1.9 miles)
  • -
  • Lombardi's Gourmet Deli & BBQ: 3413 Petaluma Blvd N (2.3 miles)
  • -
  • Lagunitas Tap Room: 1280 N. McDowell Blvd (3.3 miles)
  • +
  • Water Street Bistro (French): 100 Petaluma Blvd N (0.1 miles)
  • +
  • Sake 107 (Japanese): 107 Petaluma Blvd N (0.1 miles)
  • +
  • CBC Cafe: 21 Kentucky St (0.1 miles)
  • +
  • Slamburger: 5 Petaluma Blvd S (0.1 miles)
  • +
  • Wild Goat Bistro (Modern American): 6 Petaluma Blvd N (0.1 miles)
  • +
  • Mi Pueblo El Centro (Mexican): 108 Kentucky St (0.1 miles)
  • +
  • Graffiti (Modern American): 101 2nd St (0.1 miles)
  • +
  • Thistle Meats (Deli): 160 Petaluma Blvd N (0.1 miles)
  • +
  • Kabuki Japanese Restaurant: 17 Petaluma Blvd N (0.1 miles)
  • +
  • Chicken Pharm (Fried Chicken): 132 Keller St (0.2 miles)
  • +
  • Cafe Zazzle (Mexican, Asian): 121 Kentucky St (0.2 miles)
  • +
  • Tea Room Cafe: 316 Western Ave (0.2 miles)
  • +
  • Everest Indian Restaurant: 56 E Washington St (0.2 miles)
  • +
  • Jennie Low's Chinese Cuisine: 140 2nd St (0.2 miles)
  • +
  • Crocodile (French): 140 2nd St (0.2 miles)
  • +
  • Fourth and C (Seafood): 101 4th St (0.2 miles)
  • +
  • Paradise Sushi & Grill: 20 E Washington St (0.2 miles)
  • +
  • The Drawing Board (Modern American): 190 Kentucky St (0.2 miles)
  • +
  • Kitaru (Japenese): 212 Western Ave (0.2 miles)
  • +
  • Chinatown Restaurant: 157 Kentucky St (0.2 miles)
  • +
  • Seared (Steakhouse, Seafood): 170 Petaluma Blvd N (0.2 miles)
  • +
  • Tup Tim Thai Cuisine: 208 Petaluma Blvd N (0.2 miles)
  • +
  • Thai River: 35 E Washington St (0.3 miles)
  • +
  • The Block Petaluma (Pub, Food Trucks): 20 Grey St (0.3 miles)
  • +
  • Real Döner (Turkish): 307 F St (0.4 miles)
  • +
  • Quinua (Peruvian): 500 Petaluma Blvd S (0.4 miles)
  • +
  • Luma (Cafe): 500 1st St (0.5 miles)
  • +
  • Aqus Cafe: 189 H St (0.5 miles)
  • +
  • El Roy's Mexican Grill: 210 Edith St (0.7 miles)
  • +
  • In’n’Out Burger: 1010 Lakeville Hwy (1.3 miles)
  • +
  • Soban Korean Cuisine: 255 N McDowell Blvd (1.8 miles)
  • +
  • Simmer Vietnamese Kitchen: 299 N McDowell Blvd (1.9 miles)
  • +
  • Lombardi's Gourmet Deli & BBQ: 3413 Petaluma Blvd N (2.3 miles)
  • +
  • Lagunitas Tap Room: 1280 N. McDowell Blvd (3.3 miles)
{% endblock %} diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html index d957d42..7e5e730 100644 --- a/pinaxcon/templates/static_pages/homepage.html +++ b/pinaxcon/templates/static_pages/homepage.html @@ -14,12 +14,14 @@
-
+
+
+

North Bay Python

-

A Python conference north of the Golden Gate

+

The Python conference in a live music venue

@@ -30,8 +32,8 @@

- December 2 & 3, 2017
- Tickets on sale from $50 + November 3 & 4, 2018
+ Talk proposal submissions close August 10th

-
-
-

Speakers

- -
- -
-
-
-
-
-
-

Brandon Rhodes

- Keynote Speaker -
- -
-
-
-
-
-
-

Carina C. Zona

- Keynote Speaker -
- - {% speakers as speakers %} - {% for speaker in speakers %} -
-
-
- {% if speaker.photo %} -
- {% else %} -
- {% endif %} -
-
- {% for presentation in speaker.presentations.all %} - -

{{ speaker.conferencespeaker.name }}

- {{ presentation.title }} -
- {% endfor %} -
- {% endfor %} - -
-
-
-
-
-
-

VM Brasseur

- Speaker Training -
- -
-
- - -
- -
@@ -156,10 +86,10 @@
  • An historic venue with countless restaurants and coffee shops in walking distance
  • World-famous craft food and drink producers on your doorstep
  • -
  • Charming small-town hotels, as close as one block away
  • +
  • Charming small-town hotels, as close as one block away
-

… and it's only an hour away from San Francisco (on a good day).

+

… and it's only an hour away from San Francisco (on a good day).

diff --git a/pinaxcon/templates/static_pages/program/call_for_proposals.html b/pinaxcon/templates/static_pages/program/call_for_proposals.html index 18bf99f..41c5b1a 100644 --- a/pinaxcon/templates/static_pages/program/call_for_proposals.html +++ b/pinaxcon/templates/static_pages/program/call_for_proposals.html @@ -11,7 +11,7 @@ {% block lede %} -North Bay Python is seeking speakers of all experience levels to contribute to our first-ever conference program! If you use Python professionally, as a hobbyist, or are just excited about Python or programming and open source, we'd love to hear from you. +North Bay Python is seeking speakers of all experience levels to contribute to our second conference program! If you use Python professionally, as a hobbyist, or are just excited about Python or programming and open source, we'd love to hear from you. {% endblock %} diff --git a/pinaxcon/templates/static_pages/program/call_for_proposals.md b/pinaxcon/templates/static_pages/program/call_for_proposals.md index a5acace..7428579 100644 --- a/pinaxcon/templates/static_pages/program/call_for_proposals.md +++ b/pinaxcon/templates/static_pages/program/call_for_proposals.md @@ -1,4 +1,4 @@ -### The North Bay Python 2017 CFP closed on September 29 +### The North Bay Python 2018 CFP is open! We've got lots of good information and resources below that you should read, but in case you've already read it and want to dive in now: @@ -12,11 +12,16 @@ In the interest of transparency, we have documented our [selection process](/pro ## Dates -+ **August 21**: CFP opens -+ **September 29**: CFP closes -+ **Week of October 9**: Acceptance notifications sent -+ **Week of October 16**: Speaker confirmations due; program finalized and announced -+ **December 2–3**: Conference happens! ++ **July 5**: CFP opens ++ **August 10**: CFP closes ++ **Week of September 10**: Acceptance notifications sent ++ **Week of September 17**: Speaker confirmations due; program finalized and announced ++ **November 3–4**: Conference happens! + + +## Speaker Benefits +**All speakers will receive complimentary registration to the conference, and requests for further financial compensation to assist with travel will be considered on a case-by-case basis independent of the proposal's merits.** + ## Speakers @@ -26,11 +31,27 @@ North Bay Python is dedicated to featuring a diverse and inclusive speaker lineu We will make every effort to provide accommodations for speakers and attendees of all abilities—all we ask is that you let us know so we can prepare accordingly. -North Bay Python is a conference in support of the local programmer community outside of the core San Francisco Bay Area tech scene. We aim to feature a mix of local and non-local speakers to offer a program with broad appeal. **All speakers will receive complimentary registration to the conference, and requests for further financial compensation to assist with travel will be considered on a case-by-case basis independent of the proposal's merits.** +North Bay Python is a conference in support of the local programmer community outside of the core San Francisco Bay Area tech scene. We aim to feature a mix of local and non-local speakers to offer a program with broad appeal. + + +## Audience + +We anticipate more than 300 attendees at our 2018 conference. In 2017, we had 230 attendees from California and beyond, including: + ++ 78% from the San Francisco Bay Area, including 25% from Sonoma County ++ 5% from elsewhere in California ++ 17% from other US states, and internationally. + +30% of attendees were women or non-binary. + +Our attendees range in experience from students and new graduates, through to career professionals with more than 30 years in the industry. Our professional attendees work in many roles, including software engineers, CTO-level executives, DevOps engineers, data scientists, front-end engineers and mobile developers. + +48% of our attendees had never attended a Python-focused conference before North Bay Python. 15% of our attendees made North Bay Python their first tech conference. ## Talk Formats -**Most of the talk slots will be short**—approximately 25 to 30 minutes, including Q&A. If your ideas would benefit from a longer slot, please explain in your submission how you would use the additional time. +**Most of the talk slots will be short**—approximately 25 to 30 minutes, including Q&A if desired. If your ideas would benefit from a longer slot, please explain in your submission how you would use the additional time. + ## Topics @@ -51,17 +72,19 @@ This is a list of topics we think might go well in the North Bay Python program, + Unexpected places Python gets used (Embedded systems! Health science!) + ... and anything else we might not have thought of! + ## Resources This [public speaking](https://github.com/vmbrasseur/Public_Speaking) repository, maintained by [VM Brasseur](https://twitter.com/vmbrasseur), has many useful resources to help you polish your proposals and talks. + ### Office Hours and Mentorship First time speakers are welcomed and encouraged. In order to support speakers, we offer mentorship and feedback, are running office hours, and hosting a speaker training on the Friday before North Bay Python. Above all we want you to be successful and have a good time telling other attendees about your ideas! You can [contact the program committee](mailto:program@northbaypython.org) via email or drop by [#nbpy on the Freenode IRC network](https://webchat.freenode.net/?channels=%23nbpy) anytime to be connected with a mentor and receive guidance structuring your proposal and talk. -Our office hours will be held twice every week **Wednesday at 7pm** and **Friday at 3pm** Pacific Time starting August 21 and finishing September 29. We'll be holding them on IRC, a chat protocol, in the #nbpy channel on the Freenode network. New to IRC? You can use [this web client](https://webchat.freenode.net/?channels=%23nbpy) to connect. +Our office hours will be held twice every week **Wednesday at 7pm** and **Friday at 3pm** Pacific Time starting July 11 and finishing August 10. We'll be holding them on IRC, a chat protocol, in the #nbpy channel on the Freenode network. New to IRC? You can use [this web client](https://webchat.freenode.net/?channels=%23nbpy) to connect. We're happy to help with any of the following: @@ -71,6 +94,7 @@ We're happy to help with any of the following: + Connecting you with rehearsal audiences or even just watching you present over a video conference as practice + Anything else that'd help you be at ease and excited about bringing your ideas to our audience! + ## Submitting To help us evaluate proposals and build our program, we would like as much detail as you can provide on your talk. At a minimum this should include: **a brief description (~400 characters) suitable for inclusion in a schedule page; a brief prose abstract (intended as the content for a talk detail page on the program site); and, if you'd like, a rough outline of the structure including estimated timings for each section of your talk.** @@ -83,6 +107,7 @@ Your speaker profile includes a space for you to describe your prior experience Submit a Proposal
+ ## How to Write Your Proposal If you have an idea (or don't!) and want to speak, here's a very rough process of what you should do next: diff --git a/pinaxcon/templates/static_pages/program/events.html b/pinaxcon/templates/static_pages/program/events.html index da33d09..68c2976 100644 --- a/pinaxcon/templates/static_pages/program/events.html +++ b/pinaxcon/templates/static_pages/program/events.html @@ -9,50 +9,18 @@ {% block body_class %}program{% endblock %} {% block lede %} - North Bay Python 2017 is coming, and with it: more Python. We'll add satellite events and more to this page as details are available. + North Bay Python 2018 is coming, and with it: more Python. We'll add satellite events and more to this page as details are available. {% endblock %} {% block content %} +{% comment %}

A Taste of Python and Django
October 24, 2017

A pre-conference event with local meetup group, Web & Interactive Media Professionals (WIMP). At least three of the North Bay Python organizers will be present at this potluck-style event at Santa Rosa Junior College. Find more information and join us!

-

Speaker Training (Wiki)
- December 1, 2017 @ 5pm

- -

We are running a free speaker training the day before the conference. Everyone is invited to attend, but seating is limited so people who are accepted to speak at the conference are given priority.

- -

You must register to attend. Due to the location, the training is only open to people age 21 and older.

- -

The Blue Room
- Jamison's Roaring Donkey

- 146 Kentucky Street
- Petaluma, CA 94952

- -

Pre-conference Social Hour (Wiki)
- December 1, 2017 @ 7:30pm

- -

Getting into town early? Come meet other attendees at the Pre-conference Social Hour! We have a table reserved for 20, come find us and say hello. The venue is quite large so once the table fills up we'll just start seeding tables in unreserved space.

- -

Brewster's
- 229 Water Street North
- Petaluma, CA 94952

- -

North Bay Python 2017
- December 2-3, 2017

- -

This year's main event will run from 10:00am to about 6:15pm each day with check-in starting at 8:30am on Saturday. There are 20 sessions and 2 keynotes that make up the North Bay Python 2017 program.

- -

There will be a variety of official and unofficial events running during the conference, each day before opening, during lunch, and after closing. You can find a regularly updated list of events on the Attendee Wiki. You can find events, and organize your own, on the Meetups page.

- -

PyLadies Lunch (Wiki)
- December 2, 2017 @ 12pm

- -

Come hear some awesome talks and then have lunch with your favorite women and non-binary programmers and their friends!

- -

It's free to join and lunch is on us, but space is limited so you must register to attend.

+{% endcomment %} {% endblock %} diff --git a/pinaxcon/templates/static_pages/terms_and_conditions.md b/pinaxcon/templates/static_pages/terms_and_conditions.md index c77b26f..f1cf240 100644 --- a/pinaxcon/templates/static_pages/terms_and_conditions.md +++ b/pinaxcon/templates/static_pages/terms_and_conditions.md @@ -15,14 +15,14 @@ All transactions are performed through a payment gateway facility and use SSL en Cancellation Policy ------------------- -**Cancellations made prior to November 2, 2017**: Incur a cancellation fee of $25 or 15% of the ticket cost, whichever is greater, which will be deducted from any registration fee paid. The balance will be refunded. +**Cancellations made prior to October 2, 2018**: Incur a cancellation fee of $25 or 15% of the ticket cost, whichever is greater, which will be deducted from any registration fee paid. The balance will be refunded. -**Cancellations made after November 2, 2017**: No refund. +**Cancellations made after October 2, 2018**: No refund. Substitutions ------------- -You may substitute another person, however you must contact us with this person's details. If you wish to substitute after November 2, 2017 please note that we will not be able to provide any personalized items. +You may substitute another person, however you must contact us with this person's details. If you wish to substitute after October 2, 2018 please note that we will not be able to provide any personalized items. Privacy Notice -------------- @@ -77,7 +77,7 @@ Attendees will have a way to visibly signal their preference for photography at * Permission required: Ask before photographing * Opt-out: Photographs are never okay, don't ask -Attendees who are not visibly signaling their preference should be asked for permission before photographing. There is no prior opt-in for audio or video recordings. You must always ask before recording. +Attendees who are not visibly signaling their preference should be asked for permission before photographing. There is no prior opt-in for audio or video recordings. You must always ask before recording. The event may have one or more staff taking photographs and/or audio or video recordings during the event. These staff will respect attendees' preferences regarding photography and recordings. @@ -114,4 +114,4 @@ Immigration/Entry Requirements Anyone who lives outside the United States will need a passport and may require a visa to gain entry into the United States. Please contact your local United States embassy to determine your travel needs. You should take into account the Cancellation Policy above and do this well in advance of the event. -Where a letter of invitation is required, one will be issued by event organizers for presenters whose submissions have been accepted. \ No newline at end of file +Where a letter of invitation is required, one will be issued by event organizers for presenters whose submissions have been accepted. diff --git a/pinaxcon/templatetags/nbpy_tags.py b/pinaxcon/templatetags/nbpy_tags.py index 4bbf320..e1a28e1 100644 --- a/pinaxcon/templatetags/nbpy_tags.py +++ b/pinaxcon/templatetags/nbpy_tags.py @@ -74,11 +74,12 @@ def special(context, user): speaker = user.speaker_profile.presentations.count() != 0 except Exception: speaker = False - volunteer = "Volunteer" in ticket_type(context) + tt = ticket_type(context) + volunteer = "Volunteer" in tt if organiser: return "Organizer" - elif speaker: + elif speaker or "Speaker" in tt: return "Speaker" elif volunteer: return "Staff" diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index b1caf84..6c6e580 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -34,27 +34,27 @@ urlpatterns = [ url(r"^cfp$", RedirectView.as_view(url="program/call-for-proposals")), # attend - url(r"^attend$", TemplateView.as_view(template_name="static_pages/attend/attend.html"), name="attend/attend"), - url(r"^tickets$", RedirectView.as_view(url="attend")), - url(r"^tickets/buy$", views.buy_ticket, name="buy_ticket"), - url(r"^attend/business-case$", TemplateView.as_view(template_name="static_pages/attend/business-case.html"), name="attend/business-case"), - url(r"^attend/finaid$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="attend/finaid"), +# url(r"^attend$", TemplateView.as_view(template_name="static_pages/attend/attend.html"), name="attend/attend"), +# url(r"^tickets$", RedirectView.as_view(url="attend")), +# url(r"^tickets/buy$", views.buy_ticket, name="buy_ticket"), +# url(r"^attend/business-case$", TemplateView.as_view(template_name="static_pages/attend/business-case.html"), name="attend/business-case"), +# url(r"^attend/finaid$", TemplateView.as_view(template_name="static_pages/attend/finaid.html"), name="attend/finaid"), url(r"^attend/travel$", TemplateView.as_view(template_name="static_pages/attend/travel.html"), name="attend/travel"), - url(r"^attend/hotels$", TemplateView.as_view(template_name="static_pages/attend/hotels.html"), name="attend/hotels"), - url(r"^attend/tshirt$", TemplateView.as_view(template_name="static_pages/attend/tshirt.html"), name="attend/tshirt"), - url(r"^attend/accessibility-and-accommodations$",TemplateView.as_view(template_name="static_pages/attend/accommodations.html"), name="attend/accessibility-and-accommodations"), - url(r"^accessibility$", RedirectView.as_view(url="attend/accessibility-and-accommodations")), - url(r"^guides$",TemplateView.as_view(template_name="static_pages/attend/guides.html"), name="attend/guides"), - url(r"^guide$", RedirectView.as_view(url="guides")), +# url(r"^attend/hotels$", TemplateView.as_view(template_name="static_pages/attend/hotels.html"), name="attend/hotels"), +# url(r"^attend/tshirt$", TemplateView.as_view(template_name="static_pages/attend/tshirt.html"), name="attend/tshirt"), +# url(r"^attend/accessibility-and-accommodations$",TemplateView.as_view(template_name="static_pages/attend/accommodations.html"), name="attend/accessibility-and-accommodations"), +# url(r"^accessibility$", RedirectView.as_view(url="attend/accessibility-and-accommodations")), +# url(r"^guides$",TemplateView.as_view(template_name="static_pages/attend/guides.html"), name="attend/guides"), +# url(r"^guide$", RedirectView.as_view(url="guides")), url(r"^safety$", TemplateView.as_view(template_name="static_pages/safety.html"), name="safety"), url(r"^emergencies$", RedirectView.as_view(url="safety")), url(r"^emergency$", RedirectView.as_view(url="safety")), - url(r"^attend/food$", TemplateView.as_view(template_name="static_pages/attend/food.html"), name="attend/food"), - url(r"^food$", RedirectView.as_view(url="attend/food")), - url(r"^attend/transit$", TemplateView.as_view(template_name="static_pages/attend/transit.html"), name="attend/transit"), - url(r"^transit$", RedirectView.as_view(url="attend/transit")), +# url(r"^attend/food$", TemplateView.as_view(template_name="static_pages/attend/food.html"), name="attend/food"), +# url(r"^food$", RedirectView.as_view(url="attend/food")), +# url(r"^attend/transit$", TemplateView.as_view(template_name="static_pages/attend/transit.html"), name="attend/transit"), +# url(r"^transit$", RedirectView.as_view(url="attend/transit")), url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code_of_conduct/code_of_conduct.html"), name="code-of-conduct"), url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_attendee.html"), name="code-of-conduct/harassment-incidents"), diff --git a/static/images/footer-clouds-gradient.svg b/static/images/footer-clouds-gradient.svg new file mode 100644 index 0000000..ee3a9d4 --- /dev/null +++ b/static/images/footer-clouds-gradient.svg @@ -0,0 +1,593 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/hills-footer.svg b/static/images/hills-footer.svg index c7e9348..4fb6aed 100644 --- a/static/images/hills-footer.svg +++ b/static/images/hills-footer.svg @@ -16,7 +16,7 @@ id="svg4324" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="hills-footer.svg"> + sodipodi:docname="hills-to-ground.svg"> - - diff --git a/static/images/hills.svg b/static/images/hills.svg index 8e10c7d..4fb6aed 100644 --- a/static/images/hills.svg +++ b/static/images/hills.svg @@ -201,7 +201,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.755" - inkscape:cx="123.1931" + inkscape:cx="24.902502" inkscape:cy="65.534418" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -212,7 +212,7 @@ fit-margin-bottom="0" borderlayer="true" inkscape:window-width="1440" - inkscape:window-height="803" + inkscape:window-height="806" inkscape:window-x="0" inkscape:window-y="1" inkscape:window-maximized="1" @@ -225,7 +225,7 @@ image/svg+xml - + @@ -236,7 +236,7 @@ transform="translate(224.79828,58.616302)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/images/homepage-header-background.svg b/static/images/homepage-header-background.svg new file mode 100644 index 0000000..f0f6d68 --- /dev/null +++ b/static/images/homepage-header-background.svg @@ -0,0 +1,463 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/static/images/icon.png b/static/images/icon.png index 0e9886e..33b9e84 100644 Binary files a/static/images/icon.png and b/static/images/icon.png differ diff --git a/static/images/logo.svg b/static/images/logo.svg index 340fb28..c5ce5d0 100644 --- a/static/images/logo.svg +++ b/static/images/logo.svg @@ -16,18 +16,21 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="logo.svg"> + sodipodi:docname="logo 2018 circle.svg" + inkscape:export-filename="/Users/chrisjrn/Desktop/nbp-logo-2018.png" + inkscape:export-xdpi="2110.71" + inkscape:export-ydpi="2110.71"> @@ -196,24 +199,32 @@ sodipodi:type="inkscape:persp3d" /> + xlink:href="#linearGradient4689" + id="linearGradient5008" + x1="2.3606236" + y1="130.54842" + x2="172.60892" + y2="130.54842" + gradientUnits="userSpaceOnUse" /> + gradientTransform="translate(-561.3933,-431.6564)" /> + + fit-margin-bottom="0" + borderlayer="true" + inkscape:snap-page="true" /> @@ -249,11 +262,44 @@ + + + + + + + + transform="translate(-561.39362,-431.6564)" + style="display:inline"> - + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.93178844;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m 133.88672,61.535156 c -4.31378,0 -7.87197,3.466108 -8.14063,7.929688 l -0.0508,0.832031 -0.55664,-0.04297 c -0.7171,-0.0546 -1.70569,0.15622 -2.49609,0.53125 -0.76709,0.36399 -1.9567,1.519443 -2.34961,2.283203 l -0.26367,0.515625 -0.68946,-0.353515 c -1.4725,-0.7523 -2.91415,-1.09435 -4.61132,-1.09375 -1.20507,3.2e-4 -2.11223,0.144926 -3.18164,0.503906 -2.91086,0.97716 -5.16593,3.289625 -5.98633,6.140625 l -0.2168,0.751953 -0.6543,0 c -3.12561,0 -6.179813,1.807653 -7.035153,4.164063 -0.64768,1.78434 -0.200509,3.451403 1.332031,4.970703 0.67191,0.66612 0.939364,0.857409 1.746092,1.255859 1.40212,0.69252 2.45332,0.939008 4.07813,0.955078 l 1.30273,0.01172 0.6582,0.644531 c 0.91275,0.89376 2.23311,1.5 3.26954,1.5 0.31531,0 0.35517,0.03462 0.63086,0.525391 0.46185,0.82215 1.47196,1.754639 2.3789,2.199219 1.05269,0.51602 1.7586,0.683453 2.91016,0.689453 1.1615,0.007 1.99003,-0.186037 2.96679,-0.685547 l 0.69141,-0.353516 0.28516,0.339844 c 1.77745,2.11887 4.36166,3.51012 7.14062,3.84375 2.68779,0.32269 5.72034,-0.523809 7.87305,-2.199219 l 0.57422,-0.449219 0.88281,0.378907 c 1.74965,0.75047 3.40031,1.055756 5.25586,0.972656 3.00642,-0.1347 5.55595,-1.223456 7.69141,-3.285156 0.6505,-0.62803 1.45774,-1.552158 1.63085,-1.867188 0.008,-0.0144 0.25571,0.118149 0.55079,0.292969 0.6302,0.37349 1.93251,0.825618 2.77148,0.960938 2.38019,0.383929 5.0385,-0.441671 6.74805,-2.09375 0.33747,-0.326131 0.69315,-0.700162 0.79101,-0.832032 l 0.17774,-0.240234 0.8164,0.28125 c 0.73559,0.25336 0.92608,0.28152 1.91211,0.28125 0.96025,-2.8e-4 1.18481,-0.03178 1.82422,-0.253906 1.76491,-0.61306 3.02648,-1.844248 3.61133,-3.523438 0.30368,-0.8717 0.30308,-2.25603 -0.002,-3.1875 -0.43663,-1.33328 -1.5024,-2.572321 -2.75977,-3.207031 -0.72695,-0.36696 -1.78458,-0.630859 -2.53515,-0.630859 l -0.60938,0 -0.23633,-0.958985 c -1.14666,-4.63424 -5.95662,-7.893134 -11.65429,-7.896484 -1.50879,-9.1e-4 -2.29567,0.09207 -3.63086,0.429687 -0.51689,0.13075 -0.94921,0.221425 -0.96094,0.203125 -0.0113,-0.0183 -0.18291,-0.360318 -0.38086,-0.761719 -0.27364,-0.55486 -0.53562,-0.905287 -1.0918,-1.460937 -1.09302,-1.09195 -2.24743,-1.595703 -3.6582,-1.595703 l -0.6543,0 -0.0605,-0.457031 c -0.16259,-1.22555 -0.869,-2.803995 -1.74415,-3.896485 -1.58603,-1.97986 -3.80848,-3.0625 -6.29101,-3.0625 z" + transform="translate(561.39362,431.6564)" + id="circle5010" + inkscape:connector-curvature="0" /> - + inkscape:connector-curvature="0" /> + transform="translate(561.39362,431.6564)" /> + + diff --git a/static/images/mystic-marquee.jpg b/static/images/mystic-marquee.jpg new file mode 100644 index 0000000..3d2642a Binary files /dev/null and b/static/images/mystic-marquee.jpg differ diff --git a/static/images/square_icon.png b/static/images/square_icon.png index c38d25f..c4bf318 100644 Binary files a/static/images/square_icon.png and b/static/images/square_icon.png differ diff --git a/static/images/team/sam.jpg b/static/images/team/sam.jpg index 1cf7f37..ce4dcf6 100644 Binary files a/static/images/team/sam.jpg and b/static/images/team/sam.jpg differ diff --git a/static/images/website-background.svg b/static/images/website-background.svg index c60a936..2a09a9f 100644 --- a/static/images/website-background.svg +++ b/static/images/website-background.svg @@ -291,8 +291,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="4.525" - inkscape:cx="75.72802" - inkscape:cy="232.19034" + inkscape:cx="78.600948" + inkscape:cy="108.43343" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -302,7 +302,7 @@ fit-margin-bottom="0" borderlayer="true" inkscape:window-width="1440" - inkscape:window-height="801" + inkscape:window-height="806" inkscape:window-x="0" inkscape:window-y="1" inkscape:window-maximized="1" /> @@ -314,7 +314,7 @@ image/svg+xml - + diff --git a/static/scss/custom.scss b/static/scss/custom.scss index 74ce750..585d94d 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -27,7 +27,13 @@ section { footer { padding-top: 40px; padding-bottom: 20px; - text-shadow: 0px 0px 10px white; + //text-shadow: 0px 0px 0.5px lighten($logo-sky-blue, 0.1); + //color: white; +} + +.ftr-wrapper { + background-image: linear-gradient(transparent, $background-filter, $background-filter, $background-filter); + //background-color: black; } p.login-signup { @@ -99,8 +105,8 @@ body.auth .panel-heading .panel-title span.pull-right { } #content_body { - background-color: $background-filter-transparent; - box-shadow: 0px 0px 2em $background-filter; //, inset 0px -5px 1em rgba(0, 0, 0, 0.8); + //background-color: $background-filter-transparent; + //box-shadow: 0px 0px 2em $background-filter; //, inset 0px -5px 1em rgba(0, 0, 0, 0.8); } @@ -212,6 +218,18 @@ $homepage-block-min-height: 480px; box-shadow: $box-shadow; } +.homepage-background-opacity { + top: 0; + bottom: 0; + width: 100%; + height: 100%; + position: absolute; + opacity: 0.7; + z-index: -9999; + + background-blend-mode: multiply; +} + .homepage-block.dark { background: $gray-base; color: white; @@ -262,7 +280,7 @@ $homepage-block-min-height: 480px; position: absolute; bottom: 0; right: 0; - z-index: -9999; + z-index: -7999; &.main { background-image: url("../images/hills.svg"); @@ -273,13 +291,78 @@ $homepage-block-min-height: 480px; } } +.hphbg { + background-color: $logo-sky-blue; + opacity: 1; + /* will be "on top", if browser supports it */ + background-size: 100%; + background-position: bottom; + top: 0; + bottom: 0; + background-repeat: no-repeat; + width: 100%; + height: 100%; +} + +.floop { + + background-size: 100%; + background-position: bottom; + background-repeat: no-repeat; + width: 100%; + height: 50%; + position: absolute; + bottom: 0; + right: 0; + z-index: -9999; + //background-color: $logo-sky-blue; + background-image: linear-gradient(transparent, black); + + &.homepage-footer { + height: 10%; + } +} + +.clouds { + background-position: bottom; + background-repeat: repeat-x; + width: 100%; + height: 100%; + position: absolute; + top: 0; + //right: 0; + z-index: -9000; + + &.main { + background-image: url("../images/homepage-clouds-bottom.svg"); + } + + &.ftr { + background-image: url("../images/homepage-clouds-bottom.svg"); + opacity: 0.1; + } + + &.hdr { + background-image: url("../images/homepage-clouds-bottom.svg"); + background-position: top; + opacity: 0.6; + } + +} + + + + .circle { position: relative; border-radius: 100%; overflow: hidden; width: 100%; - border: 0.05em solid black; box-shadow: 0px 0px 1em $gray-dark; + + &.border { + border: 0.05em solid black; + } } .circle:before { @@ -313,17 +396,24 @@ $homepage-block-min-height: 480px; } .website-background { - background-image: url("../images/website-background.svg"); + /*background-image: url("../images/website-background.svg");*/ + background-color: $logo-sky-blue; } .mystic-background { - background-image: url("../images/mystic.jpg"); + background-image: url("../images/mystic-marquee.jpg"); } .djangogirls-background { background-image: url("../images/django-girls-2014.jpg"); } + +.homepage-header-background { + background-image: url("../images/homepage-header-background.svg"); +} + + .sponsor-list a img { width: 100%; max-width: 300px; diff --git a/static/scss/variables.scss b/static/scss/variables.scss index 32635c3..8fbfb98 100644 --- a/static/scss/variables.scss +++ b/static/scss/variables.scss @@ -1,15 +1,21 @@ /* COLORS */ // Used by links, buttons, and other background bits. $brand-primary: darken(rgb(0, 202, 10), 20%); -$background-filter: hsla(207, 60%, 85%, 1.0); + +$logo-sky-blue: #449fe8; +//$background-filter: hsla(207, 60%, 85%, 1.0); +$background-filter: $logo-sky-blue; + $background-filter-transparent: change-color($background-filter, $alpha: 0.5); + /* TEXT */ $font-family-sans-serif: 'Montserrat', Arial, sans-serif; $font-family-serif: Georgia, "Times New Roman", Times, serif; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; $font-size-base: 16px; $headings-line-height: 1.0; +$text-color: #000; // Navbar