comparing

.gitignore

@@ -1,4 +1,4 @@
 _site/
 .DS_Store
-.iml
+*.iml
 .idea

README.md

@@ -1,5 +1,22 @@
-Source code for Mockito site hosted at http://mockito.github.io/. The site needs love and polishing. If you want to contribute styling or content - for sure let us know at the [mailing list](http://groups.google.com/group/mockito) or send an email to szczepiq at gmail. We would really appreciate help!
+# About
 
+Source code for Mockito site hosted at http://mockito.github.io/.
 Mockito source code lives at https://github.com/mockito/mockito.
 
-The site is built with Jekyll and [github.com/t413/SinglePaged](https://github.com/t413/SinglePaged) theme.
+# Contributing to the website
+
+The site is built with Jekyll and based on the [github.com/t413/SinglePaged](https://github.com/t413/SinglePaged) theme.
+
+Clone this repository and install Jekyll:
+
+    sudo gem install github-pages
+
+If you get permission problems on latest Mac OSx try:
+
+	sudo gem install -n /usr/local/bin/ github-pages
+
+Then you can serve with Jekyll:
+
+    jekyll serve -w
+
+Whenever you modify any file, the website is automatically reloaded in the browser.

_config.yml

@@ -3,19 +3,19 @@
 
 ### site serving configuration ###
 exclude: [CNAME, README.md, .gitignore]
-permalink: / ## disables post output
+permalink: /:title ## disables post output
 timezone: null
 lsi: false
 markdown: kramdown
-highlighter: pygments
+highlighter: rouge
 
 
 ### content configuration ###
 title:       "Mockito framework site"
 keywords:    "java, mocking, mock, mock objects, testing, tdd, unit tests"
 description: "A landing page for information about Mockito framework, a mocking framework for unit tests written in Java."
 source_link: "https://github.com/mockito/mockito"
-favicon:     #put a path like: "img/favicon.ico"
+favicon:     "favicon.ico"
 touch_icon:  #put a path like: "img/apple-touch-icon.png"
 google_analytics_key: ## put YOUR key here to enable tracking! (blank to disable)
 
@@ -29,4 +29,6 @@ colors:
   purple:    '#c869bf'
   orange:    '#fab125'
   turquoise: '#0fbfcf'
-
+
+kramdown:
+  auto_ids:  false

_includes/css/base.css

@@ -52,7 +52,7 @@
 ================================================== */
 	body {
 		background: #fff;
-		font: 14px/21px "Raleway" "HelveticaNeue-Light", Arial, sans-serif;
+		font: 14px/21px "Raleway", "HelveticaNeue-Light", Arial, sans-serif;
 		color: #444;
 		-webkit-font-smoothing: antialiased; /* Fix for webkit rendering */
 		-webkit-text-size-adjust: 100%;
@@ -100,7 +100,7 @@
 /* #Lists
 ================================================== */
 	ul, ol { margin-bottom: 20px; }
-	ul { list-style: none outside; text-align: left; }
+	ul { list-style: none outside; }
 	ol { list-style: decimal; }
 	ul, ul.square { list-style: square outside; }
 	ul ul, ul.circle { list-style: circle outside; }
@@ -267,26 +267,33 @@
   ================================================== */
 
 
-.highlighttable {
+.highlight {
   color: #f8f8f2;
   table-layout: fixed;
   white-space: nowrap;
   width:90%;
 }
 
-.highlighttable pre, .highlighttable code { display:block; margin:0; padding:0; background: none; overflow:auto; word-wrap: normal; }
+.highlight pre, .highlight code {
+  display:block;
+  margin:0;
+  padding:2px;
+  background: none;
+  overflow:auto;
+  word-wrap: normal;
+}
 
 .highlight, .linenodiv {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQIHWPQ1dU1BgABzQC7XXMTYQAAAABJRU5ErkJggg==);
   display:block;
   padding: 10px;
   margin-bottom:20px;
 }
-.linenodiv, .lineno { color: #ccc; }
+.gutter, .lineno { color: #ccc; }
 
-td.linenos { width: 40px; }
+td.gl { width: 40px; }
 
-.linenodiv {
+.gutter {
   border-right: none;
   padding: 10px;
   text-align: right;
@@ -363,4 +370,4 @@ span.lineno {
 .gh { } /* Generic Heading & Diff Header */
 .gu { color: #75715e; } /* Generic.Subheading & Diff Unified/Comment? */
 .gd { color: #f92672; } /* Generic.Deleted & Diff Deleted */
-.gi { color: #a6e22e; } /* Generic.Inserted & Diff Inserted */
+.gi { color: #a6e22e; } /* Generic.Inserted & Diff Inserted */

_includes/css/main.css

@@ -5,6 +5,27 @@ html { box-sizing: border-box; }
 /* ----- Special Styles ----- */
 /* ---------------------------*/
 
+/* ----- background line ----- */
+
+.background-heading-line {
+  font-size: 0.9em;
+  display: table;
+  white-space: nowrap;
+}
+
+.background-heading-line:before,
+.background-heading-line:after {
+  top: 0.6em;
+  border-top: 1px dashed #2e2e2e;
+  position: relative;
+  content: '';
+  display: table-cell;
+  width: 45%;
+}
+
+.background-heading-line:before { right: 1.5%; }
+.background-heading-line:after { left: 1.5%; }
+
 /* ----- colors (autogenerated from _config.yml)----- */
 
 {% for c in site.colors %}
@@ -31,8 +52,8 @@ html { box-sizing: border-box; }
 code, pre { font-family: Monaco, Menlo, Consolas, "Courier New", monospace; }
 
 /* spesifically inline code */
-code {
-  background: rgba(51,51,51,0.9);
+code, pre {
+  background: rgba(255,255,255,0.2);
   display: inline;
   word-wrap: break-word;
 }
@@ -43,11 +64,14 @@ pre {
   display: block;
   margin: 20px 5%;
   padding: 4px 8px;
-  background: rgba(51,51,51,0.9);
+  background: rgba(255,255,255,0.1);
   word-wrap: break-word;
 }
 
-.highlighttable { margin:20px 5%; }
+.highlight {
+  margin:20px 5%;
+  padding: 5px;
+}
 
 
 /* ----- base elements ----- */
@@ -135,7 +159,7 @@ nav ul {
 nav ul li {
   display:inline-block;
   border-top:{{navborder}}px solid;
-  padding: {{navborder}}px 0;
+  padding: {{navborder}}px;
   *display:inline;
   zoom:1;
   line-height:normal;

_includes/css/pygments.native.css

@@ -0,0 +1,70 @@
+.highlight pre { background-color: #404040 }
+.highlight .hll { background-color: #404040 }
+.highlight .c { color: #999999; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .g { color: #d0d0d0 } /* Generic */
+.highlight .k { color: #6ab825; font-weight: bold } /* Keyword */
+.highlight .l { color: #d0d0d0 } /* Literal */
+.highlight .n { color: #d0d0d0 } /* Name */
+.highlight .o { color: #d0d0d0 } /* Operator */
+.highlight .x { color: #d0d0d0 } /* Other */
+.highlight .p { color: #d0d0d0 } /* Punctuation */
+.highlight .cm { color: #999999; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #cd2828; font-weight: bold } /* Comment.Preproc */
+.highlight .c1 { color: #999999; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #e50808; font-weight: bold; background-color: #520000 } /* Comment.Special */
+.highlight .gd { color: #d22323 } /* Generic.Deleted */
+.highlight .ge { color: #d0d0d0; font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #d22323 } /* Generic.Error */
+.highlight .gh { color: #ffffff; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #589819 } /* Generic.Inserted */
+.highlight .go { color: #cccccc } /* Generic.Output */
+.highlight .gp { color: #aaaaaa } /* Generic.Prompt */
+.highlight .gs { color: #d0d0d0; font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #ffffff; text-decoration: underline } /* Generic.Subheading */
+.highlight .gt { color: #d22323 } /* Generic.Traceback */
+.highlight .kc { color: #6ab825; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #6ab825; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #6ab825; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #6ab825 } /* Keyword.Pseudo */
+.highlight .kr { color: #6ab825; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #6ab825; font-weight: bold } /* Keyword.Type */
+.highlight .ld { color: #d0d0d0 } /* Literal.Date */
+.highlight .m { color: #3677a9 } /* Literal.Number */
+.highlight .s { color: #ed9d13 } /* Literal.String */
+.highlight .na { color: #bbbbbb } /* Name.Attribute */
+.highlight .nb { color: #24909d } /* Name.Builtin */
+.highlight .nc { color: #447fcf; text-decoration: underline } /* Name.Class */
+.highlight .no { color: #40ffff } /* Name.Constant */
+.highlight .nd { color: #ffa500 } /* Name.Decorator */
+.highlight .ni { color: #d0d0d0 } /* Name.Entity */
+.highlight .ne { color: #bbbbbb } /* Name.Exception */
+.highlight .nf { color: #447fcf } /* Name.Function */
+.highlight .nl { color: #d0d0d0 } /* Name.Label */
+.highlight .nn { color: #447fcf; text-decoration: underline } /* Name.Namespace */
+.highlight .nx { color: #d0d0d0 } /* Name.Other */
+.highlight .py { color: #d0d0d0 } /* Name.Property */
+.highlight .nt { color: #6ab825; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #40ffff } /* Name.Variable */
+.highlight .ow { color: #6ab825; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #666666 } /* Text.Whitespace */
+.highlight .mf { color: #3677a9 } /* Literal.Number.Float */
+.highlight .mh { color: #3677a9 } /* Literal.Number.Hex */
+.highlight .mi { color: #3677a9 } /* Literal.Number.Integer */
+.highlight .mo { color: #3677a9 } /* Literal.Number.Oct */
+.highlight .sb { color: #ed9d13 } /* Literal.String.Backtick */
+.highlight .sc { color: #ed9d13 } /* Literal.String.Char */
+.highlight .sd { color: #ed9d13 } /* Literal.String.Doc */
+.highlight .s2 { color: #ed9d13 } /* Literal.String.Double */
+.highlight .se { color: #ed9d13 } /* Literal.String.Escape */
+.highlight .sh { color: #ed9d13 } /* Literal.String.Heredoc */
+.highlight .si { color: #ed9d13 } /* Literal.String.Interpol */
+.highlight .sx { color: #ffa500 } /* Literal.String.Other */
+.highlight .sr { color: #ed9d13 } /* Literal.String.Regex */
+.highlight .s1 { color: #ed9d13 } /* Literal.String.Single */
+.highlight .ss { color: #ed9d13 } /* Literal.String.Symbol */
+.highlight .bp { color: #24909d } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #40ffff } /* Name.Variable.Class */
+.highlight .vg { color: #40ffff } /* Name.Variable.Global */
+.highlight .vi { color: #40ffff } /* Name.Variable.Instance */
+.highlight .il { color: #3677a9 } /* Literal.Number.Integer.Long */

_posts/2000-01-01-intro.md

@@ -4,34 +4,58 @@ color: black
 style: center
 ---
 ### Tasty mocking framework for unit tests in Java
-![Mockito](img/mockito-logo-small.svg)
 
-[![Build Status](https://travis-ci.org/mockito/mockito.svg?branch=master)](https://travis-ci.org/mockito/mockito)
-[![Coverage Status](http://img.shields.io/coveralls/mockito/mockito/master.svg)](https://coveralls.io/r/mockito/mockito)
-[![Current release](https://api.bintray.com/packages/szczepiq/maven/mockito/images/download.svg)](https://bintray.com/szczepiq/maven/mockito/_latestVersion)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.mockito/mockito-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.mockito/mockito-core)
+<img alt="Mockito" src="https://github.com/mockito/mockito.github.io/raw/master/img/logo%402x.png" width="400">
 
-### Current release
 
-See the [release notes page](https://github.com/mockito/mockito/blob/master/doc/release-notes/official.md) and [latest documentation](http://mockito.github.io/mockito/docs/current/org/mockito/Mockito.html).
+<div markdown="1">
 
-### Project status
+[![Build Status](https://travis-ci.org/mockito/mockito.svg?branch=release/2.x)](https://travis-ci.org/mockito/mockito)
+[![Coverage Status](https://img.shields.io/codecov/c/github/mockito/mockito.svg)](https://codecov.io/github/mockito/mockito)
+[![MIT License](http://img.shields.io/badge/license-MIT-green.svg)](https://github.com/mockito/mockito/blob/master/LICENSE)
 
-* Continuously [delivering new version](https://github.com/mockito/mockito/blob/master/doc/release-notes/official.md) for every git push that passes the build
-* Moving away from [Google Code](https://code.google.com/p/mockito/) to [GitHub](https://github.com/mockito/mockito) (GitHub, you're awesome, thank you!)
-* Releasing [2.0 final](https://github.com/mockito/mockito/issues/123) by the end of March '15
-* Compatible with JDK8 with exception of defender methods
+[![Latest 2.x on bintray](https://api.bintray.com/packages/mockito/maven/mockito-development/images/download.svg)](https://bintray.com/mockito/maven/mockito-development/_latestVersion)
+[![Latest 2.x on Maven Central](https://maven-badges.herokuapp.com/maven-central/org.mockito/mockito-core/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/org.mockito/mockito-core)
+
+</div>
+
+
+
+
+
+
+### Current version is <strong>2</strong>
+
+Still on Mockito 1.x? See [what's new in Mockito 2](https://github.com/mockito/mockito/wiki/What%27s-new-in-Mockito-2)!
+
+See the [release notes page](https://github.com/mockito/mockito/blob/release/2.x/doc/release-notes/official.md)
+and [latest documentation](http://javadoc.io/page/org.mockito/mockito-core/latest/org/mockito/Mockito.html)
+(docs in javadoc.io are available 24h after release). 
+
+Older 1.x releases are available in [Central Repository](http://search.maven.org/#artifactdetails%7Corg.mockito%7Cmockito-core%7C1.10.19%7C)
+, [Bintray](https://bintray.com/mockito/maven/mockito/1.10.19/view) and [javadoc.io](http://www.javadoc.io/doc/org.mockito/mockito-core/1.10.19) (documentation).
+
+### Project status updates
+
+Updates are announced via [Twitter](https://twitter.com/mockitojava) <img alt="Twitter logo" src="https://g.twimg.com/dev/img/marketing/twitter-for-websites/header-logo.png" width="21" height="21"> and [mailing list] <img alt="Google Groups" src="https://groups.google.com/forum/favicon.ico" width="21" height="21">.
+
+After releasing Mockito 2 (<a href="https://github.com/mockito/mockito/wiki/What%27s-new-in-Mockito-2">see what's new</a>) the team will continue to improve version 2.x for a short time, then focus on Mockito 3.
+Please provide your feedback and suggestions for the scope of Mockito 3.x using the above two channels and <a href="https://github.com/mockito/mockito/issues">GitHub issue tracker</a>.
+Mockito 3.x will target Java 8.
 
 ### Contributions welcome
 
 Fancy getting world-wide visibility and building up an eternal fame of an OSS contributor?
 
 * Help the [project site](https://github.com/mockito/mockito.github.io) look decent and match the quality of the library!
-* [Contribute](https://github.com/mockito/mockito/wiki/How%20To%20Contribute) a pull request! It is automatically released via state-of-art [continuous delivery automation](http://szczepiq.blogspot.com/2014_08_01_archive.html).
-* Use latest version! Hack and experiment. Speak up at the [mailing list](http://groups.google.com/group/mockito). Report [issues and new features](https://github.com/mockito/mockito/issues).
+* [Contribute](https://github.com/mockito/mockito/blob/master/.github/CONTRIBUTING.md) a pull request! It is automatically released via state-of-art [continuous delivery automation](http://szczepiq.blogspot.com/2014_08_01_archive.html).
+* Use latest version! Hack and experiment. Speak up at the [mailing list]. Report [issues and new features](https://github.com/mockito/mockito/issues).
 
 <span id="forkongithub">
   <a href="{{ site.source_link }}" class="bg-green">
     Fork me on GitHub
   </a>
-</span>
+</span>
+
+
+[mailing list]: https://groups.google.com/group/mockito

_posts/2000-01-02-why.md

@@ -7,13 +7,13 @@ fa-icon: glass
 ## Why drink it?
 
 Mockito is a mocking framework that tastes really good.
-It lets you write beautiful tests with clean & simple API.
+It lets you write beautiful tests with a clean & simple API.
 Mockito doesn't give you hangover because the tests are very readable and they produce clean verification errors.
-Read more about [features & motivations](https://code.google.com/p/mockito/wiki/FeaturesAndMotivations).
+Read more about [features & motivations](https://github.com/mockito/mockito/wiki/Features-And-Motivations).
 
 * Massive StackOverflow community voted Mockito the best mocking framework for java.
 Even though StackOverflow shuns questions that likely raise emotional debates the fact is
-[Mockito has most votes](http://stackoverflow.com/questions/22697/whats-the-best-mock-framework-for-java).
+[Mockito has the most votes](http://stackoverflow.com/questions/22697/whats-the-best-mock-framework-for-java).
 You can add your vote, too!
 
 * Top 10 Java library across all libraries, not only the testing tools.
@@ -31,5 +31,6 @@ Treat this study as an indicator of a big impact that Mockito makes every day on
 
     Given the current popularity of Mockito, Dan was spot on with his prediction.
 
-Use your own judgement in choosing the testing framework.
-Mockito team always respects your choice. Keep writing great tests every day!
+Use your own judgement in choosing a testing framework.
+The Mockito team always respects your choice. Keep writing great tests every day!
+

_posts/2000-01-10-how.md

@@ -12,7 +12,7 @@ With [Gradle](http://gradle.org) one can do:
 
 {% highlight Groovy %}
 repositories { jcenter() }
-dependencies { testCompile "org.mockito:mockito-core:1.+" }
+dependencies { testCompile "org.mockito:mockito-core:2.+" }
 {% endhighlight %}
 
 Maven users can declare a [dependency on mockito-core](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.mockito%22%2C%20a%3A%22mockito-core%22).