[Bf-docboard-svn] bf-manual: [7964] trunk/blender_docs/resources: version switch: add title
Tobias Heinke
noreply at blender.org
Wed Apr 21 23:03:48 CEST 2021
Revision: 7964
https://developer.blender.org/rBM7964
Author: TobiasH
Date: 2021-04-21 23:03:47 +0200 (Wed, 21 Apr 2021)
Log Message:
-----------
version switch: add title
Modified Paths:
--------------
trunk/blender_docs/resources/templates/versions.html
trunk/blender_docs/resources/theme/css/version_switch.css
trunk/blender_docs/resources/theme/js/version_switch.js
Modified: trunk/blender_docs/resources/templates/versions.html
===================================================================
--- trunk/blender_docs/resources/templates/versions.html 2021-04-18 06:55:41 UTC (rev 7963)
+++ trunk/blender_docs/resources/templates/versions.html 2021-04-21 21:03:47 UTC (rev 7964)
@@ -6,6 +6,7 @@
</span>
<div class="version-dialog" aria-hidden="true">
<div class="version-arrow" aria-hidden="true"></div>
+ <div class="version-title">Versions</div>
<ul id="version-vsnlist" class="version-list" role="menu" aria-labelledby="version-dropdown" aria-hidden="true">
<li role="presentation">Loading...</li>
</ul>
@@ -17,6 +18,7 @@
</span>
<div class="version-dialog" aria-hidden="true">
<div class="version-arrow" aria-hidden="true"></div>
+ <div class="version-title">Languages</div>
<ul id="version-langlist" class="version-list" role="menu" aria-labelledby="lang-dropdown" aria-hidden="true">
<li role="presentation">Loading...</li>
</ul>
Modified: trunk/blender_docs/resources/theme/css/version_switch.css
===================================================================
--- trunk/blender_docs/resources/theme/css/version_switch.css 2021-04-18 06:55:41 UTC (rev 7963)
+++ trunk/blender_docs/resources/theme/css/version_switch.css 2021-04-21 21:03:47 UTC (rev 7964)
@@ -1,4 +1,3 @@
-/* start version */
/* Override RTD theme */
.rst-versions {
border-top: 0px;
@@ -17,7 +16,7 @@
padding: 2px 0px 30px;
font-size: 90%;
}
-.version-btn, .version-btn-open {
+.version-btn {
position: relative;
display: inline-block;
background-color: #272525;
@@ -26,14 +25,12 @@
padding: 3px 10px;
margin: 0 5px;
vertical-align: middle;
- z-index: 400;
- transition: border-color 0.4s;
-}
-.version-btn {
color: #27AE60;
border: solid 1px #444444;
border-radius: 3px;
cursor: pointer;
+ z-index: 400;
+ transition: border-color 0.4s;
}
.version-btn::after {
content:"\f0d8";
@@ -43,6 +40,9 @@
vertical-align: top;
padding-left: 0.5em;
}
+.version-btn-open::after {
+ color: gray;
+}
.version-btn:hover, .version-btn:focus {
border-color: #525252;
}
@@ -49,8 +49,6 @@
.version-btn-open {
color: gray;
border: solid 1px gray;
- border-radius: 3px;
- cursor: pointer;
}
.version-btn.wait {
cursor: wait;
@@ -67,23 +65,30 @@
margin: 0 5px;
padding-bottom: 4px;
background-color: #0003;
- border-radius: 3px 3px 0px 0px;
+ border-radius: 3px;
+ box-shadow: 0 0 6px #000C;
z-index: 399;
max-height: calc(100vh - 30px);
overflow-y: auto;
}
+.version-title {
+ padding: 5px;
+ color: black;
+ text-align: center;
+ font-size: 102%;
+ background-color: #27ae60;
+ border-bottom: solid 1.5px #444;
+}
.version-list {
margin-bottom: 4px;
text-align: center;
background-color: #000C;
border: solid 1px gray;
- border-radius: 3px;
- box-shadow: 0 0 6px #000C;
}
.version-list a, .version-list span, .version-list li {
position: relative;
display: block;
- font-size: 14px;
+ font-size: 98%;
line-height: 1.15;
width: 100%;
margin: 0;
@@ -117,4 +122,3 @@
border: 1px solid gray;
border-width: 1px 0 0 1px;
}
-/* End version. */
Modified: trunk/blender_docs/resources/theme/js/version_switch.js
===================================================================
--- trunk/blender_docs/resources/theme/js/version_switch.js 2021-04-18 06:55:41 UTC (rev 7963)
+++ trunk/blender_docs/resources/theme/js/version_switch.js 2021-04-21 21:03:47 UTC (rev 7964)
@@ -3,7 +3,7 @@
var versionsFileUrl = "https://docs.blender.org/versions.json"
-var all_versions = "";
+var all_versions;
var all_langs = {
"en": "English",
"ar": "اَلْعَرَبِيَّةُ",
@@ -31,8 +31,6 @@
function Drop(id){
this.isOpen=false;
this.type = (id === "version-dropdown");
- this.listlabel = this.type ? "Versions" : "Language";
- this.label = this.listlabel;
this.$btn = $('#' + id);
this.$dialog = this.$btn.next();
this.$list = this.$dialog.children("ul");
@@ -50,7 +48,7 @@
this.$btn.off("click");
this.$btn.off("keydown");
- if(all_versions === "") {
+ if(all_versions === undefined) {
this.$btn.addClass("wait");
this.loadVL(this);
} else {
@@ -79,7 +77,6 @@
this.warnOld(release, all_versions);
var version = this.getNamed(release);
- this.label = this.type ? all_versions[version] : all_langs[lang];
var list = this.buildList(version, lang);
this.$list.children(":first-child").remove();
@@ -175,10 +172,8 @@
var that=this;
if(!this.isOpen) {
this.$btn.addClass("version-btn-open");
- this.$btn.removeClass("version-btn");
this.$btn.attr("aria-pressed", true);
this.$dialog.attr("aria-hidden", false);
- this.$btn.html(this.listlabel);
this.$dialog.fadeIn(speed, function() {
that.$btn.parent().on("focusout", function(e) {that.focusoutHandler(); e.stopImmediatePropagation();})
that.$btn.parent().on("mouseleave", function(e){that.mouseoutHandler(); e.stopImmediatePropagation();});
@@ -185,14 +180,13 @@
});
this.isOpen = true;
} else {
- this.$btn.addClass("version-btn");
this.$btn.removeClass("version-btn-open");
this.$btn.attr("aria-pressed", false);
this.$dialog.attr("aria-hidden", true);
- this.$btn.html(this.label);
this.$btn.parent().off("focusout");
this.$btn.parent().off("mouseleave");
this.$dialog.fadeOut(speed, function() {
+ if (this.$sel) {this.$sel.attr("tabindex", -1);}
that.$btn.attr("tabindex", 0);
if(document.activeElement !== null && document.activeElement !== document && document.activeElement !== document.body) {
that.$btn.focus();
@@ -218,7 +212,7 @@
var list = this.$list;
var that = this;
setTimeout(function() {
- if (list.find(":focus").length == 0) {
+ if (list.find(":focus").length === 0) {
that.dialogToggle(200);
}
}, 200);
More information about the Bf-docboard-svn
mailing list