From: Michael Hanke
Date: Fri, 7 Dec 2012 08:38:03 +0000 (+0100)
Subject: Merge branch 'master' into newdesign
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1f3e1e3baea966d60a549aaa16e5e03ad890a473;hp=daa9f4b4c6fabcdd1abe8b53d760a7ece4681e01;p=neurodebian.git
Merge branch 'master' into newdesign
* master:
updated VM page for 6.0.6 (with the date when VM was wrapped on 1st of Oct)
add remake to give it a page
Conflicts:
sphinx/vm.rst
---
diff --git a/artwork/config.svg b/artwork/config.svg
new file mode 100644
index 0000000..b8fe600
--- /dev/null
+++ b/artwork/config.svg
@@ -0,0 +1,192 @@
+
+
+
+
diff --git a/artwork/debian.svg b/artwork/debian.svg
new file mode 100644
index 0000000..d23a4b5
--- /dev/null
+++ b/artwork/debian.svg
@@ -0,0 +1,278 @@
+
+
+
+
diff --git a/artwork/faq.svg b/artwork/faq.svg
new file mode 100644
index 0000000..493b775
--- /dev/null
+++ b/artwork/faq.svg
@@ -0,0 +1,432 @@
+
+
+
+
diff --git a/artwork/feedback.svg b/artwork/feedback.svg
new file mode 100644
index 0000000..f7de496
--- /dev/null
+++ b/artwork/feedback.svg
@@ -0,0 +1,561 @@
+
+
+
+
diff --git a/artwork/neurodebian.svg b/artwork/neurodebian.svg
new file mode 100644
index 0000000..f877aae
--- /dev/null
+++ b/artwork/neurodebian.svg
@@ -0,0 +1,335 @@
+
+
+
+
diff --git a/artwork/nitrc.svg b/artwork/nitrc.svg
new file mode 100644
index 0000000..7735073
--- /dev/null
+++ b/artwork/nitrc.svg
@@ -0,0 +1,6345 @@
+
+
+
+
diff --git a/neurodebian/templates/sources_lists.rst b/neurodebian/templates/sources_lists.rst
index f56d610..58de169 100644
--- a/neurodebian/templates/sources_lists.rst
+++ b/neurodebian/templates/sources_lists.rst
@@ -1,26 +1,21 @@
.. raw:: html
-
-
- After selecting a release the setup code will be shown here.
-
-
-
diff --git a/sphinx/_static/config.png b/sphinx/_static/config.png
new file mode 100644
index 0000000..e60f10c
Binary files /dev/null and b/sphinx/_static/config.png differ
diff --git a/sphinx/_static/debian.png b/sphinx/_static/debian.png
new file mode 100644
index 0000000..0e19be0
Binary files /dev/null and b/sphinx/_static/debian.png differ
diff --git a/sphinx/_static/demo_button.png b/sphinx/_static/demo_button.png
new file mode 100644
index 0000000..c7cfa11
Binary files /dev/null and b/sphinx/_static/demo_button.png differ
diff --git a/sphinx/_static/faq.png b/sphinx/_static/faq.png
new file mode 100644
index 0000000..adca7c8
Binary files /dev/null and b/sphinx/_static/faq.png differ
diff --git a/sphinx/_static/feedback.png b/sphinx/_static/feedback.png
new file mode 100644
index 0000000..0d1d8a5
Binary files /dev/null and b/sphinx/_static/feedback.png differ
diff --git a/sphinx/_static/hotbrain_bg.jpg b/sphinx/_static/hotbrain_bg.jpg
new file mode 100644
index 0000000..771a5ed
Binary files /dev/null and b/sphinx/_static/hotbrain_bg.jpg differ
diff --git a/sphinx/_static/neurodebian.css b/sphinx/_static/neurodebian.css
index e5e3d06..b0d643b 100644
--- a/sphinx/_static/neurodebian.css
+++ b/sphinx/_static/neurodebian.css
@@ -5,7 +5,7 @@
body {
font-family: sans-serif;
font-size: 100%;
- background-color: #444;
+ background-color: #fff;
color: #000;
margin: 0;
padding: 0;
@@ -14,7 +14,7 @@ body {
/* :::: LAYOUT :::: */
div.document {
- background-color: #afafaf;
+ background-color: #fff;
}
div.documentwrapper {
@@ -28,6 +28,10 @@ div.bodywrapper {
div.body {
background-color: white;
+ background-image: url(hotbrain_bg.jpg);
+ background-repeat:no-repeat;
+ background-position:100% 100%;
+ background-attachment:fixed;
padding: 0 20px 30px 20px;
}
@@ -71,24 +75,20 @@ div.clearer {
}
div.footer {
- color: #fff;
+ color: #000;
width: 100%;
padding: 9px 0 9px 0;
text-align: center;
font-size: 75%;
}
-div.footer a {
- color: #fff;
- text-decoration: underline;
-}
-
div.related {
background-color: #2c3c3d;
- color: #fff;
+ color: #888;
width: 100%;
line-height: 30px;
font-size: 90%;
+ float: right;
}
div.related h3 {
@@ -111,7 +111,7 @@ div.related li.right {
}
div.related a {
- color: white;
+ color: #fff;
}
/* ::: TOC :::: */
@@ -218,6 +218,10 @@ ul.search li div.context {
text-align: left;
}
+ul.simple {
+ margin-bottom: 1em;
+}
+
ul.keywordmatches li.goodmatch a {
font-weight: bold;
}
@@ -335,7 +339,7 @@ div.body h4,
div.body h5,
div.body h6 {
font-family: 'Trebuchet MS', sans-serif;
- background-color: #f2f2f2;
+ background-color: rgba(242, 242, 242, 0.5);
font-weight: normal;
color: #20435c;
border-bottom: 1px solid #ccc;
@@ -343,7 +347,7 @@ div.body h6 {
padding: 3px 0 3px 10px;
}
-div.body h1 { margin-top: 0; font-size: 200%; }
+div.body h1 { margin-top: 0em; font-size: 180%; padding-top: 1em;}
div.body h2 { font-size: 160%; }
div.body h3 { font-size: 140%; }
div.body h4 { font-size: 120%; }
@@ -477,7 +481,7 @@ div.warning {
}
div.note {
- background-color: #eaf2f9;
+ background-color: rgba(234, 242, 249, 0.6);
border: 1px solid #3d7aa5;
border-left: none;
border-right: none;
@@ -552,6 +556,11 @@ dd {
color: #060;
}
+dt {
+ font-weight: bold;
+ margin-top: 1em;
+}
+
dt:target,
.highlight {
background-color: #fbe54e;
@@ -569,7 +578,7 @@ th {
pre {
padding: 5px;
- background-color: #efc;
+ background-color: rgba(238, 255, 204, 0.6);
color: #333;
border: 1px solid #ac9;
border-left: none;
@@ -784,5 +793,112 @@ td.task {
text-align: left;
}
+.button {
+ background-color: transparent;
+ font-weight: normal;
+ color: #20435c;
+ border: 1px solid #ccc;
+ padding: 3px;
+ text-align: center;
+ cursor: pointer;
+}
+
+div.buttonbar {
+ background-color: #fff;
+ font-size: 70%;
+}
+div.buttonbar a:hover {
+ text-decoration: none;
+}
+
+div.buttonbar a:hover img {
+ background-color: #ffc7da;
+}
+
+div.buttonbar ul {
+ list-style: none;
+ padding: 0px;
+}
+
+div.buttonbar li {
+ display: inline;
+ float: left;
+ margin: 5px;
+ text-align: center;
+}
+div#randomquote {
+}
+
+div#randomquote blockquote.epigraph {
+ padding: 0 2em 2em 2em;
+ background-color: transparent;
+ font-style: italic;
+ font-size: 80%;
+ border: 0px
+}
+
+#troubleshooting dt,
+div#frequently-asked-questions dt {
+ font-weight: bold;
+ margin-top: 1em;
+ margin-left: 1em;
+ cursor: pointer;
+ display: list-item;
+ list-style-image:url(neurodebian_bullet.png);
+}
+
+div#frequently-asked-questions dt:after {
+ content: "\203A\203A";
+ padding-left: .25em;
+}
+
+div#sitemap ul {
+ float: left;
+ list-style: none;
+}
+
+.linkmore {
+ margin-top: -2em;
+ float: right;
+ font-size: 70%;
+}
+
+.nojavascriptinstructions {
+ font-size: 70%;
+}
+
+.expandinstructions {
+ font-size: 70%;
+ display: none;
+}
+
+.linkmore:before,
+.nojavascriptinstructions:before,
+.expandinstructions:before {
+ content: "["
+}
+
+.linkmore:after,
+.nojavascriptinstructions:after,
+.expandinstructions:after {
+ content: "]"
+}
+
+
+.highlighted {
+ background-color: yellow;
+}
+
+#searchbox p {
+ display: inline;
+}
+
+.inlineimage {
+ vertical-align: baseline;
+}
+
+a img.inlineimage:hover {
+ background-color: #820430;
+}
diff --git a/sphinx/_static/neurodebian.png b/sphinx/_static/neurodebian.png
new file mode 100644
index 0000000..d88a9e6
Binary files /dev/null and b/sphinx/_static/neurodebian.png differ
diff --git a/sphinx/_static/nitrc.png b/sphinx/_static/nitrc.png
new file mode 100644
index 0000000..ca4bc05
Binary files /dev/null and b/sphinx/_static/nitrc.png differ
diff --git a/sphinx/_static/video_button.png b/sphinx/_static/video_button.png
new file mode 100644
index 0000000..dff08a1
Binary files /dev/null and b/sphinx/_static/video_button.png differ
diff --git a/sphinx/_templates/layout.html b/sphinx/_templates/layout.html
index 4e53265..c262f01 100644
--- a/sphinx/_templates/layout.html
+++ b/sphinx/_templates/layout.html
@@ -2,68 +2,51 @@
{% block extrahead %}
+
+
+
+
{% endblock %}
-{% block rootrellink %}
- Debian ||
- Neuroscience :
- Software |
- Datasets |
- Virtual Machine |
- FAQ |
- Testimonials
+{% block header %}
+
+
{% endblock %}
+{% block rootrellink %}{% endblock %}
+
{% block relbaritems %}
Comments |
-{% endblock %}
-
-{% block sidebar1 %}{% endblock %}
-
-{% block sidebar2 %}
-{{ sidebar() }}
-{% endblock %}
-
{% block sidebarsearch %}
{{ super() }}
-
-
-
-
-
-
-
-
-
+{% endblock %}
+
+
{{ super() }}
-