CopyleftConf/copyleftconf-website Changeset - 7fdeb0f81298

Changeset - 7fdeb0f81298

Parent rev.

Child rev.

[Not reviewed]

Merge

0 2 0

Christopher Neugebauer - 7 years ago 2017-08-31 00:16:22
chrisjrn@gmail.com

Merge branch 'master' into prod

2 files changed with 22 insertions and 2 deletions:

pinaxcon/templates/static_pages/homepage.html

static/scss/custom.scss

0 comments (0 inline, 0 general)

pinaxcon/templates/static_pages/homepage.html

➞

Show inline comments

@@ ... / @@ -23,148 +23,150 @@ @@
         <div class="col-md-6">
           <h3>
             The Mystic Theatre</br>
             Petaluma, California
           </h3>
           <h4>
             December 2 &amp; 3, 2017<br/>
             Talk submissions close September 29
           </h4>
         </div>
         <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>
             </div>
             <div class="panel-body">
               <form
                 class="form-inline"
                 action="https://tinyletter.com/northbaypython" method="post" target="popupwindow" onsubmit="window.open('https://tinyletter.com/northbaypython', 'popupwindow', 'scrollbars=yes,width=800,height=600');return true">
                 <div class="form-group">
                   <span>
                     <label class="hidden-accessible" for="tlemail">Email address:</label>
                   </span>
                   <span>
                     <input class="form-control" type="email" name="email" id="tlemail" placeholder="E-mail address"/>
                   </span>
                 </div>
                 <span>
                   <input class="btn btn-primary" type="submit" value="Subscribe" />
                 </span>
                 <input type="hidden" value="1" name="embed"/>
               </form>
             </div>
           </div>
         </div>
       </div>
     </div>
     <div class="container homepage-block-footer">
       <div>
         <a class="btn btn-primary btn-lg" href="/dashboard">Submit a Proposal</a>
         <a class="btn btn-default btn-lg " href="https://twitter.com/northbaypython">Twitter</a>
         <a class="btn btn-default btn-lg" href="https://facebook.com/northbaypython">Facebook</a>
       </div>
     </div>
   </div>
   <div class="jumbotron homepage-block dark">
     <div class="homepage-block-bg mystic-background"></div>
     <div class="container homepage-block-content">
       <h1>Downtown Petaluma</h1>
       <p>North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the edge of California's Wine Country. Here's what you can look forward to:</p>
       <ul>
         <li>An historic venue with countless restaurants and coffee shops in walking distance</li>
         <li>World-famous craft food and drink producers on your doorstep</li>
         <li>Charming small-town hotels, as close as one block away</li>
       </ul>
       <p>&hellip; and it's only an hour away from San Francisco (on a good day).</p>
     </div>
     <div class="homepage-block-footer full-width">
       <div class="container">
         <div class="row">
           <div class="btn-group col-md-4">
             <a class="btn btn-lg btn-primary btn-shadow" href="/about/north-bay-python">Learn More</a>
           </div>
           <div class="col-md-8 text-right photo-attribution">
             Image credit: <a href="https://www.instagram.com/p/BU-G5dGAkHt">Mystic Theatre</a>, &copy; 2017 Christopher Neugebauer (<a href="https://creativecommons.org/licenses/by-sa/2.0/">CC BY-SA 2.0</a>)
           </div>
         </div>
       </div>
     </div>
   </div>
   <div class="jumbotron homepage-block white">
     <div class="container homepage-block-content">
       <h1>Sponsors</h1>
       {% load sponsorship_tags %}
       {% load thumbnail %}
       {% sponsor_levels as levels %}
       <div class="row sponsor-list">
       {% for level in levels %}
           {% if level.sponsors %}
               {% for sponsor in level.sponsors %}
                   <div class="sponsor">
                     <div class="logo-alignment">
                       {% if sponsor.website_logo %}
                           <a href="{{ sponsor.external_url }}">
                               <img src="{% thumbnail sponsor.website_logo '600x360' %}" alt="{{ sponsor.name }}">
                           </a>
                       {% else %}
                           <a href="{{ sponsor.external_url }}">{{ sponsor.name }}</a>
                       {% endif %}
                     </div>
                   </div>
               {% endfor %}
           {% endif %}
       {% endfor %}
       </div>
     </div>
     <div class="container homepage-block-footer">
       <div class="btn-group">
         <a class="btn btn-lg btn-primary btn-shadow" href="/sponsors/become-a-sponsor">Become a Sponsor</a>
       </div>
     </div>
   </div>
   <div class="jumbotron homepage-block dark">
     <div class="homepage-block-bg djangogirls-background"></div>
     <div class="container homepage-block-content">
       <h1>Inclusion and Diversity</h1>
       <p>North Bay Python is proud to be founded on a commitment to inclusion and diversity. Here's what we commit to:</p>
       <ul>
         <li>A strong Code of Conduct and enforcement policy built on the Python Software Foundation's PyCon US policy.</li>
         <li>Diversity targets for speakers and attendees.</li>
         <li>Financial assistance for speakers who need it.</li>
         <li>Low-cost tickets, with fees enthusiastically waived on request.</li>
       </ul>
     </div>
     <div class="homepage-block-footer full-width">
       <div class="container">
         <div class="row">
           <div class="btn-group col-md-4">
             <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 photo-attribution">
             Image credit: <a href="https://www.flickr.com/photos/richard_jones/14638274749">DjangoGirls Brisbane</a>, &copy; 2014 Richard Jones (<a href="https://creativecommons.org/licenses/by/2.0/">CC BY 2.0</a>)
           </div>
         </div>
       </div>
     </div>
   </div>
 {% endblock %}

static/scss/custom.scss

➞

Show inline comments

@@ ... / @@ -34,348 +34,366 @@ p.login-signup { @@
     margin-top: 20px;
+}
 .feature-columns {
     @include make-row();
     > div {
         i.fa {
             margin-bottom: 0.2em;
+        }
         @include make-sm-column(4);
         /*.text-center;
         margin: 2em 0;*/
+    }
+}
 body.reviews.review-list .review-list,
 body.reviews.voting-status .voting-status,
 body.reviews.review-results .review-results {
     z-index: 2; // Place active items above their siblings for proper border styling
     color: $list-group-active-color;
     background-color: $list-group-active-bg;
     border-color: $list-group-active-border;
+}
 body.reviews.voting-status {
     &.positive a.positive,
     &.negative a.negative,
     &.indifferent a.indifferent,
     &.controversial a.controversial,
     &.too_few a.too_few {
         z-index: 2;
         color: #333;
         background-color: #e6e6e6;
         border-color: #adadad;
         outline: 0;
         background-image: none;
         box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+    }
+}
 #accountLogOutForm {
     display: none;
+}
 .sponsor-list h3 {
     margin-top: 3em;
+}
 .sponsor-list > div {
     margin: 10px 0;
+}
 body.auth .panel-heading .panel-title span.pull-right {
     margin: 0 auto;
+}
 .home {
   margin: 0;
   padding-top: $navbar-height - $navbar-padding-vertical - 8;
+}
 .home#content_body {
   margin: 0;
   padding: 0;
+}
 #content_body {
   background-color: $background-filter-transparent;
   box-shadow: 0px 0px 2em $background-filter; //, inset 0px -5px 1em rgba(0, 0, 0, 0.8);
+}
 .hidden-accessible {
   border:0 none;
   clip:rect(0px,0px,0px,0px);
   height:1px;
   margin:-1px;
   overflow:hidden;
   padding:0;
   position:absolute;
   width:1px
+}
 $homepage-block-min-height: 480px;
 .homepage-block {
   margin-top: 0;
   margin-bottom: 0;
   min-height: $homepage-block-min-height;
   position: relative;
   box-shadow: $box-shadow;
   z-index: 3;
   .sponsor {
     $sponsor-height: 150px;
     @include make-xs-column(6);
     @include make-sm-column(4);
     @include make-md-column(3);
     max-width: 600px;
     height: $sponsor-height;
     .logo-alignment {
       max-width: 300px;
       width: 100%;
       height: 100%;
       // Center the icon horizontally and vertically
       text-align: center;
       line-height: ($sponsor-height - 5px);
       vertical-align: middle;
       a img {
         max-width: 100%;
         max-height: 100%;
+      }
+    }
+  }
+}
 .homepage-block-content {
   min-height: ($homepage-block-min-height - 80px);
+}
 /* ??? */
 .homepage-block-footer {
+}
 .homepage-block.light {
   background-color: $background-filter;
   z-index: 2;
+}
 .homepage-block.white {
   background-color: white;
   z-index: 1;
+}
 .homepage-block-bg {
   top: 0;
   bottom: 0;
   width: 100%;
   height: 100%;
   position: absolute;
   background-size: cover;
   background-position: center;
   opacity: 0.3;
   background-blend-mode: multiply;
   z-index: -9999;
   box-shadow: $box-shadow;
+}
 .homepage-block.dark {
   background: $gray-base;
   color: white;
   text-shadow: 1px 1px $gray-dark;
   a:not(.btn) {
     color: lighten($brand-primary, 20%);
     &:hover,
     &:focus,
     &:active {
       color: lighten($brand-primary, 15%);
+    }
+  }
+}
 .navbar {
   box-shadow: $box-shadow;
+}
 .navbar ul.navbar-nav > li > a,
 .navbar-header a.navbar-brand {
   &:active,
   &:focus,
   &:hover {
     background-color: #004303;
+  }
+}
 .tight-headings {
   h1, h2, h3, h4, h5, h6 {
     margin: 0.05em;
+  }
+}
 .btn-shadow {
   box-shadow: 1px 1px 5px $gray-dark;
+}
 .hills {
   background-size: 100%;
   background-position: bottom;
   background-repeat: no-repeat;
   width: 50%;
   height: 100%;
   position: absolute;
   bottom: 0;
   right: 0;
   z-index: -9999;
   &.main {
     background-image: url("../images/hills.svg");
+  }
   &.footer {
     background-image: url("../images/hills-footer.svg");
+  }
+}
 .circle {
   position: relative;
   border-radius: 100%;
   overflow: hidden;
   width: 100%;
   border: 0.05em solid black;
   box-shadow: 0px 0px 1em $gray-dark;
+}
 .circle:before {
   content: "";
   display: block;
   padding-top: 100%;
+}
 .fill {
   position: absolute;
   width: 100%;
   height: 100%;
   top: 0;
   bottom: 0;
   left: 0;
   right:0;
   background-size: cover;
   background-position: center;
+}
 .squish {
   position: relative;
   width: 70%;
   margin: auto;
   margin-top: 5%;
   margin-bottom: 5%;
+}
 .btn-group + p {
   margin-top: 1em;
+}
 .website-background {
   background-image: url("../images/website-background.svg");
+}
 .mystic-background {
   background-image: url("../images/mystic.jpg");
+}
 .djangogirls-background {
   background-image: url("../images/django-girls-2014.jpg");
+}
 .sponsor-list a img {
   width: 100%;
   max-width: 300px;
+}
 .sponsor-list {
   margin-top: 1em;
+}
 .full-width {
   width: 100%;
+}
 body.about {
   h2, h3, h4 {
     clear: both;
+  }
   .team-headshot {
     height: 150px;
     width: 150px;
     float: left;
     margin-right: 1em;
     margin-top: 0.25em;
     margin-bottom: 1em;
+  }
+}
 body.news {
   h2, .h2 {
     font-size: 28px;
+  }
+}
 body:not(.home) {
   #background-filter a:not(.btn) {
     text-decoration: underline;
+  }
+}
 span.date {
   font-weight: 900;
+}
 .email-signup-panel {
   max-width: 600px;
+}
 .logo {
   float: right !important;
   width: 80px;
   height: 80px;
   margin: 0 1em 2em 2em;
   .circle {
     width: 80px;
     height: 80px;
+  }
+}
 footer .footer-copy {
   margin-left: 1em;
+}
 @media (max-width: 1200px) and (min-width: 992px) {
   .email-signup-panel input.btn {
     margin-top: 1em;
+  }
+}
 @media (max-width: 992px) {
   .photo-attribution {
     margin-top: 1em;
     text-align: left;
+  }
   .email-signup-panel {
     margin-top: 2em;
+  }
+}
 @media (max-width: 768px) {
   .navbar-nav.pull-right {
     float: left !important;
+  }
+}
 @media (max-width: 992px) and (min-width: 768px) {
   .nav > li > a {
     padding: 15px 7px;
+  }
+}
 @media (max-width: 550px) {
+}
 @media (min-width: 992px) {

0 comments (0 inline, 0 general)