WIP Spring cleaning

.travis.yml

@@ -19,3 +19,5 @@ script:
 - bundle exec jekyll build 2> error.log
 - cat >&2 error.log
 - ( ! grep -qie Error error.log )
+- find ./_site \( -type d \( -name events -o -name training \) -prune -false \) -o \( -type f ! -name error.log -empty \)
+- find ./_site \( -type d \( -name events -o -name training \) -prune -false \) -o \( -type f ! -name error.log -empty \) | ( ! read )

_config.yml

@@ -4,5 +4,13 @@ scalaversion: "2.12.0"
 
 baseurl: ""
 markdown: kramdown
-exclude: [bundle-vendor]
+exclude:
+  - bundle-vendor/
+  - blog/README.md
+  - training/README.md
+  - README.md
+  - news/README.md
+  - events/README.md
+  - Gemfile
+  - Gemfile.lock
 future: true

_includes/footer.html

@@ -53,7 +53,6 @@
     <!-- jquery js -->
     <script src="{{ site.baseurl }}/resources/js/vendor/jquery-1.8.3.min.js" type="text/javascript" ></script>
     <script src="{{ site.baseurl }}/resources/js/vendor/jquery.stellar.min.js" type="text/javascript" ></script>
-    <script src="{{ site.baseurl }}/resources/js/vendor/tweetMachine.min.js" type="text/javascript" ></script>
 
     <!-- modernizr js -->
     <script src="{{ site.baseurl }}/resources/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js" type="text/javascript" ></script>

_layouts/page-full-width.html → _layouts/base.html

@@ -1,6 +1,4 @@
 ---
-layout: default
-toc: true
 ---
 
 {% include headertop.html %}
@@ -29,16 +27,7 @@ <h1 id="page-title">{{ page.title }}</h1>
 
 <div class="page-container">
   <div class="container" style="min-height: 540px;">
-    <div class="row">
-      <div class="span12">
-          <div class="main-page-column" style="width: 100%;">
-            {% if page.by %}
-              <div class="written">Written By: <span class="by">{{ page.by }}</span></div>
-            {% endif %}
-            {{ content }}
-          </div>
-      </div>
-    </div>
+    {{ content }}
   </div>
 </div>
 

_layouts/blog.html

@@ -1,53 +1,18 @@
 ---
-layout: default
-toc: true
+layout: base
 ---
 
-{% include headertop.html %}
-{% include headerbottom.html %}
-
-<div class="darkstrip"></div>
-
-<div class="darkbluetopbar">
-  <div class="container" style="height: 100%">
-    <div class="navbar-wrap">
-      <div class="container" style="position: relative; height: 100%;">
-        <div class="scala-logo">
-          <a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png" alt="white Scala logo" /></a>
-        </div>
-        {% include navbar.html %}
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="midbluebar">
-  <div class="container">
-    <h1 id="page-title">{{ page.title }}</h1>
-  </div>
+<div class="main-page-column">
+  <div class="article-date">{{ page.date | date: "%B %-d, %Y" }}</div>
+  {% if page.by %}
+    <div class="written">Written By: <span class="by">{{ page.by }}</span></div>
+  {% endif %}
+  {{ content }}
+  {% if page.disqus == true %}{% include disqus.txt %}{% endif %}
 </div>
-
-<div class="page-container">
-  <div class="container" style="min-height: 540px;">
-    <!-- <div class="row"> -->
-      <!-- <div class="span12"> -->
-          <div class="main-page-column">
-            <div class="article-date">{{ page.date | date: "%B %-d, %Y" }}</div>
-            {% if page.by %}
-              <div class="written">Written By: <span class="by">{{ page.by }}</span></div>
-            {% endif %}
-            {{ content }}
-            {% if page.disqus == true %}{% include disqus.txt %}{% endif %}
-          </div>
-          <div class="sidebar">
-            <div class="sidebar-inner">
-              <div id="toc"></div>
-            </div>
-          </div>
-          <div style="clear:both"></div>
-      <!-- </div> -->
-    <!-- </div> -->
+<div class="sidebar">
+  <div class="sidebar-inner">
+    <div id="toc"></div>
   </div>
 </div>
-
-{% include footer.html %}
+<div style="clear:both"></div>

_layouts/frontpage.html

@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 
 {% include headertop.html %}
@@ -12,8 +11,6 @@
       <div class="span12">
         <div class="scala-logo">
           <img src="{{ site.baseurl }}/resources/img/scala-logo-white.png" alt="Scala Logo" />
-          <!-- <div class="spiral-logo"><img src="{{ site.baseurl }}/resources/img/scala-spiral-white.png"/></div> -->
-          <!-- <div class="scala-text">Scala</div> -->
         </div>
         {% include navbar.html %}
       </div>
@@ -150,17 +147,6 @@ <h3>Higher-Order Functions</h3>
 <div id="hidden-pattern-matching">{% include bullet-pattern-matching.html %}</div>
 <div id="hidden-higher-order-functions">{% include bullet-higher-order-functions.html %}</div>
 
-<!-- <div class="highlighted-events">
-  <div class="container">
-    <div id="scaladays">
-      <a id="scaladays-register-btn" href="http://scaladays.org/">More Info</a>
-    </div>
-    <div id="scalawksp">
-      <a id="scalawksp-register-btn" href="http://lampwww.epfl.ch/~hmiller/scala2014">More Info</a>
-    </div>
-  </div>
-</div> -->
-
 <div class="events">
   <div class="container">
     <div class="row">
@@ -169,10 +155,6 @@ <h2><span>Upcoming Events</span></h2>
       </div>
 
       <div class="span12" id="eventspane">
-
-        <!-- <a id="event-btn" style="margin-top: 6px" href="{{ site.baseurl }}/events">More Events</a> -->
-        <!-- <div class="add-event">or <a href="https://github.com/scala/scala-lang/tree/master/events">add an event</a></div> -->
-
       </div>
     </div>
   </div>
@@ -188,10 +170,8 @@ <h2><span>Upcoming Events</span></h2>
         <h2><span>Upcoming Training</span></h2>
       </div>
       <div class="span12" id="trainingspane">
-
-        <!-- <span class="center"><a id="training-btn" href="{{ site.baseurl }}/training">More Training</a></span> -->
-        <!-- <div class="add-training">or <a href="https://github.com/scala/scala-lang/tree/master/training">add a training</a></div> -->
-        <div class="add-training"><a href="{{ site.baseurl }}/training">See more trainings</a> or <a href="https://github.com/scala/scala-lang/tree/master/training">add one to our feed</a></div>
+        <div class="add-training"><a href="{{ site.baseurl }}/training">See more trainings</a> or <a href="https://github.com/scala/scala-lang/tree/master/training">add one to our feed</a>
+        </div>
 
       </div>
     </div>
@@ -219,7 +199,9 @@ <h2 class="twitterhdr"><span>Scala on Twitter</span></h2>
     </div>
     <div class="row">
       <div class="span12">
-        <div id="tweets" class="tweets"></div>
+        <div id="tweets" class="tweets">
+          <a class="twitter-timeline" data-tweet-limit="4" data-chrome="noheader nofooter noborders" data-width="520" href="https://twitter.com/scala_lang">Tweets by scala_lang</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+        </div>
         <br/>&nbsp;
         <div class="see-more-tweets">See more tweets, or</div>
         <a id="twitter-btn" href="https://twitter.com/scala_lang">Follow Scala on Twitter</a>

_layouts/page.html

@@ -1,56 +1,22 @@
 ---
-layout: default
+layout: base
 ---
 
-{% include headertop.html %}
-{% include headerbottom.html %}
-
-<div class="darkstrip"></div>
-
-<div class="darkbluetopbar">
-  <div class="container" style="height: 100%">
-    <div class="navbar-wrap">
-      <div class="container" style="position: relative; height: 100%;">
-        <div class="scala-logo">
-          <a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png" alt="white Scala logo" /></a>
-        </div>
-        {% include navbar.html %}
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="midbluebar">
-  <div class="container">
-    <h1 id="page-title">{{ page.title }}</h1>
-  </div>
+<div class="main-page-column">
+  {% if page.by %}
+    <div class="written">Written By: <span class="by">{{ page.by }}</span></div>
+  {% endif %}
+  {{ content }}
 </div>
-
-<div class="page-container">
-  <div class="container" style="min-height: 540px;">
-    <!-- <div class="row"> -->
-      <!-- <div class="span12"> -->
-          <div class="main-page-column">
-            {% if page.by %}
-              <div class="written">Written By: <span class="by">{{ page.by }}</span></div>
-            {% endif %}
-            {{ content }}
-          </div>
-          <div class="sidebar">
-            <div class="sidebar-inner">
-              <div class="contents">Contents</div>
-              <div id="toc"></div>
-              <br/>
-              <div class="alert-info">
-                <a href="/contribute/documentation.html#updating-scala-langorg"><p><strong>Problem with this page?</strong>
-                Please help us fix it!</p></a>
-              </div>
-            </div>
-          </div>
-          <div style="clear:both"></div>
-      <!-- </div> -->
-    <!-- </div> -->
+<div class="sidebar">
+  <div class="sidebar-inner">
+    <div class="contents">Contents</div>
+    <div id="toc"></div>
+    <br/>
+    <div class="alert-info">
+      <a href="/contribute/documentation.html#updating-scala-langorg"><p><strong>Problem with this page?</strong>
+      Please help us fix it!</p></a>
+    </div>
   </div>
 </div>
-
-{% include footer.html %}
+<div style="clear:both"></div>