This is an automated email from the ASF dual-hosted git repository.
jxie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new b30a056 Website redesign (#7787)
b30a056 is described below
commit b30a0563ace3f0ac56564f09904f9d934fb2c4c4
Author: Yao Wang <[email protected]>
AuthorDate: Thu Sep 7 12:37:35 2017 -0700
Website redesign (#7787)
* Add background image
* Home page redesign
* Implement redesign for home page
* More features
* Address comments
* More fix
* Fix link
* Fix version build
* Move background image to web-data repository
* Small fix
* Dummy commit to retrigger test
* Move resources to web data
---
docs/_static/js/copycode.js | 1 +
docs/_static/js/navbar.js | 27 +-
docs/_static/js/page.js | 66 +++
docs/_static/js/sidebar.js | 71 ++-
docs/_static/mxnet-theme/footer.html | 11 +-
docs/_static/mxnet-theme/index.html | 118 ++---
docs/_static/mxnet-theme/layout.html | 15 +-
docs/_static/mxnet-theme/navbar.html | 59 ++-
docs/_static/mxnet.css | 586 ++++++++++++++-------
docs/_static/mxnet.png | Bin 67645 -> 0 bytes
docs/_static/searchtools_custom.js | 12 +-
docs/api/julia/index.md | 5 +-
docs/api/perl/index.md | 10 +-
docs/api/scala/index.md | 12 +-
docs/build_version_doc/AddPackageLink.py | 2 +-
docs/build_version_doc/AddVersion.py | 8 +-
docs/build_version_doc/build_doc.sh | 1 +
docs/community/collaborator.md | 68 +++
docs/get_started/index.md | 8 -
docs/get_started/why_mxnet.md | 6 +-
docs/{get_started => install}/amazonlinux_setup.md | 0
docs/{get_started => install}/build_from_source.md | 0
docs/{get_started => install}/centos_setup.md | 0
docs/{get_started/install.md => install/index.md} | 0
docs/{get_started => install}/osx_setup.md | 0
docs/{get_started => install}/raspbian_setup.md | 0
docs/{get_started => install}/tx2_setup.md | 0
docs/{get_started => install}/ubuntu_setup.md | 0
docs/{get_started => install}/windows_setup.md | 0
docs/mxdoc.py | 2 +-
30 files changed, 711 insertions(+), 377 deletions(-)
diff --git a/docs/_static/js/copycode.js b/docs/_static/js/copycode.js
index 141e797..f9ebd64 100644
--- a/docs/_static/js/copycode.js
+++ b/docs/_static/js/copycode.js
@@ -6,6 +6,7 @@ function addBtn() {
'data-placement="bottom" title="Copy to clipboard"><i class="fa
fa-copy"></i></button>'
for (var lang in LANG_GP) {
codeBlock = $('div .highlight-' + lang);
+ codeBlock.css('position', 'relative')
codeBlock.prepend(copyBtn);
codeBlock.find('.copy-btn').addClass(lang);
codeBlock.hover(
diff --git a/docs/_static/js/navbar.js b/docs/_static/js/navbar.js
index 91e0356..419d7d8 100644
--- a/docs/_static/js/navbar.js
+++ b/docs/_static/js/navbar.js
@@ -1,9 +1,11 @@
var searchBox = $("#search-input-wrap");
-var TITLE = ['/get_started/', '/tutorials/', '/how_to/', '/api/',
'/architecture/'];
-var APIsubMenu;
+var TITLE = ['/get_started/', '/tutorials/', '/community/contribute.html',
'/api/'];
+var DOC_TITLE = ['/how_to/', '/architecture/', '/model_zoo/'];
+var APISubmenu, versionSubmenu, docSubmenu;
$("#burgerMenu").children().each(function () {
- if($(this).children().first().html() == 'API') APIsubMenu = $(this).clone()
- if($(this).children().first().html().startsWith('Versions'))
VersionsubMenu = $(this).clone()
+ if($(this).children().first().html() == 'API') APISubmenu =
$(this).clone();
+ if($(this).children().first().html().startsWith('Versions'))
versionSubmenu = $(this).clone();
+ if($(this).children().first().html() == 'Docs') docSubmenu=
$(this).clone();
});
function navbar() {
@@ -40,10 +42,13 @@ function navbar() {
$("#plusMenu").empty();
for (var i = 0; i < plusMenuList.length; ++i) {
if(plusMenuList[i].attr('id') == 'dropdown-menu-position-anchor') {
- $("#plusMenu").append(APIsubMenu);
+ $("#plusMenu").append(APISubmenu);
}
else if(plusMenuList[i].attr('id') ==
'dropdown-menu-position-anchor-version') {
- $("#plusMenu").append(VersionsubMenu);
+ $("#plusMenu").append(versionSubmenu);
+ }
+ else if(plusMenuList[i].attr('id') ==
'dropdown-menu-position-anchor-docs') {
+ $("#plusMenu").append(docSubmenu);
}
else {
$("#plusMenu").append("<li></li>");
@@ -62,8 +67,16 @@ function showTab() {
var tab = $($('#main-nav').children().eq(i));
if(!tab.is('a')) tab = tab.find('a').first();
tab.css('border-bottom', '3px solid');
+ return;
}
}
+ for(var i = 0; i < DOC_TITLE.length; ++i) {
+ if(url.indexOf(DOC_TITLE[i]) != -1) {
+ var tab = $($('#main-nav').children().eq(4));
+ if(!tab.is('a')) tab = tab.find('a').first();
+ tab.css('border-bottom', '3px solid');
+ }
+ }
}
$(document).ready(function () {
@@ -71,5 +84,7 @@ $(document).ready(function () {
showTab();
$(window).resize(function () {
navbar();
+ if($("body").prop("clientWidth") < 1000 ||
$('div.sphinxsidebar').css('visibility') == 'hidden')
$('div.content').css('width', '100%');
+ else $('div.content').css('width', 'calc(100% - 300px)');
});
});
\ No newline at end of file
diff --git a/docs/_static/js/page.js b/docs/_static/js/page.js
new file mode 100644
index 0000000..befb5b0
--- /dev/null
+++ b/docs/_static/js/page.js
@@ -0,0 +1,66 @@
+/* Generate url tracking for each page */
+var protocol = location.protocol.concat("//");
+var host = protocol.concat(window.location.host);
+var path = window.location.pathname;
+var pathArr = path.split('/');
+var icon = '<i class="fa fa-angle-right" aria-hidden="true"></i>';
+var urlTracker = "<ul><li><a href=" + host + ">MXNet</a>" + icon + "</li>";
+
+// Check whether this is another version
+var lastUrl = host;
+var versionIDX = -1;
+for (var i = 1; i < pathArr.length; ++i) {
+ lastUrl += '/' + pathArr[i];
+ if(pathArr[i] == 'versions') {
+ versionIDX = i;
+ lastUrl += '/' + pathArr[i + 1];
+ break;
+ }
+}
+if (versionIDX > 0) {
+ pathArr = pathArr.slice(versionIDX + 1, pathArr.length);
+ urlTracker = "<ul><li><a href=" + lastUrl + "/index.html>MXNet</a>" + icon
+ "</li>";
+}
+else lastUrl = host;
+
+for (var i = 1; i < pathArr.length; ++i) {
+ if (pathArr[i] == 'index.html' || pathArr[i].length == 0) continue;
+ if (pathArr[i].indexOf('#') != -1) pathArr[i] = pathArr[i].substring(0,
pathArr[i].indexOf('#'));
+ lastUrl += '/' + pathArr[i];
+ if (pathArr[i].endsWith('.html')) pathArr[i] = pathArr[i].substring(0,
pathArr[i].length - 5);
+ if (i == pathArr.length - 1 || pathArr[i + 1].length == 0 ||
+ pathArr[i + 1] == 'index.html') urlTracker += "<li><a
class='last-tracker' href=" + lastUrl + ">" + pathArr[i].replace(/_/g, ' ') +
"</a></li>";
+ else {
+ // Check whether current folder has index.html.
+ // If it doesn't, disable the link.
+ $.ajax(lastUrl + '/index.html', {
+ type: "GET",
+ statusCode: {
+ 404: function (response) {
+ if (pathArr[i] == 'api') urlTracker += "<li>API" + icon +
"</li>";
+ else urlTracker += "<li>" + pathArr[i].replace(/_/g, ' ')
+ icon + "</li>";
+ }
+ },
+ success: function () {
+ item = pathArr[i] == 'ndarray' ? "NDArray" : pathArr[i];
+ urlTracker += "<li><a href=" + lastUrl + '/index.html' + ">" +
item.replace(/_/g, ' ') + "</a>" + icon + "</li>";
+ },
+ async: false
+ });
+ }
+}
+urlTracker += '</ul>';
+$('.page-tracker').append(urlTracker);
+
+/* Generate top download btn*/
+if ($('div.download-btn').length > 0) {
+ var topBtn = $('div.download-btn').clone();
+ topBtn.addClass('download-btn-top');
+ topBtn.insertAfter(".page-tracker");
+}
+
+/* Adjust footer position */
+var footerHeight = 252;
+if ($('div.content-block').height() > $(window).height() - footerHeight) {
+ $('div.footer').css('position', 'relative');
+}
\ No newline at end of file
diff --git a/docs/_static/js/sidebar.js b/docs/_static/js/sidebar.js
index 4260706..86ef469 100644
--- a/docs/_static/js/sidebar.js
+++ b/docs/_static/js/sidebar.js
@@ -1,6 +1,6 @@
/*Preprocess*/
var LANG = ['python', 'scala', 'r', 'julia', 'c++', 'perl'];
-var TITLE_WITH_LANG = ['/get_started/', '/tutorials/', '/how_to/',
'/architecture/'];
+var TITLE_WITH_LANG = ['/get_started/', '/tutorials/', '/how_to/',
'/architecture/', '/community/'];
for(var i = 0; i < LANG.length; ++i) {
TITLE_WITH_LANG.push('/api/' + LANG[i] + '/');
}
@@ -9,22 +9,18 @@ for(var i = 0; i < LANG.length; ++i) {
var API_PAGE = ['python'];
var isAPI = false;
-function render_left_helper(toc, currentText) {
+function render_left_helper(toc) {
var lefttoc = toc;
- var currentText = currentText, trailing = ' Documents';
- if (currentText.endsWith(trailing)) currentText = currentText.substring(0,
currentText.length - trailing.length);
- if (currentText == 'System') currentText = 'Architecture';
lefttoc.addClass('current');
$('.leftsidebar > .sphinxsidebarwrapper').children().remove();
$('.leftsidebar > .sphinxsidebarwrapper').append(lefttoc);
-
- $('.leftsidebar > .sphinxsidebarwrapper').prepend('<h3>Contents</h3>');
+
addToggle('.leftsidebar');
$('.leftsidebar li a').click(function () {
- $('.leftsidebar li a').css('color', 'black');
- $(this).css('color', '#337ab7');
+ $('.leftsidebar li a').css('color', '#337ab7');
+ $(this).css('color', 'black');
});
}
@@ -38,6 +34,7 @@ function render_lefttoc() {
$('.sphinxsidebar').css("visibility", "visible");
return;
}
+ // If current page is not index page
if (url.indexOf(indexTrailing) == -1) {
for(var i = 0; i < TITLE_WITH_LANG.length; ++i) {
var path = TITLE_WITH_LANG[i];
@@ -50,14 +47,14 @@ function render_lefttoc() {
break;
}
}
- var urlPath = 'https://' + window.location.host + version +
path;
+ var protocol = location.protocol.concat("//");
+ var urlPath = protocol + window.location.host + version +
path;
$.get(urlPath + indexTrailing, null, function(data) {
- var currentText = $($.parseHTML(data)).find('.leftsidebar
> .sphinxsidebarwrapper > ul.current > li.current > a').html();
if (isAPI) {
-
render_left_helper($($.parseHTML(data)).find('#table-of-contents > div > ul'),
currentText);
+
render_left_helper($($.parseHTML(data)).find('#table-of-contents > div > ul'));
}
else {
-
render_left_helper($($.parseHTML(data)).find('.leftsidebar >
.sphinxsidebarwrapper > ul.current > li.current > ul'), currentText);
+
render_left_helper($($.parseHTML(data)).find('.leftsidebar >
.sphinxsidebarwrapper > ul.current > li.current > ul'));
var tocLink = $('.leftsidebar .sphinxsidebarwrapper
.leaf a');
var staticLink = 'http';
tocLink.each(function () {
@@ -68,21 +65,22 @@ function render_lefttoc() {
}
keepExpand();
$('.sphinxsidebar').css("visibility", "visible");
+ if ($('div.sphinxsidebar').css('display') != 'none')
$('.content').css('width', 'calc(100% - 300px)');
+ else $('.content').css('width', '100%');
})
}
}
}
else {
- var currentText = $('.leftsidebar > .sphinxsidebarwrapper >
ul.current > li.current > a').html();
var toc = isAPI ? $('#table-of-contents > div > ul').clone() :
$('.leftsidebar > .sphinxsidebarwrapper > ul.current > li.current >
ul').clone();
- render_left_helper(toc, currentText);
+ render_left_helper(toc);
$('.sphinxsidebar').css("visibility", "visible");
}
}
/*Render contents inside page*/
function render_righttoc() {
- var url = window.location.href, apiFlag = '/api/', indexTrailing =
'index.html';
+ var url = window.location.href, indexTrailing = 'index.html';
var rightTocTitle = "Page Contents";
$("div.rightsidebar > div.sphinxsidebarwrapper > h3").children().remove();
@@ -91,8 +89,8 @@ function render_righttoc() {
addToggle('.rightsidebar');
$('.rightsidebar li a').click(function () {
- $('.rightsidebar li a').css('color', 'black');
- $(this).css('color', '#337ab7');
+ $('.rightsidebar li a').css('color', '#337ab7');
+ $(this).css('color', 'black');
});
if (url.indexOf(indexTrailing) != -1 || isAPI) {
@@ -107,8 +105,8 @@ function scroll_righttoc() {
for(var i = 1; i < links.length; ++i) {
var divID = links.eq(i).attr('href');
if ($(divID).offset().top - $(window).scrollTop() > navbarHeight) {
- $('.rightsidebar a').css('color', 'black');
- links.eq(i - 1).css('color', '#337ab7');
+ $('.rightsidebar a').css('color', '#337ab7');
+ links.eq(i - 1).css('color', 'black');
if (!links.eq(i - 1).parent().hasClass('leaf')) {
links.eq(i - 1).parent().removeClass('closed');
links.eq(i - 1).parent().addClass('opened');
@@ -182,6 +180,7 @@ function keepExpand() {
}
}
+ //Merge right toc into left toc for API pages since they are quite long
if (isAPI) {
var rootEntry = currentEntry;
if (rootEntry.parent().parent().is('li')) rootEntry =
rootEntry.parent().parent();
@@ -201,8 +200,8 @@ function keepExpand() {
}
});
$('.leftsidebar li a').click(function () {
- $('.leftsidebar li a').css('color', 'black');
- $(this).css('color', '#337ab7');
+ $('.leftsidebar li a').css('color', '#337ab7');
+ $(this).css('color', 'black');
});
}
currentEntry.find('a').first().css('color', '#337ab7');
@@ -218,9 +217,9 @@ function keepExpand() {
$(document).ready(function () {
var url = window.location.href, searchFlag = 'search.html';
+ var showRightToc = false;
try {
- if(url.indexOf('/get_started/') != -1) return;
- if (url.indexOf(searchFlag) == -1) {
+ if (url.indexOf('/get_started/') == -1 && url.indexOf(searchFlag) ==
-1) {
for(var i = 0; i < API_PAGE.length; ++i) {
if (url.indexOf('/api/' + API_PAGE[i]) != -1) {
isAPI = true;
@@ -230,13 +229,27 @@ $(document).ready(function () {
render_righttoc();
if ($('.leftsidebar').length) render_lefttoc();
}
-
- if(url.indexOf('/api/') != -1) return;
- $(window).scroll(function () {
- scroll_righttoc();
- });
+ if ($('div.sphinxsidebar').css('visibility') == 'hidden')
$('.content').css('width', '100%');
+ if (url.indexOf('/api/') != -1) return;
+ if (url.indexOf('/install/') != -1) {
+ $('div.sphinxsidebar').hide();
+ $('.content').css('width', '100%');
+ }
+ if (showRightToc) {
+ $(window).scroll(function () {
+ scroll_righttoc();
+ });
+ }
+ else {
+ $('.rightsidebar').hide();
+ }
+ // move right toc to left if current left toc is empty
+ if ($('.leftsidebar > .sphinxsidebarwrapper').children().length == 0) {
+ $('.leftsidebar > .sphinxsidebarwrapper').append($('.rightsidebar
> .sphinxsidebarwrapper > ul'));
+ }
}
catch(err) {
+ if ($('div.sphinxsidebar').css('visibility') == 'hidden')
$('.content').css('width', '100%');
return;
}
});
\ No newline at end of file
diff --git a/docs/_static/mxnet-theme/footer.html
b/docs/_static/mxnet-theme/footer.html
index 45ba457..670ba81 100644
--- a/docs/_static/mxnet-theme/footer.html
+++ b/docs/_static/mxnet-theme/footer.html
@@ -1,5 +1,12 @@
-<div class="container">
<div class="footer">
- <p> </p>
+<div class="section-disclaimer">
+<div class="container">
+ <div>
+ <img
src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/apache_incubator_logo.png"
height=60>
+ <p>
+ Apache MXNet is an effort undergoing incubation at The Apache
Software Foundation (ASF), <strong>sponsored by the <i>Apache
Incubator</i></strong>. Incubation is required of all newly accepted projects
until a further review indicates that the infrastructure, communications, and
decision making process have stabilized in a manner consistent with other
successful ASF projects. While incubation status is not necessarily a
reflection of the completeness or stability of the code, [...]
+ </p>
+ </div>
</div>
</div>
+</div>
\ No newline at end of file
diff --git a/docs/_static/mxnet-theme/index.html
b/docs/_static/mxnet-theme/index.html
index e381428..59eb7f7 100644
--- a/docs/_static/mxnet-theme/index.html
+++ b/docs/_static/mxnet-theme/index.html
@@ -2,12 +2,20 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
- <div id="banner-title">A Flexible and Efficient Library for Deep
Learning</div>
- <div id="why_mxnet" class='col-sm-6 col-xs-12'>
- <a href="get_started/why_mxnet.html" id="why_mxnet_btn">Learn
More</a>
- </div>
- <div id="install_blk" class='col-sm-6 col-xs-12'>
- <a href="get_started/install.html" id="install_btn">Install</a>
+ <div id="banner-title" class='col-sm-6 col-xs-12'><span>MXNet</span>
+ <p id="landing-title">is a flexible and efficient library for deep
learning.</p>
+ <p id="intro">
+ Building a high-performance deep learning library requires
many system-level design decisions. In this design note, we share the rationale
for the specific
+ choices made when designing MXNet. We imagine that these
insights may be useful to both deep learning practioners and builders of other
deep learning systems.
+ </p>
+ <div id='landing-btn-blk'>
+ <div id="install_blk">
+ <a href="install/index.html" id="install_btn">Install</a>
+ </div>
+ <div id="why_mxnet">
+ <a href="get_started/why_mxnet.html"
id="why_mxnet_btn">Learn More</a>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -41,96 +49,30 @@
<div class="section-util">
<div class="container">
<div class="row">
- <div class="col-lg-6 col-sm-12">
+ <div id="model-zoo-blk" class="col-lg-4 col-sm-12">
+ <span class="glyphicon glyphicon-folder-open"></span>
+ <h2>Model Zoo</h2>
+ <p>Off the shelf pre-trained models. Fast implementations of many
state-of-art models.</p>
+ <div class='util-btn'>
+ <a id="model-zoo-link" href="model_zoo/index.html">Model zoo</a>
+ </div>
+ </div>
+ <div id="example-blk" class="col-lg-4 col-sm-12">
<span class="glyphicon glyphicon-list-alt"></span>
<h2>Examples</h2>
- <p>Explore projects from simple demos to state-of-the-art
research</p>
+ <p>Explore projects from simple demos, exmaples, tutorials to
state-of-the-art research.</p>
<div class='util-btn'>
- <a id="example-link"
href="https://github.com/dmlc/mxnet/tree/master/example">MXNet Examples</a>
+ <a id="example-link"
href="https://github.com/dmlc/mxnet/tree/master/example">MXNet examples</a>
</div>
</div>
- <div class="col-lg-6 col-sm-12">
- <span class="glyphicon glyphicon-folder-open"></span>
- <h2>Model Zoo</h2>
- <p>Off the shelf pre-trained models</p>
+ <div id="tutorial-blk" class="col-lg-4 col-sm-12">
+ <span class="glyphicon glyphicon-ok-circle"></span>
+ <h2>Tutorials</h2>
+ <p>These tutorials introduce a few fundamental concepts in deep
learning and how to implement them in MXNet.</p>
<div class='util-btn'>
- <a id="model-zoo-link" href="model_zoo/index.html">Model Zoo</a>
+ <a id="tutorial-link" href="tutorials/index.html">MXNet
tutorials</a>
</div>
</div>
</div>
</div>
</div>
-
-<div class="section-inst">
- <div class="container">
- <div class="row">
- <p>
- MXNet is developed by collaborators from multiple universities and
- companies. We sincerely thank the following organizations for
supporting
- MXNet and sponsoring its major developers (alphabetical order).
- </p>
- <div class="col-lg-4 col-sm-6">
- <img height="60px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/aws-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6">
- <img height="55px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/baidu-logo.jpg">
- </div>
-
- <div class="col-lg-4 col-sm-6 smallClear">
- <img height="70px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/cmu-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6">
- <img height="70px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/dato-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6">
- <img height="70px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/intel-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6">
- <img height="55px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/nyu-logo.jpg">
- </div>
-
- <div class="col-lg-4 col-sm-6 clear smallClear">
- <img height="40px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/nvidia-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6">
- <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/mit-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6 smallClear">
- <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/ms-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6 clear smallClear">
- <img height="55px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/hkust-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6">
- <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/tusimple-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6">
- <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/university-alberta-logo.png">
- </div>
-
- <div class="col-lg-4 col-sm-6 clear smallClear">
- <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/university-washington-logo.jpg">
- </div>
-
- <div class="col-lg-4 col-sm-6">
- <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/wolfram-logo.png">
- </div>
- </div>
- </div>
-</div>
-
-<div class="section-disclaimer">
- <img
src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/apache_incubator_logo.png"
height=60>
- <p>
- Apache MXNet is an effort undergoing incubation at The Apache Software
Foundation (ASF), <strong>sponsored by the <i>Apache Incubator</i></strong>.
Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure, communications, and decision making process
have stabilized in a manner consistent with other successful ASF projects.
While incubation status is not necessarily a reflection of the completeness or
stability of the code, it [...]
- </p>
-</div>
\ No newline at end of file
diff --git a/docs/_static/mxnet-theme/layout.html
b/docs/_static/mxnet-theme/layout.html
index c312181..b776117 100644
--- a/docs/_static/mxnet-theme/layout.html
+++ b/docs/_static/mxnet-theme/layout.html
@@ -148,10 +148,15 @@
<link rel="icon" type="image/png"
href="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-icon.png">
</head>
- <body role="document">
+ <body role="document"
background="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-background.png">
+ <div class='content-block'>
{%- include "navbar.html" %}
+
{% if pagename != 'index' %}
+ <script type="text/javascript">
+ $('body').css('background', 'white');
+ </script>
<div class="container">
<div class="row">
<div class="sphinxsidebar leftsidebar" role="navigation"
aria-label="main navigation">
@@ -160,15 +165,18 @@
</div>
</div>
<div class="content">
+ <div class="page-tracker"></div>
{% block body %} {% endblock %}
- {%- include "footer.html" %}
</div>
- {{ sidebar() }}
+ </div>
+ {{ sidebar() }}
</div>
+ {%- include "footer.html" %}
{%- else %}
{%- include "index.html" %}
{%- include "footer.html" %}
{%- endif %} <!-- pagename != index -->
+ </div>
<script
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
crossorigin="anonymous"></script>
<script type="text/javascript" src="{{ pathto('_static/js/sidebar.js', 1)
}}"></script>
@@ -176,6 +184,7 @@
<script type="text/javascript" src="{{ pathto('_static/js/navbar.js', 1)
}}"></script>
<script type="text/javascript" src="{{
pathto('_static/js/clipboard.min.js', 1) }}"></script>
<script type="text/javascript" src="{{ pathto('_static/js/copycode.js', 1)
}}"></script>
+ <script type="text/javascript" src="{{ pathto('_static/js/page.js', 1)
}}"></script>
<script type="text/javascript">
$('body').ready(function () {
$('body').css('visibility', 'visible');
diff --git a/docs/_static/mxnet-theme/navbar.html
b/docs/_static/mxnet-theme/navbar.html
index 0d49eeb..166f799 100644
--- a/docs/_static/mxnet-theme/navbar.html
+++ b/docs/_static/mxnet-theme/navbar.html
@@ -2,18 +2,22 @@
<div class="container" id="navContainer">
<div id="header-inner" class="innder">
<h1 id="logo-wrap">
- <a href="{{url_root}}" id="logo"><img
src="{{url_root}}_static/mxnet.png"></a>
+ <a href="{{ url_root }}" id="logo"><img
src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet_logo.png"></a>
</h1>
<nav id="main-nav" class='nav-bar'>
- <a class="main-nav-link"
href="{{url_root}}get_started/install.html">Install</a>
- {% for name in ['Tutorials', 'How To'] %}
- <a class="main-nav-link" href="{{url_root}}{{name.lower()|replace(" ",
"_")}}/index.html">{{name}}</a>
- {% endfor %}
+ <a class="main-nav-link"
href="{{url_root}}install/index.html">Install</a>
+ <a class="main-nav-link"
href="{{url_root}}tutorials/index.html">Learn</a>
+ <span id="dropdown-menu-position-anchor-community">
+ <a href="#" class="main-nav-link dropdown-toggle"
data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="true">Community <span class="caret"></span></a>
+ <ul id="package-dropdown-menu-community" class="dropdown-menu
navbar-menu">
+ <li><a class="main-nav-link"
href="{{url_root}}community/index.html">Community</a></li>
+ <li><a class="main-nav-link"
href="{{url_root}}community/collaborator.html">Collaborator</a></li>
+ </ul>
+ </span>
- {% for name in ['API'] %}
<span id="dropdown-menu-position-anchor">
- <a href="#" class="main-nav-link dropdown-toggle"
data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="true">{{name}} <span class="caret"></span></a>
- <ul id="package-dropdown-menu" class="dropdown-menu">
+ <a href="#" class="main-nav-link dropdown-toggle"
data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="true">API <span class="caret"></span></a>
+ <ul id="package-dropdown-menu" class="dropdown-menu navbar-menu">
<li><a class="main-nav-link"
href="{{url_root}}api/python/index.html">Python</a></li>
<li><a class="main-nav-link"
href="{{url_root}}api/scala/index.html">Scala</a></li>
<li><a class="main-nav-link"
href="{{url_root}}api/r/index.html">R</a></li>
@@ -21,21 +25,34 @@
<li><a class="main-nav-link"
href="{{url_root}}api/c++/index.html">C++</a></li>
<li><a class="main-nav-link"
href="{{url_root}}api/perl/index.html">Perl</a></li>
</ul>
- {% endfor %}
+ </span>
+
+ <span id="dropdown-menu-position-anchor-docs">
+ <a href="#" class="main-nav-link dropdown-toggle"
data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="true">Docs <span class="caret"></span></a>
+ <ul id="package-dropdown-menu-docs" class="dropdown-menu
navbar-menu">
+ <li><a class="main-nav-link"
href="{{url_root}}tutorials/index.html">Tutorials</a></li>
+ <li><a class="main-nav-link"
href="{{url_root}}how_to/index.html">How To</a></li>
+ <li><a class="main-nav-link"
href="{{url_root}}architecture/index.html">Architecture</a></li>
+ <li><a class="main-nav-link"
href="https://github.com/apache/incubator-mxnet/tree/master/example">Examples</a></li>
+ <li><a class="main-nav-link"
href="{{url_root}}model_zoo/index.html">Model Zoo</a></li>
+ </ul>
</span>
- <a class="main-nav-link"
href="{{url_root}}architecture/index.html">Architecture</a>
- <!-- <a class="main-nav-link"
href="{{url_root}}community/index.html">Community</a> -->
<a class="main-nav-link"
href="https://github.com/dmlc/mxnet">Github</a>
</nav>
<script> function getRootPath(){ return "{{url_root}}" } </script>
<div class="burgerIcon dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"
role="button">☰</a>
- <ul id="burgerMenu" class="dropdown-menu dropdown-menu-right">
- <li><a
href="{{url_root}}get_started/install.html">Install</a></li>
- {% for name in ['Tutorials', 'How To'] %}
- <li><a href="{{url_root}}{{name.lower()|replace(" ",
"_")}}/index.html">{{name}}</a></li>
- {% endfor %}
+ <ul id="burgerMenu" class="dropdown-menu">
+ <li><a href="{{url_root}}install/index.html">Install</a></li>
+ <li><a class="main-nav-link"
href="{{url_root}}tutorials/index.html">Learn</a></li>
+ <li class="dropdown-submenu">
+ <a href="#" tabindex="-1">Community</a>
+ <ul class="dropdown-menu">
+ <li><a tabindex="-1"
href="{{url_root}}community/index.html">Community</a></li>
+ <li><a tabindex="-1"
href="{{url_root}}community/collaborator.html">Collaborator</a></li>
+ </ul>
+ </li>
{% for name in ['API'] %}
<li class="dropdown-submenu">
<a href="#" tabindex="-1">{{name}}</a>
@@ -47,6 +64,16 @@
</ul>
</li>
{% endfor %}
+ <li class="dropdown-submenu">
+ <a href="#" tabindex="-1">Docs</a>
+ <ul class="dropdown-menu">
+ <li><a tabindex="-1"
href="{{url_root}}tutorials/index.html">Tutorials</a></li>
+ <li><a tabindex="-1"
href="{{url_root}}how_to/index.html">How To</a></li>
+ <li><a tabindex="-1"
href="{{url_root}}architecture/index.html">Architecture</a></li>
+ <li><a tabindex="-1"
href="https://github.com/apache/incubator-mxnet/tree/master/example">Examples</a></li>
+ <li><a tabindex="-1"
href="{{url_root}}model_zoo/index.html">Model Zoo</a></li>
+ </ul>
+ </li>
<li><a
href="{{url_root}}architecture/index.html">Architecture</a></li>
<li><a class="main-nav-link"
href="https://github.com/dmlc/mxnet">Github</a></li>
</ul>
diff --git a/docs/_static/mxnet.css b/docs/_static/mxnet.css
index db2c5a2..ea25de5 100644
--- a/docs/_static/mxnet.css
+++ b/docs/_static/mxnet.css
@@ -1,3 +1,22 @@
+/*-------------------- AmazonEmber font -----------------------------------*/
+@font-face {
+ font-family: AmazonEmber;
+ src:
url(https://raw.githubusercontent.com/kevinthesun/web-data/MoreResourcesForWeb/mxnet/font/AmazonEmber_Rg.ttf);
+ font-weight: normal;
+}
+
+@font-face {
+ font-family: AmazonEmber;
+ src:
url(https://raw.githubusercontent.com/kevinthesun/web-data/MoreResourcesForWeb/mxnet/font/AmazonEmber_Bd.ttf);
+ font-weight: bold;
+}
+
+@font-face {
+ font-family: AmazonEmber;
+ src:
url(https://raw.githubusercontent.com/kevinthesun/web-data/MoreResourcesForWeb/mxnet/font/AmazonEmber_Th.ttf);
+ font-weight: 300;
+}
+
/*-------------------- basic html elements and classes --------------------*/
html, body {
@@ -9,16 +28,18 @@ html, body {
body {
display: block;
visibility: hidden;
+ background-size: cover;
+ background-attachment: fixed;
}
body, div {
- font-family: "Open Sans", "Lucida Grande", "Helvetica Neue", Arial;
+ font-family: AmazonEmber;
font-size: 16px;
color: #000;
}
p {
- font-family: "Open Sans", "Lucida Grande", "Helvetica Neue", Arial;
+ font-family: AmazonEmber;
color: #000;
font-size: 16px;
line-height: 1.5em;
@@ -34,6 +55,13 @@ li, dt a, dt span {
line-height: 1.5em;
}
+.footer {
+ z-index: 10;
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+}
+
/* /\*Content paragraph space*\/ */
/* div.content p { */
/* margin-top: 20px; */
@@ -41,7 +69,7 @@ li, dt a, dt span {
/*------------------ Headings -------------------*/
h1, h2, h3 {
- font-family: "Open Sans", "Lucida Grande", "Helvetica Neue", Arial;
+ font-family: AmazonEmber;
margin-top: 18px;
margin-bottom: 18px;
color: #444;
@@ -51,6 +79,7 @@ h1 {
margin-top: 0px;
margin-bottom: 25px;
font-size: 28px;
+ font-weight: bold;
}
h2 {
@@ -90,15 +119,18 @@ img {
/*-----------------------nav bar-----------------------*/
.navbar {
- background-color:#0079b2;
opacity: 0.9;
border: 0px;
height: 60px;
margin-bottom: 0px;
+ border-bottom: 0.01em solid #fff;
+ background-image:
url("https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-navbar.png");
+ background-size: cover;
+ background-attachment: scroll;
}
.navbar .container {
- position: fixed;
+ position: relative;
left: 20px;
}
@@ -124,7 +156,8 @@ img {
-webkit-box-align: center;
-ms-flex-align: center;
-webkit-align-items: center;
- align-items: center
+ align-items: center;
+ padding-left: 10px;
}
@media screen and(max-width: 768 px) {
@@ -143,18 +176,14 @@ img {
width: 125px;
}
-@media screen and (max-width: 405px) {
- #logo-wrap {
- margin-left: -25px;
- }
-}
-
#logo {
+ color: #fff;
width: 150px;
display: block;
float: left;
height: 60px;
- padding: 10px 0 0 0;
+ padding: 15px 0 0 0;
+ text-decoration: none;
}
#logo > img {
@@ -175,12 +204,10 @@ img {
color: #fff;
text-decoration: none;
line-height: 50px;
- opacity: .7;
- -webkit-transition: .2s;
- transition: .2s;
- font-family: Lato, "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-family: AmazonEmber;
display: inline-block;
padding: 0 15px;
+ font-weight: 300;
}
.main-nav-link:hover {
@@ -190,18 +217,20 @@ img {
}
#dropdown-menu-position-anchor,
+#dropdown-menu-position-anchor-docs,
+#dropdown-menu-position-anchor-community,
#dropdown-menu-position-anchor-version,
#dropdown-menu-position-anchor-version-mobile {
position: relative;
}
-#package-dropdown-menu {
+.navbar-menu {
top: 36px;
border-radius: 4px;
padding: 0;
}
-#package-dropdown-menu > li > a {
+.navbar-menu > li > a {
color: #0079b2;
padding: 6px 16px;
@@ -209,10 +238,12 @@ img {
#search-input-wrap {
display: block;
- position: fixed;
+ position: absolute;
top: 15px;
- right: 40px;
- width: 140px;
+ right: 20px;
+ width: 200px;
+ -webkit-transition: width 0.5s;
+ transition: width 0.5s;
}
#search-input-wrap ul {
@@ -223,7 +254,7 @@ img {
display: none;
position: fixed;
top: 20px;
- right: 20px;
+ right: 35px;
color: white;
}
@@ -231,13 +262,15 @@ img {
position: absolute;
top: 0;
left: 0;
- width: 140px;
- background: #87CEFA;
+ width: 200px;
+ background: transparent;
border-radius: 5px;
+ -webkit-transition: width 0.5s;
+ transition: width 0.5s;
}
.searchBox input {
- background: #87CEFA;
+ background: transparent;
}
.searchBox input::placeholder {
@@ -262,19 +295,12 @@ img {
@media screen and (max-width: 510px) {
#search-input-wrap {
- display: none;
- right: 40px;
- margin-left: -100px;
- }
-
- #searchIcon {
- display: block;
+ width: 120px;
+ margin-right: 10px;
}
-}
-
-@media screen and (min-width: 511px) {
- #search-input-wrap {
- display: block !important;
+
+ .searchBox {
+ width: 120px;
}
}
@@ -288,7 +314,7 @@ img {
#lang-select-label {
color: #fff;
opacity: .7;
- font-family: Lato, Helvetica Neue, Helvetica, Arial, sans-serif;
+ font-family: AmazonEmber;
line-height: 50px
}
@@ -318,20 +344,15 @@ div .burgerIcon {
font-size: 25px;
position: fixed;
right: 155px;
- top: 10px;
- display: none
+ top: 11px;
+ display: none;
+ width: 30px;
}
div .burgerIcon a {
color: white;
}
-@media screen and (max-width: 405px) {
- div .burgerIcon {
- margin-left: -25px;
- }
-}
-
/*burger menu*/
#burgerMenu, #plusMenu {
list-style-type: none;
@@ -350,7 +371,7 @@ div .burgerIcon a {
height: 30px;
padding-left: 5px;
width: 108px;
- max-width: 200px
+ max-width: 250px;
}
#burgerMenu li, #plusMenu li {
@@ -363,11 +384,17 @@ li.dropdown-submenu ul.dropdown-menu {
}
li.dropdown-submenu ul.dropdown-menu li {
- height: auto
+ border-style: none !important;
}
li.dropdown-submenu ul.dropdown-menu a {
- height: auto
+ padding-left: 20px !important;
+}
+
+@media screen and (max-width: 360px) {
+ li.dropdown-submenu ul.dropdown-menu a {
+ font-size: 12px !important;
+ }
}
/*dropdown submenu*/
@@ -376,13 +403,12 @@ li.dropdown-submenu ul.dropdown-menu a {
}
.dropdown-submenu>.dropdown-menu {
- top: 0;
- left: 100%;
- margin-top: -6px;
- margin-left: -1px;
+ top: -8px;
+ left: 200px;
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px;
border-radius: 0 6px 6px 6px;
+ background: transparent;
}
.dropdown-submenu:hover>.dropdown-menu {
@@ -399,7 +425,7 @@ li.dropdown-submenu ul.dropdown-menu a {
border-style: solid;
border-width: 5px 0 5px 5px;
border-left-color: #ccc;
- margin-top: 5px;
+ margin-top: 10px;
margin-right: -10px;
}
@@ -422,9 +448,9 @@ li.dropdown-submenu ul.dropdown-menu a {
/*Plus icon*/
.plusIcon {
display: none;
- position: fixed;
+ position: absolute;
top: 20px;
- right: 175px;
+ right: 210px;
width: 30px;
}
@@ -437,18 +463,50 @@ li.dropdown-submenu ul.dropdown-menu a {
display: none !important;
}
- div .burgerIcon {
+ div.burgerIcon {
display: block;
position: fixed;
- top: 10px;
- left: 160px;
+ left: 45px;
+ }
+
+ #burgerMenu {
+ position: fixed;
+ left: 0;
+ top: 49px;
+ width: 100%;
+ height: 100%;
+ background:
url(https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-background.png);
+ background-attachment: initial;
+ background-size: cover;
+ }
+
+ #burgerMenu a {
+ display: block;
+ font-size: 19px;
+ width: auto;
+ padding-left: 75px;
+ padding-top: 10px;
+ color: #fff;
+ text-decoration: none;
+ }
+
+ #burgerMenu a:hover {
+ color: initial;
+ background-color: inherit;
+ }
+
+ #burgerMenu li {
+ border-bottom: 1px solid lightgray;
+ height: 50px;
+ }
+
+ #logo-wrap {
+ margin-left: 30px;
}
}
/*--------------------------banner---------------------------*/
#splash{
- padding:60px 0 50px 0;
- background-color:#0079b2;
- /* background-image:url(../img/bg.jpg); */
+ padding:60px 0 0 0;
background-size:cover;
background-attachment:fixed;
color:#fff;
@@ -459,31 +517,43 @@ li.dropdown-submenu ul.dropdown-menu a {
text-align: center
}
-#splash #banner-title {
- padding: 20px 0 10px 0;
+#banner-title span {
+ font-family: AmazonEmber;
+ font-weight: bold;
+}
+
+#banner-title {
+ padding: 60px 0 10px 0;
font-size: 40px;
- line-height: 1.15;
+ line-height: 55px;
font-weight: 300;
- font-family: Lato, Helvetica Neue, Helvetica, Arial, sans-serif;
+ font-family: AmazonEmber;
color: #fff;
+ max-width: 600px;
+ text-align: left;
+ margin-left: 30px;
}
-@media screen and (min-width:769px) {
- #splash #banner-title {
- padding-top: 100px;
- }
+#landing-title {
+ margin-right: 40px;
+ font-size: 35px;
+ color: #fff;
+ font-family: AmazonEmber;
+ font-weight: 300;
}
-@media screen and (max-width:768px) {
- #splash #banner-title {
- font-size: 30px;
- padding: 60px 30px 10px 30px;
- }
+#intro {
+ font-size: 16px;
+ color: #fff;
+ font-family: AmazonEmber;
+ font-weight: 300;
}
-@media screen and (max-width:510px) {
- #splash #banner-title {
- padding-top: 60px;
+@media screen and (max-width:768px) {
+ #banner-title {
+ font-size: 30px;
+ padding: 60px 30px 10px 30px;
+ margin-left: 0;
}
}
@@ -496,62 +566,55 @@ li.dropdown-submenu ul.dropdown-menu a {
margin:2em 0 4em 0;
}
-#why_mxnet, #install_blk {
- margin:2em 0
+#landing-btn-blk {
+ margin-top: 2em;
}
-#why_mxnet_btn, #install_btn, #release_btn {
- border: 1.8px solid #FFFFFF;
- color: #FFFFFF;
- display: inline-block;
- font-size: 18px;
- font-family: Helvetica, Helvetica Neue, Arial, sans-serif;
- padding: 8px 20px;
- -webkit-transition: .2s;
- transition: .2s;
- width: 160px;
- border-radius: 30px;
+#why_mxnet, #install_blk {
+ margin:2em 0;
+ display: inline;
}
-#release_btn {
- width: auto;
- border: none;
+#why_mxnet {
+ padding-left: 20px;
}
-@media (min-width: 768px) {
- #why_mxnet_btn {
- margin-right: -45%;
+@media screen and (max-width:400px) {
+ #install_blk, #install_blk{
+ display: block;
}
- #install_btn {
- margin-left: -45%;
+
+ #install_blk {
+ padding-left: 0;
+ margin-top: 0;
}
}
-@media (min-width: 992px) {
- #why_mxnet_btn {
- margin-right: -55%;
- }
- #install_btn {
- margin-left: -55%;
- }
+#why_mxnet_btn {
+ border: 1.8px solid #FFFFFF;
+ color: #FFFFFF;
+ display: inline;
+ font-size: 18px;
+ font-family: AmazonEmber;
+ padding: 8px 20px;
+ -webkit-transition: .2s;
+ transition: .2s;
}
-@media (min-width: 1200px) {
- #why_mxnet_btn {
- margin-right: -65%;
- }
- #install_btn {
- margin-left: -65%;
- }
+#install_btn {
+ border: 1.8px solid #FFFFFF;
+ color: #fff;
+ display: inline;
+ font-size: 18px;
+ font-family: AmazonEmber;
+ padding: 8px 40px;
+ -webkit-transition: .2s;
+ transition: .2s;
}
-@media (max-width: 767px) {
- #why_mxnet_btn {
- margin-bottom: -20%;
- }
- #install_btn {
- margin-top: -20%;
- }
+#release_btn {
+ width: auto;
+ border: none;
}
#why_mxnet_btn:hover, #install_btn:hover {
@@ -563,9 +626,7 @@ li.dropdown-submenu ul.dropdown-menu a {
/*------------------------index page section----------------------------*/
.section-tout {
- padding:3em 0 3em;
- border-bottom:1px solid rgba(0,0,0,.05);
- background-color:#fff
+ padding:3em 0 1em;
}
.section-tout .container {
@@ -577,21 +638,30 @@ li.dropdown-submenu ul.dropdown-menu a {
}
.section-tout .row div {
- height: 100%;
+ height: 110%;
padding-left: 50px;
+ background-color:#fff;
+ box-shadow: 0px 2px 4px 0px rgba(0, 28, 36, 0.5);
}
.section-tout .row a {
+ font-family: AmazonEmber;
position: absolute;
bottom: 20px;
+ border: solid 1px;
+ padding: 5px 10px;
+ color: #111;
}
.section-tout h3{
+ font-family: AmazonEmber;
font-size:20px;
- color: #444;
+ color: #007dbc;
+ padding-top: 10px
}
.section-tout p {
+ font-family: AmazonEmber;
margin-bottom:2em;
}
@@ -605,34 +675,76 @@ li.dropdown-submenu ul.dropdown-menu a {
}
.section-tout .row div {
- margin-bottom: 20px;
- padding-left: 20px;
+ padding-left: 45px;
+ }
+
+ .section-tout .row p {
+ padding-bottom: 10px;
+ }
+}
+
+@media (max-width: 767px) {
+ .section-tout .row div {
+ margin-bottom: -20px;
}
}
.section-util {
- background-color: #eaf1f1;
padding:3em 0 3em;
- border-bottom:1px solid rgba(0,0,0,.05);
- text-align: center;
+ text-align: left;
+ margin-bottom: 50px;
+}
+
+.section-util .row > div {
+ height: 320px;
+ padding-left: 50px;
+ padding-top: 40px;
+}
+
+.section-util .row div h2 {
+ font-family: AmazonEmber;
+ color: #fff;
+}
+
+#model-zoo-blk {
+ background-color: #00446e;
+ box-shadow: 0px 2px 4px 0px rgba(0, 28, 36, 0.5);
+}
+
+#example-blk {
+ background-color: #006ea7;
+ box-shadow: 0px 2px 4px 0px rgba(0, 28, 36, 0.5);
+}
+
+#tutorial-blk {
+ background-color: #00a1c9;
+ box-shadow: 0px 2px 4px 0px rgba(0, 28, 36, 0.5);
+}
+
+@media (min-width: 1200px) {
+ #model-zoo-blk {
+ width: 370px;
+ margin-right: 20px;
+ }
+
+ #example-blk {
+ width: 370px;
+ margin-right: 20px;
+ }
}
.section-util p {
- color: #999;
+ font-family: AmazonEmber;
+ color: #fff;
position: absolute;
- width: 50%;
- margin: auto;
- left: 0;
- right: 0;
+ width: 70%;
+ font-size: 14px;
+ font-weight: 300;
}
.section-util .util-btn {
position: absolute;
- margin: auto;
- left: 0;
- right: 0;
- padding-top: 10px;
- margin-top: 60px;
+ bottom: 30px;
}
@media (max-width: 600px) {
@@ -643,18 +755,17 @@ li.dropdown-submenu ul.dropdown-menu a {
.section-util .glyphicon {
font-size: 50px;
- color: #999;
+ color: #b3ffff;
}
.util-btn a {
+ font-family: AmazonEmber;
display: inline-block;
- border: 1.8px solid #0079b2;
- border-radius: 30px;
- width: 200px;
- height: 50px;
+ border: 1.8px solid;
-webkit-transition: .2s;
transition: .2s;
- padding: 10px 30px;
+ padding: 5px 30px;
+ color: #fff;
}
.util-btn a:hover {
@@ -672,27 +783,35 @@ li.dropdown-submenu ul.dropdown-menu a {
.section-util .container {
height: auto
}
-
- .section-util .row div {
- margin-bottom: 200px;
- }
-}
-
-@media (max-width: 767px) {
- .section-util .row div {
- margin-bottom: 250px;
- }
}
.section-inst {
padding:3em 0 3em;
border-bottom:1px solid rgba(0,0,0,.05);
+ text-align: left;
+ background-color: #fff;
+}
- text-align:center
+.section-inst .row div {
+ text-align: center;
+ margin-bottom: 30px;
+ height: 80px;
}
.section-inst p {
- margin-bottom:2em
+ font-family: AmazonEmber;
+ font-weight: 300;
+ margin-bottom:2em;
+ padding-left: 50px;
+ color: #111;
+}
+
+.section-inst h2 {
+ font-family: AmazonEmber;
+ margin-top: -20px;
+ margin-bottom: 50px;
+ color: dimgray;
+ padding-left: 40px;
}
@media (min-width: 1200px) {
@@ -718,26 +837,29 @@ li.dropdown-submenu ul.dropdown-menu a {
}
.section-disclaimer {
- padding: 3em 3em 3em;
+ padding: 3em 0 3em;
+ background-color: #f2f2f2;
+}
+
+.section-disclaimer .container div {
+ padding-left: 50px;
}
.section-disclaimer p {
padding-top: 2em;
}
-.footer{
- padding-top: 40px;
-}
.footer li{
float:right;
margin-right:1.5em;
margin-bottom:1.5em
}
.footer p{
- font-size: 15px;
- color: #888;
+ font-family: AmazonEmber;
+ font-weight: 300;
+ font-size: 12px;
clear:right;
- margin-bottom:0
+ margin-bottom:0;
}
/*------------------content----------------------*/
@@ -746,39 +868,62 @@ div.navbar + div.container {
}
div.content {
- position: absolute;
- left: 320px;
- right: 200px;
- margin-right: 5%;
- padding: 40px 0 0 0;
+ padding: 80px 40px 40px 45px;
+ background: #fff;
+ width: calc(100% - 300px);
+ float: right;
overflow-x: hidden;
z-index: -1;
}
@media (max-width: 999px) {
div.content {
- left: 0;
- margin-left: 5%;
- right: 0;
overflow-x: auto;
+ width: 100%;
}
}
+div.page-tracker {
+ margin-bottom: 30px;
+ font-family: AmazonEmber;
+}
+
+div.page-tracker ul {
+ padding-left: 0;
+}
+
+div.page-tracker ul li {
+ text-transform: capitalize;
+ display: inline;
+}
+
+div.page-tracker a {
+ text-transform: capitalize;
+ color: #337ab7;
+}
+
+div.page-tracker a.last-tracker {
+ color: #aab7b8;
+}
+
+div.page-tracker i {
+ margin: 0 10px;
+}
+
/*------------------sidebar-----------------------*/
div.sphinxsidebar {
position: fixed;
- background-color: white;
- height: calc(100% - 80px);
+ padding-top: 40px;
+ height: 100%;
display: none;
visibility: hidden;
overflow: auto;
}
div.leftsidebar {
- left: 30px;
- width: 250px;
- padding: 40px 0 15px 0;
- margin: 0;
+ width: 300px;
+ margin-left: 25px;
+ background: #f2f2f2;
}
div.rightsidebar {
@@ -793,7 +938,8 @@ div.sphinxsidebar ul {
}
div.sphinxsidebar a {
- color: black;
+ font-family: AmazonEmber;
+ font-size: 13px;
}
div.rightsidebar div.sphinxsidebarwrapper > ul {
@@ -804,11 +950,10 @@ div.sphinxsidebar li {
padding-top: 5px;
margin-bottom: 5px;
margin-left: -10px;
- font: normal 12px "Open Sans", "Lucida Grande", "Helvetica Neue", Arial;
}
div.leftsidebar > div.sphinxsidebarwrapper {
- padding: 10px 10px 10px 10px;
+ padding: 40px 20px 10px 20px;
background: #f2f2f2;
}
@@ -827,26 +972,26 @@ div.rightsidebar > div.sphinxsidebarwrapper > ul > li {
div.sphinxsidebar li.opened .tocToggle:before {
font-family: 'FontAwesome';
- content: "\f146";
+ content: "\f0d7";
margin: 0 5px 0 -15px;
- color: #337ab7;
+ color: #999999;
}
div.sphinxsidebar li.closed .tocToggle:before {
font-family: 'FontAwesome';
- content: "\f0fe";
+ content: "\f0da";
margin: 0 5px 0 -15px;
- color: #337ab7;
+ color: #999999;
}
div.sphinxsidebar li.leaf .tocToggle:before {
- font-family: 'FontAwesome';
- content: "\f096";
+ /*font-family: 'FontAwesome';*/
+ content: " ";
margin: 0 5px 0 -15px;
- color: #337ab7;
+ color: #f2f2f2;
}
-@media (min-width:1000px) {
+@media (min-width:1015px) {
div.sphinxsidebar {display: block}
}
@@ -985,6 +1130,15 @@ code {
background-color: #f5f5f5;
}
+code.docutils.literal {
+ color: #111;
+ font-weight: bold;
+}
+
+a code.docutils.literal {
+ color: #337ab7;
+}
+
dt code {
color: #555;
}
@@ -1120,7 +1274,6 @@ table.docutils tr:nth-child(even) {
height: 38px;
}
-
/*----------------Search function style------------------*/
#searchPage {
width: 60%;
@@ -1187,7 +1340,7 @@ table.docutils tr:nth-child(even) {
/* align icon */
.left-addon .glyphicon {
- left: 0px;
+ right: 0px;
}
.right-addon .glyphicon {
right: 0px;
@@ -1195,7 +1348,8 @@ table.docutils tr:nth-child(even) {
/* add padding */
.left-addon input {
- padding-left: 40px;
+ font-family: AmazonEmber;
+ font-style: italic;
}
.right-addon input {
padding-right: 40px;
@@ -1219,9 +1373,9 @@ button.download {
}
/*----------------------Download button------------------------*/
-div.download_btn {
+div.download-btn {
- border: solid 1px lightgray;
+ border: solid 1px #000;
border-radius: 3px;
font-size: 90%;
height: 40px;
@@ -1229,18 +1383,29 @@ div.download_btn {
float: left;
}
-div.download_btn a {
+div.download-btn a {
padding: 0 10px;
display: table-cell;
vertical-align: middle;
+ color: #000;
}
-div.download_btn a:hover {
+div.download-btn a:hover {
background-color: #0079b2;
color: white;
text-decoration: none;
}
+div.download-btn.download-btn-top {
+ border-color: #ec7211;
+ background: #ec7211;
+ float: right;
+}
+
+div.download-btn.download-btn-top a {
+ color: #fff;
+}
+
/*-------------output blocks----------------*/
.highlight-results .highlight pre {
@@ -1258,3 +1423,28 @@ div.download_btn a:hover {
display: none;
padding-top: 40px;
}
+
+/*------------Mobile dropdown menu smooth transition---------------*/
+@keyframes slide {
+ 0% {
+ left: -100%;
+ }
+ 25% {
+ left: -75%;
+ }
+ 50% {
+ left: -50%;
+ }
+ 75% {
+ left: -25%;
+ }
+ 100% {
+ left: 0;
+ }
+}
+
+#burgerMenu {
+ animation-name: slide;
+ animation-duration: 0.3s;
+ animation-timing-function: ease-in-out;
+}
diff --git a/docs/_static/mxnet.png b/docs/_static/mxnet.png
deleted file mode 100644
index 523676c..0000000
Binary files a/docs/_static/mxnet.png and /dev/null differ
diff --git a/docs/_static/searchtools_custom.js
b/docs/_static/searchtools_custom.js
index c6fd37f..786b03e 100644
--- a/docs/_static/searchtools_custom.js
+++ b/docs/_static/searchtools_custom.js
@@ -756,30 +756,30 @@ var Search = {
};
$(document).ready(function() {
- var searchBoxWidth = 140;
- var searchBoxWidthModifier = 200;
-
+ var searchBoxWidth = $('#search-input-wrap').width();
+ var searchBoxWidthModifier = 150;
var focusInputColor = "white";
var focusIconColor = "dimgray";
var focusPlaceColor = "searchBoxExp";
- var normalInputColor = "#87CEFA";
+ var normalInputColor = "transparent";
var normalIconColor = "white";
var normalPlaceColor = "searchBoxNorm";
function focusOut() {
- $("#search-input-wrap").width(searchBoxWidth);
+ $("#search-input-wrap").css('width', '');
$(".searchBox").width(searchBoxWidth);
$(".searchBox").css("background-color", normalInputColor);
$('#search-input-wrap input').css("background-color", normalInputColor);
$(".searchBox .glyphicon-search").css("color", normalIconColor);
$(".searchBox").addClass(normalPlaceColor);
$(".searchBox").removeClass(focusPlaceColor);
+ $(".searchBox").css('width', '');
$('#search-preview').hide();
}
Search.init();
$('#search-input-wrap input').focus(function () {
- var modifiedWidth = $(window).width() - searchBoxWidthModifier;
+ var modifiedWidth = Math.max($('#navContainer').width() -
searchBoxWidthModifier, searchBoxWidth);
$("#search-input-wrap").width(modifiedWidth);
$(".searchBox").width(modifiedWidth);
$(".searchBox").css("background-color", focusInputColor);
diff --git a/docs/api/julia/index.md b/docs/api/julia/index.md
index ecd08bf..edcc145 100644
--- a/docs/api/julia/index.md
+++ b/docs/api/julia/index.md
@@ -1,5 +1,5 @@
-MXNet - Julia API
-=================
+# MXNet - Julia API
+
MXNet supports the Julia programming language. The MXNet Julia package brings
flexible and efficient GPU
computing and the state-of-art deep learning to Julia.
@@ -10,4 +10,5 @@ computing and the state-of-art deep learning to Julia.
+## Julia API Reference
Julia documents are available at
[http://dmlc.ml/MXNet.jl/latest/](http://dmlc.ml/MXNet.jl/latest/).
diff --git a/docs/api/perl/index.md b/docs/api/perl/index.md
index 19f70fa..0ec6319 100644
--- a/docs/api/perl/index.md
+++ b/docs/api/perl/index.md
@@ -56,9 +56,9 @@ pdl> print mx->nd->array(sequence(2,3))->aspdl ## 3 rows, 2
columns
]
```
## Perl API Reference
- * [Module API](module.md) is a flexible high-level interface for training
neural networks.
- * [Symbolic API](symbol.md) performs operations on NDArrays to assemble
neural networks from layers.
- * [IO Data Loading API](io.md) performs parsing and data loading.
- * [NDArray API](ndarray.md) performs vector/matrix/tensor operations.
- * [KVStore API](kvstore.md) performs multi-GPU and multi-host distributed
training.
+ * [Module API is a flexible high-level interface for training neural
networks.](module.md)
+ * [Symbolic API performs operations on NDArrays to assemble neural networks
from layers.](symbol.md)
+ * [IO Data Loading API performs parsing and data loading.](io.md)
+ * [NDArray API performs vector/matrix/tensor operations.](ndarray.md)
+ * [KVStore API performs multi-GPU and multi-host distributed
training.](kvstore.md)
diff --git a/docs/api/scala/index.md b/docs/api/scala/index.md
index 2d5a047..ef8a03a 100644
--- a/docs/api/scala/index.md
+++ b/docs/api/scala/index.md
@@ -26,12 +26,12 @@ You can perform tensor or matrix computation in pure Scala:
```
## Scala API Reference
- * [Module API](module.md) is a flexible high-level interface for training
neural networks.
- * [Model API](model.md) is an alternate simple high-level interface for
training neural networks.
- * [Symbolic API](symbol.md) performs operations on NDArrays to assemble
neural networks from layers.
- * [IO Data Loading API](io.md) performs parsing and data loading.
- * [NDArray API](ndarray.md) performs vector/matrix/tensor operations.
- * [KVStore API](kvstore.md) performs multi-GPU and multi-host distributed
training.
+ * [Module API is a flexible high-level interface for training neural
networks.](module.md)
+ * [Model API is an alternate simple high-level interface for training neural
networks.](model.md)
+ * [Symbolic API performs operations on NDArrays to assemble neural networks
from layers.](symbol.md)
+ * [IO Data Loading API performs parsing and data loading.](io.md)
+ * [NDArray API performs vector/matrix/tensor operations.](ndarray.md)
+ * [KVStore API performs multi-GPU and multi-host distributed
training.](kvstore.md)
## Resources
diff --git a/docs/build_version_doc/AddPackageLink.py
b/docs/build_version_doc/AddPackageLink.py
index e3cc198..280f9d0 100644
--- a/docs/build_version_doc/AddPackageLink.py
+++ b/docs/build_version_doc/AddPackageLink.py
@@ -21,7 +21,7 @@ from bs4 import BeautifulSoup as bs
parser = argparse.ArgumentParser(description="Add download package link.",
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-parser.add_argument('--file_path', type=str,
default='docs/_build/html/get_started/install.html',
+parser.add_argument('--file_path', type=str,
default='docs/_build/html/install/index.html',
help='file to be modified')
parser.add_argument('--current_version', type=str, default='master',
help='Current version')
diff --git a/docs/build_version_doc/AddVersion.py
b/docs/build_version_doc/AddVersion.py
index f7abdbf..2c9ee22 100755
--- a/docs/build_version_doc/AddVersion.py
+++ b/docs/build_version_doc/AddVersion.py
@@ -59,9 +59,6 @@ if __name__ == '__main__':
continue
with open(os.path.join(path, name), 'r') as html_file:
content = bs(html_file, 'html.parser')
- if os.path.join(path, name) == args.file_path + 'index.html':
- content.find(id='example-link')['href'] = \
-
'https://github.com/apache/incubator-mxnet/tree/%s/example' %
(args.current_version)
navbar = content.find(id="main-nav")
navbar_mobile = content.find(id="burgerMenu")
outstr = str(content)
@@ -106,6 +103,11 @@ if __name__ == '__main__':
outstr = outstr.replace('pip install mxnet%s\n<' % (trail),
'pip install mxnet%s==%s\n<' %
(trail, args.current_version))
+ # Add tag for example link
+ outstr =
outstr.replace('https://github.com/apache/incubator-mxnet/tree/master/example',
+
'https://github.com/apache/incubator-mxnet/tree/%s/example' %
+ (args.current_version))
+
with open(os.path.join(path, name), "w") as outf:
outf.write(outstr)
diff --git a/docs/build_version_doc/build_doc.sh
b/docs/build_version_doc/build_doc.sh
index f98e1e0..d7cbd3b 100755
--- a/docs/build_version_doc/build_doc.sh
+++ b/docs/build_version_doc/build_doc.sh
@@ -64,6 +64,7 @@ then
cp -a "$web_folder/versions/." "$local_build/versions"
mkdir "$local_build/versions/${tag_list[0]}"
cp -a "$web_folder/." "$local_build/versions/${tag_list[0]}" || exit 1
+ cp "$web_folder/README.md" "$local_build"
rm -rf "$local_build/versions/${tag_list[0]}/versions"
rm -rf "$web_folder/*"
cp -a "$local_build/." "$web_folder"
diff --git a/docs/community/collaborator.md b/docs/community/collaborator.md
new file mode 100644
index 0000000..9e36668
--- /dev/null
+++ b/docs/community/collaborator.md
@@ -0,0 +1,68 @@
+# Collaborators
+
+<div class="section-inst">
+<div class="container">
+<div class="row">
+<div class="col-lg-4 col-sm-6">
+ <img height="60px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/aws-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="55px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/baidu-logo.jpg">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="70px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/cmu-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="70px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/dato-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="70px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/intel-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/ms-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/mit-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="40px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/nvidia-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="55px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/nyu-logo.jpg">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="55px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/hkust-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/tusimple-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/university-alberta-logo.png">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/university-washington-logo.jpg">
+</div>
+
+<div class="col-lg-4 col-sm-6">
+ <img height="45px"
src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/wolfram-logo.png">
+</div>
+</div>
+ <p>
+ MXNet is developed by collaborators from multiple universities and
+ companies. We sincerely thank the following organizations for
supporting
+ MXNet and sponsoring its major developers (alphabetical order).
+ </p>
+</div>
+</div>
diff --git a/docs/get_started/index.md b/docs/get_started/index.md
deleted file mode 100644
index 1112c9d..0000000
--- a/docs/get_started/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<html lang="en-US">
- <head>
- <meta charset="UTF-8">
- <meta http-equiv="refresh" content="0;
url=http://mxnet.io/get_started/why_mxnet.html">
- <title>Page Redirection</title>
- </head>
-</html>
diff --git a/docs/get_started/why_mxnet.md b/docs/get_started/why_mxnet.md
index 170a6ac..ed8cef1 100755
--- a/docs/get_started/why_mxnet.md
+++ b/docs/get_started/why_mxnet.md
@@ -7,7 +7,7 @@ in self-driving cars, machine translation, speech recognition
and more.
While widespread interest in deep learning took off in 2012,
deep learning has become an indispensable tool for countless industries.
-
+
It might not come as a surprise that researchers
have investigated neural networks for decades.
@@ -16,7 +16,7 @@ suggested the forerunner of today's artificial neurons back
in 1943.
Each neuron is connected to other neurons along _edges_, analogous to the
synapses that connect real neurons.
And associated with each edge is a _weight_ that indicates whether the
connection is excitatory or inhibitatory and the strength of the connection.
-
+
In the 1980s, the modern version of neural networks took shape.
Researchers arranged artificial neurons into _layers_.
@@ -53,7 +53,7 @@ replacing classical models and hand-engineered features.
Similarly, nearly every production speech recognition system now relies on
neural networks,
where replacing the hidden Markov models that previously held sway.
-
+
While GPUs and clusters present a huge opportunity for accelerating neural
network training,
adapting traditional machine learning code
diff --git a/docs/get_started/amazonlinux_setup.md
b/docs/install/amazonlinux_setup.md
similarity index 100%
rename from docs/get_started/amazonlinux_setup.md
rename to docs/install/amazonlinux_setup.md
diff --git a/docs/get_started/build_from_source.md
b/docs/install/build_from_source.md
similarity index 100%
rename from docs/get_started/build_from_source.md
rename to docs/install/build_from_source.md
diff --git a/docs/get_started/centos_setup.md b/docs/install/centos_setup.md
similarity index 100%
rename from docs/get_started/centos_setup.md
rename to docs/install/centos_setup.md
diff --git a/docs/get_started/install.md b/docs/install/index.md
similarity index 100%
rename from docs/get_started/install.md
rename to docs/install/index.md
diff --git a/docs/get_started/osx_setup.md b/docs/install/osx_setup.md
similarity index 100%
rename from docs/get_started/osx_setup.md
rename to docs/install/osx_setup.md
diff --git a/docs/get_started/raspbian_setup.md b/docs/install/raspbian_setup.md
similarity index 100%
rename from docs/get_started/raspbian_setup.md
rename to docs/install/raspbian_setup.md
diff --git a/docs/get_started/tx2_setup.md b/docs/install/tx2_setup.md
similarity index 100%
rename from docs/get_started/tx2_setup.md
rename to docs/install/tx2_setup.md
diff --git a/docs/get_started/ubuntu_setup.md b/docs/install/ubuntu_setup.md
similarity index 100%
rename from docs/get_started/ubuntu_setup.md
rename to docs/install/ubuntu_setup.md
diff --git a/docs/get_started/windows_setup.md b/docs/install/windows_setup.md
similarity index 100%
rename from docs/get_started/windows_setup.md
rename to docs/install/windows_setup.md
diff --git a/docs/mxdoc.py b/docs/mxdoc.py
index 010118c..26e4c9e 100644
--- a/docs/mxdoc.py
+++ b/docs/mxdoc.py
@@ -317,7 +317,7 @@ def _get_src_download_btn(out_prefix, langs, lines):
with open(ipynb, 'w') as f:
json.dump(_get_jupyter_notebook(lang, lines), f)
f = ipynb.split('/')[-1]
- btn += '<div class="download_btn"><a href="%s" download="%s">' \
+ btn += '<div class="download-btn"><a href="%s" download="%s">' \
'<span class="glyphicon glyphicon-download-alt"></span>
%s</a></div>' % (f, f, f)
btn += '</div>\n'
return btn
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].