From 212da5c6e83c561c851076799c98c558f1b5c52f Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 27 Oct 2019 13:09:59 +0100 Subject: [PATCH] topnav refactoring --- pages/_docs/alerts.md | 2 +- pages/_docs/badges.md | 4 +- pages/_docs/buttons.md | 78 +- pages/_docs/cards.md | 12 +- pages/_docs/form-elements.md | 14 +- pages/_includes/cards/_full-2.html | 6 +- pages/_includes/cards/_full.html | 8 +- pages/_includes/cards/activity.html | 4 +- pages/_includes/cards/comments.html | 8 +- pages/_includes/cards/company-employees.html | 2 +- pages/_includes/cards/company-lookup.html | 12 +- pages/_includes/cards/feed-card.html | 16 +- pages/_includes/cards/image-box.html | 6 +- pages/_includes/cards/invoices.html | 2 +- pages/_includes/cards/most-visited-pages.html | 2 +- pages/_includes/cards/place-box.html | 4 +- pages/_includes/cards/pricing-card.html | 2 +- pages/_includes/cards/profile-2.html | 6 +- pages/_includes/cards/project-box.html | 4 +- pages/_includes/cards/project-kanban.html | 2 +- pages/_includes/cards/quote-box.html | 2 +- pages/_includes/cards/recommended-users.html | 2 +- pages/_includes/cards/store-product.html | 4 +- pages/_includes/cards/subscribe.html | 4 +- pages/_includes/cards/tabs.html | 10 +- pages/_includes/cards/tasks.html | 6 +- pages/_includes/cards/text-box.html | 2 +- pages/_includes/cards/timeline.html | 4 +- pages/_includes/cards/top-users.html | 6 +- pages/_includes/cards/user-card-bg.html | 2 +- pages/_includes/cards/user-card-big.html | 2 +- pages/_includes/cards/user-card.html | 2 +- pages/_includes/cards/user-profile-2.html | 6 +- pages/_includes/cards/user-profile.html | 6 +- pages/_includes/forms/form-elements-1.html | 6 +- pages/_includes/forms/form-elements-2.html | 8 +- pages/_includes/layout/debug.html | 14 +- pages/_includes/layout/menu.html | 20 +- pages/_includes/layout/sidenav-content.html | 2 +- pages/_includes/layout/topmenu.html | 2 +- pages/_includes/layout/topnav.html | 6 +- pages/_includes/parts/calendar.html | 2 +- pages/_includes/parts/dropdown/days.html | 8 +- pages/_includes/parts/navbar.html | 70 +- pages/_includes/parts/pagination.html | 6 +- pages/_includes/ui/alert.html | 6 +- pages/_includes/ui/breadcrumb.html | 4 +- pages/_includes/ui/steps.html | 2 +- pages/_layouts/default.html | 2 +- pages/_plugins/jekyll-example.rb | 2 +- pages/email.html | 16 +- pages/form-elements.html | 2 +- pages/gallery.html | 4 +- pages/homepage.html | 2 +- pages/repo.html | 65 -- pages/timeline.html | 14 - pages/toasts.html | 40 - pages/tracks.html | 17 - scss/_mixins.scss | 1 + scss/_variables.scss | 13 +- scss/layout/_navbar.scss | 731 +++++++++--------- scss/layout/_page.scss | 2 +- scss/mixins/_mixins.scss | 10 + scss/ui/_badges.scss | 2 +- scss/ui/_dropdowns.scss | 2 +- scss/ui/_nav.scss | 13 +- scss/ui/_tables.scss | 2 +- scss/ui/_typo.scss | 6 +- 68 files changed, 607 insertions(+), 747 deletions(-) delete mode 100644 pages/repo.html delete mode 100644 pages/timeline.html delete mode 100644 pages/toasts.html delete mode 100644 pages/tracks.html create mode 100644 scss/mixins/_mixins.scss diff --git a/pages/_docs/alerts.md b/pages/_docs/alerts.md index 276c31ba7..34a29c7b5 100644 --- a/pages/_docs/alerts.md +++ b/pages/_docs/alerts.md @@ -25,7 +25,7 @@ Add the `alert-link` class to any links inside the alert box to create "matching {% example %} {% for variant in site.variants %} {% capture variant-text %} - This is a {{ variant.name }} alert — check it out! + This is a {{ variant.name }} alert — check it out! {% endcapture %} {% include ui/alert.html type=variant.name text=variant-text %} {% endfor %} diff --git a/pages/_docs/badges.md b/pages/_docs/badges.md index b2f2b6e6e..f37b5eebf 100644 --- a/pages/_docs/badges.md +++ b/pages/_docs/badges.md @@ -36,7 +36,7 @@ A small count and labeling component. Please read the [official Bootstrap docume {% example %} {% for color in site.colors %} -{{ color[0] }} +{{ color[0] }} {% endfor %} {% endexample %} @@ -45,6 +45,6 @@ A small count and labeling component. Please read the [official Bootstrap docume {% example %} {% for color in site.colors %} - + {% endfor %} {% endexample %} diff --git a/pages/_docs/buttons.md b/pages/_docs/buttons.md index 253f9ae9d..3021345d1 100644 --- a/pages/_docs/buttons.md +++ b/pages/_docs/buttons.md @@ -10,7 +10,7 @@ description: Use Bootstrap’s custom button styles for actions in forms, dialog The `.btn` classes are designed to be used with the ` @@ -23,9 +23,9 @@ Use any of the available button classes to quickly create a styled button . We p {% example html wrapper=btn-list %} {% for button in site.button_variants %} -{{ button.title }} +{{ button.title }} {% endfor %} -Link +Link {% endexample %} ### Disabled buttons @@ -45,7 +45,7 @@ The classic button, in different colors. {% example html wrapper=btn-list %} {% for button in site.colors %} -{{ button[1].name }} +{{ button[1].name }} {% endfor %} {% endexample %} @@ -163,8 +163,8 @@ Wrap the dropdown’s toggle (your button or link) and the dropdown menu within
- Dropdown link - Dropdown link + Dropdown link + Dropdown link
@@ -173,8 +173,8 @@ Wrap the dropdown’s toggle (your button or link) and the dropdown menu within Show calendar
- Dropdown link - Dropdown link + Dropdown link + Dropdown link
@@ -183,8 +183,8 @@ Wrap the dropdown’s toggle (your button or link) and the dropdown menu within Show calendar
- Dropdown link - Dropdown link + Dropdown link + Dropdown link
{% endexample %} @@ -209,9 +209,9 @@ You can now create a list of buttons with the `.btn-list` container. {% example html %}
- Save changes - Save and continue - Cancel + Save changes + Save and continue + Cancel
{% endexample %} @@ -219,25 +219,25 @@ If the list is very long, it will automatically wrap on multiple lines, while ke {% example html %}
- One - Two - Three - Four - Five - Six - Seven - Eight - Nine - Ten - Eleven - Twelve - Thirteen - Fourteen - Fifteen - Sixteen - Seventeen - Eighteen - Nineteen + One + Two + Three + Four + Five + Six + Seven + Eight + Nine + Ten + Eleven + Twelve + Thirteen + Fourteen + Fifteen + Sixteen + Seventeen + Eighteen + Nineteen
{% endexample %} @@ -245,23 +245,23 @@ Use the `.text-center` or the `.text-right` modifiers to alter the alignment. {% example html %}
- Save changes - Save and continue + Save changes + Save and continue
{% endexample %} {% example html %}
- Save changes - Save and continue + Save changes + Save and continue
{% endexample %} ### Button with avatar {% example html%} -{% include ui/avatar.html person-id="4" class="btn-avatar" %} Avatar -{% include ui/avatar.html person-id="5" class="btn-avatar" %} Avatar -{% include ui/avatar.html person-id="6" class="btn-avatar" %} Avatar +{% include ui/avatar.html person-id="4" class="btn-avatar" %} Avatar +{% include ui/avatar.html person-id="5" class="btn-avatar" %} Avatar +{% include ui/avatar.html person-id="6" class="btn-avatar" %} Avatar {% endexample %} diff --git a/pages/_docs/cards.md b/pages/_docs/cards.md index 264077636..e0f7526fe 100644 --- a/pages/_docs/cards.md +++ b/pages/_docs/cards.md @@ -95,14 +95,14 @@ You can also add the image on the left side of the card. All you need do to is:
- NATURE + NATURE
- + It’s 2018, and the race is on between tech giants to decide who will control what you see every time you open your eyes What Not To Wear: The Hats, Scarves In History @@ -127,11 +127,11 @@ You can also add the image on the left side of the card. All you need do to is:
- + Fashion
- + What Not To Wear: The Hats, Scarves In History
@@ -151,14 +151,14 @@ You can also add the image on the left side of the card. All you need do to is:
- MUSIC + MUSIC
- + Radio Listeners Prepare For An Impending Alien Invasion In This Visually Stunning Short Film What Not To Wear: The Hats, Scarves In History diff --git a/pages/_docs/form-elements.md b/pages/_docs/form-elements.md index c090c8087..8895561ac 100644 --- a/pages/_docs/form-elements.md +++ b/pages/_docs/form-elements.md @@ -167,14 +167,14 @@ title: Form Elements
- + News - + Messages
- + Edit Profile
@@ -276,11 +276,11 @@ title: Form Elements Action
- Action - Another action - Something else here + Action + Another action + Something else here - Separated link + Separated link
diff --git a/pages/_includes/cards/_full-2.html b/pages/_includes/cards/_full-2.html index ea70c583e..4b0724b74 100644 --- a/pages/_includes/cards/_full-2.html +++ b/pages/_includes/cards/_full-2.html @@ -3,13 +3,13 @@
diff --git a/pages/_includes/cards/_full.html b/pages/_includes/cards/_full.html index d0cf527c6..2e4a728e5 100644 --- a/pages/_includes/cards/_full.html +++ b/pages/_includes/cards/_full.html @@ -4,8 +4,8 @@
Card title
- Button - Button + Button + Button
@@ -20,8 +20,8 @@
- Card link - Another link + Card link + Another link
diff --git a/pages/_includes/cards/activity.html b/pages/_includes/cards/activity.html index 7673a0128..98505b37d 100644 --- a/pages/_includes/cards/activity.html +++ b/pages/_includes/cards/activity.html @@ -7,7 +7,7 @@ {% include ui/avatar.html person-id="3" class="mr-3"%}
- Martin completed the task Set up client chat channel + Martin completed the task Set up client chat channel
Just now
@@ -27,7 +27,7 @@ {% include ui/avatar.html person-id="10" class="mr-3"%}
- Kate added the task Let's make Tabler awesome! + Kate added the task Let's make Tabler awesome!
Just now
diff --git a/pages/_includes/cards/comments.html b/pages/_includes/cards/comments.html index e21c467ad..9cc58e79c 100644 --- a/pages/_includes/cards/comments.html +++ b/pages/_includes/cards/comments.html @@ -21,14 +21,14 @@

+{{ forloop.index | random_number: 20, 50 }} - {% include ui/icon.html icon="chevron-up" %} - + {% include ui/icon.html icon="chevron-up" %} + {% include ui/icon.html icon="chevron-down" %} · - Reply + Reply · - Edit + Edit
diff --git a/pages/_includes/cards/company-employees.html b/pages/_includes/cards/company-employees.html index 2b319a491..7dabfb7b9 100644 --- a/pages/_includes/cards/company-employees.html +++ b/pages/_includes/cards/company-employees.html @@ -13,7 +13,7 @@ {% for person in site.data.people limit: 5 offset: 20 %} {% include ui/avatar.html src=person.photo %} - {{ person.full_name }} + {{ person.full_name }} {{ person.department }} {{ forloop.index | random_number: 30, 90 }}% diff --git a/pages/_includes/cards/company-lookup.html b/pages/_includes/cards/company-lookup.html index c4f1e920c..b909dee3e 100644 --- a/pages/_includes/cards/company-lookup.html +++ b/pages/_includes/cards/company-lookup.html @@ -64,7 +64,7 @@ diff --git a/pages/_includes/cards/feed-card.html b/pages/_includes/cards/feed-card.html index eb4d8f07e..bed264501 100644 --- a/pages/_includes/cards/feed-card.html +++ b/pages/_includes/cards/feed-card.html @@ -2,11 +2,11 @@ {% assign id = 0 | random_id %}
- + {% include ui/avatar.html person=person size="md" %}
- {{ person.full_name }} + {{ person.full_name }}
11 days ago
@@ -175,13 +175,13 @@
- + {% include ui/icon.html icon="thumbs-up" %} 321 Likes {% include ui/icon.html icon="message-square" %} 56 Comments - + {% include ui/icon.html icon="share-2" %} Share @@ -192,10 +192,10 @@
- {% include ui/icon.html icon="image" %} - {% include ui/icon.html icon="video" %} - {% include ui/icon.html icon="map-pin" %} - {% include ui/icon.html icon="paperclip" %} + {% include ui/icon.html icon="image" %} + {% include ui/icon.html icon="video" %} + {% include ui/icon.html icon="map-pin" %} + {% include ui/icon.html icon="paperclip" %}
diff --git a/pages/_includes/cards/image-box.html b/pages/_includes/cards/image-box.html index 529557057..0f9d0638a 100644 --- a/pages/_includes/cards/image-box.html +++ b/pages/_includes/cards/image-box.html @@ -1,11 +1,11 @@
- +

Awesome Breakfast

- + {% include ui/icon.html icon="clock" %} May 23rd, 2018 @@ -16,6 +16,6 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ad aspernatur consequatur dolor dolore, earum enim error, nemo neque nulla quasi rerum,

- See more + See more
diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index f028f629a..48621847e 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -38,7 +38,7 @@ {{ invoice.price }} - Manage + Manage diff --git a/pages/_includes/cards/most-visited-pages.html b/pages/_includes/cards/most-visited-pages.html index 8f7d68f41..691f35b99 100644 --- a/pages/_includes/cards/most-visited-pages.html +++ b/pages/_includes/cards/most-visited-pages.html @@ -14,7 +14,7 @@ {% for page in site.data.pages %} {{ page.uri }} - {% include ui/icon.html icon="link" %} + {% include ui/icon.html icon="link" %} {{ page.visitors | format_number }} {{ page.unique | format_number }} {{ page.bounce-rate }} diff --git a/pages/_includes/cards/place-box.html b/pages/_includes/cards/place-box.html index 5eaf6acd4..3141ceb6c 100644 --- a/pages/_includes/cards/place-box.html +++ b/pages/_includes/cards/place-box.html @@ -29,11 +29,11 @@

Sunny Place Apartment

- + {% include ui/icon.html icon="map-pin" %} Veiga, PT - + {% include ui/icon.html icon="users" %} 51 diff --git a/pages/_includes/cards/pricing-card.html b/pages/_includes/cards/pricing-card.html index efe4dceec..c973d3efd 100644 --- a/pages/_includes/cards/pricing-card.html +++ b/pages/_includes/cards/pricing-card.html @@ -24,7 +24,7 @@
- Choose plan + Choose plan
diff --git a/pages/_includes/cards/profile-2.html b/pages/_includes/cards/profile-2.html index 2dd93cfb0..2093793a4 100644 --- a/pages/_includes/cards/profile-2.html +++ b/pages/_includes/cards/profile-2.html @@ -8,17 +8,17 @@
diff --git a/pages/_includes/cards/timeline.html b/pages/_includes/cards/timeline.html index 108b1e539..0b7dbc82b 100644 --- a/pages/_includes/cards/timeline.html +++ b/pages/_includes/cards/timeline.html @@ -25,7 +25,7 @@
1 day ago

Database backup completed!

-

Download the latest backup.

+

Download the latest backup.

  • @@ -74,7 +74,7 @@
    2 weeks ago

    System updated to v2.02

    -

    Check the complete changelog at the activity +

    Check the complete changelog at the activity page.

    • diff --git a/pages/_includes/cards/top-users.html b/pages/_includes/cards/top-users.html index 51ef16208..f75b975c9 100644 --- a/pages/_includes/cards/top-users.html +++ b/pages/_includes/cards/top-users.html @@ -7,13 +7,13 @@ {% for person in site.data.people limit: 12 offset: 40 %}
    - + {% include ui/avatar.html src=person.photo size="md" %}
    - {{ person.full_name }} - + {{ person.full_name }} + {{ person.company }}
    diff --git a/pages/_includes/cards/user-card-bg.html b/pages/_includes/cards/user-card-bg.html index 5594623c7..5586403a0 100644 --- a/pages/_includes/cards/user-card-bg.html +++ b/pages/_includes/cards/user-card-bg.html @@ -1,6 +1,6 @@ {% assign person-id = include.person-id | default: 0 %} {% assign person = site.data.people[person-id] %} - +
    {% include ui/avatar.html size="xl" person=person thumb=true %}
    diff --git a/pages/_includes/cards/user-card-big.html b/pages/_includes/cards/user-card-big.html index a78895b2e..6550b57cb 100644 --- a/pages/_includes/cards/user-card-big.html +++ b/pages/_includes/cards/user-card-big.html @@ -8,5 +8,5 @@
    {{ person.full_name }}
    {{ person.job_title }}
    - View full profile + View full profile
    diff --git a/pages/_includes/cards/user-card.html b/pages/_includes/cards/user-card.html index fee3b8064..f6db78777 100644 --- a/pages/_includes/cards/user-card.html +++ b/pages/_includes/cards/user-card.html @@ -1,6 +1,6 @@ {% assign person-id = include.person-id | default: 0 %} {% assign person = site.data.people[person-id] %} - +
    {% include ui/avatar.html person=person %} diff --git a/pages/_includes/cards/user-profile-2.html b/pages/_includes/cards/user-profile-2.html index d3ee0c6f4..fa79f5a41 100644 --- a/pages/_includes/cards/user-profile-2.html +++ b/pages/_includes/cards/user-profile-2.html @@ -4,16 +4,16 @@
    - + {% include ui/avatar.html person=p size="lg" class="mb-3" %}

    {{p.full_name}}

    - + {% include ui/icon.html icon="map-pin" %} {{ p.city }}, {{ p.country }} - + {% include ui/icon.html icon="briefcase" %} {{ p.job_title }} diff --git a/pages/_includes/cards/user-profile.html b/pages/_includes/cards/user-profile.html index 9df38684a..7763538f9 100644 --- a/pages/_includes/cards/user-profile.html +++ b/pages/_includes/cards/user-profile.html @@ -5,7 +5,7 @@
    - + {% include ui/avatar.html person=p size="lg" %}
    @@ -21,8 +21,8 @@ officiis.

    - View profile - + View profile + {% include ui/icon.html icon="user" %}
    diff --git a/pages/_includes/forms/form-elements-1.html b/pages/_includes/forms/form-elements-1.html index ab4fdcf0e..428f11441 100644 --- a/pages/_includes/forms/form-elements-1.html +++ b/pages/_includes/forms/form-elements-1.html @@ -45,14 +45,14 @@
    - + News - + Messages
    - + Edit Profile
    diff --git a/pages/_includes/forms/form-elements-2.html b/pages/_includes/forms/form-elements-2.html index 5227c55de..9f156a26e 100644 --- a/pages/_includes/forms/form-elements-2.html +++ b/pages/_includes/forms/form-elements-2.html @@ -27,11 +27,11 @@ Action
    - Action - Another action - Something else here + Action + Another action + Something else here - Separated link + Separated link
    diff --git a/pages/_includes/layout/debug.html b/pages/_includes/layout/debug.html index 7ad1ba344..a9a0e97df 100644 --- a/pages/_includes/layout/debug.html +++ b/pages/_includes/layout/debug.html @@ -1,10 +1,10 @@
    - Dark mode - RTL mode - Show cards code - Folded sidebar - Fullscreen - Sticky header + Dark mode + RTL mode + Show cards code + Folded sidebar + Fullscreen + Sticky header All pages
    Jekyll {{ jekyll.version }}
    @@ -137,7 +137,7 @@ var $card = $(this), htmlCode = $card[0].innerHTML.replace(/(^[ \t]*\n)/gm, ''); - var $button = $('
    code
    '), + var $button = $('
    code
    '), $codeLink = $button.find('[data-code]'); $codeLink diff --git a/pages/_includes/layout/menu.html b/pages/_includes/layout/menu.html index 022f96373..b8e308328 100644 --- a/pages/_includes/layout/menu.html +++ b/pages/_includes/layout/menu.html @@ -4,8 +4,8 @@ {% for level-1 in site.data.menu %} {% assign icon = level-1[1].icon %} -
  • - +
  • + {% include ui/icon.html icon=icon %} @@ -27,8 +27,8 @@ {% for d in site.data.docs %} {% assign doc = site.docs | where: "slug", d.page | first %} {% if doc %} -
  • - +
  • + {{ doc.title }} @@ -43,8 +43,8 @@ {% endif %} {% for level-2 in level-1[1].children %} -
  • -