Merge pull request #1 from josegonzalez/patch-1

Minor changes
This commit is contained in:
Benjamin Kampmann committed 2016-03-13 12:33:06 +01:00
commit 63db85b244
3 files changed
+28 -6

No files matched your search

+2 -2
View File
@@ -238,8 +238,8 @@ blockquote {
margin-bottom: 30px; margin-bottom: 30px;
} }
blockquote.new-as-of { blockquote.new-as-of {
border-left: 4px solid #f0ad4e; border-left: 4px solid #d1f2a5;
background-color: #f0dc6e; background-color: #effab4;
} }
blockquote.not-yet-released { blockquote.not-yet-released {
border-left: 4px solid #ef5b58; border-left: 4px solid #ef5b58;
+1
View File
@@ -4,6 +4,7 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas
To propose a release, the following tasks need to be performed: To propose a release, the following tasks need to be performed:
- Update all blockquote references of `not yet released and only available in master` to point to release version.
- The installable version must be changed in the `contrib/dokku-installer.py` file. - The installable version must be changed in the `contrib/dokku-installer.py` file.
- The installable version must be changed in the `debian/control` file. - The installable version must be changed in the `debian/control` file.
- The installable version must be changed in the `docs/home.html` file - The installable version must be changed in the `docs/home.html` file
+25 -4
View File
@@ -36,6 +36,9 @@
<link href="https://cdn.rawgit.com/dokku/dokku/v0.4.14/docs/assets/style.css" rel="stylesheet"> <link href="https://cdn.rawgit.com/dokku/dokku/v0.4.14/docs/assets/style.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
<style> <style>
blockquote.new-as-of {border-left:4px solid #d1f2a5;background-color:#effab4;}
blockquote.not-yet-released {border-left:4px solid #ef5b58;background-color:#f9ad76;}
.rst-versions.rst-badge {display: block;} .rst-versions.rst-badge {display: block;}
.rst-other-versions {text-align: left;} .rst-other-versions {text-align: left;}
.rst-other-versions a {border: 0;} .rst-other-versions a {border: 0;}
@@ -78,11 +81,18 @@
.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left} .rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}
.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left} .rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}
.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center} .rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}
@media screen and (max-width: 768px){.rst-versions{width:85%;display:none} .dev-warning, .outdated-warning {position: absolute;top: 0;width: 100%;padding: 8px 20px 8px;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;background-image: -webkit-linear-gradient(-45deg, rgba(0,0,0,0.04) 25%, transparent 25%, transparent 50%, rgba(0,0,0,0.04) 50%, rgba(0,0,0,0.04) 75%, transparent 75%, transparent);background-image: -moz-linear-gradient(-45deg, rgba(0,0,0,0.04) 25%, transparent 25%, transparent 50%, rgba(0,0,0,0.04) 50%, rgba(0,0,0,0.04) 75%, transparent 75%, transparent);background-image: linear-gradient(135deg, rgba(0,0,0,0.04) 25%, transparent 25%, transparent 50%, rgba(0,0,0,0.04) 50%, rgba(0,0,0,0.04) 75%, transparent 75%, transparent);font-family: "Roboto", Corbel, Avenir, "Lucida Grande", "Lucida Sans", sans-serif;font-size: 14px;text-align: center;background-color: #ffe761;}
.rst-versions.shift{display:block}img{width:100%;height:auto}} @media screen and (max-width: 768px){
.rst-versions{width:85%;display:none}
.rst-versions.shift{display:block}img{width:100%;height:auto}
.dev-warning, .outdated-warning { position: fixed; min-width: 768px;}
}
</style> </style>
</head> </head>
<body> <body>
<div class="dev-warning doc-floating-warning" style="display:none">
This document is for dokku's development version, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page.
</div>
<div class="header"> <div class="header">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
@@ -192,6 +202,10 @@
</div> </div>
</div> </div>
<div class="dev-warning doc-floating-warning" style="display:none">
This document is for dokku's development version, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page.
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/1.3.0/anchor.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/1.3.0/anchor.js"></script>
<script> <script>
document.addEventListener("DOMContentLoaded", function (e) { document.addEventListener("DOMContentLoaded", function (e) {
@@ -250,9 +264,9 @@
}; };
Array.prototype.forEach.call(blockquotes, function (el, i) { Array.prototype.forEach.call(blockquotes, function (el, i) {
if (el.innerHTML.indexOf('New as of') !== -1) { if (el.innerHTML.toLowerCase().indexOf('new as of') !== -1) {
addClass(el, 'new-as-of'); addClass(el, 'new-as-of');
} else if (el.innerHTML.indexOf('not yet released') !== -1) { } else if (el.innerHTML.toLowerCase().indexOf('not yet released') !== -1) {
addClass(el, 'not-yet-released'); addClass(el, 'not-yet-released');
} }
}); });
@@ -327,6 +341,13 @@
}); });
}; };
if (currentVersion == 'master') {
document.querySelectorAll('.dev-warning')[0].style.position = 'relative';
Array.prototype.forEach.call(document.querySelectorAll('.dev-warning'), function (el, i) {
el.style.display = '';
});
}
data = ls2.load('max-versions'); data = ls2.load('max-versions');
if (!data) { if (!data) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();