Merge pull request mixxxdj#44 from radusuciu/hotfix_get-involved

Add needed clearfix to get-involved page + misc fixes
m0dB · Oct 14, 2018 · a7a0a9f · a7a0a9f
2 parents 19458a6 + b624bf1
commit a7a0a9f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/pages/contact.html b/pages/contact.html
@@ -29,7 +29,7 @@ <h1>{% trans "Get in Touch" %}</h1>
   <div style="text-align: center;">
     <h2>{% trans "Credits" %}</h2>
     <p>
-      {% blocktrans with tue_anderson_link="http://haste.dk/tue/"%}In 2001, Mixxx was started by Ken and <a href="{{ tue_anderson_link }}">Tue</a> Haste Andersen. Today, development is done by an open source development team from around the world, led by RJ Ryan (Lead Developer), Owen Williams (User Experience Lead), Sean Pappalardo (Controller Manager), and S. Brandt (Lead Artist).{% endblocktrans %}
+      {% blocktrans with tue_anderson_link="https://web.archive.org/web/http://haste.dk/tue/"%}In 2001, Mixxx was started by Ken and <a href="{{ tue_anderson_link }}">Tue</a> Haste Andersen. Today, development is done by an open source development team from around the world, led by RJ Ryan (Lead Developer), Owen Williams (User Experience Lead), Sean Pappalardo (Controller Manager), and S. Brandt (Lead Artist).{% endblocktrans %}
     </p>
 
     <p class="credits"><b>{% trans "Mixxx 2.0.0 Development Team" %}</b></p>
@@ -129,7 +129,7 @@ <h2>{% trans "Credits" %}</h2>
 
     <p class="credits"><b>{% trans "Past Developers" %}</b></p>
     <p class="credits">
-      <a href="http://haste.dk/tue/">Tue Haste Andersen</a><br/>
+      <a href="https://web.archive.org/web/http://haste.dk/tue/">Tue Haste Andersen</a><br/>
       Ken Haste Andersen<br/>
       Cedric Gestes<br/>
       John Sully<br/>
@@ -144,7 +144,7 @@ <h2>{% trans "Credits" %}</h2>
       Pawel Bartkiewicz<br/>
       Nick Guenther<br/>
       <a href="http://themodelnation.com/contact/">Adam Davison</a><br/>
-      <a href="http://stacktrace.org/">Garth Dahlstrom</a><br/>
+      <a href="https://web.archive.org/web/2009/http://stacktrace.org/">Garth Dahlstrom</a><br/>
       <a href="http://www.santoni.ca/albert">Albert Santoni</a><br/>
       Phillip Whelan<br/>
       Tobias Rafreider<br/>

diff --git a/pages/get-involved.html b/pages/get-involved.html
@@ -10,6 +10,7 @@ <h1 style="display:inline-block">{% trans "Get Involved" %}</h1>
   <div style="padding-top: 5px; float: right;">
     <h2><a href="#djs">{% trans "Not a coder? Scroll down!" %}</a></h2>
   </div>
+  <div style="clear:both"></div>
   <div class="halfbox_left">
     <h2>{% trans "Software Developers" %}</h2>
     <p>

diff --git a/pages/support.html b/pages/support.html
@@ -48,7 +48,7 @@ <h2>{% trans "Zulip Chat" %}</h2>
   <div class="halfbox_left">
     <h2>{% trans "Mailing List" %}</h2>
     <p>
-      {% blocktrans with mailing_list_link="https://lists.sourceforge.net/lists/listinfo/mixxx-devel" sourceforge_archive_link="http://sourceforge.net/mailarchive/forum.php?forum=mixxx-devel" gmane_archive_link="http://news.gmane.org/gmane.comp.multimedia.mixxx.devel" %}The <a href="{{ mailing_list_link}} ">mixxx-devel</a> mailing list (<a href="{{ sourceforge_archive_link }}">SourceForge</a> and <a href="{{ gmane_archive_link }}">Gmane</a> archives) is now a low-traffic, mostly announcement channel. Subscribe if you would like to be informed about new releases and other topics. {% endblocktrans %}
+      {% blocktrans with mailing_list_link="https://lists.sourceforge.net/lists/listinfo/mixxx-devel" sourceforge_archive_link="https://sourceforge.net/p/mixxx/mailman/mixxx-devel/" the_mail_archive_link="https://www.mail-archive.com/mixxx-devel@lists.sourceforge.net/" %}The <a href="{{ mailing_list_link}} ">mixxx-devel</a> mailing list (<a href="{{ sourceforge_archive_link }}">SourceForge</a> and <a href="{{ the_mail_archive_link }}">The Mail Archive</a> archives) is now a low-traffic, mostly announcement channel. Subscribe if you would like to be informed about new releases and other topics.{% endblocktrans %}
     </p>
   </div>
 

diff --git a/static/css/mixxx.css b/static/css/mixxx.css
@@ -1,3 +1,6 @@
+@charset "utf-8";
+
+/* styles for html, body and wrapper */
 html, body
 {
     margin: 0;
@@ -29,6 +32,7 @@ body
     box-shadow: 0px 15px 15px #444444; /* Opera 10.5, IE9, Chrome 10+ */
 }
 
+/* styles for general elements */
 a
 {
   /* color: #d0d0d0; very light grey */
@@ -77,6 +81,7 @@ img.center
     margin: 0 auto;
 }
 
+/* styles for rest of page */
 #navbar
 {
     font-size: 1.4em;
@@ -304,6 +309,7 @@ p#navbar_tinylinks
     text-align: center;
 }
 
+/* media query styles */
 /* squish menu items together for tablet style screens */
 @media only screen and (max-width: 1100px)
 {
@@ -441,6 +447,7 @@ switch to hamburger menu
 }
 
 
+/* styles for hamburger menu component */
 /*
  * Made by Erik Terwan
  * 24th of November 2015

diff --git a/templates/footer.html b/templates/footer.html
@@ -2,7 +2,7 @@
   <H2>Spread the Word</H2>
 
   <div style="width: 440px; float: left;">
-    <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FMIXXX-Digital-DJ%2F21723485212&amp;layout=standard&amp;show_faces=false&amp;width=440&amp;action=like&amp;colorscheme=dark&amp;height=24" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:440px; height:24px;" allowtransparency="true"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FMIXXX-Digital-DJ%2F21723485212&amp;layout=standard&amp;show_faces=false&amp;width=440&amp;action=like&amp;colorscheme=dark&amp;height=24" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:440px; height:24px;" allowtransparency="true"></iframe>
   </div>
 
   <div style="clear: both;"></div>