From 0be994b2bb77e7e1506785684a5f337b45d1326f Mon Sep 17 00:00:00 2001 From: chomik Date: Sat, 13 Apr 2019 19:49:11 +0200 Subject: [PATCH] badges docs --- _config.yml | 6 ++--- pages/_docs/badges.md | 46 ++++++++++++++++++++++++++++++++++++ pages/_layouts/docs.html | 5 ++-- scss/_variables.scss | 6 ++++- scss/ui/_badges.scss | 50 ++++++++-------------------------------- 5 files changed, 66 insertions(+), 47 deletions(-) create mode 100644 pages/_docs/badges.md diff --git a/_config.yml b/_config.yml index 11729bb01..a714aa795 100644 --- a/_config.yml +++ b/_config.yml @@ -91,9 +91,9 @@ colors: gray: hex: '#868e96' name: Gray - black: + dark: hex: '#354051' - name: Black + name: Dark variants: [primary, secondary, success, info, warning, danger, dark] socials: [facebook, twitter, google, youtube, vimeo, dribbble, github, instagram, pinterest, vk, rss, flickr, bitbucket] @@ -106,4 +106,4 @@ docs-menu: - title: Getting started pages: [index] - title: Components - pages: [avatars, typography, alerts, buttons, colors, cards] + pages: [avatars, badges, buttons] diff --git a/pages/_docs/badges.md b/pages/_docs/badges.md new file mode 100644 index 000000000..a4265ddb7 --- /dev/null +++ b/pages/_docs/badges.md @@ -0,0 +1,46 @@ +--- +title: Badges +--- + +### Default markup + +{% example html %} +{% for color in site.colors %} +{{ color[0] }} +{% endfor %} +{% endexample %} + +### Pill badges + +{% example html %} +{% for color in site.colors %} +{{ forloop.index }} +{% endfor %} +{% endexample %} + + +### Soft badges + +{% example html %} +{% for color in site.colors %} +{{ color[0] }} +{% endfor %} +{% endexample %} + + +### Links + +{% example html %} +{% for color in site.colors %} +{{ color[0] }} +{% endfor %} +{% endexample %} + + +### Empty badges + +{% example html %} +{% for color in site.colors %} + +{% endfor %} +{% endexample %} diff --git a/pages/_layouts/docs.html b/pages/_layouts/docs.html index edaef923a..8569055fd 100644 --- a/pages/_layouts/docs.html +++ b/pages/_layouts/docs.html @@ -8,15 +8,16 @@ page-title: Documentation
- + {% include ui/icon.html icon="github" class="mr-2" %}Browse source code {% for group in site.docs-menu %} + {{ group.title }}
{% for p in group.pages %} {% assign doc = site.docs | where: "slug", p | first %} - + {{ doc.title }} {% endfor %} diff --git a/scss/_variables.scss b/scss/_variables.scss index f68397ec0..0a5b21eec 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -93,7 +93,8 @@ $colors: ( "cyan": $cyan, "white": $white, "gray": $gray-600, - "gray-dark": $gray-800 + "gray-dark": $gray-800, + "dark": $dark ) !default; $avatar-sizes: ( @@ -153,6 +154,9 @@ $container-max-widths: ( xl: 1200px ) !default; +//badges +$badge-font-weight: 600 !default; + //pagination $pagination-border-width: 0 !default; $pagination-padding-y: .25rem !default; diff --git a/scss/ui/_badges.scss b/scss/ui/_badges.scss index 6b5ac55a6..9e10c8d40 100644 --- a/scss/ui/_badges.scss +++ b/scss/ui/_badges.scss @@ -1,11 +1,12 @@ .badge { - //color: #ffffff; - //color: $text-muted; - //background: theme-color-lightest($text-muted); - font-weight: 600; + //font-weight: 600; + + @at-root a#{&} { + color: $white; + } &:empty { - display: block; + display: inline-block; width: 8px; min-width: 0; height: 8px; @@ -26,41 +27,8 @@ transform: translate(0%, -50%); } -//light -@each $name, $color in $status-colors { - .badge-#{$name}-lt { - color: $color; - background-color: theme-color-lighter($color); - } -} - //bordered -@each $name, $color in $status-colors { - .badge-#{$name}.badge-outline { - color: $color; - background-color: transparent; - border: 1px solid $color; - } -} - -// rest colors -@if $generate-colors { - @each $name, $color in $colors { - .badge-#{$name}-lt { - color: $color; - background-color: theme-color-lighter($color); - } - - .badge-#{$name}.badge-outline { - color: $color; - background-color: transparent; - border: 1px solid $color; - } - - .badge-#{$name} { - color: #fff; - background-color: $color; - } - } - +.badge-outline { + background-color: transparent; + border: 1px solid currentColor; }