-
Notifications
You must be signed in to change notification settings - Fork 57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add fonts for new builtin Shiny theme preset #638
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4ac949b
chore(bs_preset): Improve not valid preset error message
gadenbuie 563e1c4
chore(preset-shiny): Split variables and rules into separate files
gadenbuie 40c6d21
feat: Download fonts for presets too
gadenbuie 547bf39
chore: Add fonts for presets
gadenbuie 248109e
feat: Set heading font-weight to 400
gadenbuie cfd03d2
chore: Make rule file an argument rather than guessing
gadenbuie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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,31 @@ | ||
| /*-- scss:rules --*/ | ||
| $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&family=Source+Code+Pro:ital,wght@0,400;0,600;1,400;1,600&display=swap" !default; | ||
| @if $web-font-path { | ||
| @import url($web-font-path); | ||
| } | ||
|
|
||
| // move checkbox and radio text slightly to the right | ||
| .checkbox input, | ||
| .radio input { | ||
| margin-right: 0.35em; | ||
| } | ||
|
|
||
| // make selected item more accessible | ||
| .selectize-dropdown-content .option.selected.active, | ||
| .selectize-dropdown-content .option:hover, | ||
| .selectize-dropdown-content .option:active { | ||
| background-color: $blue; | ||
| color: $white; | ||
| } | ||
|
|
||
| // make non-selected items slightly different visually (but still 3:1 contrast) | ||
| // TODO: Restore this if we fix https://github.com/rstudio/shiny/issues/3839 | ||
| // .selectize-dropdown-content .option.active { | ||
| // background-color: tint-color($blue, 25%); | ||
| // color: $white; | ||
| // } | ||
|
|
||
| // fix "to" width in the middle of the date picker | ||
| .shiny-date-range-input .input-daterange .input-group-addon { | ||
| margin-right: -1px; | ||
| } | ||
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
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,124 @@ | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: italic; | ||
| font-weight: 300; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| 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/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVQ.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: italic; | ||
| font-weight: 500; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk_RkaVQ.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: italic; | ||
| font-weight: 600; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkxhjaVQ.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: italic; | ||
| font-weight: 700; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: italic; | ||
| font-weight: 800; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| src: url(fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk0ZjaVQ.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: normal; | ||
| font-weight: 300; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| 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/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4k.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: normal; | ||
| font-weight: 500; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjr0C4k.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: normal; | ||
| font-weight: 600; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsgH1y4k.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: normal; | ||
| font-weight: 700; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4k.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Open Sans'; | ||
| font-style: normal; | ||
| font-weight: 800; | ||
| font-stretch: normal; | ||
| font-display: swap; | ||
| src: url(fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgshZ1y4k.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Source Code Pro'; | ||
| font-style: italic; | ||
| font-weight: 400; | ||
| font-display: swap; | ||
| src: url(fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTbI1rSg.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Source Code Pro'; | ||
| font-style: italic; | ||
| font-weight: 600; | ||
| font-display: swap; | ||
| src: url(fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTsoprSg.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Source Code Pro'; | ||
| font-style: normal; | ||
| font-weight: 400; | ||
| font-display: swap; | ||
| src: url(fonts/HI_diYsKILxRpg3hIP6sJ7fM7PqPMcMnZFqUwX28DMyQhM0.woff) format('woff'); | ||
| } | ||
| @font-face { | ||
| font-family: 'Source Code Pro'; | ||
| font-style: normal; | ||
| font-weight: 600; | ||
| font-display: swap; | ||
| src: url(fonts/HI_diYsKILxRpg3hIP6sJ7fM7PqPMcMnZFqUwX28DBKXhM0.woff) format('woff'); | ||
| } |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+70.4 KB
inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk0ZjaVQ.woff
Binary file not shown.
Binary file added
BIN
+73.2 KB
inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk_RkaVQ.woff
Binary file not shown.
Binary file added
BIN
+72.9 KB
inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkxhjaVQ.woff
Binary file not shown.
Binary file added
BIN
+69 KB
inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsgH1y4k.woff
Binary file not shown.
Binary file added
BIN
+67.8 KB
inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgshZ1y4k.woff
Binary file not shown.
Binary file added
BIN
+69.5 KB
inst/fonts/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjr0C4k.woff
Binary file not shown.
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
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
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gregswinehart Do you think we could cut back these font weights a little bit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suppose we could if it's a thing. That said, I would probably only lose the 800 weight? I like to celebrate the whole catalog....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Greg. I'm going to leave this as is for now and will review again with Carson this week.