diff --git a/pages/_includes/parts/navbar.html b/pages/_includes/parts/navbar.html index 3e32e4402..c2fe6c458 100644 --- a/pages/_includes/parts/navbar.html +++ b/pages/_includes/parts/navbar.html @@ -220,13 +220,5 @@ {% endif %} - - -
  • - - {% include ui/icon.html icon="menu" %} - -
    • diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html index bd20ede59..0a4c0d1ec 100644 --- a/pages/_layouts/default.html +++ b/pages/_layouts/default.html @@ -19,7 +19,7 @@ layout: base
    -
    +
    {% include layout/page-title.html %} diff --git a/pages/_layouts/docs.html b/pages/_layouts/docs.html index 4cf2febf5..6660916d2 100644 --- a/pages/_layouts/docs.html +++ b/pages/_layouts/docs.html @@ -6,7 +6,7 @@ title: Documentation
    -
    +
    diff --git a/pages/blank.html b/pages/blank.html index ce372790d..c0e0c15fc 100644 --- a/pages/blank.html +++ b/pages/blank.html @@ -1,10 +1,11 @@ --- title: Blank page container-size: sm +blank: true +done: true ---
    - {% include ui/illustration.html image="undraw_printing_invoices_5r4r.svg" class="mb-4 h-48" %}

    @@ -12,8 +13,6 @@ container-size: sm

    - {% include ui/button.html text="+ Add your first client" color="primary" %} - + {% include ui/button.html text="Add your first client" icon="plus" color="primary" %}
    - -
    \ No newline at end of file +
    diff --git a/pages/cards-stats.html b/pages/cards-stats.html index a09f80a08..10bd75328 100644 --- a/pages/cards-stats.html +++ b/pages/cards-stats.html @@ -4,88 +4,7 @@ layout: default ---
    -
    -
    -
    -
    -
    Sales
    -
    - {% include parts/dropdown/days.html %} -
    -
    -
    75%
    -
    -
    Conversion rate
    -
    - 24% {% include ui/icon.html icon="trending-up" class="icon-thin" %} -
    -
    - {% include ui/progress.html percentage=75 color="blue" size="sm" %} -
    -
    -
    -
    -
    -
    -
    -
    Revenue
    -
    - {% include parts/dropdown/days.html %} -
    -
    -
    -
    $4,300
    -
    - 24% {% include ui/icon.html icon="trending-up" class="icon-thin" %} -
    -
    -
    -
    - {% include js/charts.html id="card-chart-1" chart-id="revenue-bg" %} -
    -
    -
    -
    -
    -
    -
    New clients
    -
    - {% include parts/dropdown/days.html %} -
    -
    -
    -
    6,782
    -
    - 5% {% include ui/icon.html icon="trending-down" class="icon-thin" %} -
    -
    -
    - {% include js/charts.html id="chart-active-users" chart-id="new-clients" %} -
    -
    -
    -
    -
    -
    -
    -
    Active users
    -
    - {% include parts/dropdown/days.html %} -
    -
    -
    -
    2,986
    -
    - 4% {% include ui/icon.html icon="trending-up" class="icon-thin" %} -
    -
    - -
    - {% include js/charts.html id="chart-active-users2" chart-id="active-users" %} -
    -
    -
    diff --git a/pages/index.html b/pages/index.html index 36b86371c..09b375f14 100644 --- a/pages/index.html +++ b/pages/index.html @@ -5,6 +5,90 @@ menu: level-1.level-2.level-3.level-4 ---
    +
    +
    +
    +
    +
    Sales
    +
    + {% include parts/dropdown/days.html %} +
    +
    +
    75%
    +
    +
    Conversion rate
    +
    + 24% {% include ui/icon.html icon="trending-up" class="icon-thin" %} +
    +
    + {% include ui/progress.html percentage=75 color="blue" size="sm" %} +
    +
    +
    +
    +
    +
    +
    +
    Revenue
    +
    + {% include parts/dropdown/days.html %} +
    +
    +
    +
    $4,300
    +
    + 24% {% include ui/icon.html icon="trending-up" class="icon-thin" %} +
    +
    +
    +
    + {% include js/charts.html id="card-chart-1" chart-id="revenue-bg" %} +
    +
    +
    +
    +
    +
    +
    New clients
    +
    + {% include parts/dropdown/days.html %} +
    +
    +
    +
    6,782
    +
    + 5% {% include ui/icon.html icon="trending-down" class="icon-thin" %} +
    +
    + +
    + {% include js/charts.html id="chart-active-users" chart-id="new-clients" %} +
    +
    +
    + +
    +
    +
    +
    +
    Active users
    +
    + {% include parts/dropdown/days.html %} +
    +
    +
    +
    2,986
    +
    + 4% {% include ui/icon.html icon="trending-up" class="icon-thin" %} +
    +
    + +
    + {% include js/charts.html id="chart-active-users2" chart-id="active-users" %} +
    +
    +
    +
    {% include cards/small-stats-3.html number=43 title="New Tickets" percentage=6 %}
    diff --git a/pages/typography.html b/pages/typography.html index a333ea79f..99c0e4f43 100644 --- a/pages/typography.html +++ b/pages/typography.html @@ -193,7 +193,7 @@ done: true
    -
    +
    Blockquotes
    @@ -209,15 +209,10 @@ done: true Suspendisse maximus.

    Julius Cesar
    -
    -

    Nulla facilisi. Curabitur magna neque, maximus at pellentesque et, mattis et neque. Mauris quis - ligula.

    -
    Albert Einstein
    -
    -
    +
    Text elements
    diff --git a/scss/_variables.scss b/scss/_variables.scss index 695a2e5c4..162840a7e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -27,7 +27,7 @@ $gray-700: #495057 !default; $gray-800: #343a40 !default; $gray-900: #212529 !default; -$blue: #2E7CD9 !default; +$blue: #2e7cd9 !default; $azure: #45aaf2 !default; $indigo: #6574cd !default; $purple: #a55eea !default; @@ -107,17 +107,30 @@ $avatar-sizes: ( $font-size-base: 1rem !default; $font-weight-base: 400 !default; -$line-height-base: 1.5 !default; +$line-height-base: 1.375 !default; $border-radius: 3px !default; -$h1-font-size: $font-size-base * 1.25 * 1.25 * 1.25 * 1.25 !default; -$h2-font-size: $font-size-base * 1.25 * 1.25 * 1.25 !default; -$h3-font-size: $font-size-base * 1.25 * 1.25 !default; -$h4-font-size: $font-size-base * 1.25 !default; -$h5-font-size: $font-size-base !default; -$h6-font-size: $font-size-base * .8 !default; +/** +Typography + */ +$headings-font-weight: 600 !default; +$small-font-size: 80% !default; + +$h1-font-size: $font-size-base * 1.875 !default; +$h2-font-size: $font-size-base * 1.5 !default; +$h3-font-size: $font-size-base * 1.125 !default; +$h4-font-size: $font-size-base * 1 !default; +$h5-font-size: $font-size-base * .875 !default; +$h6-font-size: $font-size-base * .75 !default; + +$blockquote-font-size: $h4-font-size !default; +$lead-font-size: $h3-font-size !default; + +/** +Ribbons + */ $ribbon-margin: .25rem !default; $loader-size: 2.5rem !default; diff --git a/scss/layout/_core.scss b/scss/layout/_core.scss index 1b81177c7..0f2baa267 100644 --- a/scss/layout/_core.scss +++ b/scss/layout/_core.scss @@ -1,6 +1,11 @@ // stylelint-disable property-no-vendor-prefix html { height: 100%; + font-size: 16px; + + @include media-breakpoint-down(md) { + font-size: 15px; + } } body { diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss index 56f46753d..bcaba6fd0 100644 --- a/scss/layout/_page.scss +++ b/scss/layout/_page.scss @@ -8,7 +8,7 @@ .page-title { margin: 0; - font-size: $h4-font-size; + font-size: $h3-font-size; font-weight: 400; line-height: 2.5rem; } diff --git a/scss/ui/_typo.scss b/scss/ui/_typo.scss index 704d35953..fe9408b49 100644 --- a/scss/ui/_typo.scss +++ b/scss/ui/_typo.scss @@ -29,16 +29,8 @@ b { font-weight: 600; } -p, -ul, -ol, blockquote { - margin-bottom: 1em; -} - -blockquote { - padding-left: 2rem; - font-style: italic; + padding-left: 1rem; color: $text-muted; border-left: 2px solid $border-color;