CopyleftConf/copyleftconf-website Changeset - 41a6ab12767d

Changeset - 41a6ab12767d

Parent rev.

Child rev.

[Not reviewed]

Merge

0 7 0

Joshua Simmons - 7 years ago 2017-08-16 04:10:42
i@joshuasimmons.name

Merge branch 'master' of github.com:northbaypython/website

7 files changed with 31 insertions and 17 deletions:

pinaxcon/settings.py

pinaxcon/templates/_footer.html

pinaxcon/templates/static_pages/about/team.html

pinaxcon/templates/static_pages/homepage.html

pinaxcon/templates/static_pages/news.html

requirements/base.txt

static/scss/custom.scss

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... @@
 # timezone as the operating system.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 TIME_ZONE = "UTC"
 TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles")
 # Use SSLRedirectMiddleware
 SSL_ON = os.environ.get("DJANGO_SSL_ON", True)
 SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False)
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
@@ ... / @@ -80,6 +85,14 @@ STATICFILES_FINDERS = [ @@
     "compressor.finders.CompressorFinder",
+]
 # Amazon S3 setup
 DEFAULT_FILE_STORAGE = os.environ.get("DJANGO_DEFAULT_FILE_STORAGE", 'django.core.files.storage.FileSystemStorage') # noqa
 AWS_ACCESS_KEY_ID = os.environ.get("DJANGO_AWS_ACCESS_KEY_ID", None)
 AWS_SECRET_ACCESS_KEY = os.environ.get("DJANGO_AWS_SECRET_ACCESS_KEY", None)
 AWS_STORAGE_BUCKET_NAME = os.environ.get("DJANGO_AWS_STORAGE_BUCKET_NAME", None)
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = "6r&z0i#!k-thu4nv^zzx!f$fbp(&#2i5mq_^%%@ihu_qxxotl_"
@@ ... / @@ -118,6 +131,8 @@ MIDDLEWARE_CLASSES = [ @@
     "django.contrib.messages.middleware.MessageMiddleware",
     "reversion.middleware.RevisionMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "ssl_redirect.middleware.SSLRedirectMiddleware",
+]
 ROOT_URLCONF = "pinaxcon.urls"

pinaxcon/templates/_footer.html

➞

Show inline comments

 {% load staticfiles %}
 <div class="row">
-  <div class="col-xs-1 col-md-1" >
+  <div class="logo">
     <div class="circle">
       <div class="fill" style="background-image: url('{% static "images/logo.svg" %}');"></div>
     </div>
   </div>
-  <div class="col-xs-12 col-md-7">
+  <div class="footer-copy">
     <p>&copy; 2017 North Bay Python, a member project of <a href="https://sfconservancy.org" title="Software Freedom Conservancy">Software Freedom Conservancy</a>, a 501(c)(3) charity.</p>
     <p>
@@ ... / @@ -15,10 +15,7 @@ @@
       | <a href="https://twitter.com/northbaypython" title="North Bay Python on Twitter">Twitter</a>
       | <a href="/code-of-conduct" title="North Bay Python Code of Conduct">Code of Conduct</a>
       | <a href="/about/colophon" title="North Bay Python Colophon">Colophon</a></p>
   </div>
   <div class="col-xs 12 col-md-4 text-right">
       This site is <a href="https://github.com/northbaypython/website" title="North Bay Python Website Git Repository">free and open source software</a>, powered by <a href="https://github.com/chrisjrn/symposion/" title="Symposion Git Repository">Symposion</a>
       and <a href="https://github.com/chrisjrn/registrasion/" title="Registrasion Git Repository">Registrasion</a>.
     <p>This site is <a href="https://github.com/northbaypython/website" title="North Bay Python Website Git Repository">free and open source software</a>, powered by <a href="https://github.com/chrisjrn/symposion/" title="Symposion Git Repository">Symposion</a> and <a href="https://github.com/chrisjrn/registrasion/" title="Registrasion Git Repository">Registrasion</a>.</p>
   </div>
 </div>

pinaxcon/templates/static_pages/about/team.html

➞

Show inline comments

@@ ... @@
 <ul>
   <li><a href="https://facebook.com/northbaypython" title="North Bay Python on Facebook">Facebook</a></li>
   <li><a href="https://twitter.com/northbaypython" title="North Bay Python on Twitter">Twitter</a></li>
   <li><a href="http://webchat.freenode.net/?channels=%23nbpy" title="IRC Web Client for North Bay Python's #nbpy Channel on Freenode">IRC (#nbpy on Freenode)</a></li>
 </ul>
@@ ... @@
 <p>We acknowledge that our small team has limited perspective, and that to build a truly inclusive event, we need to seek the perspectives of a diverse range of people. We thank the following people and organizations for providing us with advice along the way.</p>
 <ul>
   <li><a href="https://twitter.com/vavroom" title="Nicolas Steenhout on Twitter">Nicolas Steenhout</a></li>
   <li><a href="https://twitter.com/vmbrasseur" title="VM Brasseur on Twitter">VM (Vicky) Brasseur</a></li>
   <li><a href="https://twitter.com/vavroom" title="Nicolas Steenhout on Twitter">Nicolas Steenhout</a> is helping us with accessibility and inclusion of people with disabilities.</li>
   <li><a href="https://twitter.com/vmbrasseur" title="VM Brasseur on Twitter">VM (Vicky) Brasseur</a> is helping us run an excellent call for proposals, design our office hours program, and support new speakers with speaker training.</li>
 </ul>

pinaxcon/templates/static_pages/homepage.html

➞

Show inline comments

@@ ... / @@ -27,14 +27,14 @@ @@
           </h3>
           <h4>
-            <strong>2017 conference:</strong> December 2 &amp; 3 <br/>
+            December 2 &amp; 3, 2017<br/>
             Talk submissions open August 21
           </h4>
         </div>
         <div class="col-md-4 col-md-offset-2">
+        <div class="col-md-4 col-md-offset-2 email-signup-panel">
           <div class="panel panel-default">
             <div class="panel-heading">
               <h2 class="panel-title">Sign up for our low-volume announcements newsletter</h4>
+              <h2 class="panel-title">Sign up for our low-volume announcements newsletter!</h4>
             </div>
             <div class="panel-body">
               <form
@@ ... / @@ -93,7 +93,7 @@ @@
             <a class="btn btn-lg btn-primary btn-shadow" href="/about/north-bay-python" title="About North Bay Python">Learn More</a>
           </div>
           <div class="col-md-8 text-right">
+          <div class="col-md-8 text-right photo-attribution">
             Image credit: <a href="https://www.instagram.com/p/BU-G5dGAkHt" title="Photo of the Mystic Theatre">Mystic Theatre</a>, &copy; 2017 Christopher Neugebauer (<a href="https://creativecommons.org/licenses/by-sa/2.0/" title="Creative Commons Attribute Share Alike 2.0 Generic License">CC BY-SA 2.0</a>)
           </div>
         </div>
@@ ... / @@ -158,7 +158,7 @@ @@
             <a class="btn btn-lg btn-primary btn-shadow" href="/code-of-conduct" title"North Bay Python Code of Conduct">Read the Code of Conduct</a>
           </div>
           <div class="col-md-8 text-right">
+          <div class="col-md-8 text-right photo-attribution">
             Image credit: <a href="https://www.flickr.com/photos/richard_jones/14638274749" title="Photo from DjangoGirls Brisbane 2014">DjangoGirls Brisbane</a>, &copy; 2014 Richard Jones (<a href="https://creativecommons.org/licenses/by/2.0/" title="Creative Commons Attribute 2.0 Generic License">CC BY 2.0</a>)
           </div>
         </div>

pinaxcon/templates/static_pages/news.html

➞

Show inline comments

@@ ... / @@ -30,7 +30,7 @@ @@
 <p><span class="date">Wednesday, August 16, 2017</span>&mdash;We are proud to announce that North Bay Python is now a member project of <a href="https://sfconservancy.org" title="Software Freedom Conservancy">Software Freedom Conservancy</a>, a 501(c)(3) charity dedicated to ethical technology and the development and promotion free and open source software. Conservancy will act as our fiscal sponsor, allowing our team to operate without managing our own corporate structure and administrative services.</p>
 <p>Conservancy is home to many popular <a href="https://sfconservancy.org/projects/current/" title="Current Member Projects of the Software Freedom Conservancy">free and open source software projects</a>, like <a href="http://www.seleniumhq.org/" title="Selenium">Selenium</a>, <a href="https://www.phpmyadmin.net/" title="phpMyAdmin">phpMyAdmin</a>, <a href="https://twistedmatrix.com/trac/" title="Twisted">Twisted</a>, and <a href="https://www.gnome.org/outreachy/" title="Outreachy">Outreachy</a>, some of which run their own events. North Bay Python has the distinct honor of being the first member project that is exclusively focused on organizing community events.</p>
+<p>Conservancy is home to many popular <a href="https://sfconservancy.org/projects/current/" title="Current Member Projects of the Software Freedom Conservancy">free and open source software projects</a>, like <a href="http://www.seleniumhq.org/" title="Selenium">Selenium</a>, <a href="https://pypy.org/" title="PyPy">PyPy</a>, <a href="https://www.phpmyadmin.net/" title="phpMyAdmin">phpMyAdmin</a>, <a href="https://twistedmatrix.com/trac/" title="Twisted">Twisted</a>, and <a href="https://www.gnome.org/outreachy/" title="Outreachy">Outreachy</a>, some of which run their own events. North Bay Python has the distinct honor of being the first member project that is exclusively focused on organizing community events.</p>
 <p>We couldn't be more excited. We're celebrating by donating five free tickets to Outreachy participants and will be promoting member projects relevant to the Python community at the conference. Interested Outreachy alums (past or present) should <a href="mailto:outreach@northbaypython.org" title="outreach@northbaypython.org">contact us</a>. We'll also have discounted tickets available for active financial supporters of Software Freedom Conservancy.</p>

requirements/base.txt

➞

Show inline comments

 Django>=1.11,<1.12
 boto3==1.4.6
 pinax-theme-bootstrap==7.3.0
 django-user-accounts==1.3.1
 metron==1.3.7
@@ ... / @@ -7,6 +8,8 @@ dj-static==0.0.6 @@
 dj-database-url==0.4.0
 pinax-pages==0.4.2
 pinax-boxes==2.1.2
 django-ssl-redirect==2.0
 django-storages==1.6.5
 django-libsass==0.7
 django-markdown-deux==1.0.5
 django-sitetree==1.8.0

static/scss/custom.scss

➞

Show inline comments

@@ ... / @@ -259,8 +259,6 @@ $homepage-block-min-height: 480px; @@
   background-image: url("../images/django-girls-2014.jpg");
+}
 .sponsor-list a img {
   width: 100%;
+}

0 comments (0 inline, 0 general)