wins-feature-1 merge with gh-pages #2140
Merged
Conversation
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
* edited js * edited html * edited scss * added all svgs * all changes added minus one Co-authored-by: erikaBell <67438372+erikaBelll@users.noreply.github.com>
* overlay and styling * mobile styling * see more toggle * adjusted styling, issues with onClick function * badges are clickable on mobile * badge icon click hooked up to seeMore * design edits + see more functionality edit Co-authored-by: erikaBell <67438372+erikaBelll@users.noreply.github.com>
Fixes #1550 Changed from 1.7em to 1.4em and 1.5em to 1em
This reverts commit 9fc22fb.
* adjust styling of Wins page with badges * charge roles wrap
…, 1em when expanded (#1670)
…arser in wins.html (#1883)
* [qiqicodes-1549-see-less-button-wins-pages] toggle see more/see less functionality * [qiqicodes-1549-see-less-button-wins-pages] adds caret svg * [qiqicodes-1549-see-less-button-wins-pages] toggle see more/see less for wins card * [qiqicodes-1549-see-less-button-wins-pages] delete commented lines of old code * [qiqicodes-1549-see-less-button-wins-pages] see more/see less styling * change position of see more in mobile, and clean up code * make placement on expansion work * move see more to bottom of text, and see less to bottom of card in mobile * delete console.log * remove commented code Co-authored-by: qiqicodes <qiqizheng0127@gmail.com>
* Changed margin for toolkit page header (#1726) * Updating wins data * Update meeting data * Update contributor and language data * Wins page modal a11y (#1679) * makes ESC key close wins page modal * progress toward mwins page modal fix * in progress * fixes issue w hideoverly and inert * removes package-lock.json and commented code * fixes bug where inert remained true after window resize < 960 * fixes inert bug * Revert "Wins page modal a11y (#1679)" (#1738) This reverts commit c122699. * Updating wins data * Update meeting data * Update contributor and language data * revert wins-data.json (#1745) * Updating wins data * need to delete this, this check is in the app sheet, plus it is breaking the page (#1746) * Update program areas page to reflect correct mini project cards (#1684) * Updates program areas to reflect correct project cards * Add placeholder image to repo and update on corresponding cards * Revert "Revert "Wins page modal a11y (#1679)" (#1738)" (#1747) This reverts commit c492445. * Wins form css (#1314) * begin css changes * initial page styling * add submit success message * styled the inputs to be more simple * small update * change colors to variables * fix github error checking, and make textarea required * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Updating wins data * Update meeting data * Update contributor and language data * Create add-issue-labels-to-pr.yml (#1740) * Create add-issue-labels-to-pr.yml * Update add-issue-labels-to-pr.yml * Update add-issue-labels-to-pr.yml * Update add-issue-labels-to-pr.yml * Update add-issue-labels-to-pr.yml * Added auth. To be reverted. * Update add-issue-labels-to-pr.yml * Update add-issue-labels-to-pr.yml * Update add-issue-labels-to-pr.yml * Update add-issue-labels-to-pr.yml * Update CONTRIBUTING.md (#1751) * Update update-comment-on-update-label.yml Fix typo * Create pull_request_template.md * Delete pull_request_template.md * Create pull_request_template.md * Update pull_request_template.md * Update pull_request_template.md * Fixes #1574 (#1764) * Update people2.yml (#1763) * Update meeting data * Update contributor and language data * Updating wins data * Updating wins data * Updating wins data * Updating wins data * Updating wins data * Updating wins data * Updating wins data * Updating wins data * Updating wins data * Updating wins data * Update meeting data * Update contributor and language data * Updating wins data * Change Alt Text for Delegate Icon on Credit page (#1771) * Fixes #1574 * Change Alt Text for Delegate Icon on Credit page * change resume alt to resume icon (#1765) * Update comment on gh action add-issue-labels-to-pr (#1758) The comments added to the action clarifies and notes the decision behind the usage of the event `pull_request_target` instead of `pull_request` * Contributing.md changes (#1471) * Got Akibs Changes * Update CONTRIBUTING.md file * Accepted incoming merge conflict * Made github username wording more consistent * Added documentation for using Docker back to the file * Added git status code back to file * Changed edits to pull request * Changed wording of issue and pull request headers * Fixed broken link in edits to a pull request * Changed wording of first pull request in bottom greeting * Removed unnecessary text * Added info about VS Code and moved Changes from Upsream section * Added hfla-site slack link * Made changes suggested by alyssa * Update CONTRIBUTING.md Minor changes. Made two changes to the file. Co-authored-by: Josh Bubar <53061723+jbubar@users.noreply.github.com> Co-authored-by: Alyssa <38295612+alyssabenipayo@users.noreply.github.com> * Updating wins data * Update meeting data * Update contributor and language data * Updating wins data * Update meeting data * Update contributor and language data * Changed the alt attribute value to 'Design Community Concept Illustration' for the Design Image on the Credit Page (#1780) Co-authored-by: Mateo Godoy <mgodoy@berkeley.edu> * 1586 - update alt itext for "Technology" image within the "Credits" page (#1784) * Updating wins data * Update meeting data * Update contributor and language data * Adjusts Program Areas page image cards in mobile (#1774) * Adjusts Program Areas page image cards in mobile * Updates height of card image to correct size * Updating wins data * Update meeting data * Update contributor and language data * Change alt text (#1782) * changed alt text for Partnership Icon on Credit page (#1783) * Updating wins data * Update meeting data * Update contributor and language data * changed alt office worker (#1804) * changed alt text for designer life image on credits page (#1801) * add missing periods in the Getting Started Page (#1799) * remove margin: auto to split header paragraphs (#1790) * Adding button xl-long class and applying it to CTA "Join Us" home page button (#1773) * Testing * New home button * Removed test * New Classes * removed} * } * removed accidental changes Co-authored-by: Sakari Salminiitty <sakarisalminiitty@Sakaris-MacBook-Air.local> * 1792 - add HTML/CSS to ensure "Online Project Team Meetings" button wraps text within the mobile view of the "Events" page (#1813) * Standardize join us page mobile (#1731) * added title attibutes to sponsor and partner logos in about pages * Changed "vertical" to "program area" * standardized join us page on mobile * media queries changed and header name change * text-align left added to mobile & header container added Co-authored-by: Linda-OC <67043889+Linda-OC@users.noreply.github.com> Co-authored-by: avali4907 <avali4907@outlook.com> * Updating wins data * Update meeting data * Update contributor and language data * Rename security.yml (#1821) * issue 1570, change email alt text (#1827) * Updating wins data * Update meeting data * Update contributor and language data * Updating wins data * Update meeting data * Update contributor and language data * Updating wins data * Update meeting data * Update contributor and language data * Create Responsiveness on mobile * Rename Responsiveness on mobile to Mobile_responsiveness.md * Update Mobile_responsiveness.md * Update Mobile_responsiveness.md * Update Mobile_responsiveness.md * Update Mobile_responsiveness.md * Update Mobile_responsiveness.md * Update issue templates * Updating wins data * Update meeting data * Update contributor and language data * Updating wins data * Update meeting data * Update contributor and language data * Update Toolkit page's filter banner font weight (#1831) * Fixes #1574 * Change Alt Text for Delegate Icon on Credit page * changed toolkit banner font to 400 * Revert "changed toolkit banner font to 400" This reverts commit 7c24302. * Revert "Revert "changed toolkit banner font to 400"" This reverts commit b4b1c83. * Added documentation for unseen changes (#1854) * Added documentation for fixing jekyll livereloading bug * Fixed some typos * Moved location of changes * removed max height property so all getting started cards were visible (#1853) * Add x modal wins page (#1775) * Added x to modal in wins page to exit * Styled x closing icon to fit in upper right corner of modal * Used svg icon to show close icon on modal in wins page * Implementing new design system heading typography in the code base (#1814) * New typography * removed { * removes } * Added , * Update _typography.scss * Update _typography.scss * Update _typography.scss * Update _print.scss * Update _typography.scss * Update _typography.scss * Fixed title1 print Co-authored-by: Sakari Salminiitty <sakarisalminiitty@Sakaris-MacBook-Air.local> * Updating wins data * Update meeting data * Update contributor and language data * Add media query to .leader-description (#1855) * Update credits.html * Clarified adding images * Update pull_request_template.md * 1748, closed pr 1832, attempt 2 (#1858) * 1748, closed pr 1832, attempt 2 * 1858 pr update * change alt for video conference icon (#1860) * changed alt attribute for meetings icon on credit page (#1862) * Updating wins data * Update meeting data * Update contributor and language data * fix overlay Co-authored-by: Marco Barrera <marcobarrera749@gmail.com> Co-authored-by: HackforLABot <64623632+HackforLABot@users.noreply.github.com> Co-authored-by: GitHub Actions Bot <hackforla-bot@hackforla.org> Co-authored-by: Garrett Hickman <79604590+grhhhh@users.noreply.github.com> Co-authored-by: Akib Rhast <akib.rhast@gmail.com> Co-authored-by: Sarah W <40401149+arghmatey@users.noreply.github.com> Co-authored-by: Zak234 <85966467+Zak234@users.noreply.github.com> Co-authored-by: Ava Li <62368440+Aveline-art@users.noreply.github.com> Co-authored-by: Abel-Zambrano <67209686+Abel-Zambrano@users.noreply.github.com> Co-authored-by: Ali Ibsin <ibsin.a1996@gmail.com> Co-authored-by: Alex Verdin <alexverdin01@gmail.com> Co-authored-by: Alyssa <38295612+alyssabenipayo@users.noreply.github.com> Co-authored-by: mgodoy2023 <86011089+mgodoy2023@users.noreply.github.com> Co-authored-by: Mateo Godoy <mgodoy@berkeley.edu> Co-authored-by: Adam Abundis <adamjabundis@gmail.com> Co-authored-by: Vicki Chung <72854605+vickiychung@users.noreply.github.com> Co-authored-by: benrempel <benrempel93@gmail.com> Co-authored-by: Marianna Askova <74923247+MariannaAskova@users.noreply.github.com> Co-authored-by: Andrew Lieu <andrewalieu@gmail.com> Co-authored-by: Alexey Sergeev <xengawe@gmail.com> Co-authored-by: Sakari Salminiitty <sakarisalminiitty@Sakaris-MacBook-Air.local> Co-authored-by: Josephine Han <63170710+josiehandeveloper@users.noreply.github.com> Co-authored-by: Linda-OC <67043889+Linda-OC@users.noreply.github.com> Co-authored-by: avali4907 <avali4907@outlook.com> Co-authored-by: Sophia Ling <86015625+anonymousanemone@users.noreply.github.com> Co-authored-by: Sihemgourou <55627107+Sihemgourou@users.noreply.github.com> Co-authored-by: macho-catt <48004150+macho-catt@users.noreply.github.com>
* Changed margin to 32px * reversed back the main margin and changed only the margin for mobile
* remove tablet view and fix responsiveness issues * make icons clickable in mobile * remove clickable icons in desktop * quick fix to remove see less on desktop * better fix for removing see less on desktop * fix the unclickability issue on the see more after resize * fix overlay other icon parser problem * clean up * make icons unclickable when expanded * delete console log
* fixes spacing between wins-text and wins-badges * clean up * more spacing added * spacing * resolved Co-authored-by: erikaBell <67438372+erikaBelll@users.noreply.github.com> Co-authored-by: Josh Bubar <53061723+jbubar@users.noreply.github.com>
* Clarified comments, Change functions to arrow functions and removed extra spaces * Revert "Clarified comments, Change functions to arrow functions and removed extra spaces" This reverts commit 7bf6086. * Clarified comments, changed function into arrow function and removed extra spaces * removed spacing in functions Co-authored-by: avali4907 <avali4907@outlook.com>
…into wins-feature-1
github-actions
bot
added
P-Feature: Wins Page
17 tasks
|
Will have merge conflicts every day. could not figure out how to remove the json files from the pr |
|
This command is the one that I use to update the files git checkout upstream/gh-pages -- _data/external/github-data.json _data/external/vrms_data.json |
2 tasks
|
@jbubar Thanks for following up with this! We will showcase this to the team on Sunday to ensure that it reaches the all-team standard for MVP before merging. Cross your fingers! |
12 tasks
12 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #2138
What changes have been made by the team over many months ??
Screenshots of Proposed Changes Of The Website (if any, please do not screen shot code changes)
Visuals before changes are applied (mobile: width 700px)
Visuals after changes are applied (mobile: width 700px)
Visuals before changes are applied (desktop: width 1000px)
Visuals after changes are applied (desktop: width 1000px)