+
-
Current Projects
Have an idea? @@ -13,7 +13,7 @@
Current Projects
+
diff --git a/_includes/current-projects.html b/_includes/current-projects.html
index c8973d62ea..3042fcd59b 100644
--- a/_includes/current-projects.html
+++ b/_includes/current-projects.html
@@ -1,7 +1,7 @@
-
-
+
diff --git a/_includes/donate-card.html b/_includes/donate-card.html
index 75503e7b1f..374f861de1 100644
--- a/_includes/donate-card.html
+++ b/_includes/donate-card.html
@@ -1,29 +1,8 @@
-
+
+
-
Running Hack for LA co
our infrastructure and procedures. This enables Hack for LA to provide
world-class training to our members and valuable, scalable, impactful
products to the community.
-
-
+
{% endif %}
diff --git a/_projects/access-the-data.md b/_projects/access-the-data.md
index 21ce603df6..50c1536036 100644
--- a/_projects/access-the-data.md
+++ b/_projects/access-the-data.md
@@ -25,7 +25,7 @@ leadership:
- name: AJ Price
role: Product Manager
links:
- slack: 'https://hackforla.slack.com/team/D02USE0EPSS'
+ slack: 'https://hackforla.slack.com/team/U02UZ5BK8UB'
github: 'https://github.com/mxajPrice'
picture: https://avatars.githubusercontent.com/mxajPrice
- name: Judson Lester
@@ -34,12 +34,6 @@ leadership:
slack: 'https://hackforla.slack.com/team/U9NFW84QK'
github: 'https://github.com/nyarly'
picture: https://avatars.githubusercontent.com/nyarly
- - name: Cathy Cai
- role: Product Manager
- links:
- slack: 'https://hackforla.slack.com/team/U04TUV2FQCU'
- github: 'https://github.com/Cathyyyyyyyy'
- picture: https://avatars.githubusercontent.com/Cathyyyyyyyy
- name: Aparna Gopal
role: UX Researcher
links:
@@ -65,7 +59,7 @@ leadership:
github: 'https://github.com/TonyDelgadoWillis'
picture: https://avatars.githubusercontent.com/TonyDelgadoWillis
links:
- - name: Github
+ - name: GitHub
url: 'https://github.com/hackforla/access-the-data/'
- name: Slack
url: 'https://hackforla.slack.com/archives/C01L2ANCG6M'
diff --git a/_projects/design-systems.md b/_projects/design-systems.md
index 463b2b3504..d74611ca60 100644
--- a/_projects/design-systems.md
+++ b/_projects/design-systems.md
@@ -121,7 +121,7 @@ partner:
tools: Figma, Google Docs, Zoom, Otter.ai
program-area:
- Civic Tech Infrastructure
-status: Active
+status: On Hold
visible: true
# If the project should not have a project homepage for any given reason, add the following line (uncommented):
# project-homepage: false
diff --git a/_projects/expunge-assist.md b/_projects/expunge-assist.md
index 3365ab7e3b..2cc8b7ad1b 100644
--- a/_projects/expunge-assist.md
+++ b/_projects/expunge-assist.md
@@ -4,7 +4,7 @@ title: Expunge Assist
description: 'Expunge Assist aims to help people in California with criminal records accomplish record clearance, expungement or reduction and subsequently a second chance as a part of society.
We work with verifiable non-profits, the government and partners to build digital tools that can affect changes in the lives of these justice impacted individuals.' image: /assets/images/projects/expunge-assist.png -alt: 'Image of a criminal record' +alt: 'Expunge Assist' image-hero: /assets/images/projects/expunge-assist-hero.png leadership: - name: Thomas Demoner diff --git a/_projects/home-unite-us.md b/_projects/home-unite-us.md index 91b134ce4d..13ce950600 100644 --- a/_projects/home-unite-us.md +++ b/_projects/home-unite-us.md @@ -124,7 +124,9 @@ technologies: - React - NoSQL - Flask - - Amazon Cognito / OIDC / OAuth2 + - Amazon Cognito + - OIDC + - OAuth2 - MongoDB location: - Remote diff --git a/_projects/website.md b/_projects/website.md index 4a85b19875..80dc9ceda7 100644 --- a/_projects/website.md +++ b/_projects/website.md @@ -1,9 +1,9 @@ --- identification: '130000551' -title: Hackforla.org Website -description: The hackforla.org website is our organization's way of communicating with volunteers, stakeholders, and donors. This project is a good place to start for new volunteers looking to polish their git protocol skills (branches, separation of concerns, etc.). We currently have two development paths: growth (building out new pages and guides) and optimization (taking inventory of our code and design systems) to ensure we are consistently delivering value to our users while being scalable in our approach to building the site. +title: Hack for LA Site +description: The Hack for LA Site (hackforla.org) is our organization's way of communicating with volunteers, stakeholders, and donors. This project is a good place to start for new volunteers looking to polish their git protocol skills (branches, separation of concerns, etc.). We currently have two development paths: growth (building out new pages and guides) and optimization (taking inventory of our code and design systems) to ensure we are consistently delivering value to our users while being scalable in our approach to building the site. image: /assets/images/projects/website.png -alt: 'Hackforla.org Website' +alt: 'Hack for LA Site' image-hero: /assets/images/projects/website-hero.jpg leadership: - name: Bonnie Wolfe @@ -24,12 +24,6 @@ leadership: slack: 'https://hackforla.slack.com/team/U02M686LYET' github: 'https://github.com/blulady' picture: https://avatars.githubusercontent.com/blulady - - name: Arpita Pandya - role: Merge Team - links: - slack: 'https://hackforla.slack.com/team/U02LQ20MEDU' - github: 'https://github.com/arpitapandya' - picture: https://avatars.githubusercontent.com/arpitapandya - name: Matt Pereira role: Merge Team links: @@ -66,19 +60,30 @@ leadership: slack: 'https://hackforla.slack.com/team/U04J1GBA6QP' github: 'https://github.com/christinaor' picture: https://avatars.githubusercontent.com/christinaor - - name: Bitian Zhang - role: Merge Team - links: - slack: 'https://hackforla.slack.com/team/U04H6PYK14N' - github: 'https://github.com/bzzz-coding' - picture: https://avatars.githubusercontent.com/bzzz-coding - name: Brian Mui role: Merge Team links: slack: https://hackforla.slack.com/team/U04MFMMNJRH github: https://github.com/bootcamp-brian picture: https://avatars.githubusercontent.com/bootcamp-brian - + - name: MJ Shelton + role: Merge Team + links: + slack: https://hackforla.slack.com/team/U04UG4UQE8G + github: https://github.com/mjshelton12 + picture: https://avatars.githubusercontent.com/mjshelton12 + - name: Chris Menke + role: Merge Team + links: + slack: https://hackforla.slack.com/team/U04KVG05H3J + github: https://github.com/chrismenke45 + picture: https://avatars.githubusercontent.com/chrismenke45 + - name: Drake Nguyen + role: Merge Team + links: + slack: https://hackforla.slack.com/team/U04TSESVB4J + github: https://github.com/drakenguyen4000 + picture: https://avatars.githubusercontent.com/drakenguyen4000 links: - name: Wiki url: 'https://github.com/hackforla/website/wiki' diff --git a/_sass/components/_about.scss b/_sass/components/_about.scss index cbf5f38a79..105b4b492c 100644 --- a/_sass/components/_about.scss +++ b/_sass/components/_about.scss @@ -38,8 +38,6 @@ grid-template-rows: repeat(4, 1fr); column-gap: 10px; row-gap: 26px; - justify-items: stretch; - align-content: space-between; } // Makes the sticky navigation stick diff --git a/_sass/components/_donate-components.scss b/_sass/components/_donate-components.scss index 135375a7c1..53f4bb7eb9 100644 --- a/_sass/components/_donate-components.scss +++ b/_sass/components/_donate-components.scss @@ -12,10 +12,8 @@ .circle-full-container { display: flex; flex-direction: column; - padding: 1em 2em; justify-content: center; - align-items: center; - padding: 0; + align-items: center; margin: 0; } @@ -56,15 +54,19 @@ .inside-circle-text { text-align: center; - color: #030D2D; - margin: 0; - padding: 0.4em 0em; + color: $color-darkblue; + margin: 0; +} + +// Override p padding from page-card--large-icon-body in _card.scss +#circle-override-p-padding { + padding: 0.2em 0em; } .circle-title{ padding: 0.5em; font-size: 1.5em; - color: #030D2D; + color: $color-darkblue; margin: 0; } @@ -73,4 +75,93 @@ flex-direction: column; justify-content: center; align-items: center; +} + +.donation-gif { + box-shadow: 0px 2px 4px 0px #00000040; +} + +.donation-grid { + display: flex; + flex-direction: column; + align-items: center; + p { + margin-top: 20px; + margin-left: 20px; + } +} + +.donation-body { + p { + margin-left: -10px; + font-size: 18px; + } + + ol { + padding-left: 5px; + } + + li { + padding-bottom: 15px; + } +} + +.donation-footer { + margin-left: -10px; + font-style: italic; +} + +@media #{$bp-tablet-up} { + .donation-grid{ + display: grid; + grid-template-columns: 50% 50%; + grid-template-rows: 50% 50%; + padding: 20px; + text-align: left; + align-items: flex-start; + font-size:18px; + + .donation-body { + grid-column: 1 / span 1; + grid-row: 1 / span 1; + + p { + margin-left: 0px; + } + + ol { + margin-bottom: 0px; + padding-left: 50px; + max-width: 360px; + line-height: 24px; + } + + li { + padding: 10px 10px 25px 0px; + font-size: 1.125rem; + } + } + + .donation-footer { + max-width: 3340px; + margin: 20px 0px 0px -10px; + padding: 0px 48px 0px 60px; + font-size: 15px; + } + + .donation-gif { + grid-column: 2 / span 1; + grid-row: 1 / span 2; + margin: auto; + width: 318px; + padding-bottom: 20px; + } + + p { + margin-top: 0px; + padding: 0 10px 0 30px; + grid-row: 2 / span 3; + grid-column: 1 / span 1; + } + } } \ No newline at end of file diff --git a/_sass/components/_donate.scss b/_sass/components/_donate.scss index 9acd018402..4207156072 100644 --- a/_sass/components/_donate.scss +++ b/_sass/components/_donate.scss @@ -1,6 +1,10 @@ /*-------- | Mobile ----------*/ +.donate-title { + text-align: center; + font-size: 1.5rem; +} .donate-wrapper { min-height: 100vh; @@ -12,16 +16,13 @@ align-items: center; padding: 4rem 1rem; height: fit-content; - .donate-banner-text { display: flex; flex-direction: column; align-items: center; - .title1 { padding-bottom: 28px; } - p { font-size: 18px; max-width: 300px; @@ -31,7 +32,8 @@ } @media #{$bp-mobile-up} { font-size: 16px; - text-align: left; + text-align: left; + padding-left: 0px; } } } @@ -39,71 +41,4 @@ .page-card--donate{ padding: 32px; - - .donate-title { - text-align: center; - } - .donation-gif { - box-shadow: 0px 2px 4px 0px #00000040; - } -} - -.donation-grid{ - display: flex; - flex-direction: column; - align-items: center; - - p { - margin-top: 20px; - } -} - - -@media #{$bp-tablet-up} { - .donation-grid{ - display: grid; - grid-template-columns: 50% 50%; - grid-template-rows: 50% 50%; - padding: 20px; - text-align: left; - align-items: flex-start; - - .donation-body { - grid-column: 1 / span 1; - grid-row: 1 / span 1; - margin-top: 15%; - padding: 0 32px 0 16px; - - h3 { - text-align: left; - } - - ol { - padding-left: 30px; - max-width: 480px; - line-height: 24px; - } - - li { - padding: 5px 0; - font-size: 1.125rem; - } - } - - .donation-gif { - grid-column: 2 / span 1; - grid-row: 1 / span 2; - margin: auto; - width: 318px; - padding-bottom: 20px; - } - - p { - margin-top: 10px; - padding: 0 32px 0 36px; - font-size: 15px; - grid-row: 2 / span 3; - grid-column: 1 / span 1; - } - } -} +} \ No newline at end of file diff --git a/_sass/components/_events.scss b/_sass/components/_events.scss index 108da02702..43b91fb967 100644 --- a/_sass/components/_events.scss +++ b/_sass/components/_events.scss @@ -112,7 +112,7 @@ color: $color-black; font-weight: normal; font-size: 18px; - margin: 0 6px; + margin: 0 6px 65px 6px; @media #{$bp-below-desktop} { content: "\226A"; diff --git a/_sass/components/_home.scss b/_sass/components/_home.scss index d200466022..0795a0fe46 100644 --- a/_sass/components/_home.scss +++ b/_sass/components/_home.scss @@ -321,7 +321,7 @@ button { } .status-Active { - background-color: rgb(187, 255, 187); + background-color: $color-lightgreen; } .status-Rebooting { diff --git a/_sass/components/_privacy-policy.scss b/_sass/components/_privacy-policy.scss index 52ace98e2e..76afdf6f32 100644 --- a/_sass/components/_privacy-policy.scss +++ b/_sass/components/_privacy-policy.scss @@ -5,25 +5,33 @@ width: 236.41px; } } - .content-section--privacy-policy { - .subsection-spacing--privacy-policy { - margin-bottom: 24px; + #visiting-hackforlaorg, + #email-addresses, + #third-party-service-providers, + #google-analytics, + #how-to-opt-out-of-the-use-of-cookies { + margin-top: 24px; } - - .title-spacing { + ul, + p { + font-size: $font-size-paragraph2; + } + + h2 { margin-bottom: 24px; } - .title-spacing.first-title-spacing { + #overview { margin-top: 0px; } - .subtitle-spacing { + h3 { + font-size: #{map-get($font-size-title4, desktop)}; margin-bottom: 18px; } - - .no-bottom-margin-spacing { + #visiting-hackforlaorg + p, + #as-required-by-law-and-similar-disclosures + p { margin-bottom: 0px; } } @@ -34,42 +42,45 @@ align-self: start; } } - .content-section.content-section--privacy-policy { padding-top: 34px; padding-bottom: 34px; } - .page-card--privacy-policy { padding: 36px 57px; } - - .section-spacing--privacy-policy { - margin-bottom: 48px; + h2 { + margin-top: 48px; } } @media #{$bp-below-desktop} { - /* This has the same font-size as paragraph3 so it can be used for the Privacy Policy page in mobile screen sizes, which is a different font-size than the paragraph2 classes used for desktop size screens. */ - section { - .paragraph2.paragraph--privacy-policy { + .content-section--privacy-policy { + ul, + p { font-size: $font-size-paragraph3; + line-height: 1.375; + font-family: "Roboto", sans-serif; + font-weight: 400; + color: $color-black; + } + h2 { + margin-top: 32px; + font-size: 1.75rem; + } + h3 { + font-size: 1.25rem; } } - .header-container--privacy-policy { padding: 32px 37.5px; } - .section-spacing--privacy-policy { - margin-bottom: 32px; - } - .page-card--privacy-policy { padding: 28px 21.5px; } -} \ No newline at end of file +} diff --git a/_sass/components/_project-meetings.scss b/_sass/components/_project-meetings.scss index cb6b44e934..3af4abf74d 100644 --- a/_sass/components/_project-meetings.scss +++ b/_sass/components/_project-meetings.scss @@ -1,18 +1,3 @@ -.covid-notification-banner { - background-color: $color-gold; - width: 100%; - display: flex; - justify-content: center; - align-content: center; - - p { - text-align: center; - font-weight: bold; - margin: 0; - padding: 15px 0; - } -} - .calendar-started-page { background: $color-darkblue; min-height: 100vh; @@ -20,7 +5,7 @@ flex-direction: column; justify-content: center; align-items: center; -} +} .page-card--project-meetings { padding: 30px; diff --git a/_sass/components/_project-page.scss b/_sass/components/_project-page.scss index 870cbaf1dc..e143612667 100644 --- a/_sass/components/_project-page.scss +++ b/_sass/components/_project-page.scss @@ -254,7 +254,7 @@ margin-right: -40px; margin-bottom: -65px; padding: 26px 33px 33px 50px; - background: #F7F5F5; + background: $color-pink; border-top-left-radius: 0px; border-top-right-radius: 0px; } @@ -262,7 +262,7 @@ .sdg-description-grid-item { padding: 25px 19px; - background: #F6F6F6; + background: $color-whitesmoke; border-radius: 0px 0px 10px 10px; height: 80%; diff --git a/_sass/components/_projects-page.scss b/_sass/components/_projects-page.scss index 7266839b83..1af7b2013d 100644 --- a/_sass/components/_projects-page.scss +++ b/_sass/components/_projects-page.scss @@ -6,7 +6,7 @@ .projects-inner { display: flex; flex-direction: column; - + @media #{$bp-mobile-up} { flex-direction: row; flex-wrap: wrap; @@ -98,7 +98,7 @@ } .status-Active { - background-color: rgb(187, 255, 187); + background-color: $color-lightgreen; } .status-Rebooting { diff --git a/_sass/components/_projects.scss b/_sass/components/_projects.scss index 91f8756fa6..3a239f3a8e 100644 --- a/_sass/components/_projects.scss +++ b/_sass/components/_projects.scss @@ -98,7 +98,7 @@ } .status-Active { - background-color: rgb(187, 255, 187); + background-color: $color-lightgreen; } .status-Rebooting { diff --git a/_sass/components/_wins-page.scss b/_sass/components/_wins-page.scss index 282ac305f6..913eefd091 100644 --- a/_sass/components/_wins-page.scss +++ b/_sass/components/_wins-page.scss @@ -473,12 +473,12 @@ width: 100%; } -@media #{$bp-below-desktop}{ - .wins-page-contain > ul.wins-filter{ - width: 100%; - grid-template-rows: none; - } +.wins-page-contain > ul.wins-filter{ + width: 100%; + grid-template-rows: none; +} +@media #{$bp-below-desktop}{ .wins-tablet{ margin-left: 0em; diff --git a/_sass/elements/_background-sdg-colors.scss b/_sass/elements/_background-sdg-colors.scss new file mode 100644 index 0000000000..08061c61ee --- /dev/null +++ b/_sass/elements/_background-sdg-colors.scss @@ -0,0 +1,18 @@ +/** + * Sustainable Development Goal (SDG) Background Colors + * + * These background color classes match the colors of the SDG icons provided by the United Nations (UN): + * https://www.un.org/sustainabledevelopment/news/communications-material/ + */ + + .background-color-sdg2 { background-color: $color-sdg2; } + .background-color-sdg3 { background-color: $color-sdg3; } + .background-color-sdg4 { background-color: $color-sdg4; } + .background-color-sdg5 { background-color: $color-sdg5; } + .background-color-sdg8 { background-color: $color-sdg8; } + .background-color-sdg9 { background-color: $color-sdg9; } + .background-color-sdg10 { background-color: $color-sdg10; } + .background-color-sdg11 { background-color: $color-sdg11; } + .background-color-sdg13 { background-color: $color-sdg13; } + .background-color-sdg16 { background-color: $color-sdg16; } + .background-color-sdg17 { background-color: $color-sdg17; } \ No newline at end of file diff --git a/_sass/elements/_dropdown_filters.scss b/_sass/elements/_dropdown_filters.scss index 736b904094..1c0c00147b 100644 --- a/_sass/elements/_dropdown_filters.scss +++ b/_sass/elements/_dropdown_filters.scss @@ -8,10 +8,19 @@ .filters-title .hide-filters-button { display: none; } + +// Centered Components and filters up top section.filter-content-container { - display: grid; - grid-template-columns: 377px 1fr; + display: flex; + justify-content: center; +} +.page-contain.projects-inner { + margin: 0px 0px; } +.page-contain.projects-inner.curr-projects { + margin: 0px auto; +} + a.filter-item { text-decoration: none; } @@ -20,22 +29,15 @@ a.filter-item { } .filter-toolbar { - width: 100%; padding: 8px 32px; box-sizing: border-box; - margin: 0 auto; height: 100%; } -.filter-toolbar > .stickyDiv { - position: sticky; - position: -webkit-sticky; - top: 120px; -} -@media only screen and (max-width: 1028px) { - .filter-toolbar > .stickyDiv { - top: 75px; - } + +.filtersDiv { + min-width:282px; } + //filter container ul.filter-list { display: flex; @@ -253,9 +255,6 @@ a.clear-filter-tags { overflow-y: scroll; background: $color-white; } - .filter-toolbar > .stickyDiv { - position: static; - } .filters-title { background: $color-white; border: 1px solid $color-mediumgrey; diff --git a/_sass/elements/_old_dropdown_filters.scss b/_sass/elements/_old_dropdown_filters.scss new file mode 100644 index 0000000000..2ebc5734d2 --- /dev/null +++ b/_sass/elements/_old_dropdown_filters.scss @@ -0,0 +1,196 @@ +a.old-filter-item { + text-decoration: none; +} +.old-project-list { + margin-top: 0.5rem; +} +//filter container +ul.old-filter-list { + background: $color-pink; + display: grid; + list-style: none; + padding-left: 0; + grid-auto-flow: column; + grid-column-gap: 20px; + // grid-template-columns: repeat(4, 1fr); + // ^ See issue #1997 for more info on why this is commented out and changed to 3 + grid-template-columns: repeat(3, 1fr); +} + +//category boxes +li.old-filter-item { + border: 1px solid rgba(0, 0, 0, 0.24); + border-radius: 5px; + color: black; + background: white; + display: flex; + padding: 10px 15px; + position: relative; + transition-duration: 0.5s; + cursor: pointer; +} + +//category names +li.old-filter-item a { + color: black; + text-transform: capitalize; +} + +li.old-filter-item:hover, +li.old-filter-item:focus-within { + background: white; +} + +li.old-filter-item:focus-within a { + outline: none; +} + +//dropdown +ul.old-filter-list li ul { + background: white; + border: 1px solid rgba(0, 0, 0, 0.24); + visibility: hidden; + opacity: 0; + transition: all 0.5s ease; + z-index: 99; + list-style: none; + width: 100%; + padding: 15px 20px; + line-height: 2em; + font-size: 0.9em; + position: absolute; + left: 0; + top: 100%; + cursor: default; +} + +ul.old-filter-list li:hover > ul, +ul.old-filter-list li:focus-within > ul, +ul.old-filter-list li ul:hover, +ul.old-filter-list li ul:focus { + visibility: visible; + opacity: 1; + display: block; +} + +ul.old-filter-list li ul li { + clear: both; + width: 100%; + text-align: left; +} + +.old-hidden-project { + display: none; +} + +.old-dropdown label { + cursor: pointer; + vertical-align: middle; +} + +.old-filter-checkbox { + border: 1px solid #000000; + border-radius: 4px; + margin: 0px 5px; + cursor: pointer; + vertical-align: middle; +} + +.old-labelArrow { + transform: rotate(-45deg); + font-size: 24px; + position: absolute; + top: 2%; + right: 10%; +} + +.old-filter-tag-container { + display: flex; + flex-wrap: wrap; + list-style: none; +} + +.old-filter-tag { + align-self: flex-start; + height: 24px; + box-sizing: border-box; + max-width: fit-content; + + margin: 0em 0.5em 1em; + padding: 0.15em 1em; + background: $color-red; + border: none; + border-radius: 5px; + color: $color-white; + font-weight: 500; + font-size: 15px; + text-transform: capitalize; + + &::after { + content: "\00d7"; + padding-left: 0.5em; + } + + &:hover, + &:active, + &:focus { + background: darken($color-red, 10%); + color: $color-white; + text-decoration: none; + cursor: pointer; + } +} + +.old-filter-tag span { + margin: 0 0 0 5px; + min-height: 20px; +} + +a.old-clear-filter-tags { + margin-left: 1em; + text-decoration: underline; + color: $color-cement; + + &:hover { + cursor: pointer; + } +} + +.old-number-of-checked-boxes { + color: $color-red; +} + +@media #{$bp-below-tablet} { + //resize dropdown on tablet and mobile view + ul.old-filter-list li ul { + width: 100%; + padding: 15px; + } +} + +@media (max-width: 659px) { + //creating 2 rows and 2 columns to display categories on mobile + ul.old-filter-list { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(2, 1fr); + grid-auto-flow: row; + grid-gap: 10px; + } + + //resize category labels + li.old-filter-item { + padding: 5px 10px; + } + + //resize and reposition label arrow + .old-labelArrow { + top: -8%; + right: 5%; + font-size: 20px; + } + + .old-clear-filter-tags { + display: none; + } +} \ No newline at end of file diff --git a/_sass/layouts/_main.scss b/_sass/layouts/_main.scss index 8a051c856d..7e62f2c964 100644 --- a/_sass/layouts/_main.scss +++ b/_sass/layouts/_main.scss @@ -35,3 +35,8 @@ .content-section { padding: 32px 16px; } + +// This is to provide padding for readability to the content in the default-markdown.html layout +#content-markdown { + padding: 200px 100px 300px 100px; +} \ No newline at end of file diff --git a/_sass/main.scss b/_sass/main.scss index 136666f27d..8c64fdb98f 100644 --- a/_sass/main.scss +++ b/_sass/main.scss @@ -23,6 +23,7 @@ // /** // * Elements // */ +@import 'elements/background-sdg-colors'; @import 'elements/accordion'; @import 'elements/buttons'; @import 'elements/forms'; @@ -34,6 +35,7 @@ @import 'elements/cards'; @import 'elements/color-styles'; @import 'elements/dropdown_filters'; +@import 'elements/old_dropdown_filters'; // /** // * Components diff --git a/_sass/variables/_layout.scss b/_sass/variables/_layout.scss index 5a63eb6b50..9a6c6fd332 100644 --- a/_sass/variables/_layout.scss +++ b/_sass/variables/_layout.scss @@ -17,13 +17,13 @@ $screen-mobile: 480px; * anything below a tablet, use $bp-below-tablet. */ $bp-desktop-large-up: '(min-width: #{$screen-desktop-large})'; -$bp-below-desktop-large: '(max-width: #{$screen-desktop-large - 1})'; +$bp-below-desktop-large: '(max-width: #{$screen-desktop-large - .02})'; $bp-desktop-up: '(min-width: #{$screen-desktop})'; -$bp-below-desktop: '(max-width: #{$screen-desktop - 1})'; +$bp-below-desktop: '(max-width: #{$screen-desktop - .02})'; $bp-tablet-up: '(min-width: #{$screen-tablet})'; -$bp-below-tablet: '(max-width: #{$screen-tablet - 1})'; +$bp-below-tablet: '(max-width: #{$screen-tablet - .02})'; $bp-mobile-up: '(min-width: #{$screen-mobile})'; -$bp-below-mobile: '(max-width: #{$screen-mobile - 1})'; +$bp-below-mobile: '(max-width: #{$screen-mobile - .02})'; /** * Magic Numbers diff --git a/assets/images/donate/solidarity-pana.svg b/assets/images/donate/solidarity-pana.svg deleted file mode 100644 index 62b6d6db96..0000000000 --- a/assets/images/donate/solidarity-pana.svg +++ /dev/null @@ -1,169 +0,0 @@ - diff --git a/assets/js/current-projects.js b/assets/js/current-projects.js index 5aee0f5d13..8208e9267e 100644 --- a/assets/js/current-projects.js +++ b/assets/js/current-projects.js @@ -476,94 +476,94 @@ function clearAllEventHandler(){ * Takes a single project object and returns the html string representing the project card */ function projectCardComponent(project){ -return ` -
- `
+ return `
+
+ `
}
/**
@@ -605,4 +605,4 @@ function filterTagComponent(filterName,filterValue){
${filterName === "looking" ? "Role" : filterName}: ${filterValue}
`
-}
\ No newline at end of file
+}
diff --git a/github-actions/trigger-schedule/add-update-label-weekly/add-label.js b/github-actions/trigger-schedule/add-update-label-weekly/add-label.js
index cea8f8aa20..e255226acb 100644
--- a/github-actions/trigger-schedule/add-update-label-weekly/add-label.js
+++ b/github-actions/trigger-schedule/add-update-label-weekly/add-label.js
@@ -303,7 +303,7 @@ function createAssigneeString(assignees) {
return assigneeString.join(', ')
}
function formatComment(assignees, labelString) {
- const path = './github-actions/add-update-label-weekly/update-instructions-template.md'
+ const path = './github-actions/trigger-schedule/add-update-label-weekly/update-instructions-template.md'
const text = fs.readFileSync(path).toString('utf-8');
const options = {
dateStyle: 'full',
diff --git a/github-actions/trigger-schedule/add-update-label-weekly/update-instructions-template.md b/github-actions/trigger-schedule/add-update-label-weekly/update-instructions-template.md
index d32117c337..29ab9992e5 100644
--- a/github-actions/trigger-schedule/add-update-label-weekly/update-instructions-template.md
+++ b/github-actions/trigger-schedule/add-update-label-weekly/update-instructions-template.md
@@ -7,6 +7,6 @@ Please add update using the below template (even if you have a pull request). Af
4. ETA: "When do you expect this issue to be completed?"
5. Pictures (optional): "Add any pictures of the visual changes made to the site so far."
-If you need help, be sure to either: 1) place your issue in the developer meeting discussion column and ask for help at your next meeting, 2) put a "Status: Help Wanted" label on your issue and pull request, or 3) put up a request for assistance on the #hfla-site channel.
+If you need help, be sure to either: 1) place your issue in the developer meeting discussion column and ask for help at your next meeting, 2) put a "Status: Help Wanted" label on your issue and pull request, or 3) put up a request for assistance on the #hfla-site channel. Please note that including your questions in the issue comments- along with screenshots, if applicable- will help us to help you. [Here](https://github.com/hackforla/website/issues/1619#issuecomment-897315561) and [here](https://github.com/hackforla/website/issues/1908#issuecomment-877908152) are examples of well-formed questions.
You are receiving this comment because your last comment was before ${cutoffTime} PST.
diff --git a/pages/code-of-conduct.html b/pages/code-of-conduct.html
new file mode 100644
index 0000000000..bbe5ea92c1
--- /dev/null
+++ b/pages/code-of-conduct.html
@@ -0,0 +1,8 @@
+---
+layout: default-markdown
+title: Code of Conduct
+permalink: /code-of-conduct/
+---
+
+
+{% include code-of-conduct-page/CODEOFCONDUCT.md %}
\ No newline at end of file
diff --git a/pages/getting-started.html b/pages/getting-started.html
index 0bc007f92c..5dcd94f397 100644
--- a/pages/getting-started.html
+++ b/pages/getting-started.html
@@ -13,7 +13,7 @@ Provide In-Kind Software & Services
-Your donation of software or services help Hack for LA continue to use cutting edge technology in support of our nonprofit mission.
-Putting your tools in the hands of Hack for LA volunteers creates a new generation of tech workers who bring experience with your product to their companies.
-We provide visible credit on the credits page and can collaborate on joint press releases or social media posts if desired.
-Reach out to us if you would like to offer in-kind software or services.
-
- 
-
+ {% include donation/in-kind.html %}
+
-
- Make a donation to Hack for LA
--
-
- - Please follow this link to the Code for America - donation - form - -
- - To make a donation please select Hack for LA under the brigades - listed. - -
-
+ {% include donation/in-kind.html %}
+
diff --git a/_includes/donation/donate-gif-text.html b/_includes/donation/donate-gif-text.html
new file mode 100644
index 0000000000..f5c9964778
--- /dev/null
+++ b/_includes/donation/donate-gif-text.html
@@ -0,0 +1,21 @@
+Make a Donation
+ {% include donation/donate-gif-text.html %} +
+
+
+
\ No newline at end of file
diff --git a/_includes/donation/donation-circles.html b/_includes/donation/donation-circles.html
index 831e643ce6..e1059a60e8 100644
--- a/_includes/donation/donation-circles.html
+++ b/_includes/donation/donation-circles.html
@@ -2,10 +2,10 @@
+
+ Hack for LA takes donations through Code for America.
+-
+
- + Please follow this link to the Code for America + donation form. + +
- + To make a donation please select Hack for LA under the brigades + listed. + +
+
+
-
Hosting
-Mailing List Services
-Zoom
-Meetup
+Hosting
+Mailing List Services
+Zoom
+Meetup
@@ -16,8 +16,8 @@
-
Domain Names
-Insurance
+Domain Names
+Insurance
@@ -27,8 +27,8 @@
-
Stickers
-T-Shirts
+Stickers
+T-Shirts
diff --git a/_includes/donation/in-kind.html b/_includes/donation/in-kind.html new file mode 100644 index 0000000000..2dc8535f17 --- /dev/null +++ b/_includes/donation/in-kind.html @@ -0,0 +1,4 @@ +
Your donation of software or services help Hack for LA continue to use cutting edge technology in support of our nonprofit mission.
+Putting your tools in the hands of Hack for LA volunteers creates a new generation of tech workers who bring experience with your product to their companies.
+We provide visible credit on the credits page and can collaborate on joint press releases or social media posts if desired.
+Reach out to us if you would like to offer in-kind software or services.
\ No newline at end of file diff --git a/_includes/join-donate-card.html b/_includes/join-donate-card.html index fa84ec692d..558889bbec 100644 --- a/_includes/join-donate-card.html +++ b/_includes/join-donate-card.html @@ -10,8 +10,8 @@Running Hack for LA co
our infrastructure and procedures. This enables Hack for LA to provide
world-class training to our members and valuable, scalable, impactful
products to the community.
-
- 
+
+ {% include /donation/donation-circles.html %}
How to help us continue to do impactful work
-
diff --git a/_includes/program-area-pages-cards.html b/_includes/program-area-pages-cards.html
index ae07b378ca..f9df84f7fd 100644
--- a/_includes/program-area-pages-cards.html
+++ b/_includes/program-area-pages-cards.html
@@ -35,7 +35,7 @@
Impact
Sustainable Development Goal
- 
+
{{ item.sdg }}
diff --git a/_includes/resource-card.html b/_includes/resource-card.html
index 90d323641e..f997894126 100644
--- a/_includes/resource-card.html
+++ b/_includes/resource-card.html
@@ -1,12 +1,14 @@
{% assign url = include.url %}
{% assign image = include.image %}
{% assign name = include.name %}
+{% assign lowercaseName = include.name | downcase %}
+
-
- {% if name == 'GitHub' or name == 'Slack' %}
+ {% if lowercaseName == 'github' or name == 'Slack' %}
{% include {{ name | prepend: 'svg/icon-' | append: '-color.svg' | downcase }} %}
{% elsif name == 'Getting Started' %}
{% include svg/logo-hfla-small.svg %}
@@ -16,11 +18,16 @@
{% include svg/_ionicons_svg_ios-link.svg %}
{% endif %}
-
-
- {{ name }}
-
+ {% if lowercaseName == 'github' %}
+
+ GitHub
+
+ {% else %}
+
+ {{ name }}
+
+ {% endif %}
\ No newline at end of file
diff --git a/_includes/wins-page/wins-filter-template.html b/_includes/wins-page/wins-filter-template.html
index f9773d3ab2..737f09bbda 100644
--- a/_includes/wins-page/wins-filter-template.html
+++ b/_includes/wins-page/wins-filter-template.html
@@ -1,17 +1,17 @@
-
- -
- Role ∟
-
+
-
-
+
diff --git a/_layouts/default-markdown.html b/_layouts/default-markdown.html
new file mode 100644
index 0000000000..b39b6b6521
--- /dev/null
+++ b/_layouts/default-markdown.html
@@ -0,0 +1,19 @@
+
+
+{% include head.html %}
+
+
+
+
+ Skip to main content.
+
+ {%- include header.html -%}
+
+ {{ content | markdownify }}
+
+ {%- include footer.html -%}
+
+
+
+
+
\ No newline at end of file
diff --git a/_layouts/project.html b/_layouts/project.html
index 182591fddf..38025e2bbe 100644
--- a/_layouts/project.html
+++ b/_layouts/project.html
@@ -3,7 +3,7 @@
---
- 
+
{{ page.title }}
@@ -173,7 +173,7 @@ All-Time Cont
height="100%"
style="margin: 0; border: 2px solid color-mediumdarkcyanblue; box-sizing: border-box">
-
Impact
Sustainable Development Goal
-
+
{{ item.sdg }}
- {% if name == 'GitHub' or name == 'Slack' %}
+ {% if lowercaseName == 'github' or name == 'Slack' %}
{% include {{ name | prepend: 'svg/icon-' | append: '-color.svg' | downcase }} %}
{% elsif name == 'Getting Started' %}
{% include svg/logo-hfla-small.svg %}
@@ -16,11 +18,16 @@
{% include svg/_ionicons_svg_ios-link.svg %}
{% endif %}
-
-
- {{ name }} -
+ {% if lowercaseName == 'github' %} ++ GitHub +
+ {% else %} ++ {{ name }} +
+ {% endif %}-
-
-
- Role ∟
-
+ {{ content | markdownify }} + + {%- include footer.html -%} + + +- @@ -173,7 +173,7 @@
+
{{ page.title }}
All-Time Cont height="100%" style="margin: 0; border: 2px solid color-mediumdarkcyanblue; box-sizing: border-box"> -
We work with verifiable non-profits, the government and partners to build digital tools that can affect changes in the lives of these justice impacted individuals.' image: /assets/images/projects/expunge-assist.png -alt: 'Image of a criminal record' +alt: 'Expunge Assist' image-hero: /assets/images/projects/expunge-assist-hero.png leadership: - name: Thomas Demoner diff --git a/_projects/home-unite-us.md b/_projects/home-unite-us.md index 91b134ce4d..13ce950600 100644 --- a/_projects/home-unite-us.md +++ b/_projects/home-unite-us.md @@ -124,7 +124,9 @@ technologies: - React - NoSQL - Flask - - Amazon Cognito / OIDC / OAuth2 + - Amazon Cognito + - OIDC + - OAuth2 - MongoDB location: - Remote diff --git a/_projects/website.md b/_projects/website.md index 4a85b19875..80dc9ceda7 100644 --- a/_projects/website.md +++ b/_projects/website.md @@ -1,9 +1,9 @@ --- identification: '130000551' -title: Hackforla.org Website -description: The hackforla.org website is our organization's way of communicating with volunteers, stakeholders, and donors. This project is a good place to start for new volunteers looking to polish their git protocol skills (branches, separation of concerns, etc.). We currently have two development paths: growth (building out new pages and guides) and optimization (taking inventory of our code and design systems) to ensure we are consistently delivering value to our users while being scalable in our approach to building the site. +title: Hack for LA Site +description: The Hack for LA Site (hackforla.org) is our organization's way of communicating with volunteers, stakeholders, and donors. This project is a good place to start for new volunteers looking to polish their git protocol skills (branches, separation of concerns, etc.). We currently have two development paths: growth (building out new pages and guides) and optimization (taking inventory of our code and design systems) to ensure we are consistently delivering value to our users while being scalable in our approach to building the site. image: /assets/images/projects/website.png -alt: 'Hackforla.org Website' +alt: 'Hack for LA Site' image-hero: /assets/images/projects/website-hero.jpg leadership: - name: Bonnie Wolfe @@ -24,12 +24,6 @@ leadership: slack: 'https://hackforla.slack.com/team/U02M686LYET' github: 'https://github.com/blulady' picture: https://avatars.githubusercontent.com/blulady - - name: Arpita Pandya - role: Merge Team - links: - slack: 'https://hackforla.slack.com/team/U02LQ20MEDU' - github: 'https://github.com/arpitapandya' - picture: https://avatars.githubusercontent.com/arpitapandya - name: Matt Pereira role: Merge Team links: @@ -66,19 +60,30 @@ leadership: slack: 'https://hackforla.slack.com/team/U04J1GBA6QP' github: 'https://github.com/christinaor' picture: https://avatars.githubusercontent.com/christinaor - - name: Bitian Zhang - role: Merge Team - links: - slack: 'https://hackforla.slack.com/team/U04H6PYK14N' - github: 'https://github.com/bzzz-coding' - picture: https://avatars.githubusercontent.com/bzzz-coding - name: Brian Mui role: Merge Team links: slack: https://hackforla.slack.com/team/U04MFMMNJRH github: https://github.com/bootcamp-brian picture: https://avatars.githubusercontent.com/bootcamp-brian - + - name: MJ Shelton + role: Merge Team + links: + slack: https://hackforla.slack.com/team/U04UG4UQE8G + github: https://github.com/mjshelton12 + picture: https://avatars.githubusercontent.com/mjshelton12 + - name: Chris Menke + role: Merge Team + links: + slack: https://hackforla.slack.com/team/U04KVG05H3J + github: https://github.com/chrismenke45 + picture: https://avatars.githubusercontent.com/chrismenke45 + - name: Drake Nguyen + role: Merge Team + links: + slack: https://hackforla.slack.com/team/U04TSESVB4J + github: https://github.com/drakenguyen4000 + picture: https://avatars.githubusercontent.com/drakenguyen4000 links: - name: Wiki url: 'https://github.com/hackforla/website/wiki' diff --git a/_sass/components/_about.scss b/_sass/components/_about.scss index cbf5f38a79..105b4b492c 100644 --- a/_sass/components/_about.scss +++ b/_sass/components/_about.scss @@ -38,8 +38,6 @@ grid-template-rows: repeat(4, 1fr); column-gap: 10px; row-gap: 26px; - justify-items: stretch; - align-content: space-between; } // Makes the sticky navigation stick diff --git a/_sass/components/_donate-components.scss b/_sass/components/_donate-components.scss index 135375a7c1..53f4bb7eb9 100644 --- a/_sass/components/_donate-components.scss +++ b/_sass/components/_donate-components.scss @@ -12,10 +12,8 @@ .circle-full-container { display: flex; flex-direction: column; - padding: 1em 2em; justify-content: center; - align-items: center; - padding: 0; + align-items: center; margin: 0; } @@ -56,15 +54,19 @@ .inside-circle-text { text-align: center; - color: #030D2D; - margin: 0; - padding: 0.4em 0em; + color: $color-darkblue; + margin: 0; +} + +// Override p padding from page-card--large-icon-body in _card.scss +#circle-override-p-padding { + padding: 0.2em 0em; } .circle-title{ padding: 0.5em; font-size: 1.5em; - color: #030D2D; + color: $color-darkblue; margin: 0; } @@ -73,4 +75,93 @@ flex-direction: column; justify-content: center; align-items: center; +} + +.donation-gif { + box-shadow: 0px 2px 4px 0px #00000040; +} + +.donation-grid { + display: flex; + flex-direction: column; + align-items: center; + p { + margin-top: 20px; + margin-left: 20px; + } +} + +.donation-body { + p { + margin-left: -10px; + font-size: 18px; + } + + ol { + padding-left: 5px; + } + + li { + padding-bottom: 15px; + } +} + +.donation-footer { + margin-left: -10px; + font-style: italic; +} + +@media #{$bp-tablet-up} { + .donation-grid{ + display: grid; + grid-template-columns: 50% 50%; + grid-template-rows: 50% 50%; + padding: 20px; + text-align: left; + align-items: flex-start; + font-size:18px; + + .donation-body { + grid-column: 1 / span 1; + grid-row: 1 / span 1; + + p { + margin-left: 0px; + } + + ol { + margin-bottom: 0px; + padding-left: 50px; + max-width: 360px; + line-height: 24px; + } + + li { + padding: 10px 10px 25px 0px; + font-size: 1.125rem; + } + } + + .donation-footer { + max-width: 3340px; + margin: 20px 0px 0px -10px; + padding: 0px 48px 0px 60px; + font-size: 15px; + } + + .donation-gif { + grid-column: 2 / span 1; + grid-row: 1 / span 2; + margin: auto; + width: 318px; + padding-bottom: 20px; + } + + p { + margin-top: 0px; + padding: 0 10px 0 30px; + grid-row: 2 / span 3; + grid-column: 1 / span 1; + } + } } \ No newline at end of file diff --git a/_sass/components/_donate.scss b/_sass/components/_donate.scss index 9acd018402..4207156072 100644 --- a/_sass/components/_donate.scss +++ b/_sass/components/_donate.scss @@ -1,6 +1,10 @@ /*-------- | Mobile ----------*/ +.donate-title { + text-align: center; + font-size: 1.5rem; +} .donate-wrapper { min-height: 100vh; @@ -12,16 +16,13 @@ align-items: center; padding: 4rem 1rem; height: fit-content; - .donate-banner-text { display: flex; flex-direction: column; align-items: center; - .title1 { padding-bottom: 28px; } - p { font-size: 18px; max-width: 300px; @@ -31,7 +32,8 @@ } @media #{$bp-mobile-up} { font-size: 16px; - text-align: left; + text-align: left; + padding-left: 0px; } } } @@ -39,71 +41,4 @@ .page-card--donate{ padding: 32px; - - .donate-title { - text-align: center; - } - .donation-gif { - box-shadow: 0px 2px 4px 0px #00000040; - } -} - -.donation-grid{ - display: flex; - flex-direction: column; - align-items: center; - - p { - margin-top: 20px; - } -} - - -@media #{$bp-tablet-up} { - .donation-grid{ - display: grid; - grid-template-columns: 50% 50%; - grid-template-rows: 50% 50%; - padding: 20px; - text-align: left; - align-items: flex-start; - - .donation-body { - grid-column: 1 / span 1; - grid-row: 1 / span 1; - margin-top: 15%; - padding: 0 32px 0 16px; - - h3 { - text-align: left; - } - - ol { - padding-left: 30px; - max-width: 480px; - line-height: 24px; - } - - li { - padding: 5px 0; - font-size: 1.125rem; - } - } - - .donation-gif { - grid-column: 2 / span 1; - grid-row: 1 / span 2; - margin: auto; - width: 318px; - padding-bottom: 20px; - } - - p { - margin-top: 10px; - padding: 0 32px 0 36px; - font-size: 15px; - grid-row: 2 / span 3; - grid-column: 1 / span 1; - } - } -} +} \ No newline at end of file diff --git a/_sass/components/_events.scss b/_sass/components/_events.scss index 108da02702..43b91fb967 100644 --- a/_sass/components/_events.scss +++ b/_sass/components/_events.scss @@ -112,7 +112,7 @@ color: $color-black; font-weight: normal; font-size: 18px; - margin: 0 6px; + margin: 0 6px 65px 6px; @media #{$bp-below-desktop} { content: "\226A"; diff --git a/_sass/components/_home.scss b/_sass/components/_home.scss index d200466022..0795a0fe46 100644 --- a/_sass/components/_home.scss +++ b/_sass/components/_home.scss @@ -321,7 +321,7 @@ button { } .status-Active { - background-color: rgb(187, 255, 187); + background-color: $color-lightgreen; } .status-Rebooting { diff --git a/_sass/components/_privacy-policy.scss b/_sass/components/_privacy-policy.scss index 52ace98e2e..76afdf6f32 100644 --- a/_sass/components/_privacy-policy.scss +++ b/_sass/components/_privacy-policy.scss @@ -5,25 +5,33 @@ width: 236.41px; } } - .content-section--privacy-policy { - .subsection-spacing--privacy-policy { - margin-bottom: 24px; + #visiting-hackforlaorg, + #email-addresses, + #third-party-service-providers, + #google-analytics, + #how-to-opt-out-of-the-use-of-cookies { + margin-top: 24px; } - - .title-spacing { + ul, + p { + font-size: $font-size-paragraph2; + } + + h2 { margin-bottom: 24px; } - .title-spacing.first-title-spacing { + #overview { margin-top: 0px; } - .subtitle-spacing { + h3 { + font-size: #{map-get($font-size-title4, desktop)}; margin-bottom: 18px; } - - .no-bottom-margin-spacing { + #visiting-hackforlaorg + p, + #as-required-by-law-and-similar-disclosures + p { margin-bottom: 0px; } } @@ -34,42 +42,45 @@ align-self: start; } } - .content-section.content-section--privacy-policy { padding-top: 34px; padding-bottom: 34px; } - .page-card--privacy-policy { padding: 36px 57px; } - - .section-spacing--privacy-policy { - margin-bottom: 48px; + h2 { + margin-top: 48px; } } @media #{$bp-below-desktop} { - /* This has the same font-size as paragraph3 so it can be used for the Privacy Policy page in mobile screen sizes, which is a different font-size than the paragraph2 classes used for desktop size screens. */ - section { - .paragraph2.paragraph--privacy-policy { + .content-section--privacy-policy { + ul, + p { font-size: $font-size-paragraph3; + line-height: 1.375; + font-family: "Roboto", sans-serif; + font-weight: 400; + color: $color-black; + } + h2 { + margin-top: 32px; + font-size: 1.75rem; + } + h3 { + font-size: 1.25rem; } } - .header-container--privacy-policy { padding: 32px 37.5px; } - .section-spacing--privacy-policy { - margin-bottom: 32px; - } - .page-card--privacy-policy { padding: 28px 21.5px; } -} \ No newline at end of file +} diff --git a/_sass/components/_project-meetings.scss b/_sass/components/_project-meetings.scss index cb6b44e934..3af4abf74d 100644 --- a/_sass/components/_project-meetings.scss +++ b/_sass/components/_project-meetings.scss @@ -1,18 +1,3 @@ -.covid-notification-banner { - background-color: $color-gold; - width: 100%; - display: flex; - justify-content: center; - align-content: center; - - p { - text-align: center; - font-weight: bold; - margin: 0; - padding: 15px 0; - } -} - .calendar-started-page { background: $color-darkblue; min-height: 100vh; @@ -20,7 +5,7 @@ flex-direction: column; justify-content: center; align-items: center; -} +} .page-card--project-meetings { padding: 30px; diff --git a/_sass/components/_project-page.scss b/_sass/components/_project-page.scss index 870cbaf1dc..e143612667 100644 --- a/_sass/components/_project-page.scss +++ b/_sass/components/_project-page.scss @@ -254,7 +254,7 @@ margin-right: -40px; margin-bottom: -65px; padding: 26px 33px 33px 50px; - background: #F7F5F5; + background: $color-pink; border-top-left-radius: 0px; border-top-right-radius: 0px; } @@ -262,7 +262,7 @@ .sdg-description-grid-item { padding: 25px 19px; - background: #F6F6F6; + background: $color-whitesmoke; border-radius: 0px 0px 10px 10px; height: 80%; diff --git a/_sass/components/_projects-page.scss b/_sass/components/_projects-page.scss index 7266839b83..1af7b2013d 100644 --- a/_sass/components/_projects-page.scss +++ b/_sass/components/_projects-page.scss @@ -6,7 +6,7 @@ .projects-inner { display: flex; flex-direction: column; - + @media #{$bp-mobile-up} { flex-direction: row; flex-wrap: wrap; @@ -98,7 +98,7 @@ } .status-Active { - background-color: rgb(187, 255, 187); + background-color: $color-lightgreen; } .status-Rebooting { diff --git a/_sass/components/_projects.scss b/_sass/components/_projects.scss index 91f8756fa6..3a239f3a8e 100644 --- a/_sass/components/_projects.scss +++ b/_sass/components/_projects.scss @@ -98,7 +98,7 @@ } .status-Active { - background-color: rgb(187, 255, 187); + background-color: $color-lightgreen; } .status-Rebooting { diff --git a/_sass/components/_wins-page.scss b/_sass/components/_wins-page.scss index 282ac305f6..913eefd091 100644 --- a/_sass/components/_wins-page.scss +++ b/_sass/components/_wins-page.scss @@ -473,12 +473,12 @@ width: 100%; } -@media #{$bp-below-desktop}{ - .wins-page-contain > ul.wins-filter{ - width: 100%; - grid-template-rows: none; - } +.wins-page-contain > ul.wins-filter{ + width: 100%; + grid-template-rows: none; +} +@media #{$bp-below-desktop}{ .wins-tablet{ margin-left: 0em; diff --git a/_sass/elements/_background-sdg-colors.scss b/_sass/elements/_background-sdg-colors.scss new file mode 100644 index 0000000000..08061c61ee --- /dev/null +++ b/_sass/elements/_background-sdg-colors.scss @@ -0,0 +1,18 @@ +/** + * Sustainable Development Goal (SDG) Background Colors + * + * These background color classes match the colors of the SDG icons provided by the United Nations (UN): + * https://www.un.org/sustainabledevelopment/news/communications-material/ + */ + + .background-color-sdg2 { background-color: $color-sdg2; } + .background-color-sdg3 { background-color: $color-sdg3; } + .background-color-sdg4 { background-color: $color-sdg4; } + .background-color-sdg5 { background-color: $color-sdg5; } + .background-color-sdg8 { background-color: $color-sdg8; } + .background-color-sdg9 { background-color: $color-sdg9; } + .background-color-sdg10 { background-color: $color-sdg10; } + .background-color-sdg11 { background-color: $color-sdg11; } + .background-color-sdg13 { background-color: $color-sdg13; } + .background-color-sdg16 { background-color: $color-sdg16; } + .background-color-sdg17 { background-color: $color-sdg17; } \ No newline at end of file diff --git a/_sass/elements/_dropdown_filters.scss b/_sass/elements/_dropdown_filters.scss index 736b904094..1c0c00147b 100644 --- a/_sass/elements/_dropdown_filters.scss +++ b/_sass/elements/_dropdown_filters.scss @@ -8,10 +8,19 @@ .filters-title .hide-filters-button { display: none; } + +// Centered Components and filters up top section.filter-content-container { - display: grid; - grid-template-columns: 377px 1fr; + display: flex; + justify-content: center; +} +.page-contain.projects-inner { + margin: 0px 0px; } +.page-contain.projects-inner.curr-projects { + margin: 0px auto; +} + a.filter-item { text-decoration: none; } @@ -20,22 +29,15 @@ a.filter-item { } .filter-toolbar { - width: 100%; padding: 8px 32px; box-sizing: border-box; - margin: 0 auto; height: 100%; } -.filter-toolbar > .stickyDiv { - position: sticky; - position: -webkit-sticky; - top: 120px; -} -@media only screen and (max-width: 1028px) { - .filter-toolbar > .stickyDiv { - top: 75px; - } + +.filtersDiv { + min-width:282px; } + //filter container ul.filter-list { display: flex; @@ -253,9 +255,6 @@ a.clear-filter-tags { overflow-y: scroll; background: $color-white; } - .filter-toolbar > .stickyDiv { - position: static; - } .filters-title { background: $color-white; border: 1px solid $color-mediumgrey; diff --git a/_sass/elements/_old_dropdown_filters.scss b/_sass/elements/_old_dropdown_filters.scss new file mode 100644 index 0000000000..2ebc5734d2 --- /dev/null +++ b/_sass/elements/_old_dropdown_filters.scss @@ -0,0 +1,196 @@ +a.old-filter-item { + text-decoration: none; +} +.old-project-list { + margin-top: 0.5rem; +} +//filter container +ul.old-filter-list { + background: $color-pink; + display: grid; + list-style: none; + padding-left: 0; + grid-auto-flow: column; + grid-column-gap: 20px; + // grid-template-columns: repeat(4, 1fr); + // ^ See issue #1997 for more info on why this is commented out and changed to 3 + grid-template-columns: repeat(3, 1fr); +} + +//category boxes +li.old-filter-item { + border: 1px solid rgba(0, 0, 0, 0.24); + border-radius: 5px; + color: black; + background: white; + display: flex; + padding: 10px 15px; + position: relative; + transition-duration: 0.5s; + cursor: pointer; +} + +//category names +li.old-filter-item a { + color: black; + text-transform: capitalize; +} + +li.old-filter-item:hover, +li.old-filter-item:focus-within { + background: white; +} + +li.old-filter-item:focus-within a { + outline: none; +} + +//dropdown +ul.old-filter-list li ul { + background: white; + border: 1px solid rgba(0, 0, 0, 0.24); + visibility: hidden; + opacity: 0; + transition: all 0.5s ease; + z-index: 99; + list-style: none; + width: 100%; + padding: 15px 20px; + line-height: 2em; + font-size: 0.9em; + position: absolute; + left: 0; + top: 100%; + cursor: default; +} + +ul.old-filter-list li:hover > ul, +ul.old-filter-list li:focus-within > ul, +ul.old-filter-list li ul:hover, +ul.old-filter-list li ul:focus { + visibility: visible; + opacity: 1; + display: block; +} + +ul.old-filter-list li ul li { + clear: both; + width: 100%; + text-align: left; +} + +.old-hidden-project { + display: none; +} + +.old-dropdown label { + cursor: pointer; + vertical-align: middle; +} + +.old-filter-checkbox { + border: 1px solid #000000; + border-radius: 4px; + margin: 0px 5px; + cursor: pointer; + vertical-align: middle; +} + +.old-labelArrow { + transform: rotate(-45deg); + font-size: 24px; + position: absolute; + top: 2%; + right: 10%; +} + +.old-filter-tag-container { + display: flex; + flex-wrap: wrap; + list-style: none; +} + +.old-filter-tag { + align-self: flex-start; + height: 24px; + box-sizing: border-box; + max-width: fit-content; + + margin: 0em 0.5em 1em; + padding: 0.15em 1em; + background: $color-red; + border: none; + border-radius: 5px; + color: $color-white; + font-weight: 500; + font-size: 15px; + text-transform: capitalize; + + &::after { + content: "\00d7"; + padding-left: 0.5em; + } + + &:hover, + &:active, + &:focus { + background: darken($color-red, 10%); + color: $color-white; + text-decoration: none; + cursor: pointer; + } +} + +.old-filter-tag span { + margin: 0 0 0 5px; + min-height: 20px; +} + +a.old-clear-filter-tags { + margin-left: 1em; + text-decoration: underline; + color: $color-cement; + + &:hover { + cursor: pointer; + } +} + +.old-number-of-checked-boxes { + color: $color-red; +} + +@media #{$bp-below-tablet} { + //resize dropdown on tablet and mobile view + ul.old-filter-list li ul { + width: 100%; + padding: 15px; + } +} + +@media (max-width: 659px) { + //creating 2 rows and 2 columns to display categories on mobile + ul.old-filter-list { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(2, 1fr); + grid-auto-flow: row; + grid-gap: 10px; + } + + //resize category labels + li.old-filter-item { + padding: 5px 10px; + } + + //resize and reposition label arrow + .old-labelArrow { + top: -8%; + right: 5%; + font-size: 20px; + } + + .old-clear-filter-tags { + display: none; + } +} \ No newline at end of file diff --git a/_sass/layouts/_main.scss b/_sass/layouts/_main.scss index 8a051c856d..7e62f2c964 100644 --- a/_sass/layouts/_main.scss +++ b/_sass/layouts/_main.scss @@ -35,3 +35,8 @@ .content-section { padding: 32px 16px; } + +// This is to provide padding for readability to the content in the default-markdown.html layout +#content-markdown { + padding: 200px 100px 300px 100px; +} \ No newline at end of file diff --git a/_sass/main.scss b/_sass/main.scss index 136666f27d..8c64fdb98f 100644 --- a/_sass/main.scss +++ b/_sass/main.scss @@ -23,6 +23,7 @@ // /** // * Elements // */ +@import 'elements/background-sdg-colors'; @import 'elements/accordion'; @import 'elements/buttons'; @import 'elements/forms'; @@ -34,6 +35,7 @@ @import 'elements/cards'; @import 'elements/color-styles'; @import 'elements/dropdown_filters'; +@import 'elements/old_dropdown_filters'; // /** // * Components diff --git a/_sass/variables/_layout.scss b/_sass/variables/_layout.scss index 5a63eb6b50..9a6c6fd332 100644 --- a/_sass/variables/_layout.scss +++ b/_sass/variables/_layout.scss @@ -17,13 +17,13 @@ $screen-mobile: 480px; * anything below a tablet, use $bp-below-tablet. */ $bp-desktop-large-up: '(min-width: #{$screen-desktop-large})'; -$bp-below-desktop-large: '(max-width: #{$screen-desktop-large - 1})'; +$bp-below-desktop-large: '(max-width: #{$screen-desktop-large - .02})'; $bp-desktop-up: '(min-width: #{$screen-desktop})'; -$bp-below-desktop: '(max-width: #{$screen-desktop - 1})'; +$bp-below-desktop: '(max-width: #{$screen-desktop - .02})'; $bp-tablet-up: '(min-width: #{$screen-tablet})'; -$bp-below-tablet: '(max-width: #{$screen-tablet - 1})'; +$bp-below-tablet: '(max-width: #{$screen-tablet - .02})'; $bp-mobile-up: '(min-width: #{$screen-mobile})'; -$bp-below-mobile: '(max-width: #{$screen-mobile - 1})'; +$bp-below-mobile: '(max-width: #{$screen-mobile - .02})'; /** * Magic Numbers diff --git a/assets/images/donate/solidarity-pana.svg b/assets/images/donate/solidarity-pana.svg deleted file mode 100644 index 62b6d6db96..0000000000 --- a/assets/images/donate/solidarity-pana.svg +++ /dev/null @@ -1,169 +0,0 @@ - diff --git a/assets/js/current-projects.js b/assets/js/current-projects.js index 5aee0f5d13..8208e9267e 100644 --- a/assets/js/current-projects.js +++ b/assets/js/current-projects.js @@ -476,94 +476,94 @@ function clearAllEventHandler(){ * Takes a single project object and returns the html string representing the project card */ function projectCardComponent(project){ -return ` -
-
-
-
-
- 
-
-
-
-
-
-
-
-
- ${ project.status }
-${ project.title }
- -${ project.description }
- -
- Links:
- ${project.links.map(item => ` ${ item.name }`).join(", ")}
-
-
- ${project.partner ?
- `
-
- Partner:
- ${ project.partner }
-
- `:""
- }
-
- ${project.tools ?
- `
-
- Tools:
- ${ project.tools }
-
- `:""
- }
-
- ${project.looking ? "" : ""
- // `
- //
- // Looking for:
- // ${project.looking.map( role => `
- // `:""
- // ^ See issue #1997 for more info on why this is commented out
- }
-
- ${project.languages?.length > 0 ?
- `
- ${ role.skill }
`).join(", ")} - //
- Languages:
- ${project.languages.map(language => `
- `: ""
- }
-
- ${project.technologies ?
- `
- ${ language }
`).join(", ")} -
- Technologies:
- ${project.technologies.map(tech => `
- `:""
- }
-
- ${project.programAreas ?
- `
- ${ tech }
`).join(", ")} -
- Program Areas:
- ${project.programAreas.map(programArea => `
- `:""
- }
-${ programArea }
`).join(", ")} -
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${ project.status }
+${ project.title }
+ +${ project.description }
+ +
+ Links:
+ ${project.links.map(item => ` ${ item.name }`).join(", ")}
+
+
+ ${project.partner ?
+ `
+
+ Partner:
+ ${ project.partner }
+
+ `:""
+ }
+
+ ${project.tools ?
+ `
+
+ Tools:
+ ${ project.tools }
+
+ `:""
+ }
+
+ ${project.looking ? "" : ""
+ // `
+ //
+ // Looking for:
+ // ${project.looking.map( role => `
+ // `:""
+ // ^ See issue #1997 for more info on why this is commented out
+ }
+
+ ${project.languages?.length > 0 ?
+ `
+ ${ role.skill }
`).join(", ")} + //
+ Languages:
+ ${project.languages.map(language => `
+ `: ""
+ }
+
+ ${project.technologies ?
+ `
+ ${ language }
`).join(", ")} +
+ Technologies:
+ ${project.technologies.map(tech => `
+ `:""
+ }
+
+ ${project.programAreas ?
+ `
+ ${ tech }
`).join(", ")} +
+ Program Areas:
+ ${project.programAreas.map(programArea => `
+ `:""
+ }
+ ${ programArea }
`).join(", ")} +Getting Started
+
Step 2
@@ -124,7 +124,7 @@ STEP 3: Adopt Our Standard
STEP 3: Adopt Our Standard
- 
+
- Set up GitHub two-factor
authentication.
@@ -175,7 +175,7 @@ STEP 4: Choose a Role
- 
+
- Join one project's Slack channel. Post your interest to join in the channel.
@@ -204,13 +204,13 @@ STEP 5: Join a Project
- 
+
- Fill out the Team Roster after you receive access to the Google Drive.
- 
+
- Attend your first team meeting and take on a first issue assignment from your lead.
diff --git a/pages/privacy-policy.html b/pages/privacy-policy.html
index 32a010cd39..b46aad59c6 100644
--- a/pages/privacy-policy.html
+++ b/pages/privacy-policy.html
@@ -25,166 +25,7 @@ Privacy Policy
-
- Overview
-
- - We may collect information from you when you visit and take actions on our website. We use this information to provide the services you've requested.
- - We utilize cookies (such as those stored by Google Analytics) to provide a better experience and improve our review tool website for your use.
- - We will not knowingly disclose or sell your personal information to any third party, except as provided in this privacy policy.
- - Protecting your personal information is extremely important to us, and we take all reasonable measures to do so.
-
-
-
- The personal information we collect
-
- Visiting HackforLA.org
-
- We may automatically collect and store data about your visit to HackforLA.org:
-
-
- - Domain from which you access the Internet;
- - Operating system on your computer and information about the browser you used when visiting the site;
- - Date and time of your visit;
- - Pages you visited;
- - Address of the website that connects you to the Site (such as google.com or bing.com);
- - The queries you make on our site.
-
-
- None of the information we collect about you when you visit HackforLA.org is personally identifiable.
- We use this non-personally identifiable information to understand how the HackforLA.org website is used, to improve the website, and to monitor usage for security purposes.
-
- We will not collect personal information from you without your knowledge and consent, except in a few limited circumstances as described in this policy.
-
-
- Email addresses
-
- Email addresses obtained through the website will not be sold or given to private companies for marketing purposes.
- The information collected is subject to the access and confidentiality provisions of the Public Records Act, other applicable sections of the California code, as well as federal laws.
- Individuals can cancel any communications regarding new service updates at any time.
-
-
-
- Google Analytics
-
- We use Google Analytics to understand how visitors use our site and to gather aggregate performance metrics.
- We've set up Google Analytics so that it doesn’t collect your full IP address.
- We don't collect any personally identifiable information using Google Analytics, and we do not combine the information collected through Google Analytics with any personally identifiable information.
-
-
- Google Analytics places a cookie on your web browser to identify you as a unique user.
- This cookie cannot be used by anyone but Google.
- Google's ability to use and share information collected by Google Analytics about your visits to this site is restricted by the Google Analytics Terms of Use and the Google Privacy Policy.
-
-
- To provide website visitors the ability to prevent their data from being used by Google Analytics, Google has developed the Google Analytics opt-out browser add-on.
- This add-on instructs Google Analytics running on websites to prohibit sending information to Google Analytics.
- However, the Google Analytics opt-out browser add-on does not prevent data from being sent to the Hack for LA server.
-
-
- Visit https://tools.google.com/dlpage/gaoptout/ for more info on how to opt out.
-
-
-
-
- Cookies and other tracking technologies
-
- Cookies are small text files that websites place on the computers and mobile devices of people who visit those websites.
- Pixel tags (also called web beacons) are small blocks of code placed on websites and emails.
- We use cookies and other technologies like pixel tags to remember your preferences, enhance your online experience, and to gather data on how you use our Sites to improve the way we promote our content, programs, and events.
-
-
- Your use of our Sites indicates your consent to such use of Cookies.
-
-
- Third party service providers
-
- We use third-party service providers to track and analyze statistical usage and volume information from our Site users.
- These third-party service providers use persistent Cookies to help us to improve the user experience, manage the content on our Sites, and analyze how users navigate and use the Sites.
-
-
- Third-party service providers we may use include Google Analytics, Mixpanel, and Hotjar.
-
-
-
- How to opt-out of the use of cookies
-
- Most browsers are initially set up to accept HTTP cookies.
- If you want to restrict or block the cookies that are set by our Site, or any other site, you can do so through your browser setting.
- The ‘Help’ function in your browser should explain how.
- Alternatively, you can visit www.aboutcookies.org, which contains comprehensive information on how to do this on a wide variety of browsers.
- You will find general information about cookies and details on how to delete cookies from your machine.
-
-
-
-
- As required by law and similar disclosures
-
- We may access, preserve, and disclose your information if we believe doing so is required or appropriate to:
-
-
- - comply with law enforcement requests and legal process, such as a court order or subpoena;
- - respond to your requests; or
- - protect your, our, or others’ rights, property, or safety.
-
- For the avoidance of doubt, the disclosure of your information may occur if you post any objectionable content on or through the Site.
-
-
- Consent
-
- We may also disclose information from you or about you or your devices with your permission.
-
-
-
- Children’s privacy
-
- We do not knowingly collect, maintain, or use personal information from children under 13 years of age, and no part of our Site is directed to children.
-
-
- If you learn that a child has provided us with personal information in violation of this Privacy Policy, then you may alert us at privacy@hackforla.org and reference “Child Privacy Report” in the subject line.
-
-
-
- Security
-
- HackforLA.org utilizes Amazon Web Services (AWS).
- AWS operates "secure data networks" protected by industry standard firewalls and password protection systems.
- Only authorized individuals have access to the information provided by our users.
-
-
- We make reasonable efforts to protect your information by using physical and electronic safeguards designed to improve the security of the information we maintain.
- However, as our Services are hosted electronically, we make no guarantees as to the security or privacy of your information.
-
-
-
- Right to be forgotten and rectification
-
- You may request that we make corrections to any personal data that is stored on our internal databases at any time.
- You may request that incomplete data be completed or that incorrect data be corrected.
- Requests can be submitted to privacy@hackforla.org and reference “Hack for LA Public Website” in the subject line.
-
-
-
- Changes
-
- This HackforLA.org Privacy Policy is subject to change from time to time in response to, or as a result of, changes in federal, state, and/or local law.
- Please check this page frequently for updates, as your continued use of this site after any changes in this Privacy Policy will constitute your acceptance of the changes.
-
-
-
- Effective date
- This version of the policy is effective November 1, 2021.
-
-
- Questions
-
- If you have any questions, comments, concerns, or complaints related to our websites, please contact us by email at privacy@hackforla.org, or by mail at:
-
- Code for America
- Ref: Hack for LA, HackforLA.org
- 155 9th Street
- San Francisco, CA 94103
-
-
+ {{site.data.internal.privacy-policy.privacy-policy | markdownify}}
\ No newline at end of file
diff --git a/pages/project-meetings.html b/pages/project-meetings.html
index 00cf26fbf9..0c9e5b29eb 100644
--- a/pages/project-meetings.html
+++ b/pages/project-meetings.html
@@ -17,9 +17,7 @@ Project Team Meetings
-
+
-
+
- Set up GitHub two-factor
authentication.
@@ -175,7 +175,7 @@ STEP 4: Choose a Role
-
+
+
STEP 4: Choose a Role
-
+
- Join one project's Slack channel. Post your interest to join in the channel.
@@ -204,13 +204,13 @@ STEP 5: Join a Project
-
+
- Fill out the Team Roster after you receive access to the Google Drive.
-
+
- Attend your first team meeting and take on a first issue assignment from your lead.
diff --git a/pages/privacy-policy.html b/pages/privacy-policy.html
index 32a010cd39..b46aad59c6 100644
--- a/pages/privacy-policy.html
+++ b/pages/privacy-policy.html
@@ -25,166 +25,7 @@ Privacy Policy
-
- Overview
-
- - We may collect information from you when you visit and take actions on our website. We use this information to provide the services you've requested.
- - We utilize cookies (such as those stored by Google Analytics) to provide a better experience and improve our review tool website for your use.
- - We will not knowingly disclose or sell your personal information to any third party, except as provided in this privacy policy.
- - Protecting your personal information is extremely important to us, and we take all reasonable measures to do so.
-
-
-
- The personal information we collect
-
- Visiting HackforLA.org
-
- We may automatically collect and store data about your visit to HackforLA.org:
-
-
- - Domain from which you access the Internet;
- - Operating system on your computer and information about the browser you used when visiting the site;
- - Date and time of your visit;
- - Pages you visited;
- - Address of the website that connects you to the Site (such as google.com or bing.com);
- - The queries you make on our site.
-
-
- None of the information we collect about you when you visit HackforLA.org is personally identifiable.
- We use this non-personally identifiable information to understand how the HackforLA.org website is used, to improve the website, and to monitor usage for security purposes.
-
- We will not collect personal information from you without your knowledge and consent, except in a few limited circumstances as described in this policy.
-
-
- Email addresses
-
- Email addresses obtained through the website will not be sold or given to private companies for marketing purposes.
- The information collected is subject to the access and confidentiality provisions of the Public Records Act, other applicable sections of the California code, as well as federal laws.
- Individuals can cancel any communications regarding new service updates at any time.
-
-
-
- Google Analytics
-
- We use Google Analytics to understand how visitors use our site and to gather aggregate performance metrics.
- We've set up Google Analytics so that it doesn’t collect your full IP address.
- We don't collect any personally identifiable information using Google Analytics, and we do not combine the information collected through Google Analytics with any personally identifiable information.
-
-
- Google Analytics places a cookie on your web browser to identify you as a unique user.
- This cookie cannot be used by anyone but Google.
- Google's ability to use and share information collected by Google Analytics about your visits to this site is restricted by the Google Analytics Terms of Use and the Google Privacy Policy.
-
-
- To provide website visitors the ability to prevent their data from being used by Google Analytics, Google has developed the Google Analytics opt-out browser add-on.
- This add-on instructs Google Analytics running on websites to prohibit sending information to Google Analytics.
- However, the Google Analytics opt-out browser add-on does not prevent data from being sent to the Hack for LA server.
-
-
- Visit https://tools.google.com/dlpage/gaoptout/ for more info on how to opt out.
-
-
-
-
- Cookies and other tracking technologies
-
- Cookies are small text files that websites place on the computers and mobile devices of people who visit those websites.
- Pixel tags (also called web beacons) are small blocks of code placed on websites and emails.
- We use cookies and other technologies like pixel tags to remember your preferences, enhance your online experience, and to gather data on how you use our Sites to improve the way we promote our content, programs, and events.
-
-
- Your use of our Sites indicates your consent to such use of Cookies.
-
-
- Third party service providers
-
- We use third-party service providers to track and analyze statistical usage and volume information from our Site users.
- These third-party service providers use persistent Cookies to help us to improve the user experience, manage the content on our Sites, and analyze how users navigate and use the Sites.
-
-
- Third-party service providers we may use include Google Analytics, Mixpanel, and Hotjar.
-
-
-
- How to opt-out of the use of cookies
-
- Most browsers are initially set up to accept HTTP cookies.
- If you want to restrict or block the cookies that are set by our Site, or any other site, you can do so through your browser setting.
- The ‘Help’ function in your browser should explain how.
- Alternatively, you can visit www.aboutcookies.org, which contains comprehensive information on how to do this on a wide variety of browsers.
- You will find general information about cookies and details on how to delete cookies from your machine.
-
-
-
-
- As required by law and similar disclosures
-
- We may access, preserve, and disclose your information if we believe doing so is required or appropriate to:
-
-
- - comply with law enforcement requests and legal process, such as a court order or subpoena;
- - respond to your requests; or
- - protect your, our, or others’ rights, property, or safety.
-
- For the avoidance of doubt, the disclosure of your information may occur if you post any objectionable content on or through the Site.
-
-
- Consent
-
- We may also disclose information from you or about you or your devices with your permission.
-
-
-
- Children’s privacy
-
- We do not knowingly collect, maintain, or use personal information from children under 13 years of age, and no part of our Site is directed to children.
-
-
- If you learn that a child has provided us with personal information in violation of this Privacy Policy, then you may alert us at privacy@hackforla.org and reference “Child Privacy Report” in the subject line.
-
-
-
- Security
-
- HackforLA.org utilizes Amazon Web Services (AWS).
- AWS operates "secure data networks" protected by industry standard firewalls and password protection systems.
- Only authorized individuals have access to the information provided by our users.
-
-
- We make reasonable efforts to protect your information by using physical and electronic safeguards designed to improve the security of the information we maintain.
- However, as our Services are hosted electronically, we make no guarantees as to the security or privacy of your information.
-
-
-
- Right to be forgotten and rectification
-
- You may request that we make corrections to any personal data that is stored on our internal databases at any time.
- You may request that incomplete data be completed or that incorrect data be corrected.
- Requests can be submitted to privacy@hackforla.org and reference “Hack for LA Public Website” in the subject line.
-
-
-
- Changes
-
- This HackforLA.org Privacy Policy is subject to change from time to time in response to, or as a result of, changes in federal, state, and/or local law.
- Please check this page frequently for updates, as your continued use of this site after any changes in this Privacy Policy will constitute your acceptance of the changes.
-
-
-
- Effective date
- This version of the policy is effective November 1, 2021.
-
-
- Questions
-
- If you have any questions, comments, concerns, or complaints related to our websites, please contact us by email at privacy@hackforla.org, or by mail at:
-
- Code for America
- Ref: Hack for LA, HackforLA.org
- 155 9th Street
- San Francisco, CA 94103
-
-
+ {{site.data.internal.privacy-policy.privacy-policy | markdownify}}
\ No newline at end of file
diff --git a/pages/project-meetings.html b/pages/project-meetings.html
index 00cf26fbf9..0c9e5b29eb 100644
--- a/pages/project-meetings.html
+++ b/pages/project-meetings.html
@@ -17,9 +17,7 @@ Project Team Meetings
+
-
+
- Fill out the Team Roster after you receive access to the Google Drive.
+
-
+
- Attend your first team meeting and take on a first issue assignment from your lead.
diff --git a/pages/privacy-policy.html b/pages/privacy-policy.html
index 32a010cd39..b46aad59c6 100644
--- a/pages/privacy-policy.html
+++ b/pages/privacy-policy.html
@@ -25,166 +25,7 @@
+
Privacy Policy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Overview
--
-
- We may collect information from you when you visit and take actions on our website. We use this information to provide the services you've requested. -
- We utilize cookies (such as those stored by Google Analytics) to provide a better experience and improve our review tool website for your use. -
- We will not knowingly disclose or sell your personal information to any third party, except as provided in this privacy policy. -
- Protecting your personal information is extremely important to us, and we take all reasonable measures to do so. -
The personal information we collect
-Visiting HackforLA.org
-- We may automatically collect and store data about your visit to HackforLA.org: -
--
-
- Domain from which you access the Internet; -
- Operating system on your computer and information about the browser you used when visiting the site; -
- Date and time of your visit; -
- Pages you visited; -
- Address of the website that connects you to the Site (such as google.com or bing.com); -
- The queries you make on our site. -
- None of the information we collect about you when you visit HackforLA.org is personally identifiable. - We use this non-personally identifiable information to understand how the HackforLA.org website is used, to improve the website, and to monitor usage for security purposes. -
-We will not collect personal information from you without your knowledge and consent, except in a few limited circumstances as described in this policy.
-Email addresses
-- Email addresses obtained through the website will not be sold or given to private companies for marketing purposes. - The information collected is subject to the access and confidentiality provisions of the Public Records Act, other applicable sections of the California code, as well as federal laws. - Individuals can cancel any communications regarding new service updates at any time. -
-Google Analytics
-- We use Google Analytics to understand how visitors use our site and to gather aggregate performance metrics. - We've set up Google Analytics so that it doesn’t collect your full IP address. - We don't collect any personally identifiable information using Google Analytics, and we do not combine the information collected through Google Analytics with any personally identifiable information. -
-- Google Analytics places a cookie on your web browser to identify you as a unique user. - This cookie cannot be used by anyone but Google. - Google's ability to use and share information collected by Google Analytics about your visits to this site is restricted by the Google Analytics Terms of Use and the Google Privacy Policy. -
-- To provide website visitors the ability to prevent their data from being used by Google Analytics, Google has developed the Google Analytics opt-out browser add-on. - This add-on instructs Google Analytics running on websites to prohibit sending information to Google Analytics. - However, the Google Analytics opt-out browser add-on does not prevent data from being sent to the Hack for LA server. -
-- Visit https://tools.google.com/dlpage/gaoptout/ for more info on how to opt out. -
-Cookies and other tracking technologies
-- Cookies are small text files that websites place on the computers and mobile devices of people who visit those websites. - Pixel tags (also called web beacons) are small blocks of code placed on websites and emails. - We use cookies and other technologies like pixel tags to remember your preferences, enhance your online experience, and to gather data on how you use our Sites to improve the way we promote our content, programs, and events. -
-- Your use of our Sites indicates your consent to such use of Cookies. -
-Third party service providers
-- We use third-party service providers to track and analyze statistical usage and volume information from our Site users. - These third-party service providers use persistent Cookies to help us to improve the user experience, manage the content on our Sites, and analyze how users navigate and use the Sites. -
-- Third-party service providers we may use include Google Analytics, Mixpanel, and Hotjar. -
-How to opt-out of the use of cookies
-- Most browsers are initially set up to accept HTTP cookies. - If you want to restrict or block the cookies that are set by our Site, or any other site, you can do so through your browser setting. - The ‘Help’ function in your browser should explain how. - Alternatively, you can visit www.aboutcookies.org, which contains comprehensive information on how to do this on a wide variety of browsers. - You will find general information about cookies and details on how to delete cookies from your machine. -
-As required by law and similar disclosures
-- We may access, preserve, and disclose your information if we believe doing so is required or appropriate to: -
--
-
- comply with law enforcement requests and legal process, such as a court order or subpoena; -
- respond to your requests; or -
- protect your, our, or others’ rights, property, or safety. -
For the avoidance of doubt, the disclosure of your information may occur if you post any objectionable content on or through the Site.
-Consent
-- We may also disclose information from you or about you or your devices with your permission. -
-Children’s privacy
-- We do not knowingly collect, maintain, or use personal information from children under 13 years of age, and no part of our Site is directed to children. -
-- If you learn that a child has provided us with personal information in violation of this Privacy Policy, then you may alert us at privacy@hackforla.org and reference “Child Privacy Report” in the subject line. -
-Security
-- HackforLA.org utilizes Amazon Web Services (AWS). - AWS operates "secure data networks" protected by industry standard firewalls and password protection systems. - Only authorized individuals have access to the information provided by our users. -
-- We make reasonable efforts to protect your information by using physical and electronic safeguards designed to improve the security of the information we maintain. - However, as our Services are hosted electronically, we make no guarantees as to the security or privacy of your information. -
-Right to be forgotten and rectification
-- You may request that we make corrections to any personal data that is stored on our internal databases at any time. - You may request that incomplete data be completed or that incorrect data be corrected. - Requests can be submitted to privacy@hackforla.org and reference “Hack for LA Public Website” in the subject line. -
-Changes
-- This HackforLA.org Privacy Policy is subject to change from time to time in response to, or as a result of, changes in federal, state, and/or local law. - Please check this page frequently for updates, as your continued use of this site after any changes in this Privacy Policy will constitute your acceptance of the changes. -
-Effective date
-This version of the policy is effective November 1, 2021.
-Questions
-
- If you have any questions, comments, concerns, or complaints related to our websites, please contact us by email at privacy@hackforla.org, or by mail at:
-
- Code for America
- Ref: Hack for LA, HackforLA.org
- 155 9th Street
- San Francisco, CA 94103
-
{{site.data.internal.privacy-policy.privacy-policy | markdownify}}
Project Team Meetings