bug: Add shiny remote to fix swatches

.vscode/settings.json

@@ -10,7 +10,7 @@
         "editor.formatOnSave": true,
         "editor.tabSize": 4,
         "editor.codeActionsOnSave": {
-            "source.organizeImports": true
+            "source.organizeImports": "explicit"
         },
     },
     "isort.args":["--profile", "black"],

CHANGELOG.md

@@ -5,9 +5,13 @@ All notable changes to `shinyswatch` will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [UNRELEASED]
+
+* Update bootswatch themes to receive posit-dev/py-shiny#1124 updates to fix navbar themeing (#26)
+
 ## [0.4.2] - 2023-12-22
 
-* Update bootswatch themes. (24)
+* Update bootswatch themes. (#24)
 
 ## [0.4.1] - 2023-10-31
 

setup.cfg

@@ -38,7 +38,8 @@ install_requires =
     typing-extensions>=3.10.0.0
     packaging>=20.9
     htmltools>=0.2.0
-    shiny>=0.6.0
+    # shiny>0.7.1
+    shiny @ git+https://github.com/posit-dev/py-shiny.git#egg=shiny
 tests_require =
   pytest>=3
 zip_safe = False

shinyswatch/__init__.py

@@ -1,6 +1,6 @@
 """Bootswatch + Bootstrap 5 themes for Shiny"""
 
-__version__ = "0.4.2"
+__version__ = "0.4.2.9000"
 
 from . import theme
 from ._get_theme import get_theme

shinyswatch/bsw5/cerulean/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: cerulean */
 :root {

shinyswatch/bsw5/cosmo/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: cosmo */
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;700&display=swap");

shinyswatch/bsw5/cyborg/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: cyborg */
 @import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap");

shinyswatch/bsw5/darkly/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: darkly */
 @import url("https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap");

shinyswatch/bsw5/flatly/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: flatly */
 @import url("https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap");

shinyswatch/bsw5/journal/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: journal */
 @import url("https://fonts.googleapis.com/css2?family=News+Cycle:wght@400;700&display=swap");

shinyswatch/bsw5/litera/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: litera */
 :root {

shinyswatch/bsw5/lumen/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: lumen */
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap");

shinyswatch/bsw5/lux/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: lux */
 @import url("https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600&display=swap");

shinyswatch/bsw5/materia/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: materia */
 @import url("https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap");

shinyswatch/bsw5/minty/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: minty */
 @import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;700&display=swap");

shinyswatch/bsw5/morph/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: morph */
 @import url("https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap");

shinyswatch/bsw5/pulse/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: pulse */
 :root {

shinyswatch/bsw5/quartz/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: quartz */
 :root {

shinyswatch/bsw5/sandstone/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: sandstone */
 @import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap");

shinyswatch/bsw5/simplex/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: simplex */
 @import url("https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&display=swap");

shinyswatch/bsw5/sketchy/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: sketchy */
 @import url("https://fonts.googleapis.com/css?family=Neucha|Cabin+Sketch&display=swap");

shinyswatch/bsw5/slate/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: slate */
 :root {

shinyswatch/bsw5/solar/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: solar */
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap");

shinyswatch/bsw5/spacelab/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: spacelab */
 @import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap");

shinyswatch/bsw5/superhero/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: superhero */
 @import url("https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700&display=swap");

shinyswatch/bsw5/united/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: united */
 @import url("https://fonts.googleapis.com/css2?family=Ubuntu:wght@400;700&display=swap");

shinyswatch/bsw5/vapor/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: vapor */
 @import url("https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap");

shinyswatch/bsw5/yeti/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: yeti */
 @import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap");

shinyswatch/bsw5/zephyr/bootswatch.css

@@ -1,4 +1,4 @@
-/* {bslib} version: Github (rstudio/bslib@f05bd23d7df5a7465e418a5794925dacdd27bb6b) */
+/* {bslib} version: Github (rstudio/bslib@63dc94a1c89f338c5805a458101e600dcaf371a7) */
 /* bw: 5: 5 */
 /* bsw5 theme: zephyr */
 @import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;700&display=swap");

tests/bug_0025/app.py

@@ -0,0 +1,24 @@
+from shiny import App, Inputs, Outputs, Session, ui
+
+import shinyswatch
+
+app_ui = ui.page_navbar(
+    shinyswatch.theme.cosmo(),
+    ui.nav_menu(
+        "Config",
+        ui.nav_panel("Config 1"),
+        ui.nav_panel("Config 2"),
+    ),
+    ui.nav_menu(
+        "Results",
+        ui.nav_panel("Results 1"),
+        ui.nav_panel("Results 2"),
+    ),
+)
+
+
+def server(input: Inputs, output: Outputs, session: Session):
+    pass
+
+
+app = App(app_ui, server)