Skip to content

Commit

Permalink
Mark dropdown with active class correctly, (#372)
Browse files Browse the repository at this point in the history
Co-authored-by: cpsievert <[email protected]>
  • Loading branch information
cpsievert and cpsievert authored Oct 1, 2021
1 parent d77f5ce commit ea30ec5
Show file tree
Hide file tree
Showing 40 changed files with 80 additions and 218 deletions.
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# bslib 0.3.0.9000

## New features

* Upgraded Bootstrap 5 (i.e., `bs_theme(version = 5)`) from 5.0.2 to 5.1.0 (#365)

## Bug fixes

* Closed rstudio/shiny#3519: `nav_menu()` (i.e., `shiny::navbarMenu()`) wasn't producing an `.active` class on it's `.dropdown` container properly. (#372)

# bslib 0.3.0

## Breaking changes
Expand Down
1 change: 1 addition & 0 deletions R/navs-legacy.R
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ buildDropdown <- function(divTag, tabset) {

dropdown <- tags$li(
class = "dropdown",
class = if (active) "active",
tags$a(
href = "#",
class = "dropdown-toggle",
Expand Down
Binary file removed inst/fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff
Binary file not shown.
Binary file removed inst/fonts/mem5YaGs126MiZpBA-UN7rgOUuhv.woff
Binary file not shown.
Binary file removed inst/fonts/mem5YaGs126MiZpBA-UN_r8-Vg.woff
Binary file not shown.
Binary file removed inst/fonts/mem5YaGs126MiZpBA-UN_r8OUuhv.woff
Binary file not shown.
Binary file removed inst/fonts/mem6YaGs126MiZpBA-UFUJ0d.woff
Binary file not shown.
Binary file removed inst/fonts/mem6YaGs126MiZpBA-UFUK0Zdcs.woff
Binary file not shown.
Binary file removed inst/fonts/mem8YaGs126MiZpBA-U1UQ.woff
Binary file not shown.
Binary file removed inst/fonts/mem8YaGs126MiZpBA-UFVZ0d.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed inst/fonts/memnYaGs126MiZpBA-UFUKWiUNhrIqU.woff
Binary file not shown.
Binary file removed inst/fonts/memnYaGs126MiZpBA-UFUKWiUOhv.woff
Binary file not shown.
Binary file removed inst/fonts/memnYaGs126MiZpBA-UFUKWyV-hv.woff
Binary file not shown.
Binary file removed inst/fonts/memnYaGs126MiZpBA-UFUKWyV9hrIqU.woff
Binary file not shown.
Binary file modified inst/fonts/pe03MImSLYBIv1o4X1M8cc9iB_5p.woff
Binary file not shown.
Binary file modified inst/fonts/pe0qMImSLYBIv1o4X1M8cfe5.woff
Binary file not shown.
6 changes: 4 additions & 2 deletions inst/lib/bsw3/simplex/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url(fonts/mem8YaGs126MiZpBA-UFVZ0d.woff) format('woff');
font-stretch: normal;
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0B4gaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: url(fonts/mem5YaGs126MiZpBA-UN7rgOUuhv.woff) format('woff');
font-stretch: normal;
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1x4gaVQ.woff) format('woff');
}
12 changes: 8 additions & 4 deletions inst/lib/bsw3/spacelab/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,27 @@
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
src: url(fonts/mem6YaGs126MiZpBA-UFUK0Zdcs.woff) format('woff');
font-stretch: normal;
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkWVAexg.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 700;
src: url(fonts/memnYaGs126MiZpBA-UFUKWiUNhrIqU.woff) format('woff');
font-stretch: normal;
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjWVAexg.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url(fonts/mem8YaGs126MiZpBA-UFVZ0d.woff) format('woff');
font-stretch: normal;
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0B4gaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: url(fonts/mem5YaGs126MiZpBA-UN7rgOUuhv.woff) format('woff');
font-stretch: normal;
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1x4gaVQ.woff) format('woff');
}
18 changes: 12 additions & 6 deletions inst/lib/bsw3/yeti/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,41 @@
font-family: 'Open Sans';
font-style: italic;
font-weight: 300;
src: url(fonts/memnYaGs126MiZpBA-UFUKWyV9hrIqU.woff) format('woff');
font-stretch: normal;
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkWVAexg.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
src: url(fonts/mem6YaGs126MiZpBA-UFUK0Zdcs.woff) format('woff');
font-stretch: normal;
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkWVAexg.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 700;
src: url(fonts/memnYaGs126MiZpBA-UFUKWiUNhrIqU.woff) format('woff');
font-stretch: normal;
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjWVAexg.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 300;
src: url(fonts/mem5YaGs126MiZpBA-UN_r8OUuhv.woff) format('woff');
font-stretch: normal;
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0B4gaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url(fonts/mem8YaGs126MiZpBA-UFVZ0d.woff) format('woff');
font-stretch: normal;
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0B4gaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: url(fonts/mem5YaGs126MiZpBA-UN7rgOUuhv.woff) format('woff');
font-stretch: normal;
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1x4gaVQ.woff) format('woff');
}
6 changes: 4 additions & 2 deletions inst/lib/bsw4/dist/simplex/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem8YaGs126MiZpBA-U1UQ.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff) format('woff');
}
12 changes: 8 additions & 4 deletions inst/lib/bsw4/dist/spacelab/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,31 @@
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem6YaGs126MiZpBA-UFUJ0d.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/memnYaGs126MiZpBA-UFUKWiUOhv.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem8YaGs126MiZpBA-U1UQ.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff) format('woff');
}
18 changes: 12 additions & 6 deletions inst/lib/bsw4/dist/yeti/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,47 @@
font-family: 'Open Sans';
font-style: italic;
font-weight: 300;
font-stretch: normal;
font-display: swap;
src: url(fonts/memnYaGs126MiZpBA-UFUKWyV-hv.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem6YaGs126MiZpBA-UFUJ0d.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/memnYaGs126MiZpBA-UFUKWiUOhv.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 300;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem5YaGs126MiZpBA-UN_r8-Vg.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0C4k.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem8YaGs126MiZpBA-U1UQ.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff) format('woff');
}
6 changes: 4 additions & 2 deletions inst/lib/bsw5/dist/simplex/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem8YaGs126MiZpBA-U1UQ.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff) format('woff');
}
12 changes: 8 additions & 4 deletions inst/lib/bsw5/dist/spacelab/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,31 @@
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem6YaGs126MiZpBA-UFUJ0d.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/memnYaGs126MiZpBA-UFUKWiUOhv.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem8YaGs126MiZpBA-U1UQ.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff) format('woff');
}
18 changes: 12 additions & 6 deletions inst/lib/bsw5/dist/yeti/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,47 @@
font-family: 'Open Sans';
font-style: italic;
font-weight: 300;
font-stretch: normal;
font-display: swap;
src: url(fonts/memnYaGs126MiZpBA-UFUKWyV-hv.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem6YaGs126MiZpBA-UFUJ0d.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/memnYaGs126MiZpBA-UFUKWiUOhv.woff) format('woff');
src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 300;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem5YaGs126MiZpBA-UN_r8-Vg.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0C4k.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem8YaGs126MiZpBA-U1UQ.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff) format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
font-stretch: normal;
font-display: swap;
src: url(fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff) format('woff');
src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff) format('woff');
}
2 changes: 1 addition & 1 deletion man/navs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ea30ec5

Please sign in to comment.