-
- Amazons Super Bowl commercial might contain a clue about where HQ2 will be
+ Amazons Super Bowl commercial might contain a clue about where HQ2 will be
Eagleeyed viewers of the Super Bowl spotted something most people missed in Amazons commercial for its Alexa voice assistant Before Alexa lo…
@@ -73,7 +73,7 @@ -
- Holiday performance propels Amazon to stellar quarter results
+ Holiday performance propels Amazon to stellar quarter results
This story was delivered to BI Intelligence ECommerce Briefing subscribers hours before appearing on Business Insider To be the first to kno…
@@ -82,7 +82,7 @@ -
- 12 highpaying jobs Amazons HQ2 will likely bring to its future city
+ 12 highpaying jobs Amazons HQ2 will likely bring to its future city
These Amazon jobs all earn over 90000tanleimagesShutterstock
businessinsider.com@@ -182,19 +182,19 @@Crunchbase
Twitter
Facebook
@@ -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 @@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 @@- +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 @@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 @@Sunny Place Apartment
- - + {% include ui/icon.html icon="facebook" %}
- - + {% include ui/icon.html icon="twitter" %}
- - + {% include ui/icon.html icon="phone" %} diff --git a/pages/_includes/cards/project-box.html b/pages/_includes/cards/project-box.html index 4dd7acc4c..d9a43c1df 100644 --- a/pages/_includes/cards/project-box.html +++ b/pages/_includes/cards/project-box.html @@ -2,11 +2,11 @@
-
@@ -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 %}
-
-
+
- + @@ -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 %} -
- - +
- + {{ level-2[1].title }} {% if level-2[1].label %} @@ -56,8 +56,8 @@
-
{% for level-3 in level-2[1].children %}
-
-
-
+
- + {{ level-3[1].title }} {% if level-3[1].label %} @@ -70,8 +70,8 @@
-
{% for level-4 in level-3[1].children %}
-
-
-
+
- + {{ level-4[1].title }} {% if level-4[1].label %} diff --git a/pages/_includes/layout/sidenav-content.html b/pages/_includes/layout/sidenav-content.html index c0d16b692..b455404ce 100644 --- a/pages/_includes/layout/sidenav-content.html +++ b/pages/_includes/layout/sidenav-content.html @@ -21,7 +21,7 @@
-
-
+
diff --git a/pages/_includes/layout/topmenu.html b/pages/_includes/layout/topmenu.html
index 65b2cc8a8..a3ac47fc8 100644
--- a/pages/_includes/layout/topmenu.html
+++ b/pages/_includes/layout/topmenu.html
@@ -1,4 +1,4 @@
-+ diff --git a/pages/_includes/parts/dropdown/days.html b/pages/_includes/parts/dropdown/days.html index 051b979dd..a088d8733 100644 --- a/pages/_includes/parts/dropdown/days.html +++ b/pages/_includes/parts/dropdown/days.html @@ -1,10 +1,10 @@ diff --git a/pages/_includes/parts/navbar.html b/pages/_includes/parts/navbar.html index 2808bfdb9..895cbac91 100644 --- a/pages/_includes/parts/navbar.html +++ b/pages/_includes/parts/navbar.html @@ -2,7 +2,6 @@ {% assign person = site.data.people | where: "id", include.person %} {% assign person = person[0] %} -@@ -17,38 +16,15 @@ {% if include.title %}{{ include.title }}{% endif %} - {% if include.plus-left %} - - {% include ui/icon.html icon="plus" %} - - {% endif %} -
-
- {% if include.fullscreen %}
-
- {% endif %}
-
- {% if include.customize %}
-
- {% endif %}
{% if include.notifications %}
-
-
-
-
+
- + {% include ui/icon.html icon="bell" %} 4 -
+diff --git a/pages/_includes/ui/breadcrumb.html b/pages/_includes/ui/breadcrumb.html index d90cf910f..e3b970c35 100644 --- a/pages/_includes/ui/breadcrumb.html +++ b/pages/_includes/ui/breadcrumb.html @@ -2,9 +2,9 @@ diff --git a/pages/_includes/ui/steps.html b/pages/_includes/ui/steps.html index e37c8293f..a07be05e1 100644 --- a/pages/_includes/ui/steps.html +++ b/pages/_includes/ui/steps.html @@ -4,7 +4,7 @@ {% for i in (1..count) %} {% assign elem = 'a' %} {% if i > active %}{% assign elem = 'span' %}{% endif %} - <{{ elem }} href="javascript:void(0)" class="step-item{% if i == active %} active{% endif %}"{% if include.show-tooltip %} data-toggle="tooltip" title="Step {{ i }} description"{% endif %}>{% if include.show-title %} + <{{ elem }} href="#" class="step-item{% if i == active %} active{% endif %}"{% if include.show-tooltip %} data-toggle="tooltip" title="Step {{ i }} description"{% endif %}>{% if include.show-title %} Step {{ i }} {% endif %} {% endfor %} diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html index 1b8f6dc1a..4171bc628 100644 --- a/pages/_layouts/default.html +++ b/pages/_layouts/default.html @@ -3,7 +3,7 @@ layout: base ---@@ -63,28 +39,6 @@ {% endif %} - {% if include.progress %} - - {% endif %} - - {% if include.language %} - - {% endif %} - @@ -92,23 +46,12 @@ {% if include.user-menu %}- {% include layout/sidenav.html dark=true folded=false fixed=true %} + {% comment %}{% include layout/sidenav.html dark=true folded=false fixed=true %}{% endcomment %}{% include layout/topnav.html dark=page.header-dark sticky=page.header-sticky %} diff --git a/pages/_plugins/jekyll-example.rb b/pages/_plugins/jekyll-example.rb index d3b3a0a81..d4325087f 100644 --- a/pages/_plugins/jekyll-example.rb +++ b/pages/_plugins/jekyll-example.rb @@ -12,7 +12,7 @@ def render_rouge(code, lang, dark = false) code = formatter.format(lexer.lex(code)) code = code.strip.gsub /^[\t\s]*$\n/, '' code = code.gsub /\t/, "\s\s\s" - code = code.gsub "javascript:void(0)", "#" + code = code.gsub "#", "#" code = code.gsub "../", "./" "diff --git a/pages/form-elements.html b/pages/form-elements.html index 77d9be487..2328e5be2 100644 --- a/pages/form-elements.html +++ b/pages/form-elements.html @@ -34,7 +34,7 @@ menu: forms#{code}" diff --git a/pages/email.html b/pages/email.html index 131bf7043..b3da92398 100644 --- a/pages/email.html +++ b/pages/email.html @@ -10,31 +10,31 @@ page-title: Crypto currencies- + {% include ui/icon.html icon="inbox" %}Inbox 14 - + {% include ui/icon.html icon="send" %}Sent Mail - + {% include ui/icon.html icon="alert-circle" %}Important 3 - + {% include ui/icon.html icon="star" %}Starred - + {% include ui/icon.html icon="file" %}Drafts - + {% include ui/icon.html icon="tag" %}Tags - + {% include ui/icon.html icon="trash" %}Trash- + {% include ui/icon.html icon="eye" %} {{ forloop.index | random_number: 300, 600 }} - + {% include ui/icon.html icon="heart" %} {{ forloop.index | random_number: 20, 100 }} diff --git a/pages/homepage.html b/pages/homepage.html index 5b13e23dd..4b3dc7367 100644 --- a/pages/homepage.html +++ b/pages/homepage.html @@ -15,7 +15,7 @@ page-title-actions: home{% include ui/avatar.html person=person class="mr-3" size="md" %}diff --git a/pages/repo.html b/pages/repo.html deleted file mode 100644 index d86af7c39..000000000 --- a/pages/repo.html +++ /dev/null @@ -1,65 +0,0 @@ ---- -title: Repository -done: true ---- -{% assign person = site.data.people[0] %} -- {{ person.first_name }} created a new task
+ {{ person.first_name }} created a new task
{{ forloop.index | random_number: 1, 10 }}h ago-diff --git a/pages/timeline.html b/pages/timeline.html deleted file mode 100644 index facb5ce03..000000000 --- a/pages/timeline.html +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Timeline -page-title: Timeline -done: true ---- - -- ----- {% include ui/avatar.html person=person size="xs" class="mr-2" %} --- {{ person.full_name }} - merge pull request - #176 - from codecalm/dev --Latest commit 54e9403 4 days ago---- {% for file in site.data.files %} -
-- - {% endfor %} -- {% if file.type == "directory" %} - {% include ui/icon.html icon="folder" class="mr-1" %} - {% else %} - {% include ui/icon.html icon="file" class="mr-1" %} - {% endif %} - {{ file.name }} - -- {{ file.comment }} - -- {{ file.date }} - --diff --git a/pages/toasts.html b/pages/toasts.html deleted file mode 100644 index a2204a05c..000000000 --- a/pages/toasts.html +++ /dev/null @@ -1,40 +0,0 @@ ---- -layout: default ---- - -- {% include cards/timeline.html %} --- {% include cards/timeline.html simple=true title="Simple timeline" %} ---- -- {% include ui/avatar.html person=1 size="xs" class="mr-2" %} - Bootstrap - {{ include.time | default: '11 mins ago' }} - --- Hello, world! This is a toast message. ---- - diff --git a/pages/tracks.html b/pages/tracks.html deleted file mode 100644 index 34d622046..000000000 --- a/pages/tracks.html +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Tracks demo ---- - -{% card %} -- {% include ui/avatar.html person=1 size="xs" class="mr-2" %} - Bootstrap - {{ include.time | default: '11 mins ago' }} - --- Hello, world! This is a toast message. --- {% for track in site.data.tracks %} -
-{% endcard %} diff --git a/scss/_mixins.scss b/scss/_mixins.scss index c1cb0bb88..a9226ed33 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -1,2 +1,3 @@ +@import "mixins/mixins"; @import "mixins/functions"; @import "mixins/container-breakpoints"; diff --git a/scss/_variables.scss b/scss/_variables.scss index 819485d64..7deef8cba 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -43,6 +43,14 @@ $white: #ffffff !default; $light: #f5f7fb !default; $dark: #354052 !default; +$primary: $blue !default; +$secondary: $gray-600 !default; +$success: $green !default; +$info: $cyan !default; +$warning: $yellow !default; +$danger: $red !default; +$light: $gray-100 !default; +$dark: $gray-800 !default; $body-bg: $light !default; $body-color: $dark !default; @@ -230,7 +238,7 @@ $card-border-color: $border-color !default; $card-border-radius: $border-radius !default; $card-cap-bg: $min-black !default; -$card-active-border-color: $blue !default; +$card-active-border-color: $primary !default; $card-status-size: 2px !default; $card-group-margin: 1.5rem !default; @@ -277,6 +285,9 @@ $sidenav-link-padding-x: .75rem !default; $navbar-padding-x: .75rem !default; $navbar-padding-y: .75rem !default; $navbar-nav-link-padding-x: .75rem !default; +$navbar-light-color: $text-muted !default; +$navbar-light-active-color: $primary !default; +$navbar-light-hover-color: $body-color !default; //steps $steps-border-width: 2px !default; diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss index 21a43a051..8b08b365d 100644 --- a/scss/layout/_navbar.scss +++ b/scss/layout/_navbar.scss @@ -1,374 +1,397 @@ .navbar { border-bottom: 1px solid; - background-color: $navbar-bg; border-color: $navbar-border-color; - - .nav-link { - color: inherit; - white-space: nowrap; - } } +/** +Navbar logo + */ +.navbar-brand-logo { + height: 2rem; +} + +//.nav-link { +// &.active { +// color: $primary; +// } +//} +// .navbar-nav { flex-direction: row; margin-right: -($navbar-padding-x); margin-left: -($navbar-padding-x); - .nav-link { - display: flex; - color: $text-muted; - transition: .3s color; - - &:hover { - color: $body-color; - } - } - - .nav-item { + .nav-item.active .nav-link { position: relative; - } - .navbar-nav { - padding-right: .5rem; - padding-left: .5rem; - } -} + &:before { + content: ''; + position: absolute; -.navbar:not(.navbar-side) .navbar-subnav { - position: absolute; - top: 100%; - left: 0; - z-index: $zindex-tooltip; - width: 12rem; - padding: .25rem; - font-size: $h5-font-size; - background: #fff; - border: 1px solid $border-color; - border-radius: 3px; - box-shadow: 0 .5rem 1rem rgba(18, 18, 18, .15); - - .nav { - flex-direction: column; - } -} - -/** -Navbar brand - */ -.navbar-brand { - display: flex; - align-items: center; - justify-content: center; - padding: 0; - margin: 0; - - @at-root a#{&} { - transition: .3s opacity; - - &:hover { - opacity: .8; - } - } -} - -.navbar-brand-logo { - height: 2rem; -} - -/** -Navbar toggler - */ -.navbar-toggler { - padding: 0; - border: 0; -} - -/* -Sidebar - */ -.navbar-side { - flex-direction: column; - flex-wrap: nowrap; - align-items: inherit; - justify-content: start; - width: $sidenav-width; - min-width: $sidenav-width; - margin: 0; - overflow: auto; - pointer-events: inherit; - user-select: none; - background: $sidenav-bg; - border-right: 1px solid $sidenav-border-color; - - .nav { - flex-direction: column; - } - - .nav-link { - display: flex; - align-items: center; - height: 2.5rem; - padding: 0 $navbar-padding-x; - color: $text-muted; - box-shadow: inset 2px 0 0 0 transparent; - transition: .3s background, .3s box-shadow; - - &[aria-expanded="true"], - &:hover { - background: rgba($link-color, .04); - border-color: $primary; - box-shadow: inset 2px 0 0 0 $primary; - } - - > .icon { - width: 2rem; - } - - &[data-toggle="collapse"] { - &::after { - display: block; - margin-left: auto; - font-family: $font-icons !important; - content: ""; - transition: transform .3s; - } - - &[aria-expanded="true"]::after { - transform: rotate(-180deg); - } + bottom: calc(-#{$navbar-padding-y} - 1px); + right: $navbar-nav-link-padding-x; + left: $navbar-nav-link-padding-x; + border-bottom: 1px solid $primary; } } - &:not(.navbar-folded) { - &[data-toggle="collapse"][aria-expanded="true"] { - background: none; - box-shadow: none; - } - } - - &:not(.hide-navbar-folded) { - //.nav-item .nav-item .nav-link { - // padding-left: 2.5rem; - //} - // - //.nav-item .nav-item .nav-item .nav-link { - // padding-left: 3.5rem; - //} - // - //.nav-item .nav-item .nav-item .nav-item .nav-link { - // padding-left: 4.5rem; - //} - } - - .navbar-brand { - height: 2.5rem; - text-align: center; - } - - .navbar-heading { - @extend .subheader; - margin: 0 0 .5rem; - } - - .navbar-nav { - flex-direction: column; - } + // + // .nav-link { + // display: flex; + // color: $text-muted; + // transition: .3s color; + // + // &:hover { + // color: $body-color; + // } + // } + // + // .nav-item { + // position: relative; + // } + // + // .navbar-nav { + // padding-right: .5rem; + // padding-left: .5rem; + // } } -/* -Fixed navbar - */ -.navbar-fixed { - position: fixed; - top: 0; - bottom: 0; - z-index: $zindex-sticky; - - + .navbar-bg { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: $zindex-dropdown; - display: none; - background: rgba($dark, .2); - } - - &.navbar-side { - top: 0; - bottom: 0; - left: 0; - - &.navbar-right { - right: 0; - left: auto; - } - } -} - -.navbar-side { - display: none; - - @include media-breakpoint-up(xl) { - display: flex; - - &.navbar-fixed { - & ~ .layout-main { - margin-left: $sidenav-width; - } - - &.navbar-right ~ .layout-main { - margin-right: $sidenav-width; - margin-left: 0; - } - } - } - - &.navbar-folded { - display: flex; - - &.navbar-fixed { - @include media-breakpoint-up(lg) { - - & ~ .layout-main { - margin-left: $sidenav-folded-width; - } - - &.navbar-right ~ .layout-main { - margin-right: $sidenav-folded-width; - margin-left: 0; - } - } - } - } -} - -/* -Right navbar - */ -.navbar-right { - order: 9; - border-right: none; - border-left: 1px solid $sidenav-border-color; -} - -/* -Dark navbar - */ -.navbar-dark { - color: #fff; - background-color: $sidenav-dark-bg; - - .navbar-brand { - filter: brightness(0) invert(1); - } - - .navbar-divider { - border-color: rgba(#fff, .2); - } - - .nav-link { - color: inherit; - } -} - -/** -Sticky navbar - */ -.navbar-sticky { - position: sticky; - top: 0; - z-index: 100; - - &.navbar-side { - left: 0; - } -} - -/** -Folded navbar - */ -.navbar-folded { - width: $sidenav-folded-width; - min-width: $sidenav-folded-width; - - .navbar-brand { - width: 2.5rem; - } - - .navbar-heading { - display: none; - } - - .nav-text { - display: none; - } - - .nav-link { - justify-content: center; - padding-top: 0; - padding-bottom: 0; - - &[data-toggle="collapse"]::after { - content: none; - } - } - - .nav-icon { - justify-content: center; - opacity: 1; - } - - .navbar-subnav { - position: absolute; - top: 0; - left: 100%; - background: #fff; - - .nav-text { - display: block; - } - - .nav-link { - color: $body-color; - } - } -} - -.nav-icon { - display: flex; - flex-shrink: 0; - align-items: center; - width: 1.5rem; - font-size: px2rem(15px); - border-radius: 100%; - opacity: .8; - - .icon { - font-size: inherit; - } -} - -.nav-text { - display: flex; - align-items: center; - width: 100%; -} - -/** -Utils - */ -.hide-navbar-folded { - @at-root .navbar-side.navbar-folded & { - display: none; - } -} - -.hide-navbar-expanded { - @at-root .navbar-side:not(.navbar-folded) & { - display: none; - } -} +//.navbar:not(.navbar-side) .navbar-subnav { +// position: absolute; +// top: 100%; +// left: 0; +// z-index: $zindex-tooltip; +// width: 12rem; +// padding: .25rem; +// font-size: $h5-font-size; +// background: #fff; +// border: 1px solid $border-color; +// border-radius: 3px; +// box-shadow: 0 .5rem 1rem rgba(18, 18, 18, .15); +// +// .nav { +// flex-direction: column; +// } +//} +// +///** +//Navbar brand +// */ +//.navbar-brand { +// display: flex; +// align-items: center; +// justify-content: center; +// padding: 0; +// margin: 0; +// +// @at-root a#{&} { +// transition: .3s opacity; +// +// &:hover { +// opacity: .8; +// } +// } +//} +// +//.navbar-brand-logo { +// height: 2rem; +//} +// +///** +//Navbar toggler +// */ +//.navbar-toggler { +// padding: 0; +// border: 0; +//} +// +///* +//Sidebar +// */ +//.navbar-side { +// flex-direction: column; +// flex-wrap: nowrap; +// align-items: inherit; +// justify-content: start; +// width: $sidenav-width; +// min-width: $sidenav-width; +// margin: 0; +// overflow: auto; +// pointer-events: inherit; +// user-select: none; +// background: $sidenav-bg; +// border-right: 1px solid $sidenav-border-color; +// +// .nav { +// flex-direction: column; +// } +// +// .nav-link { +// display: flex; +// align-items: center; +// height: 2.5rem; +// padding: 0 $navbar-padding-x; +// color: $text-muted; +// box-shadow: inset 2px 0 0 0 transparent; +// transition: .3s background, .3s box-shadow; +// +// &[aria-expanded="true"], +// &:hover { +// background: rgba($link-color, .04); +// border-color: $primary; +// box-shadow: inset 2px 0 0 0 $primary; +// } +// +// > .icon { +// width: 2rem; +// } +// +// &[data-toggle="collapse"] { +// &::after { +// display: block; +// margin-left: auto; +// font-family: $font-icons !important; +// content: ""; +// transition: transform .3s; +// } +// +// &[aria-expanded="true"]::after { +// transform: rotate(-180deg); +// } +// } +// } +// +// &:not(.navbar-folded) { +// &[data-toggle="collapse"][aria-expanded="true"] { +// background: none; +// box-shadow: none; +// } +// } +// +// &:not(.hide-navbar-folded) { +// //.nav-item .nav-item .nav-link { +// // padding-left: 2.5rem; +// //} +// // +// //.nav-item .nav-item .nav-item .nav-link { +// // padding-left: 3.5rem; +// //} +// // +// //.nav-item .nav-item .nav-item .nav-item .nav-link { +// // padding-left: 4.5rem; +// //} +// } +// +// .navbar-brand { +// height: 2.5rem; +// text-align: center; +// } +// +// .navbar-heading { +// @include subheader; +// margin: 0 0 .5rem; +// } +// +// .navbar-nav { +// flex-direction: column; +// } +//} +// +///* +//Fixed navbar +// */ +//.navbar-fixed { +// position: fixed; +// top: 0; +// bottom: 0; +// z-index: $zindex-sticky; +// +// + .navbar-bg { +// position: fixed; +// top: 0; +// right: 0; +// bottom: 0; +// left: 0; +// z-index: $zindex-dropdown; +// display: none; +// background: rgba($dark, .2); +// } +// +// &.navbar-side { +// top: 0; +// bottom: 0; +// left: 0; +// +// &.navbar-right { +// right: 0; +// left: auto; +// } +// } +//} +// +//.navbar-side { +// display: none; +// +// @include media-breakpoint-up(xl) { +// display: flex; +// +// &.navbar-fixed { +// & ~ .layout-main { +// margin-left: $sidenav-width; +// } +// +// &.navbar-right ~ .layout-main { +// margin-right: $sidenav-width; +// margin-left: 0; +// } +// } +// } +// +// &.navbar-folded { +// display: flex; +// +// &.navbar-fixed { +// @include media-breakpoint-up(lg) { +// +// & ~ .layout-main { +// margin-left: $sidenav-folded-width; +// } +// +// &.navbar-right ~ .layout-main { +// margin-right: $sidenav-folded-width; +// margin-left: 0; +// } +// } +// } +// } +//} +// +///* +//Right navbar +// */ +//.navbar-right { +// order: 9; +// border-right: none; +// border-left: 1px solid $sidenav-border-color; +//} +// +///* +//Dark navbar +// */ +//.navbar-dark { +// color: #fff; +// background-color: $sidenav-dark-bg; +// +// .navbar-brand { +// filter: brightness(0) invert(1); +// } +// +// .navbar-divider { +// border-color: rgba(#fff, .2); +// } +// +// .nav-link { +// color: inherit; +// } +//} +// +///** +//Sticky navbar +// */ +//.navbar-sticky { +// position: sticky; +// top: 0; +// z-index: 100; +// +// &.navbar-side { +// left: 0; +// } +//} +// +///** +//Folded navbar +// */ +//.navbar-folded { +// width: $sidenav-folded-width; +// min-width: $sidenav-folded-width; +// +// .navbar-brand { +// width: 2.5rem; +// } +// +// .navbar-heading { +// display: none; +// } +// +// .nav-text { +// display: none; +// } +// +// .nav-link { +// justify-content: center; +// padding-top: 0; +// padding-bottom: 0; +// +// &[data-toggle="collapse"]::after { +// content: none; +// } +// } +// +// .nav-icon { +// justify-content: center; +// opacity: 1; +// } +// +// .navbar-subnav { +// position: absolute; +// top: 0; +// left: 100%; +// background: #fff; +// +// .nav-text { +// display: block; +// } +// +// .nav-link { +// color: $body-color; +// } +// } +//} +// +//.nav-icon { +// display: flex; +// flex-shrink: 0; +// align-items: center; +// width: 1.5rem; +// font-size: px2rem(15px); +// border-radius: 100%; +// opacity: .8; +// +// .icon { +// font-size: inherit; +// } +//} +// +//.nav-text { +// display: flex; +// align-items: center; +// width: 100%; +//} +// +///** +//Utils +// */ +//.hide-navbar-folded { +// @at-root .navbar-side.navbar-folded & { +// display: none; +// } +//} +// +//.hide-navbar-expanded { +// @at-root .navbar-side:not(.navbar-folded) & { +// display: none; +// } +//} +// diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss index 5ade219bb..ea669deb8 100644 --- a/scss/layout/_page.scss +++ b/scss/layout/_page.scss @@ -10,7 +10,7 @@ } .page-pretitle { - @extend .subheader; + @include subheader; } .page-title { diff --git a/scss/mixins/_mixins.scss b/scss/mixins/_mixins.scss new file mode 100644 index 000000000..6841b717a --- /dev/null +++ b/scss/mixins/_mixins.scss @@ -0,0 +1,10 @@ +@mixin subheader($include-color: true) { + font-size: $h6-font-size; + font-weight: 600; + text-transform: uppercase; + letter-spacing: .04em; + + @if ($include-color) { + color: $text-muted; + } +} diff --git a/scss/ui/_badges.scss b/scss/ui/_badges.scss index 2ab7b9560..faa541f6e 100644 --- a/scss/ui/_badges.scss +++ b/scss/ui/_badges.scss @@ -1,5 +1,5 @@ .badge { - @extend .subheader; + @include subheader(false); background: $gray-200; @at-root a#{&} { diff --git a/scss/ui/_dropdowns.scss b/scss/ui/_dropdowns.scss index 759701da0..fe2d7aa83 100644 --- a/scss/ui/_dropdowns.scss +++ b/scss/ui/_dropdowns.scss @@ -13,7 +13,7 @@ } .dropdown-header { - @extend .subheader; + @include subheader; padding-bottom: .25rem; pointer-events: none; } diff --git a/scss/ui/_nav.scss b/scss/ui/_nav.scss index 0e59cc531..0cfaeebd7 100644 --- a/scss/ui/_nav.scss +++ b/scss/ui/_nav.scss @@ -1,4 +1,3 @@ - .nav-tabs { .icon { color: $text-muted; @@ -39,3 +38,15 @@ text-transform: uppercase; } } + +.nav-icon { + font-size: 1rem; + line-height: 1; + margin-right: .25rem; +} + +.nav-link { + display: flex; + align-items: center; + transition: .3s color; +} diff --git a/scss/ui/_tables.scss b/scss/ui/_tables.scss index bb132d811..f5026c626 100644 --- a/scss/ui/_tables.scss +++ b/scss/ui/_tables.scss @@ -5,7 +5,7 @@ th { background: $min-black; border-width: $table-border-width; - @extend .subheader; + @include subheader; } } diff --git a/scss/ui/_typo.scss b/scss/ui/_typo.scss index a81c4a2db..d89a09b85 100644 --- a/scss/ui/_typo.scss +++ b/scss/ui/_typo.scss @@ -96,11 +96,7 @@ Selection Subheader */ .subheader { - font-size: $h6-font-size; - font-weight: 600; - color: $text-muted; - text-transform: uppercase; - letter-spacing: .04em; + @include subheader; } /**- - {% endfor %} -{{ forloop.index }} -{{ track.name }} -{{ track.artists[0].name }} -{{ track.duration_ms | divided_by: 1000 }} s. - - + {% include ui/icon.html icon="bell" %} 4 -
-
-
+
- + {{ level-4[1].title }} {% if level-4[1].label %} diff --git a/pages/_includes/layout/sidenav-content.html b/pages/_includes/layout/sidenav-content.html index c0d16b692..b455404ce 100644 --- a/pages/_includes/layout/sidenav-content.html +++ b/pages/_includes/layout/sidenav-content.html @@ -21,7 +21,7 @@
- + {{ level-3[1].title }} {% if level-3[1].label %} @@ -70,8 +70,8 @@
- + @@ -27,8 +27,8 @@ {% for d in site.data.docs %} {% assign doc = site.docs | where: "slug", d.page | first %} {% if doc %} -
System redesign
-{% include ui/avatar-list.html offset=offset limit=limit size="sm" stacked=true class="mb-3" %} diff --git a/pages/_includes/cards/quote-box.html b/pages/_includes/cards/quote-box.html index bef096741..09d9c0939 100644 --- a/pages/_includes/cards/quote-box.html +++ b/pages/_includes/cards/quote-box.html @@ -11,7 +11,7 @@ illo inventore molestiae!{{ include.title | default: 'Task Title' }}{% if include.badge %} {{ include.badge }}{% endif %}
+{{ include.title | default: 'Task Title' }}{% if include.badge %} {{ include.badge }}{% endif %}
- + {% include ui/avatar.html person=p size="lg" %}diff --git a/pages/_includes/cards/recommended-users.html b/pages/_includes/cards/recommended-users.html index 9c41bc715..f526fe22b 100644 --- a/pages/_includes/cards/recommended-users.html +++ b/pages/_includes/cards/recommended-users.html @@ -5,7 +5,7 @@diff --git a/pages/_includes/cards/subscribe.html b/pages/_includes/cards/subscribe.html index 75075ddb1..ecac2495d 100644 --- a/pages/_includes/cards/subscribe.html +++ b/pages/_includes/cards/subscribe.html @@ -8,7 +8,7 @@{% for person in site.data.people limit: 5 offset: 50 %}- + {% include ui/avatar.html person=person size="sm" class="mr-2"%} {{ person.full_name }} diff --git a/pages/_includes/cards/store-product.html b/pages/_includes/cards/store-product.html index fb2b53df5..b2f9f5088 100644 --- a/pages/_includes/cards/store-product.html +++ b/pages/_includes/cards/store-product.html @@ -4,7 +4,7 @@-{{ product.name }}
+{{ product.name }}
{{ product.producer }}@@ -13,7 +13,7 @@ {{ product.price }}diff --git a/pages/_includes/cards/tabs.html b/pages/_includes/cards/tabs.html index e87d1826b..b128983f0 100644 --- a/pages/_includes/cards/tabs.html +++ b/pages/_includes/cards/tabs.html @@ -28,13 +28,13 @@ {% endif %} {% if include.dropdown %} {% endif %} diff --git a/pages/_includes/cards/tasks.html b/pages/_includes/cards/tasks.html index bf0b99159..9e8a1c979 100644 --- a/pages/_includes/cards/tasks.html +++ b/pages/_includes/cards/tasks.html @@ -13,17 +13,17 @@- {{ person.full_name }} + {{ person.full_name }}
Working in {{ person.company }} @@ -18,7 +18,7 @@- {{ task.name }} + {{ task.name }} {% include ui/icon.html icon="calendar" %} {{ forloop.index | random_date: "2019-01-01", "2018-01-01" | date: '%B %d, %Y' }} - {% include ui/icon.html icon="check" %} {{ forloop.index | random_number: 0, 6 }}/{{ forloop.index | random_number: 5, 10 }} + {% include ui/icon.html icon="check" %} {{ forloop.index | random_number: 0, 6 }}/{{ forloop.index | random_number: 5, 10 }} - {% include ui/icon.html icon="message-square" %} {{ forloop.index | random_number: 0, 12 }} + {% include ui/icon.html icon="message-square" %} {{ forloop.index | random_number: 0, 12 }} {% include ui/avatar.html person-id=forloop.index size="sm" %} diff --git a/pages/_includes/cards/text-box.html b/pages/_includes/cards/text-box.html index 48aa3425f..571154f78 100644 --- a/pages/_includes/cards/text-box.html +++ b/pages/_includes/cards/text-box.html @@ -5,6 +5,6 @@ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Accusantium asperiores aspernatur dolor fugit id, illo iste molestiae nam nesciunt veniam? - Find out more + Find out more 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 @@ 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] %} - + 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 @@- 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] %} - +{{ person.full_name }}{{ person.job_title }}{% 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. 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 @@ 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 @@ Actiondiff --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 pagesJekyll {{ jekyll.version }}@@ -137,7 +137,7 @@ var $card = $(this), htmlCode = $card[0].innerHTML.replace(/(^[ \t]*\n)/gm, ''); - var $button = $(''), + var $button = $(''), $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 %} -
