Skip to content

Commit ab91152

Browse files
a-gavea-gave
committed
minor fixes: ui and update packages
- update packages list after libremesh/lime-packages#1097 and create packages index page. - ui: better selection of links in the left menu, and decreased general font size
1 parent 403cffd commit ab91152

79 files changed

Lines changed: 166 additions & 761 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_data/packages.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ packages:
66
readme: Readme.md
77
- name: bandwidth-test
88
- name: batman-adv-auto-gw-mode
9-
- name: bmx6-auto-gw-mode
109
- name: bmx7-auto-gw-bw-mode
1110
- name: bmx7-auto-gw-mode
1211
- name: bmx7-mdns
@@ -33,7 +32,6 @@ packages:
3332
- name: lime-proto-babeld
3433
- name: lime-proto-batadv
3534
- name: lime-proto-bgp
36-
- name: lime-proto-bmx6
3735
- name: lime-proto-bmx7
3836
- name: lime-proto-olsr2
3937
- name: lime-proto-olsr6
@@ -42,10 +40,8 @@ packages:
4240
- name: lime-report
4341
- name: lime-smart-wifi
4442
- name: lime-system
45-
- name: lime-webui
4643
- name: lua-argparse
4744
readme: Readme.md
48-
- name: luci-app-batman-adv
4945
- name: luci-app-openairview
5046
- name: luci-lib-jquery-flot
5147
- name: luci-mod-status
@@ -64,7 +60,9 @@ packages:
6460
- name: shared-state-async
6561
readme: README.adoc
6662
- name: shared-state-babeld_hosts
63+
- name: shared-state-babel_links_info
6764
- name: shared-state-bat_hosts
65+
- name: shared-state-bat_links_info
6866
- name: shared-state-dnsmasq_hosts
6967
- name: shared-state-dnsmasq_leases
7068
- name: shared-state-dnsmasq_servers
@@ -79,8 +77,6 @@ packages:
7977
- name: sprunge
8078
- name: ubus-lime-batman-adv
8179
readme: Readme.md
82-
- name: ubus-lime-bmx6
83-
readme: Readme.md
8480
- name: ubus-lime-groundrouting
8581
readme: Readme.md
8682
- name: ubus-lime-location

‎_data/structure.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,23 @@ docs:
1111
- ref: docs_overview
1212
- ref: quick_starting_guide
1313
subpages:
14-
- ref: quick_starting_guide
1514
- ref: connecting_to_nodes
1615
- ref: cli_configuration
1716
- ref: configuration
1817
subpages:
19-
- ref: configuration
2018
- ref: faq-and-recommendations
2119
- ref: lime-example
2220
- ref: ethernet_config
2321
- ref: wifi_config
2422
- ref: troubleshooting
2523
- ref: hardware
2624
subpages:
27-
- ref: hardware
2825
- ref: tp-link
2926
- ref: xiaomi-miwifir3
3027

3128
development:
3229
- ref: development
3330
subpages:
34-
- ref: development
3531
- ref: development-network_profiles
3632
- ref: development-kernel_vermagic
3733

‎_includes/editable.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<style>
66
.more {
77
float:right;
8-
font-size: 1.0rem !important;
8+
font-size: 1.2rem !important;
99
}
1010
.more:hover {
1111
color: cornflowerblue !important;
@@ -16,6 +16,8 @@
1616
display: inline-block;
1717
}
1818

19+
.dropdown i { font-size: 1.6rem !important;}
20+
1921
.dropdown-content {
2022
display: none;
2123
position: absolute;
@@ -25,6 +27,7 @@
2527
box-shadow: 0px 8px 6px 0px rgba(0,0,0,0.2);
2628
padding: 0px 10px;
2729
z-index: 1;
30+
2831
}
2932

3033
.dropdown:hover .dropdown-content {

‎_includes/header.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</div>
2121
<div class="md-flex__cell md-flex__cell--stretch">
2222
<div class="md-flex__ellipsis md-header-nav__title" data-md-component=title>
23-
<span class=md-header-nav__topic>{{ site.title }}</span>
23+
<span class=md-header-nav__topic><a href="{{site.url}}">{{ site.title }}</a></span>
2424
<span class=md-header-nav__topic>{{ page.title }}</span>
2525
</div>
2626
</div>

‎_includes/nav_development.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
{% unless docs_lang_pages %} {% assign docs_lang_pages=site.pages | where:"ref",item.ref | where:"lang","en" %} {% endunless %}
44
{% assign doc_page=docs_lang_pages.first %}
55
<li class="md-nav__item {% if page.url == doc_page.url %} md-nav__item--active {% endif %}
6-
{% if item.subpages %} md-nav__item--nested {% endif %} {% if page.url contains doc_page.ref %} md-nav__item--nested-open {% endif %}">
6+
{% if item.subpages %} md-nav__item--nested {% endif %} {% if page.url contains doc_page.ref %} md-nav__item--nested-open {% endif %}
7+
{% if page.url == doc_page.url %} md-nav__item--nested-open {% endif %}
8+
">
79
{% if item.subpages %}
8-
<div>
10+
<a class="md-nav__link {% if page.url == doc_page.url %} md-nav__link--active{% endif %}"
11+
style="display: flex; justify-content: space-between;"
12+
href="{% if page.url != doc_page.url %}{{site.prefix}}/{{ doc_page.url }}/{% else %}#{% endif %}">
913
<div>
1014
{% if doc_page.fontawesome_icon %}<i class="fa {{doc_page.fontawesome_icon}}" aria-hidden="true"></i>{% endif %}
1115
<span>{{ doc_page.title }}</span>
1216
</div>
1317
<span style="text-align: right"><i class="fa fa-chevron-right" aria-hidden="true"></i></span>
14-
</div>
18+
</a>
1519
<ul class="md-nav__list {% if page.url contains doc_page.url %} md-nav__list-open {% endif %}" data-md-scrollfix="">
1620
{% for subpage in item.subpages %}
1721
{% assign docs_lang_subpages=site.pages | where:"ref",subpage.ref | where:"lang",lang | default: false %}

‎_includes/nav_documentation.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@
77
{% unless docs_lang_pages %} {% assign docs_lang_pages=site.pages | where:"ref",item.ref | where:"lang","en" %} {% endunless %}
88
{% assign doc_page=docs_lang_pages.first %}
99
<li class="md-nav__item {% if page.url == doc_page.url %} md-nav__item--active {% endif %}
10-
{% if item.subpages %} md-nav__item--nested {% for subpage in item.subpages %}{% if page.ref == subpage.ref %} md-nav__item--nested-open {% endif %}{% endfor %}{% endif %}">
10+
{% if item.subpages %} md-nav__item--nested {% for subpage in item.subpages %}{% if page.ref == subpage.ref %} md-nav__item--nested-open {% endif %}{% endfor %}{% endif %}
11+
{% if page.url == doc_page.url %} md-nav__item--nested-open {% endif %}">
1112
{% if item.subpages %}
12-
<div>
13-
<div>
14-
{% if doc_page.fontawesome_icon %}<i class="fa {{doc_page.fontawesome_icon}}" aria-hidden="true"></i>{% endif %}
13+
<a class="md-nav__link {% if page.url == doc_page.url %} md-nav__link--active{% endif %}" style="display:flex;justify-content: space-between;"
14+
href="{% if page.url != doc_page.url %}{{site.prefix}}{{ doc_page.url }}{% else %}#{% endif %}">
15+
<div style="display:flex;justify-content: flex-start;">
16+
{% if doc_page.fontawesome_icon %}<i class="fa {{doc_page.fontawesome_icon}}" aria-hidden="true"></i>{% endif %}
1517
<span>{{ doc_page.title }}</span>
1618
</div>
1719
<span style="text-align: right"><i class="fa fa-chevron-right" aria-hidden="true"></i></span>
18-
</div>
20+
</a>
1921
<ul class="md-nav__list {% if page.url contains doc_page.url %} md-nav__list-open {% endif %}" data-md-scrollfix="">
2022
{% for subpage in item.subpages %}
2123
{% assign docs_lang_subpages=site.pages | where:"ref",subpage.ref | where:"lang",lang | default: false %}

‎_includes/nav_packages.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
<li class="md-nav__item md-nav__item--nested {% if page.url == doc_page.url %} md-nav__item--active {% endif %}
1+
<li class="md-nav__item md-nav__item--nested {% if page.url == 'packages/' %} md-nav__item--active {% endif %}
22
{% if page.url contains '/packages/' %} md-nav__item--nested-open {% endif %}">
3-
<div>
3+
<a class="md-nav__link {% if page.url == doc_page.url %} md-nav__link--active{% endif %}"
4+
style="display: flex; justify-content: space-between"
5+
href="{% if page.url != 'packages/' %}{{site.prefix}}/packages/{% else %}#{% endif %}">
46
<div>
57
<i class="fa fa-cube" aria-hidden="true"></i>
68
<span>Packages</span>
79
</div>
810
<span style="text-align: right"><i class="fa fa-chevron-right" aria-hidden="true"></i></span>
9-
</div>
11+
</a>
1012
<ul class="md-nav__list{% if page.url contains '/packages/' %} md-nav__list-open {% endif %}" data-md-scrollfix="">
1113
{% for item in site.pages %}{% if item.path contains 'packages/' %}
1214
<li class="md-nav__item{% assign current_item = '/packages/' | append: item.ref | append: '.html' %}{% if page.url == current_item %} md-nav__item--active {% endif %}">

‎_includes/top_nav.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="md-flex hs no-scrollbar" style="background-color: #333;">
1+
<div class="top-nav md-flex hs no-scrollbar" style="background-color: #333;">
22
<ul class="md-tabs__list">
33
{% for item in site.data.structure.main %}
44
<!-- Use the current language and default to english if doc translation is not found -->

‎assets/css/style.css‎

Lines changed: 66 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
--color-primary: #119413;
44
--color-secondary: #536dfe;
55
--color-header: #333;
6+
font-size: 9px;
67
}
78

89
.md-sidebar--primary, .md-sidebar--secondary { top: 9.6em; position: fixed; }
@@ -21,13 +22,13 @@ li.fa-li { display: flex; align-items: baseline; }
2122
/* headings */
2223
.md-typeset h1, .md-typeset h2, .md-typeset h3 { font-weight: normal;}
2324
.md-typeset h1 { position: relative;
24-
padding-top: 13rem;
25-
margin-top: -13rem;
2625
z-index: 0;
2726
color: #666}
2827

2928
.sectionbody { z-index: 1; position: relative; }
3029

30+
.md-main__inner {padding-top: 0;}
31+
3132
.hs {
3233
display: grid;
3334
grid-gap: calc(var(--gutter) / 2);
@@ -63,7 +64,11 @@ li.fa-li { display: flex; align-items: baseline; }
6364
.text-grey { color: rgba(0, 0, 0, .54); letter-spacing: .5px; }
6465

6566
.sect-1 { padding-top: 2em;}
66-
.md-typeset h1[id]:first-of-type:before { margin-top: -3.5rem; padding-top: 0;}
67+
68+
/* h1 */
69+
.md-typeset h1[id]:first-of-type {margin: 0; padding-bottom: 2rem; transition: .15s ease-out ;}
70+
.md-sidebar--primary[data-md-state="lock"] ~ div[id] .md-typeset h1[id] {padding-top: 4rem}
71+
6772
header .md-tabs__list { margin-left: 0;}
6873
.md-footer-nav { margin-top: 0; background-color: transparent;}
6974
.md-footer-meta { background-color: var(--color-header); position: relative;}
@@ -80,34 +85,42 @@ footer .u-container {height: 2em;
8085
.lng a.md-tabs__link {background-color: #333; padding: 1rem; text-align:center; min-width: 3.5rem; height: 3.5rem; line-height: 1.2; margin: .7rem .1rem .7rem 0; opacity: 1; font-size: 1.3rem; border-radius: 50%; letter-spacing: .5px;}
8186
.lng a.md-tabs__link.lng-active {background-color: #262626;}
8287

83-
header .md-tabs__item { padding-right: 1rem; padding-left: 1rem;}
84-
85-
blockquote { background-color: rgba(204, 254, 167, .6); border-left: none;}
8688

87-
.packages-container #preamble > .sectionbody > .paragraph:first-of-type p { font-size: 1em }
88-
.packages-container h1:nth-of-type(1) { font-size: 1.5em; color: var(--color-primary); margin-bottom: 0; }
89+
/* header */
90+
header .md-flex__cell.md-flex__cell--shrink { vertical-align: middle;}
91+
header .md-header-nav__topic { padding-left: .5em }
92+
header .md-header-nav__topic a:hover { color: #fff}
93+
header .top-nav .md-tabs__item { padding-right: 0rem; padding-left: 0rem;}
94+
header .top-nav .md-tabs__item > .md-tabs__link { padding: 1.5rem 1rem !important; margin: 0; }
8995

90-
.admonitionblock table td.content {border-left: transparent;}
96+
header .top-nav .md-tabs__item > .md-tabs__link:active { background-color: #444;}
9197

9298
/* menu */
9399
body .md-sidebar--primary, body .md-sidebar--secondary,
94100
body header .hs.no-scrollbar ul.md-tabs__list { transition: .15s ease-in-out }
95-
96-
.md-sidebar--primary .md-nav__link {display: flex; align-items: center;}
97-
.md-sidebar--primary .md-nav__link { margin-top: 0em; cursor: pointer }
101+
blockquote { background-color: rgba(204, 254, 167, .6); border-left: none;}
98102

99103

100-
.md-sidebar--primary .md-nav__item--nested { margin-top: 0em; cursor: pointer }
104+
/* packages */
105+
.packages-container #preamble > .sectionbody > .paragraph:first-of-type p { font-size: 1em }
106+
.packages-container h1:nth-of-type(1) { font-size: 1.5em; color: var(--color-primary); margin-bottom: 0; }
107+
.admonitionblock table td.content {border-left: transparent;}
101108

102-
.md-sidebar--primary .md-nav__item--nested:hover > div > i,
103-
.md-sidebar--primary .md-nav__item--nested:hover > i { color: var(--color-primary); }
109+
/* sidebar primary */
110+
.md-nav__link:after { display: none !important; }
111+
.md-sidebar--primary .md-nav__link {display: flex; align-items: center;}
112+
.md-sidebar--primary .md-nav__link { margin-top: 0em; cursor: pointer }
104113

105114
.md-sidebar--primary .md-nav__item--nested div {display: flex; justify-content: space-between; align-items: center;}
106115
.md-sidebar--primary .md-nav__link > div,
107116
.md-sidebar--primary .md-nav__item > div {display: flex; align-items: center; }
108117
.md-sidebar--primary .md-nav__item i {width: 3rem; color: #333; font-size: 1.6rem}
109-
.md-sidebar--primary .md-nav__item.caption:not(:first-of-type) { padding-top: 1em; padding-bottom: .5em}
110-
.md-sidebar--primary .md-nav__item--active:not(.md-nav__item--nested) { color: #536dfe; }
118+
.md-sidebar--primary .md-nav__item.caption:not(:first-of-type) { padding-top: 1em;}
119+
.md-sidebar--primary .md-nav__item.caption { padding-bottom: 1.2rem}
120+
121+
122+
.md-sidebar--primary .md-nav__item--active:not(.md-nav__item--nested) { color: var(--color-secondary); }
123+
111124
.md-sidebar--primary .md-nav__item--nested.md-nav__item--nested-open span i { transform: rotate(90deg) translateY(.2em) translateX(.2em); }
112125
.md-sidebar--primary .md-nav__item span i { width: 1em; padding-right: 1em; transition: .2s ease-in-out; }
113126

@@ -143,18 +156,21 @@ ul.md-nav__list ul.md-nav__list.md-nav__list-open li { display: block }
143156
.md-sidebar--primary .md-nav__item .md-nav__link--active:hover,
144157
.md-sidebar--primary .md-nav__item .md-nav__link:hover,
145158
.md-nav__item--nested-open div:hover,
146-
.md-nav__item--nested > div:hover { color: var(--color-primary); }
159+
.md-nav__item--nested > a:hover { color: var(--color-primary) !important; }
147160

148161
.md-sidebar--primary .md-nav__item .md-nav__link:hover i,
149162
.md-nav__item--nested div:hover > div i,
150-
.md-nav__item--nested > div:hover > span i,
151-
.md-sidebar--primary .md-nav__item.md-nav__item--nested.md-nav__item--nested-open-active > div,
152-
.md-sidebar--primary .md-nav__item.md-nav__item--nested.md-nav__item--nested-open-active > div i { color: var(--color-primary) !important}
163+
.md-nav__item--nested > a:hover > span i { color: var(--color-primary) !important}
153164

165+
.md-sidebar--primary .md-nav__item--active > .md-nav__link,
166+
.md-sidebar--primary .md-nav__item--active > .md-nav__link i,
167+
.md-sidebar--primary .md-nav__item.md-nav__item--nested-open .md-nav__link--active > span,
168+
.md-sidebar--primary .md-nav__item.md-nav__item--nested-open .md-nav__link--active > div,
169+
.md-sidebar--primary .md-nav__item.md-nav__item--nested-open .md-nav__link--active > div i { color: var(--color-secondary) !important}
154170

155171

156-
header .md-flex__cell.md-flex__cell--shrink { vertical-align: middle;}
157-
header .md-header-nav__topic { padding-left: 1em}
172+
.md-nav--primary .md-nav__item--nested>.md-nav__link {padding-right: 0;}
173+
.md-nav--primary .md-nav__item>.md-nav__link {padding: 0 1em}
158174

159175
.md-typeset h2 { margin: 1rem 0 1rem; }
160176

@@ -183,17 +199,13 @@ a.anchor:before { display: none !important;}
183199

184200
@media screen and (min-width: 45em) {
185201
.md-typeset h1 { padding-bottom: 3rem;}
186-
.md-sidebar--primary .md-nav__item .md-nav__link, .md-sidebar--primary .md-nav__item--nested > div { padding: 0.4em 0.85rem 0.4em 0;}
187-
.md-sidebar--primary .md-nav__item.caption {
188-
padding-top: 0;
189-
padding-bottom: 0.4em;
190-
font-size: 1.4rem;
191-
}
192-
202+
.md-sidebar--primary .md-nav__item .md-nav__link, .md-sidebar--primary .md-nav__item--nested > a { padding: 0.4em 0.85rem 0.4em 0;}
203+
.md-sidebar--primary .md-nav__item.caption {padding-top: 0; padding-bottom: 1.2rem; font-size: 1.4rem;
204+
}
193205
}
194206

195207
@media only screen and (max-width: 76.1875em) {
196-
.md-sidebar--primary ul.md-nav__list .md-nav__item--nested.md-nav__item--nested-open ul.md-nav__list li:first-child .md-nav__link { padding-top: 1.2em}
208+
.md-sidebar--primary .md-nav__item--nested.md-nav__item--nested-open ul.md-nav__list li:first-child .md-nav__link { padding-top: 1em}
197209
.md-typeset h1 { font-size: 1.8em;}
198210
.md-nav--primary .md-nav__item, .md-nav--primary .md-nav__title {font-size: 0.95em;border: none;}
199211

@@ -203,17 +215,14 @@ a.anchor:before { display: none !important;}
203215
.md-sidebar--primary, .md-sidebar--secondary {height: 95vh;}
204216
.md-nav--primary .md-nav__item.caption { padding: 2em 1em .5em !important}
205217

206-
.md-nav--primary .md-nav__item:not(.md-nav__item--nested) .md-nav__link, .md-nav--primary .md-nav__item--nested {
207-
padding: 0.7em 0;
208-
}
209218
.md-nav--primary .md-nav__item--nested-open {
210219
padding-bottom: 0;
211220
}
212-
.md-sidebar--primary ul.md-nav__list .md-nav__item--nested.md-nav__item--nested-open ul.md-nav__list li { padding-left: calc(3rem + 1em) !important; margin-top: 0em }
221+
.md-sidebar--primary ul.md-nav__list .md-nav__item--nested.md-nav__item--nested-open ul.md-nav__list li { padding-left: 3.5em !important; margin-top: 0em }
222+
213223

224+
.md-nav--primary .md-nav__item>.md-nav__link {padding: 0.4em 1em}
214225

215-
.md-sidebar--primary .md-nav__item:not(.md-nav__item--nested),
216-
.md-sidebar--primary .md-nav__item.md-nav__item--nested > div { padding: 0 1rem 0 1.2rem;}
217226
}
218227

219228
@media screen and (max-width: 45em) {
@@ -226,12 +235,30 @@ a.anchor:before { display: none !important;}
226235
.md-nav__item.caption strong { padding: 1em 0 0.2em }
227236
.md-nav--primary .md-nav__item.caption:first-of-type { padding-top: 1em;}
228237
.md-sidebar--primary .md-nav__item.caption:not(:first-of-type) { padding-top: 1em; }
229-
.md-sidebar--primary .md-nav__item--nested > div { padding-right: 0.85rem; padding-left: 1em; }
230-
.md-sidebar--primary .md-nav__item--nested > div > div { display: flex; align-items: center;}
238+
.md-sidebar--primary .md-nav__item--nested > a { padding-right: 0.85rem; padding-left: 1em; }
239+
.md-sidebar--primary .md-nav__item--nested > a > div { display: flex; align-items: center;}
231240

232241
.md-sidebar--primary .md-nav__item--nested,
233242
.md-sidebar--primary ul.md-nav__list .md-nav__item--nested.md-nav__item--nested-open ul.md-nav__list li { margin-top:0; }
234243

235244
.md-sidebar--primary .md-nav__item--nested-open ul { padding-bottom: 0.4em;}
236245
.md-typeset blockquote {margin: 1.2rem -1.6rem;}
246+
247+
/* .md-sidebar--primary .md-nav__item:not(.md-nav__item--nested),
248+
.md-sidebar--primary .md-nav__item.md-nav__item--nested > a { padding: 0 1rem 0 1.2rem;} */
249+
250+
251+
}
252+
253+
254+
255+
256+
257+
.md-grid {max-width: 135rem;}
258+
259+
260+
@media only screen and (min-width: 76.25em) {
261+
.md-sidebar--secondary {
262+
margin-left: 135rem;
263+
}
237264
}

‎assets/js/main.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ window.addEventListener("load", function() {
2323
siteTopic.setAttribute("data-md-state", "");
2424
} else if (currentScrollPos < 100) {
2525
siteTopic.setAttribute("data-md-state", "active");
26+
topNav.style.display = "none";
27+
sidebarPrimary.setAttribute("data-md-state", "lock");
28+
sidebarSecondary.setAttribute("data-md-state", "lock");
2629
} else {
2730
topNav.style.display = "none";
2831
sidebarPrimary.setAttribute("data-md-state", "lock");

0 commit comments

Comments
 (0)