diff --git a/NEWS.md b/NEWS.md
index 07e12934d..6c7939ab3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -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
diff --git a/R/navs-legacy.R b/R/navs-legacy.R
index a4239e663..381bb45ef 100644
--- a/R/navs-legacy.R
+++ b/R/navs-legacy.R
@@ -584,6 +584,7 @@ buildDropdown <- function(divTag, tabset) {
dropdown <- tags$li(
class = "dropdown",
+ class = if (active) "active",
tags$a(
href = "#",
class = "dropdown-toggle",
diff --git a/inst/fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff b/inst/fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff
deleted file mode 100644
index 101c0be6e..000000000
Binary files a/inst/fonts/mem5YaGs126MiZpBA-UN7rg-Vg.woff and /dev/null differ
diff --git a/inst/fonts/mem5YaGs126MiZpBA-UN7rgOUuhv.woff b/inst/fonts/mem5YaGs126MiZpBA-UN7rgOUuhv.woff
deleted file mode 100644
index 48f005dc8..000000000
Binary files a/inst/fonts/mem5YaGs126MiZpBA-UN7rgOUuhv.woff and /dev/null differ
diff --git a/inst/fonts/mem5YaGs126MiZpBA-UN_r8-Vg.woff b/inst/fonts/mem5YaGs126MiZpBA-UN_r8-Vg.woff
deleted file mode 100644
index 9f56d335b..000000000
Binary files a/inst/fonts/mem5YaGs126MiZpBA-UN_r8-Vg.woff and /dev/null differ
diff --git a/inst/fonts/mem5YaGs126MiZpBA-UN_r8OUuhv.woff b/inst/fonts/mem5YaGs126MiZpBA-UN_r8OUuhv.woff
deleted file mode 100644
index 469999bd1..000000000
Binary files a/inst/fonts/mem5YaGs126MiZpBA-UN_r8OUuhv.woff and /dev/null differ
diff --git a/inst/fonts/mem6YaGs126MiZpBA-UFUJ0d.woff b/inst/fonts/mem6YaGs126MiZpBA-UFUJ0d.woff
deleted file mode 100644
index f90b99608..000000000
Binary files a/inst/fonts/mem6YaGs126MiZpBA-UFUJ0d.woff and /dev/null differ
diff --git a/inst/fonts/mem6YaGs126MiZpBA-UFUK0Zdcs.woff b/inst/fonts/mem6YaGs126MiZpBA-UFUK0Zdcs.woff
deleted file mode 100644
index 5b9981e73..000000000
Binary files a/inst/fonts/mem6YaGs126MiZpBA-UFUK0Zdcs.woff and /dev/null differ
diff --git a/inst/fonts/mem8YaGs126MiZpBA-U1UQ.woff b/inst/fonts/mem8YaGs126MiZpBA-U1UQ.woff
deleted file mode 100644
index 153a1d63a..000000000
Binary files a/inst/fonts/mem8YaGs126MiZpBA-U1UQ.woff and /dev/null differ
diff --git a/inst/fonts/mem8YaGs126MiZpBA-UFVZ0d.woff b/inst/fonts/mem8YaGs126MiZpBA-UFVZ0d.woff
deleted file mode 100644
index 66b4587bb..000000000
Binary files a/inst/fonts/mem8YaGs126MiZpBA-UFVZ0d.woff and /dev/null differ
diff --git a/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkWVAexg.woff b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkWVAexg.woff
new file mode 100644
index 000000000..bba082561
Binary files /dev/null and b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkWVAexg.woff differ
diff --git a/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkaVQ.woff b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkaVQ.woff
new file mode 100644
index 000000000..16b5513ca
Binary files /dev/null and b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk5hkaVQ.woff differ
diff --git a/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkWVAexg.woff b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkWVAexg.woff
new file mode 100644
index 000000000..31c0e8d94
Binary files /dev/null and b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkWVAexg.woff differ
diff --git a/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVQ.woff b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVQ.woff
new file mode 100644
index 000000000..a61dee035
Binary files /dev/null and b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVQ.woff differ
diff --git a/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjWVAexg.woff b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjWVAexg.woff
new file mode 100644
index 000000000..37b5207c0
Binary files /dev/null and b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjWVAexg.woff differ
diff --git a/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff
new file mode 100644
index 000000000..728f9cdee
Binary files /dev/null and b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff differ
diff --git a/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1x4gaVQ.woff b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1x4gaVQ.woff
new file mode 100644
index 000000000..39efae9cf
Binary files /dev/null and b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1x4gaVQ.woff differ
diff --git a/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff
new file mode 100644
index 000000000..920d7979c
Binary files /dev/null and b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff differ
diff --git a/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0B4gaVQ.woff b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0B4gaVQ.woff
new file mode 100644
index 000000000..d00c7ceb3
Binary files /dev/null and b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0B4gaVQ.woff differ
diff --git a/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0C4k.woff b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0C4k.woff
new file mode 100644
index 000000000..9151d1c8a
Binary files /dev/null and b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsiH0C4k.woff differ
diff --git a/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0B4gaVQ.woff b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0B4gaVQ.woff
new file mode 100644
index 000000000..0e36498c5
Binary files /dev/null and b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0B4gaVQ.woff differ
diff --git a/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff
new file mode 100644
index 000000000..5505d8c84
Binary files /dev/null and b/inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff differ
diff --git a/inst/fonts/memnYaGs126MiZpBA-UFUKWiUNhrIqU.woff b/inst/fonts/memnYaGs126MiZpBA-UFUKWiUNhrIqU.woff
deleted file mode 100644
index df62cc9b4..000000000
Binary files a/inst/fonts/memnYaGs126MiZpBA-UFUKWiUNhrIqU.woff and /dev/null differ
diff --git a/inst/fonts/memnYaGs126MiZpBA-UFUKWiUOhv.woff b/inst/fonts/memnYaGs126MiZpBA-UFUKWiUOhv.woff
deleted file mode 100644
index 8526ac3d1..000000000
Binary files a/inst/fonts/memnYaGs126MiZpBA-UFUKWiUOhv.woff and /dev/null differ
diff --git a/inst/fonts/memnYaGs126MiZpBA-UFUKWyV-hv.woff b/inst/fonts/memnYaGs126MiZpBA-UFUKWyV-hv.woff
deleted file mode 100644
index 8f8e97cfe..000000000
Binary files a/inst/fonts/memnYaGs126MiZpBA-UFUKWyV-hv.woff and /dev/null differ
diff --git a/inst/fonts/memnYaGs126MiZpBA-UFUKWyV9hrIqU.woff b/inst/fonts/memnYaGs126MiZpBA-UFUKWyV9hrIqU.woff
deleted file mode 100644
index d68e4f203..000000000
Binary files a/inst/fonts/memnYaGs126MiZpBA-UFUKWyV9hrIqU.woff and /dev/null differ
diff --git a/inst/fonts/pe03MImSLYBIv1o4X1M8cc9iB_5p.woff b/inst/fonts/pe03MImSLYBIv1o4X1M8cc9iB_5p.woff
index e19cc14ab..8278d94a6 100644
Binary files a/inst/fonts/pe03MImSLYBIv1o4X1M8cc9iB_5p.woff and b/inst/fonts/pe03MImSLYBIv1o4X1M8cc9iB_5p.woff differ
diff --git a/inst/fonts/pe0qMImSLYBIv1o4X1M8cfe5.woff b/inst/fonts/pe0qMImSLYBIv1o4X1M8cfe5.woff
index d4b9b5f3f..6d21652ae 100644
Binary files a/inst/fonts/pe0qMImSLYBIv1o4X1M8cfe5.woff and b/inst/fonts/pe0qMImSLYBIv1o4X1M8cfe5.woff differ
diff --git a/inst/lib/bsw3/simplex/font.css b/inst/lib/bsw3/simplex/font.css
index fea580081..b04e814f8 100644
--- a/inst/lib/bsw3/simplex/font.css
+++ b/inst/lib/bsw3/simplex/font.css
@@ -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');
}
diff --git a/inst/lib/bsw3/spacelab/font.css b/inst/lib/bsw3/spacelab/font.css
index 9625b8c68..e7049b763 100644
--- a/inst/lib/bsw3/spacelab/font.css
+++ b/inst/lib/bsw3/spacelab/font.css
@@ -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');
}
diff --git a/inst/lib/bsw3/yeti/font.css b/inst/lib/bsw3/yeti/font.css
index e8d8d6eb6..8f50f68bd 100644
--- a/inst/lib/bsw3/yeti/font.css
+++ b/inst/lib/bsw3/yeti/font.css
@@ -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');
}
diff --git a/inst/lib/bsw4/dist/simplex/font.css b/inst/lib/bsw4/dist/simplex/font.css
index c51008bce..e1ef4843f 100644
--- a/inst/lib/bsw4/dist/simplex/font.css
+++ b/inst/lib/bsw4/dist/simplex/font.css
@@ -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');
}
diff --git a/inst/lib/bsw4/dist/spacelab/font.css b/inst/lib/bsw4/dist/spacelab/font.css
index 5fd5e2df7..f980d6eec 100644
--- a/inst/lib/bsw4/dist/spacelab/font.css
+++ b/inst/lib/bsw4/dist/spacelab/font.css
@@ -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');
}
diff --git a/inst/lib/bsw4/dist/yeti/font.css b/inst/lib/bsw4/dist/yeti/font.css
index 51e667e14..ed5c7cfd4 100644
--- a/inst/lib/bsw4/dist/yeti/font.css
+++ b/inst/lib/bsw4/dist/yeti/font.css
@@ -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');
}
diff --git a/inst/lib/bsw5/dist/simplex/font.css b/inst/lib/bsw5/dist/simplex/font.css
index c51008bce..e1ef4843f 100644
--- a/inst/lib/bsw5/dist/simplex/font.css
+++ b/inst/lib/bsw5/dist/simplex/font.css
@@ -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');
}
diff --git a/inst/lib/bsw5/dist/spacelab/font.css b/inst/lib/bsw5/dist/spacelab/font.css
index 5fd5e2df7..f980d6eec 100644
--- a/inst/lib/bsw5/dist/spacelab/font.css
+++ b/inst/lib/bsw5/dist/spacelab/font.css
@@ -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');
}
diff --git a/inst/lib/bsw5/dist/yeti/font.css b/inst/lib/bsw5/dist/yeti/font.css
index 51e667e14..ed5c7cfd4 100644
--- a/inst/lib/bsw5/dist/yeti/font.css
+++ b/inst/lib/bsw5/dist/yeti/font.css
@@ -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');
}
diff --git a/man/navs.Rd b/man/navs.Rd
index a9f5292af..b75368e9c 100644
--- a/man/navs.Rd
+++ b/man/navs.Rd
@@ -69,7 +69,7 @@ navigation list.}
\item{fluid}{\code{TRUE} to use fluid layout; \code{FALSE} to use fixed
layout.}
-\item{widths}{Column withs of the navigation list and tabset content areas
+\item{widths}{Column widths of the navigation list and tabset content areas
respectively.}
\item{title}{The title to display in the navbar}
diff --git a/tests/testthat/_snaps/nav.md b/tests/testthat/_snaps/nav.md
deleted file mode 100644
index ab45ccbf3..000000000
--- a/tests/testthat/_snaps/nav.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# navs_[tab/pill]_card() basically works
-
- Code
- renderTags(x)$html
- Output
-
-
-
-
-
-
tab a
-
tab b
-
tab c
-
-
-
-
-
-
-
-
-
tab a
-
tab b
-
tab c
-
-
-
-
-
-
- -
- Foo
-
- -
- A
-
- -
- B
-
-
-
-
-