From 6a85e9c5a1ff6b722cb07cc456951ffd0ffab365 Mon Sep 17 00:00:00 2001 From: REJack Date: Wed, 28 Aug 2019 09:26:57 +0200 Subject: [PATCH] enhanced buttons - added btn-xs class - added btn-xs demo in pages/UI/buttons.html - enhanced dropdown-hover for button dropdowns - fixed dropdown examples in pages/UI/buttons.html --- build/scss/_buttons.scss | 5 ++ build/scss/_dropdown.scss | 3 +- build/scss/_variables.scss | 7 +++ pages/UI/buttons.html | 98 ++++++++++++++++++++++++++++++-------- 4 files changed, 93 insertions(+), 20 deletions(-) diff --git a/build/scss/_buttons.scss b/build/scss/_buttons.scss index 24cb92bd..87914e33 100644 --- a/build/scss/_buttons.scss +++ b/build/scss/_buttons.scss @@ -92,3 +92,8 @@ } } +// Extra Button Size + +.btn-xs { + @include button-size($button-padding-y-xs, $button-padding-x-xs, $button-font-size-xs, $button-line-height-xs, $button-border-radius-xs); +} diff --git a/build/scss/_dropdown.scss b/build/scss/_dropdown.scss index 9beb71a5..e3c65a18 100644 --- a/build/scss/_dropdown.scss +++ b/build/scss/_dropdown.scss @@ -58,10 +58,11 @@ // Dropdown Hover .dropdown-hover { + &:hover, &.nav-item.dropdown:hover, .dropdown-submenu:hover, &.dropdown-submenu:hover { - > ul.dropdown-menu { + > .dropdown-menu { display: block; } } diff --git a/build/scss/_variables.scss b/build/scss/_variables.scss index b33aa026..db23d3b1 100644 --- a/build/scss/_variables.scss +++ b/build/scss/_variables.scss @@ -175,6 +175,13 @@ $font-size-xl: ($font-size-base * 2); $button-default-background-color: $gray-100 !default; $button-default-color: #444 !default; $button-default-border-color: #ddd !default; + +$button-padding-y-xs: .125rem !default; +$button-padding-x-xs: .25rem !default; +$button-line-height-xs: $line-height-sm !default; +$button-font-size-xs: ($font-size-base * .75) !default; +$button-border-radius-xs: .15rem !default; + // RIBBON // -------------------------------------------------------- diff --git a/pages/UI/buttons.html b/pages/UI/buttons.html index 5964354d..beca9afb 100644 --- a/pages/UI/buttons.html +++ b/pages/UI/buttons.html @@ -628,6 +628,7 @@ Normal Large .btn-lg Small .btn-sm + Extra Small .btn-xs Flat .btn-flat Disabled .disabled @@ -641,6 +642,9 @@ + + + @@ -658,6 +662,9 @@ + + + @@ -675,6 +682,9 @@ + + + @@ -692,6 +702,9 @@ + + + @@ -709,6 +722,9 @@ + + + @@ -726,6 +742,9 @@ + + + @@ -743,6 +762,9 @@ + + + @@ -775,6 +797,7 @@ Normal Large .btn-lg Small .btn-sm + Extra Small .btn-xs Flat .btn-flat Disabled .disabled @@ -788,6 +811,9 @@ + + + @@ -805,6 +831,9 @@ + + + @@ -822,6 +851,9 @@ + + + @@ -839,6 +871,9 @@ + + + @@ -856,6 +891,9 @@ + + + @@ -873,6 +911,9 @@ + + + @@ -895,7 +936,7 @@

- Gradient Buttons (bg-*) + Gradient Buttons (bg-gradient-*)

@@ -905,6 +946,7 @@ Normal Large .btn-lg Small .btn-sm + Extra Small .btn-xs Flat .btn-flat Disabled .disabled @@ -918,6 +960,9 @@ + + + @@ -935,6 +980,9 @@ + + + @@ -952,6 +1000,9 @@ + + + @@ -969,6 +1020,9 @@ + + + @@ -986,6 +1040,9 @@ + + + @@ -1003,6 +1060,9 @@ + + + @@ -1302,7 +1362,7 @@ Flat
- + @@ -1403,13 +1463,13 @@ Toggle Dropdown - +
@@ -1577,8 +1637,8 @@
@@ -1618,8 +1678,8 @@ @@ -1660,8 +1720,8 @@ @@ -1703,8 +1763,8 @@ @@ -1746,8 +1806,8 @@ -- GitLab