Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $bv-utility-classes-defined: false !default;

@if $bv-utility-classes-defined == false {
// This test will only include these style definitions once
$bv-utility-classes-defined: true;

// Create .bv-d-<bp>-down-none helper classes
@each $breakpoint in map-keys($grid-breakpoints) {
Expand Down
32 changes: 19 additions & 13 deletions src/components/dropdown/_dropdown-form.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
// Custom styles for b-dropdown-form
// Based on class .dropdown-item
$bv-dropdown-form-defined: false !default;

.b-dropdown-form {
display: inline-block;
padding: $dropdown-item-padding-y $dropdown-item-padding-x;
width: 100%;
clear: both;
font-weight: $font-weight-normal;
@if $bv-dropdown-form-defined == false {
// This test will only include these style definitions once
$bv-dropdown-form-defined: true;

&:first-child {
@include border-top-radius($dropdown-inner-border-radius);
}
// Custom styles for b-dropdown-form
// Based on class .dropdown-item
.b-dropdown-form {
display: inline-block;
padding: $dropdown-item-padding-y $dropdown-item-padding-x;
width: 100%;
clear: both;
font-weight: $font-weight-normal;

&:first-child {
@include border-top-radius($dropdown-inner-border-radius);
}

&:last-child {
@include border-bottom-radius($dropdown-inner-border-radius);
&:last-child {
@include border-bottom-radius($dropdown-inner-border-radius);
}
}
}
34 changes: 20 additions & 14 deletions src/components/dropdown/_dropdown-text.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
// Custom styles for b-dropdown-text
// Based on class .dropdown-item
$bv-dropdown-text-defined: false !default;

.b-dropdown-text {
display: inline-block;
padding: $dropdown-item-padding-y $dropdown-item-padding-x;
margin-bottom: 0;
width: 100%;
clear: both;
font-weight: $font-weight-lighter;
@if $bv-dropdown-text-defined == false {
// This test will only include these style definitions once
$bv-dropdown-text-defined: true;

&:first-child {
@include border-top-radius($dropdown-inner-border-radius);
}
// Custom styles for b-dropdown-text
// Based on class .dropdown-item
.b-dropdown-text {
display: inline-block;
padding: $dropdown-item-padding-y $dropdown-item-padding-x;
margin-bottom: 0;
width: 100%;
clear: both;
font-weight: $font-weight-lighter;

&:first-child {
@include border-top-radius($dropdown-inner-border-radius);
}

&:last-child {
@include border-bottom-radius($dropdown-inner-border-radius);
&:last-child {
@include border-bottom-radius($dropdown-inner-border-radius);
}
}
}
35 changes: 21 additions & 14 deletions src/components/dropdown/_dropdown.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
// Hide the caret for no-caret setting
// See: https://github.com/bootstrap-vue/bootstrap-vue/issues/1473
// See: https://github.com/twbs/bootstrap/issues/23724
.dropdown {
&:not(.dropleft) {
.dropdown-toggle {
&.dropdown-toggle-no-caret:after {
display: none !important;
$bv-dropdown-defined: false !default;

@if $bv-dropdown-defined == false {
// This test will only include these style definitions once
$bv-dropdown-defined: true;

// Hide the caret for no-caret setting
// See: https://github.com/bootstrap-vue/bootstrap-vue/issues/1473
// See: https://github.com/twbs/bootstrap/issues/23724
.dropdown {
&:not(.dropleft) {
.dropdown-toggle {
&.dropdown-toggle-no-caret::after {
display: none !important;
}
}
}
}

// See: https://github.com/bootstrap-vue/bootstrap-vue/issues/2909
&.dropleft {
.dropdown-toggle {
&.dropdown-toggle-no-caret:before {
display: none !important;
// See: https://github.com/bootstrap-vue/bootstrap-vue/issues/2909
&.dropleft {
.dropdown-toggle {
&.dropdown-toggle-no-caret::before {
display: none !important;
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
@import "form-input/index";
@import "form-radio/index";
@import "input-group/index";
@import "nav/index";
@import "navbar/index";
@import "pagination/index";
@import "pagination-nav/index";
@import "table/index";
1 change: 1 addition & 0 deletions src/components/nav/_nav-item-dropdown.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "../dropdown/index";
1 change: 1 addition & 0 deletions src/components/nav/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "nav-item-dropdown";
1 change: 1 addition & 0 deletions src/components/navbar/_navbar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "../dropdown/index";
1 change: 1 addition & 0 deletions src/components/navbar/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "navbar";