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

Rename "legal text" to "warning text" #432

Merged
merged 5 commits into from
Jan 18, 2018

Conversation

dashouse
Copy link

@dashouse dashouse commented Jan 16, 2018

  • Updates every reference to "legal text" to "warning text"
  • Updates the template to take text or html
  • A 1px change to icon position :)

https://trello.com/c/45Fnu1yr/254-2-update-legal-text-component-api-and-name

@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-review-pr-432 January 16, 2018 10:36 Inactive
@@ -26,14 +26,14 @@

min-width: 38px;
min-height: 35px;
margin-top: -19px; // Half the height of the 38px circle
margin-top: -20px; // Half the height of the 38px circle
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This comment is confusing now, could update to say 'half the height of the circle'

@NickColley
Copy link
Contributor

@dashouse would you mind adding an entry for this to the unreleased section of the changelog? https://github.com/alphagov/govuk-frontend/blob/master/CHANGELOG.md#unreleased

Let me know if you want to pair on the versioning side of it.

Copy link
Contributor

@NickColley NickColley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes sense to me 👍

@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-review-pr-432 January 16, 2018 14:53 Inactive
@dashouse
Copy link
Author

@igloosi There's no gotcha's hiding with renaming a component I haven't addressed is there?

@dashouse dashouse force-pushed the update-legal-text-to-warning-text branch from 4e8b243 to f8eb9cf Compare January 17, 2018 12:01
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-review-pr-432 January 17, 2018 12:01 Inactive
@kr8n3r
Copy link

kr8n3r commented Jan 17, 2018

@dashouse not for this bit, just need to remember to update all.scss file in packages

did you rebase from master, where Ollie removed the link component?
it currently fails with

Message:
    src/globals/scss/govuk-frontend.scss
Error: File to import not found or unreadable: ../../components/link/link.
       Parent style sheet: /Users/janikraner/Desktop/git/govuk-frontend/src/globals/scss/govuk-frontend.scss
        on line 19 of src/globals/scss/govuk-frontend.scss
>> @import "../../components/link/link";

@NickColley
Copy link
Contributor

@dashouse we will need make sure to follow step 11. in https://github.com/alphagov/govuk-frontend/blob/master/docs/publishing.md

@kr8n3r kr8n3r force-pushed the update-legal-text-to-warning-text branch from f8eb9cf to 88206ff Compare January 17, 2018 16:00
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-review-pr-432 January 17, 2018 16:00 Inactive
@kr8n3r
Copy link

kr8n3r commented Jan 17, 2018

@NickColley i have removed the link component reference from govuk-frontend.scss file

@NickColley
Copy link
Contributor

👍 when green

@hannalaakso
Copy link
Member

@dashouse I've updated CHANGELOG to reflect changes in this PR. Could you please check I've captured everything.

Our new guidance for updating CHANGELOG is here, I've only just added it: https://github.com/alphagov/govuk-frontend/pull/433/files

@dashouse
Copy link
Author

@igloosi @NickColley @hannalaakso Sorry I wasn't around for most of this yesterday. Thanks for fixing :)

@dashouse dashouse merged commit 85e529b into master Jan 18, 2018
@dashouse dashouse deleted the update-legal-text-to-warning-text branch January 18, 2018 07:14
36degrees added a commit that referenced this pull request Jan 18, 2018
In [#432](#432) changes were made directly to README.md that should have been made in index.njk, mainly to update references to the component name, but also to change the 'description' to remove a reference to legal consequences.

This updates index.njk to include the change to the description and regenerates the readme with the correct whitespace and capitalisation as well as changes to the arguments table and to the macro example.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants