-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from rstudio/shiny-1.6
Additional rules for dark-mode themes to ensure sliderInput()'s text color is readable.
- Loading branch information
Showing
8 changed files
with
67 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,4 @@ | |
^\.Rproj\.user$ | ||
^.*\.sublime-.*$ | ||
^cran-comments.md$ | ||
^patches$ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
Package: shinythemes | ||
Title: Themes for Shiny | ||
Version: 1.1.2 | ||
Version: 1.1.2.9000 | ||
Authors@R: c( | ||
person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]"), | ||
person(family = "RStudio", role = "cph"), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
diff --git a/inst/shinythemes/css/cyborg.min.css b/inst/shinythemes/css/cyborg.min.css | ||
index aac1c5a..d3faf47 100644 | ||
--- a/inst/shinythemes/css/cyborg.min.css | ||
+++ b/inst/shinythemes/css/cyborg.min.css | ||
@@ -10,7 +10,8 @@ | ||
font-weight: 700; | ||
src: url(../fonts/Roboto_700.ttf) format('truetype'); | ||
} | ||
- | ||
+/* For compatibility with shiny::sliderInput() v1.6 & above */ | ||
+.irs-grid-pol{background:#fff !important;}.irs-grid-text{color:#fff !important;}.irs-min{color:#fff !important;}.irs-max{color:#fff !important;} | ||
/*! | ||
* bootswatch v3.3.7 | ||
* Homepage: http://bootswatch.com | ||
diff --git a/inst/shinythemes/css/darkly.min.css b/inst/shinythemes/css/darkly.min.css | ||
index 0082fec..745b66f 100644 | ||
--- a/inst/shinythemes/css/darkly.min.css | ||
+++ b/inst/shinythemes/css/darkly.min.css | ||
@@ -16,7 +16,8 @@ | ||
font-weight: 400; | ||
src: url(../fonts/Lato_400italic.ttf) format('truetype'); | ||
} | ||
- | ||
+/* For compatibility with shiny::sliderInput() v1.6 & above */ | ||
+.irs-grid-pol{background:#fff !important;}.irs-grid-text{color:#fff !important;}.irs-min{color:#fff !important;}.irs-max{color:#fff !important;} | ||
/*! | ||
* bootswatch v3.3.7 | ||
* Homepage: http://bootswatch.com | ||
diff --git a/inst/shinythemes/css/slate.min.css b/inst/shinythemes/css/slate.min.css | ||
index 5eb3a4c..15a0918 100644 | ||
--- a/inst/shinythemes/css/slate.min.css | ||
+++ b/inst/shinythemes/css/slate.min.css | ||
@@ -1,3 +1,5 @@ | ||
+/* For compatibility with shiny::sliderInput() v1.6 & above */ | ||
+.irs-grid-pol{background:#c8c8c8 !important;}.irs-grid-text{color:#c8c8c8 !important;}.irs-min{color:#c8c8c8 !important;}.irs-max{color:#c8c8c8 !important;} | ||
/*! | ||
* bootswatch v3.3.7 | ||
* Homepage: http://bootswatch.com | ||
diff --git a/inst/shinythemes/css/superhero.min.css b/inst/shinythemes/css/superhero.min.css | ||
index f0deb84..ed12a30 100644 | ||
--- a/inst/shinythemes/css/superhero.min.css | ||
+++ b/inst/shinythemes/css/superhero.min.css | ||
@@ -16,7 +16,8 @@ | ||
font-weight: 700; | ||
src: url(../fonts/Lato_700.ttf) format('truetype'); | ||
} | ||
- | ||
+/* For compatibility with shiny::sliderInput() v1.6 & above */ | ||
+.irs-grid-pol{background:#ebebeb !important;}.irs-grid-text{color:#ebebeb !important;}.irs-min{color:#ebebeb !important;}.irs-max{color:#ebebeb !important;} | ||
/*! | ||
* bootswatch v3.3.7 | ||
* Homepage: http://bootswatch.com |