Skip to content

Commit

Permalink
UI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
amr-bash committed Apr 28, 2024
1 parent 5dda1b5 commit f16b602
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 43 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ permalink: pretty

# Defaults https://jekyllrb.com/docs/configuration/front-matter-defaults/

nav-file: '_data/navigation.yml'
nav-file: '_data/navigation/map.yml'

defaults:
# ALL
Expand Down
2 changes: 1 addition & 1 deletion _includes/dev-shortcuts.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</a>
<!-- https://icons.getbootstrap.com/icons/apple/ -->

<a class="btn bg-primary" href="https://github.com/{{ site.repository_name }}/_layouts/{{ page.layout }}.html">
<a class="btn bg-primary" href="https://github.com/{{ site.repository }}/blob/master/_layouts/{{ page.layout }}.html">
<i class="{{site.default_icon}} {{site.default_icon}}-filetype-html"></i>
</a>
<!-- https://icons.getbootstrap.com/icons/filetype-html/ -->
Expand Down
18 changes: 13 additions & 5 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!--
file: header.html
path: /_includes/header.html
includes: _includes/branding.html, _includes/navbar.html
includes: branding.html, navbar.html, info-bar.html, halfmoon.html
-->

<header id="navbar" class="navbar sticky-top bottom-shadow" role="navigation">
<header id="navbar" class="sticky-top bottom-shadow" role="navigation"></header>
<!-- Top Navigation Bar -->
<div class="container-xxl flex-wrap flex-lg-nowrap">
<div class="container-xxl flex-wrap flex-lg-nowrap"></div>
<!-- Main Navbar -->
<nav class="navbar navbar-expand-xxl bg-body-tertiary container-fluid order-2 order-lg-1">

Expand All @@ -28,7 +28,7 @@
</a>
{% endfor %}

<!-- include branding.html -->
<!-- include branding.html -->
{% include branding.html %}

<!-- <div class="offcanvas offcanvas-end" tabindex="-1" id="bdNavbar" aria-labelledby="bdNavbarOffcanvasLabel" data-bs-scroll="true"> -->
Expand Down Expand Up @@ -67,6 +67,14 @@
</div>

</nav>
</div>
<!-- _includes/info-bar.html - Section with breadbcrumbs and search engine -->
<div class="container-xxl mt-10">
{% include info-bar.html %}
</div>

<!-- Source code shortcuts -->
<div class="text-center"></div>
{% include dev-shortcuts.html %}
</div>
</div>
</header>
29 changes: 14 additions & 15 deletions _includes/info-bar.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<!-- info-bar.html
_include/searchbar.html
_include/breadcrumbs.html
<!--
file: info-bar.html
path: _includes/info-bar.html
includes: searchbar.html, breadcrumbs.html
-->

<!-- Search and breadcrumbs section -->

<div class="bg-body-tertiary position-relative z-index-1 mt-1">
<!-- Intro Section and breadcrumbs -->
<div class="bd-intro col-lg-auto order-1 order-lg-2">

<!-- _include/breadcrumbs.html -->
<div class="container dev-settings collapse">
{% include breadcrumbs.html %}
{% include searchbar.html %}
</div>
</div>
<!-- Search and breadcrumbs section -->
<div class="bg-body-tertiary position-relative z-index-1">
<!-- Intro Section and breadcrumbs -->
<div class="bd-intro col-lg-auto order-1 order-lg-2">
<!-- _include/breadcrumbs.html -->
<div class="container dev-settings collapse">
{% include breadcrumbs.html %}
{% include searchbar.html %}
</div>
</div>
6 changes: 4 additions & 2 deletions _includes/sidebar-left.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<!-- Sidebar.html
_includes/nav_list.html
<!--
file: sidebar.html
path: _includes/sidebar.html
includes: nav_list.html
-->

<div>
Expand Down
20 changes: 8 additions & 12 deletions _includes/sidebar-right.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!-- Sidebar-right.html
_includes/nav_list.html
<!--
file: sidebar-right.html
path: _includes/sidebar-right.html
includes: nav_list.html, toc.html
-->



<div class="d-flex justify-content-end">
<!-- TODO: Need to fix the TOC to be hidden in mobile view -->
<!-- [x] TODO: Need to fix the TOC to be hidden in mobile view -->
<!-- Button in mobile view -->
<button class="col-2 btn btn-link text-decoration-none bd-toc-toggle d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#tocContents" aria-expanded="false" aria-controls="tocContents">
<i class="bi bi-list-ul"></i>
Expand All @@ -15,11 +15,6 @@
<!-- Right sidebar container -->
<div class="d-flex justify-content-end">

<!-- Source code shortcuts -->
<div>
{% include dev-shortcuts.html %}
</div>

<!-- Table of contents -->
<div class="toc-collapse collapse" id="tocContents">
<nav class="" id="TableOfContents">
Expand All @@ -29,12 +24,13 @@
<i class="fas fa-file-alt"></i>
On this page
</strong>
</div>
</div>

<!-- TOC list -->
{% include toc.html sanitize=true html=content h_min=1 h_max=3 class="" item_class="" anchor_class="" skip_no_ids=true %}
</nav>
</div>

<!-- Back to Top -->
<div>
<button onclick="topFunction()" id="backToTopBtn" title="Go to top">
Expand Down
15 changes: 8 additions & 7 deletions _layouts/root.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
---
---
<!--
Zer0 Mistakes Jekyll Theme 0.1 by Amr Abdel-Motaleb
Copyright 2021 Amr Abdel-Motaleb - amrabdel.com | @bamr87
Zer0 Mistakes Jekyll Theme version 0.1 by Amr Abdel-Motaleb
Copyright 2024 Amr Abdel-Motaleb - amrabdel.com | @bamr87
-->

<!-- _layouts/root.html -->
<!--
file: root.html
path:_layouts/root.html
includes: head.html, google-tag-mgr.html, header.html, footer.html, algolia.html
-->

<!doctype html>
<html lang="{{ site.locale | slice: 0,2 | default: en }}" class="no-js" data-bs-theme="dark">
Expand All @@ -25,10 +29,7 @@
<div>
<!-- _includes/header.html - Header section with main Navigation and Search engine -->
{% include header.html %}
<!-- _includes/info-bar.html - Section with breadbcrumbs and search engine -->
<div class="container-xxl position-fixed mt-10">
{% include info-bar.html %}
</div>

</div>

<div>
Expand Down

0 comments on commit f16b602

Please sign in to comment.