Merge branch 'master' of github.com:imagej/imagej.github.io

Author: frauzufall

_includes/about-menu

@@ -1,4 +1,4 @@
-<div class="about-menu">
+<div class="menu">
 <center><strong><h3>About</h3></strong></center>
 <table>
     <tbody>

_includes/git-menu

@@ -0,0 +1,18 @@
+{% include menu title="Git Tutorials" content=
+"
+| :---: |
+| [Git for dummies](/pages/Git_for_dummies) |
+| [Git in Eclipse(EGit)](/pages/EGit) |
+| |
+| [Git mini howto](/pages/Git_mini_howto) |
+| [Git workshop](/pages/Git_workshop) |
+| [Git conflicts](/pages/Git_Conflicts) |
+| [Git topic branches](/pages/Git_topic_branches) |
+| [Git Notes](/pages/Git_Notes) |
+| [Git reflogs](/pages/Git_reflogs) |
+| [Git submodule tutorial](/pages/Git_submodule_tutorial) |
+| [Pinpoint regressions with Git](/pages/Pinpoint_regressions_with_Git) |
+| [How to publish a Git repository](/pages/How_to_publish_a_Git_repository) |
+| [How to extract a subproject](/pages/How_to_extract_a_subproject)
+"
+%}

_includes/menu

@@ -1 +1,4 @@
-<div class="menu">{{include.content}}</div>
+<div class="menu" markdown="1">
+<center><strong><h3>{{include.title}}</h3></strong></center>
+{{include.content}}
+</div>

_includes/page-info

@@ -1,6 +1,6 @@
 <div class="page-info"> 
 
-    <a href="{{"https://github.com/imagej/imagej.github.io/edit/master"}}{{page.url | replace: ".html", ".md"}}">View source</a>
+    <a href="{{"https://github.com/imagej/imagej.github.io/edit/master"}}{{page.url | replace: ".html", ".md"}}">Edit page</a>
     <a href="{{"https://github.com/imagej/imagej.github.io/commits/master"}}{{page.url | replace: ".html", ".md"}}">History</a>
 
 </div>

_layouts/browse.html

@@ -12,9 +12,6 @@
 		<!-- Navigation bar-->
 		{% include nav-bar %}
 
-		<!-- Breadcrumb -->
-		{% include nav-bc %}
-
 		<!-- Page-info -->
 		{% include page-info %}
 

_layouts/page.html

@@ -14,9 +14,6 @@
 		<!-- Navigation bar-->
 		{% include nav-bar %}
 
-		<!-- Breadcrumb -->
-		{% include nav-bc %}
-
 		<!-- Page-info -->
 		{% include page-info %}
 

assets/css/main.css

@@ -2980,10 +2980,10 @@ input, select, textarea {
 		.sidebar a {font-size: 18px;}
 	}
 
-/* About-menu */
+/* Menu */
 
-	.about-menu {
-		max-width: 25%;
+	.menu {
+		max-width: 40%;
 		float: right;
 		z-index: 1;
 		top: 0;
@@ -2995,32 +2995,36 @@ input, select, textarea {
 		padding: 0.5em 1em 0.5em 1em;
 	}
 
-	.about-menu h3 {
+	.menu h3 {
 		margin: 0 0 0.5em 0 !important;
 	}
 
-	.about-menu table {
+	.menu table {
 		background-color: #f9f9f9;
 		border-collapse: collapse;
 		table-layout: fixed;
 		width: 100%;
 		text-align: left;
 	}
 
-	.about-menu tbody {
+	.menu tbody {
 		background-color: #f9f9f9;
 		text-align: left;
 	}
 
-	.about-menu tr {
+	.menu table tbody tr:nth-child(2n+1) {
+		background-color: #f9f9f9;
+	}
+
+	.menu tr {
 		text-align: left;
 	}
 
-	.about-menu td {
+	.menu td {
 		padding: 0 0 0 0;
 	}
 
-	.about-menu th {
+	.menu th {
 		background: lightgray;
 		font-variant: small-caps;
 		text-align: center;
@@ -3029,7 +3033,7 @@ input, select, textarea {
 		padding: 0 0.5em 0 0.5em;
 	}
 
-	.about-menu a {
+	.menu a {
 		padding: 0.1em 0 0 0;
 		text-decoration: none;
 		text-align: justify;
@@ -3041,7 +3045,7 @@ input, select, textarea {
 		margin-bottom: 0;
 	}
 
-	.about-menu p {
+	.menu p {
 		font-size: large;
 		text-align: justify;
 		font-weight: 500;

pages/demo-git-menu.md

@@ -0,0 +1,23 @@
+---
+title: Demo Git menu
+layout: page
+author: 
+categories: 
+description: This page demonstrates how to insert the Git menu.
+---
+
+## Usage
+
+{% raw %}
+```
+{% include git-menu %}
+```
+{% endraw %}
+
+{% include git-menu %}
+
+Lorem ipsum dolor sit amet, qui possit aeterno denique ea, te usu affert consequuntur, vix in utinam mentitum reformidans. Sed ea vidisse eripuit aliquid, no usu ullum dictas, an epicurei maluisset vix. Ne posse virtute impedit duo. Eos homero euripidis honestatis no.
+
+Sed ex magna honestatis, ea illud honestatis pri. Vix libris nemore suscipiantur cu. Offendit posidonium has ad, nec ad vocent maiorum consetetur. Vis ei iisque phaedrum atomorum, vis ea esse cetero. In est qualisque adipiscing reformidans, ut sint habeo libris quo.
+
+Mel tempor consetetur posidonium in, mei admodum mentitum ullamcorper cu. Ius no prima dolorum. Mea electram imperdiet adversarium in, vide reque ei sed. Ut duo putant dictas theophrastus. Ne vim etiam theophrastus, cu vel minimum detracto, modus possit phaedrum ius an. Noster nominavi persequeris has ex, brute mnesarchum intellegebat eu eum.

pages/demo-person.md

@@ -3,7 +3,7 @@ title: Demo people
 layout: page
 author: 
 categories: 
-description: this page demonstrates how to use the person include tag
+description: this page demonstrates how to use the person include tag.
 ---
 
 ## Usage

pages/feature_demo.md

@@ -16,6 +16,7 @@ description: This page is a feature demo.
 | Generate info/details box | [details-box]({{"/pages/demo-details-box" | relative_url}}) | 
 | Insert figure | [figure]({{"/pages/demo-figure" | relative_url}})
 | Link to github files | [github]({{"/pages/demo-github" | relative_url}}) |
+| Insert Git menu | [git-menu]({{"/pages/demo-git-menu" | relative_url}}) |
 | Insert images | [image]({{"/pages/demo-image" | relative_url}}) |
 | Insert a notice | [info-box]({{"/pages/demo-info-box" | relative_url}})
 | Insert logos | [logo]({{"/pages/demo-logo" | relative_url}}) |
@@ -25,7 +26,7 @@ description: This page is a feature demo.
 | Insert a sidebox | [sidebox]({{"/pages/demo-sidebox" | relative_url}})
 | Insert the SNT nav bar | [SNT-nav]({{"/pages/demo-SNT-nav" | relative_url}})|
 | Insert a tech box | [tech-box]({{"/pages/demo-tech-box" | relative_url}})
-| Insert a warning | [warning-box]({{"/pages/demo-warning-box" | relative_url}})
+| Insert a warning | [warning-box]({{"/pages/demo-warning-box" | relative_url}}) |
 
 {% include sidebar title="Demo" content="Introduction, |, Left image, Right image, Center image, Fit image, Figure left, Figure right,Figure center, Figure row, Markdown table, YouTube video, Embedded images in table, Math equations, Sidebox, Syntax highlighting, Menu breadcrumbs" %}