Merge pull request #461 from NoRedInk/puffins/prepare-for-merge

Puffins/prepare for merge
2024-11-04 07:02:12 +03:00 · 2020-03-02 10:41:26 +00:00 · 2020-03-02 10:41:26 +00:00 · 4373c78d82
commit 4373c78d82
parent 6b78075f02 8f8e14bdab
198 changed files with 4 additions and 2 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1 @@
-styleguide-app/assets/images/** filter=lfs diff=lfs merge=lfs -text
+lib/noredink-ui/styleguide-app/assets/images/** filter=lfs diff=lfs merge=lfs -text
--- a/.travis.yml
+++ b/.travis.yml
@ -19,6 +19,7 @@ before_install:
      make && make install;
      cd ..;
    fi
    cd lib/noredink-ui
 install:
  - travis_retry $TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 make -B setup
--- a/lib/noredink-ui/.envrc.nix
+++ b/lib/noredink-ui/.envrc.nix
--- a/lib/noredink-ui/.gitignore
+++ b/lib/noredink-ui/.gitignore
--- a/lib/noredink-ui/.npmignore
+++ b/lib/noredink-ui/.npmignore
--- a/lib/noredink-ui/LICENSE
+++ b/lib/noredink-ui/LICENSE
--- a/lib/noredink-ui/Makefile
+++ b/lib/noredink-ui/Makefile
--- a/lib/noredink-ui/README.md
+++ b/lib/noredink-ui/README.md
--- a/lib/noredink-ui/docs/pull_request_template.md
+++ b/lib/noredink-ui/docs/pull_request_template.md
--- a/lib/noredink-ui/elm.json
+++ b/lib/noredink-ui/elm.json
--- a/lib/noredink-ui/lib/CustomElement.js
+++ b/lib/noredink-ui/lib/CustomElement.js
--- a/lib/noredink-ui/lib/TextArea/V3.js
+++ b/lib/noredink-ui/lib/TextArea/V3.js
--- a/lib/noredink-ui/lib/TextArea/V4.js
+++ b/lib/noredink-ui/lib/TextArea/V4.js
--- a/lib/noredink-ui/lib/index.js
+++ b/lib/noredink-ui/lib/index.js
--- a/lib/noredink-ui/nix/sources.json
+++ b/lib/noredink-ui/nix/sources.json
--- a/lib/noredink-ui/nix/sources.nix
+++ b/lib/noredink-ui/nix/sources.nix
--- a/lib/noredink-ui/package-lock.json
+++ b/lib/noredink-ui/package-lock.json
--- a/lib/noredink-ui/package.json
+++ b/lib/noredink-ui/package.json
--- a/lib/noredink-ui/script/axe-puppeteer.js
+++ b/lib/noredink-ui/script/axe-puppeteer.js
--- a/lib/noredink-ui/script/axe-report.jq
+++ b/lib/noredink-ui/script/axe-report.jq
--- a/lib/noredink-ui/script/check-exposed.py
+++ b/lib/noredink-ui/script/check-exposed.py
--- a/lib/noredink-ui/script/deprecated-imports.csv
+++ b/lib/noredink-ui/script/deprecated-imports.csv
--- a/lib/noredink-ui/script/deprecated-imports.py
+++ b/lib/noredink-ui/script/deprecated-imports.py
--- a/lib/noredink-ui/script/develop.sh
+++ b/lib/noredink-ui/script/develop.sh
--- a/lib/noredink-ui/script/format-axe-report.sh
+++ b/lib/noredink-ui/script/format-axe-report.sh
--- a/lib/noredink-ui/script/percy-tests.js
+++ b/lib/noredink-ui/script/percy-tests.js
--- a/lib/noredink-ui/script/percy-tests.sh
+++ b/lib/noredink-ui/script/percy-tests.sh
--- a/lib/noredink-ui/script/run-axe.sh
+++ b/lib/noredink-ui/script/run-axe.sh
--- a/lib/noredink-ui/script/serve.sh
+++ b/lib/noredink-ui/script/serve.sh
--- a/lib/noredink-ui/shell.nix
+++ b/lib/noredink-ui/shell.nix
--- a/lib/noredink-ui/src/Accessibility/Modal/Copy.elm
+++ b/lib/noredink-ui/src/Accessibility/Modal/Copy.elm
--- a/lib/noredink-ui/src/AttributeExtras.elm
+++ b/lib/noredink-ui/src/AttributeExtras.elm
--- a/lib/noredink-ui/src/EventExtras.elm
+++ b/lib/noredink-ui/src/EventExtras.elm
--- a/lib/noredink-ui/src/EventExtras/Styled.elm
+++ b/lib/noredink-ui/src/EventExtras/Styled.elm
--- a/lib/noredink-ui/src/List/Zipper/Extra.elm
+++ b/lib/noredink-ui/src/List/Zipper/Extra.elm
--- a/lib/noredink-ui/src/Nri/Ui.elm
+++ b/lib/noredink-ui/src/Nri/Ui.elm
--- a/lib/noredink-ui/src/Nri/Ui/Accordion/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Accordion/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Alert/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Alert/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Alert/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Alert/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/Alert/V4.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Alert/V4.elm
--- a/lib/noredink-ui/src/Nri/Ui/AssetPath.elm
+++ b/lib/noredink-ui/src/Nri/Ui/AssetPath.elm
--- a/lib/noredink-ui/src/Nri/Ui/AssetPath/Css.elm
+++ b/lib/noredink-ui/src/Nri/Ui/AssetPath/Css.elm
--- a/lib/noredink-ui/src/Nri/Ui/AssignmentIcon/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/AssignmentIcon/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/BannerAlert/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/BannerAlert/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/BannerAlert/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/BannerAlert/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/BannerAlert/V4.elm
+++ b/lib/noredink-ui/src/Nri/Ui/BannerAlert/V4.elm
--- a/lib/noredink-ui/src/Nri/Ui/BannerAlert/V5.elm
+++ b/lib/noredink-ui/src/Nri/Ui/BannerAlert/V5.elm
--- a/lib/noredink-ui/src/Nri/Ui/BannerAlert/V6.elm
+++ b/lib/noredink-ui/src/Nri/Ui/BannerAlert/V6.elm
--- a/lib/noredink-ui/src/Nri/Ui/Button/V10.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Button/V10.elm
--- a/lib/noredink-ui/src/Nri/Ui/Button/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Button/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/Button/V4.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Button/V4.elm
--- a/lib/noredink-ui/src/Nri/Ui/Button/V5.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Button/V5.elm
--- a/lib/noredink-ui/src/Nri/Ui/Button/V6.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Button/V6.elm
--- a/lib/noredink-ui/src/Nri/Ui/Button/V7.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Button/V7.elm
--- a/lib/noredink-ui/src/Nri/Ui/Button/V8.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Button/V8.elm
--- a/lib/noredink-ui/src/Nri/Ui/Button/V9.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Button/V9.elm
--- a/lib/noredink-ui/src/Nri/Ui/Callout/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Callout/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Checkbox/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Checkbox/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/Checkbox/V4.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Checkbox/V4.elm
--- a/lib/noredink-ui/src/Nri/Ui/Checkbox/V5.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Checkbox/V5.elm
--- a/lib/noredink-ui/src/Nri/Ui/ClickableText/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/ClickableText/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/ClickableText/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/ClickableText/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/ClickableText/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/ClickableText/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/Colors/Extra.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Colors/Extra.elm
--- a/lib/noredink-ui/src/Nri/Ui/Colors/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Colors/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Css/VendorPrefixed.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Css/VendorPrefixed.elm
--- a/lib/noredink-ui/src/Nri/Ui/CssFlexBoxWithVendorPrefix.elm
+++ b/lib/noredink-ui/src/Nri/Ui/CssFlexBoxWithVendorPrefix.elm
--- a/lib/noredink-ui/src/Nri/Ui/CssVendorPrefix/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/CssVendorPrefix/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Data/PremiumLevel.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Data/PremiumLevel.elm
--- a/lib/noredink-ui/src/Nri/Ui/DatePickerConstants.elm
+++ b/lib/noredink-ui/src/Nri/Ui/DatePickerConstants.elm
--- a/lib/noredink-ui/src/Nri/Ui/DisclosureIndicator/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/DisclosureIndicator/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/DisclosureIndicator/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/DisclosureIndicator/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Divider/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Divider/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Dropdown/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Dropdown/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Effects/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Effects/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Fonts/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Fonts/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Heading/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Heading/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Heading/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Heading/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Html/Attributes/Extra.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Html/Attributes/Extra.elm
--- a/lib/noredink-ui/src/Nri/Ui/Html/Attributes/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Html/Attributes/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Html/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Html/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/Icon/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Icon/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/Icon/V4.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Icon/V4.elm
--- a/lib/noredink-ui/src/Nri/Ui/Icon/V5.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Icon/V5.elm
--- a/lib/noredink-ui/src/Nri/Ui/InputStyles/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/InputStyles/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Logo/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Logo/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/MasteryIcon/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/MasteryIcon/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Modal/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Modal/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Modal/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Modal/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/Modal/V4.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Modal/V4.elm
--- a/lib/noredink-ui/src/Nri/Ui/Modal/V5.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Modal/V5.elm
--- a/lib/noredink-ui/src/Nri/Ui/Modal/V6.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Modal/V6.elm
--- a/lib/noredink-ui/src/Nri/Ui/Modal/V7.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Modal/V7.elm
--- a/lib/noredink-ui/src/Nri/Ui/Modal/V8.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Modal/V8.elm
--- a/lib/noredink-ui/src/Nri/Ui/Outline/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Outline/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Page/V2.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Page/V2.elm
--- a/lib/noredink-ui/src/Nri/Ui/Page/V3.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Page/V3.elm
--- a/lib/noredink-ui/src/Nri/Ui/Palette/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Palette/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/Pennant/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/Pennant/V1.elm
--- a/lib/noredink-ui/src/Nri/Ui/PremiumCheckbox/V1.elm
+++ b/lib/noredink-ui/src/Nri/Ui/PremiumCheckbox/V1.elm
--- a/Show More
+++ b/Show More
`@ -1 +1 @@`
	`styleguide-app/assets/images/** filter=lfs diff=lfs merge=lfs -text`	`lib/noredink-ui/styleguide-app/assets/images/** filter=lfs diff=lfs merge=lfs -text`