Skip to content

Fix aria hidden#1160

Closed
joshbruce wants to merge 8 commits into
uswds:18f-pages-stagingfrom
joshbruce:fix-aria-hidden
Closed

Fix aria hidden#1160
joshbruce wants to merge 8 commits into
uswds:18f-pages-stagingfrom
joshbruce:fix-aria-hidden

Conversation

@joshbruce

@joshbruce joshbruce commented May 10, 2016

Copy link
Copy Markdown

Remove from _base.scss: aria-hidden, display:none
Add class to _accordion.scss: usa-accordion-content-collapsed, display:none
Update accordion preview classes
Update accordion.js: Add remove class to expand and collapse.
Update styleguide.js to display code accordion collapsed on load.

Josh Bruce added 4 commits May 10, 2016 19:33
Add class: usa-accordion-content-collapsed
Update accordion.js: Add remove class-based solution
@joshbruce

Copy link
Copy Markdown
Author

Adding @ducklet - There you go, I think. If you look at the "replace lost functionality" commit - you should be able to see what was done with the JavaScript - jQuery makes it pretty simple when you know the functions and classes. :)

@joshbruce

Copy link
Copy Markdown
Author

Fixes #1120

@ducklet

ducklet commented May 11, 2016

Copy link
Copy Markdown

@joshbruce looks good to me :) thank you!!

@msecret

msecret commented May 17, 2016

Copy link
Copy Markdown
Contributor

@joshbruce we just merged the somewhat large change to not check in the compiled dist files as well as not copying around files into the docs folder. This means this PR is merge conflicted, but the good news is there should be much less merge conflicts in the future.

When you rebase, none of the files in dist or docs/assets should be checked in. For more info check #1164.

@joshbruce

Copy link
Copy Markdown
Author

@msecret - No worries. Will see what I can do. Maybe @ducklet can duplicate the changes and do a separate PR - as I think I will have to anyway as well (not sure what all is involved in a "rebase" and what it allows for).

I will add it to my backlog though.

Josh Bruce added 3 commits May 20, 2016 18:04
# Conflicts:
#	dist/css/uswds.css
#	dist/css/uswds.min.css
#	dist/css/uswds.min.css.map
#	dist/js/uswds.js
#	dist/js/uswds.min.js
#	dist/js/uswds.min.js.map
#	docs/_scss/components/_accordions.scss
#	docs/_scss/core/_base.scss
#	docs/_scss/lib/_bourbon.scss
#	docs/_scss/lib/css3/_radial-gradient.scss
#	docs/assets/img/alerts/error.png
#	docs/assets/img/alerts/info.png
#	docs/assets/img/alerts/success.png
#	docs/assets/img/arrow-right.png
#	docs/assets/img/correct8.png
#	docs/assets/img/correct9.png
#	docs/assets/img/favicons/favicon-114.png
#	docs/assets/img/favicons/favicon-144.png
#	docs/assets/img/favicons/favicon-192.png
#	docs/assets/img/favicons/favicon-57.png
#	docs/assets/img/favicons/favicon-72.png
#	docs/assets/img/favicons/favicon.png
#	docs/assets/img/logo-img.png
#	docs/assets/img/minus.png
#	docs/assets/img/social-icons/png/facebook25.png
#	docs/assets/img/social-icons/png/rss25.png
#	docs/assets/img/social-icons/png/youtube15.png
#	docs/assets/js/vendor/uswds.min.js
@joshbruce

joshbruce commented May 20, 2016

Copy link
Copy Markdown
Author

@msecret - Don't merge this if it integrates. I need to add the new class to the pages that use accordions. Just wanted to see quickly what would happen.

Typography page was the only page found with collapsed accordions not
generated by Javascript.
@joshbruce

Copy link
Copy Markdown
Author

@msecret, @ducklet - Should be good to go.

I could only find collapsed accordions on the Typography page that were not code samples generated from the JavaScript.

Good job to the 18f crew on isolating /src and the other directories, much easier to understand what needs to be changed.

@rogeruiz

Copy link
Copy Markdown
Contributor

Hey @joshbruce, we're doing a little branch switcheroo and will need to close this since the branch names will change. We would still like to get these changes into staging once the branches are switched over. We will return to this work once the branch switch is complete.

@joshbruce

Copy link
Copy Markdown
Author

@rogeruiz - No worries. Couple of questions:

  1. What caused the decision to not merge the changes prior to the branch name changing? (Would like to know in case I end up in a similar situation in my own GitHub workflows.)
  2. What action(s), if any, will be required on my part once it is done? (Assuming a PR into the new staging branch.)

@maya

maya commented May 25, 2016

Copy link
Copy Markdown
Contributor

@joshbruce the branch switch is complete! Feel free to re-open.

What caused the decision to not merge the changes prior to the branch name changing? (Would like to know in case I end up in a similar situation in my own GitHub workflows.)

I believe there were changes on the dist and scss on docs which we no longer use (35 file changes).

What action(s), if any, will be required on my part once it is done? (Assuming a PR into the new staging branch.)

Cleaning up the above should be all that's needed.

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.

7 participants