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

@@ ... @@
 # 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)
@@ ... / @@ -82,2 +87,10 @@ STATICFILES_FINDERS = [ @@
 # 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.
@@ ... / @@ -120,2 +133,4 @@ MIDDLEWARE_CLASSES = [ @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "ssl_redirect.middleware.SSLRedirectMiddleware",
+]

pinaxcon/templates/_footer.html

➞

Show inline comments

@@ ... / @@ -3,3 +3,3 @@ @@
-  <div class="col-xs-1 col-md-1" >
+  <div class="logo">
     <div class="circle">
@@ ... / @@ -9,3 +9,3 @@ @@
-  <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>
@@ ... / @@ -17,7 +17,4 @@ @@
       | <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>

pinaxcon/templates/static_pages/about/team.html

➞

Show inline comments

@@ ... @@
   <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>
@@ ... @@
 <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

@@ ... / @@ -29,3 +29,3 @@ @@
           <h4>
-            <strong>2017 conference:</strong> December 2 &amp; 3 <br/>
+            December 2 &amp; 3, 2017<br/>
             Talk submissions open August 21
@@ ... / @@ -33,6 +33,6 @@ @@
         </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>
@@ ... / @@ -95,3 +95,3 @@ @@
           <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>)
@@ ... / @@ -160,3 +160,3 @@ @@
           <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>)

pinaxcon/templates/static_pages/news.html

➞

Show inline comments

...		@@ -32,3 +32,3 @@

		<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>

requirements/base.txt

➞

Show inline comments

 Django>=1.11,<1.12
 boto3==1.4.6
 pinax-theme-bootstrap==7.3.0
@@ ... / @@ -9,2 +10,4 @@ pinax-pages==0.4.2 @@
 pinax-boxes==2.1.2
 django-ssl-redirect==2.0
 django-storages==1.6.5
 django-libsass==0.7

static/scss/custom.scss

➞

Show inline comments

...		@@ -261,4 +261,2 @@ $homepage-block-min-height: 480px;



		.sponsor-list a img {

0 comments (0 inline, 0 general)