Skip to content

Commit 1817c5c

Browse files
authored
Merge pull request #161 from james-baber/fixed-docs-webkit-and-footer-bug
fixed footer and webkit bug in documentation site
2 parents a88b839 + 69fea7d commit 1817c5c

File tree

6 files changed

+68
-17
lines changed

6 files changed

+68
-17
lines changed

docs/_includes/head.html

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<meta charset="utf-8">
33
<meta http-equiv="X-UA-Compatible" content="IE=edge">
44
<meta name="viewport" content="width=device-width, initial-scale=1">
5+
<meta name="color-scheme" content="only">
6+
7+
<!-- Preview image-->
8+
<link rel="image_src" href="https://epicgames.github.io/BlenderTools/assets/images/send2ue-preview-01.jpg" />
9+
510
{%- seo -%}
611
<!-- Bootstrap CSS CDN -->
712
<link rel="stylesheet" href="{{ '/assets/css/prism.css' | relative_url }}">

docs/_includes/scripts.html

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292

9393
<!--Addition Styling to Markdown-->
9494
<script>
95+
9596
// Add dividers before h2 and h3 headers
9697
$( "<div class='line'></div>" ).insertBefore('.container-fluid h2');
9798
$( "<div class='line'></div>" ).insertBefore('.container-fluid h3');

docs/_includes/side-nav.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11

22
<nav id="sidebar">
33
<div class="sidebar-header">
4-
<a style="color: #ffffff" class="sidebar-title" href="{{ /index.html | relative_url }}"><h1 style="margin-left: -15px; font-size: 25px" >{{ site.title | escape }}</h1></a>
4+
<a class="sidebar-title" href="{{ /index.html | relative_url }}"><h1 style="margin-left: -15px; font-size: 25px" >{{ site.title | escape }}</h1></a>
55
</div>
66

77
<ul class="list-unstyled components">
88
{% for category in site.data.side-nav.categories %}
99
<li>
10-
<a style="text-decoration: none; color: #999" href="#{{ category.title | remove: ' '}}" data-toggle="collapse" aria-expanded="true" class="dropdown-toggle sidebar-section">{{ category.title }}</a>
10+
<a href="#{{ category.title | remove: ' '}}" data-toggle="collapse" aria-expanded="true" class="dropdown-toggle sidebar-section">{{ category.title }}</a>
1111
<ul class="collapse {% if page.url contains category.folder %}show{% endif %} list-unstyled" id="{{ category.title | remove: ' '}}">
1212

1313
<li>
1414
{% for menu in category.menus %}
1515
{% if menu.submenus %}
16-
<a style="text-decoration: none; color: #999" href="#{{ category.title | append: menu.title | remove: ' '}}" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle">{{ menu.title }}</a>
16+
<a class="sidebar-sub-menu dropdown-toggle" href="#{{ category.title | append: menu.title | remove: ' '}}" data-toggle="collapse" aria-expanded="false">{{ menu.title }}</a>
1717
<ul class="collapse {% if page.url contains menu.folder %}show{% endif %} list-unstyled" id="{{ category.title | append: menu.title | remove: ' '}}">
1818
{% for submenu in menu.submenus %}
1919
<li>
20-
<a style="text-decoration: none; background: #1f1f1f; color: #999" href="{{ submenu.url | relative_url }}">{{ submenu.title }}</a>
20+
<a class="sidebar-sub-item" href="{{ submenu.url | relative_url }}">{{ submenu.title }}</a>
2121
</li>
2222
{% endfor %}
2323
</ul>
2424
{% else %}
25-
<a style="text-decoration: none; color: #999" href="{{ menu.url | relative_url }}">{{ menu.title }}</a>
25+
<a class="sidebar-item" href="{{ menu.url | relative_url }}">{{ menu.title }}</a>
2626
{% endif %}
2727
{% endfor %}
2828
</li>

docs/_layouts/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
{%- include header.html -%}
1313
<div class="container-fluid">
1414
{{ content }}
15+
{%- include footer.html -%}
1516
</div>
16-
{%- include footer.html -%}
1717
</div>
1818
</main>
1919
{%- include scripts.html -%}

docs/assets/css/style.scss

+55-10
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,13 @@ a, a:hover, a:focus {
7777
min-width: 250px;
7878
max-width: 250px;
7979
background: #3f3f3f;
80-
color: #fff;
80+
color: #ffffff !important;
8181
transition: all 0.6s cubic-bezier(0.945, 0.020, 0.270, 0.665);
8282
transform-origin: bottom left;
83+
text-decoration: none;
84+
-webkit-text-fill-color: #ffffff;
85+
-webkit-opacity: 1;
86+
8387
}
8488

8589
#footer {
@@ -101,15 +105,55 @@ a, a:hover, a:focus {
101105
transform: translateX(-250);
102106
}
103107

108+
#sidebar .sidebar-title {
109+
margin: 30px;
110+
text-align: center;
111+
color: inherit;
112+
text-decoration: inherit;
113+
-webkit-text-fill-color: inherit;
114+
-webkit-opacity: inherit;
115+
}
116+
104117
#sidebar .sidebar-header {
105118
padding-top: 20px;
106119
padding-left: 20px;
107120
padding-bottom: 0px;
108-
background: #3f3f3f;
121+
color: inherit;
122+
text-decoration: inherit;
123+
-webkit-text-fill-color: inherit;
124+
-webkit-opacity: inherit;
109125
}
110126

111127
#sidebar .sidebar-section {
112128
background: #1f1f1f;
129+
color: inherit;
130+
text-decoration: inherit;
131+
-webkit-text-fill-color: inherit;
132+
-webkit-opacity: inherit;
133+
}
134+
135+
#sidebar .sidebar-item {
136+
background: #2f2f2f;
137+
color: inherit;
138+
text-decoration: inherit;
139+
-webkit-text-fill-color: inherit;
140+
-webkit-opacity: inherit;
141+
}
142+
143+
#sidebar .sidebar-sub-menu {
144+
background: #1f1f1f;
145+
color: inherit;
146+
text-decoration: inherit;
147+
-webkit-text-fill-color: inherit;
148+
-webkit-opacity: inherit;
149+
}
150+
151+
#sidebar .sidebar-sub-item {
152+
background: #3f3f3f;
153+
color: inherit;
154+
text-decoration: inherit;
155+
-webkit-text-fill-color: inherit;
156+
-webkit-opacity: inherit;
113157
}
114158

115159
#sidebar ul.components {
@@ -126,9 +170,9 @@ a, a:hover, a:focus {
126170
font-size: 1.1em;
127171
display: block;
128172
}
129-
#sidebar ul li a:hover {
173+
#sidebar a:hover {
130174
color: #3f3f3f;
131-
background: #fff;
175+
background: #9f9f9f;
132176
}
133177

134178
#sidebar ul li.active > a, a[aria-expanded="true"] {
@@ -271,11 +315,15 @@ a.article, a.article:hover {
271315
#search-doc {
272316
left: -2%;
273317
}
318+
#footer {
319+
visibility: visible;
320+
}
274321
}
275322

276-
a.sidebar-title {
277-
margin: 30px;
278-
text-align: center;
323+
@media (max-width: 992px) {
324+
#footer {
325+
visibility: hidden;
326+
}
279327
}
280328

281329
.highlighter-rouge .highlight {
@@ -286,6 +334,3 @@ a.sidebar-title {
286334
height: 100%;
287335
}
288336

289-
290-
291-

docs/contributing/development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Clone your fork and checkout that branch:
3636

3737
git clone https://github.com/<your-user-name>/BlenderTools.git
3838
cd BlenderTools
39-
git checkout <some-task-branch>`
39+
git checkout <some-task-branch>
4040

4141
## Testing your changes
4242
While developing, you will want to be able to rapidly test your new changes. You can do this by running this script in the Blender text editor.

0 commit comments

Comments
 (0)