Skip to content
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

105 update to latest govuk frontend version #117

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ Currently we take [static precompiled exports of the GOV.UK Frontend files](http

2. Download and unzip the ZIP folder, copying the assets (including fonts and images) into the `inst/www/` folder

3. Apply any changes from `css_changes.md` manually, to preserve previous edits
3. Update the CSS file name in `attachDependency.R` script

4. Test all the code functions as expected using `devtools::check()`
4. Apply any changes from `css_changes.md` manually, to preserve previous edits

5. Manually test the examples using `shinyGovstyle::run_example()`, ensuring the styling is as expected
5. Test all the code functions as expected using `devtools::check()`

6. Manually test the examples using `shinyGovstyle::run_example()`, ensuring the styling is as expected

If unsure on the styling and expected appearance, use the [GOV.UK Design System site](https://design-system.service.gov.uk/) to explore the components in more detail and official guidance for their use.

Expand Down
2 changes: 1 addition & 1 deletion R/attachDependency.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ attachDependency <- function(tag, widget = NULL) {
dep <- htmltools::htmlDependency(
name = "stylecss", version = version,
src = c(href="shinyGovstyle/css"),
stylesheet = "govuk-frontend-norem.css"
stylesheet = "govuk-frontend-5.7.1.min.css"
)

if (!is.null(widget)) {
Expand Down
28 changes: 12 additions & 16 deletions css_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,11 @@ background: white;
color: #0b0c0c;
```

* error summary change
```
.govuk-error-summary__list {
color: #d4351c;
font-weight: 700;
text-decoration: underline;
text-underline-offset: 0.1em
```
* Move fonts css to the font css

* Add `font-size: 16px;` to root at top of file underneath `--govuk-frontend-version: VERSION NUMBER;`

* add
```
.govuk-link {
border:none
}
```

* Move fonts css to the font css
* Change url links

* For accordion need to fix the css by:
Expand Down Expand Up @@ -177,7 +165,7 @@ only screen and (min-resolution:2dppx) {
* Updated govuk-link--no-visited-state to still have a clear focus highlight (copied from the govuk-link formatting)

```
.govuk-link--no-visited-state:focus {
.govuk-link--no-visited-state:active, .govuk-link--no-visited-state:focus {
outline: 3px solid transparent;
background-color: #fd0;
box-shadow: 0 -2px #fd0, 0 4px #0b0c0c;
Expand Down Expand Up @@ -218,6 +206,8 @@ only screen and (min-resolution:2dppx) {

* Container for the value_box
```
/*Container for value box*/

.value-box-container {
font-family: GDS Transport, Arial, sans-serif;
font-weight: 400;
Expand All @@ -232,6 +222,8 @@ only screen and (min-resolution:2dppx) {

* Larger screens styling for value_box
```
/*Larger screen sizing for value box*/

@media (min-width: 40.0625em) {
.value-box-container {
font-size: 1.2rem;
Expand All @@ -242,6 +234,8 @@ only screen and (min-resolution:2dppx) {

* Styling for the value in value_box
```
/*Styling value for value box*/

.value-box-value {
font-size: 1.5rem;
line-height: 1;
Expand All @@ -253,6 +247,8 @@ only screen and (min-resolution:2dppx) {

* Styling for the optional description in value_box
```
/*Styling for optional description for value box*/

.value-box-description {
font-size: 1rem;
line-height: 1;
Expand Down
Loading
Loading