From f086c50756e2848a463fcc7dc0e1e599b60a512d Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 5 Jul 2023 17:31:35 +0000 Subject: [PATCH 01/40] feat(job-post): add Bootstrap columns, top/bottom margin and padding --- _layouts/job_post.html | 68 ++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/_layouts/job_post.html b/_layouts/job_post.html index 62366c9d..4555d888 100644 --- a/_layouts/job_post.html +++ b/_layouts/job_post.html @@ -3,43 +3,47 @@ title_prefix: "Jobs with Compiler:" --- -

{{ page.title }}{% if page.type %} ({{ page.type }}){% endif %}

+
+
+

{{ page.title }}{% if page.type %} ({{ page.type }}){% endif %}

-{{ content }} {% if page.apply_link %} - - Apply Now - -{% endif %} - -

- - In keeping with our beliefs and goals, no employee or applicant will face - discrimination or harassment based on race, color, ancestry, national - origin, religion, education, age, gender identity, sexual orientation, - marital domestic partner status, familial status, disability status, or - veteran status. - -

-

- - We will consider for employment qualified applicants with arrest and - conviction records. + {{ content }} {% if page.apply_link %} - #banthebox + Apply Now - -

+ {% endif %} + +

+ + In keeping with our beliefs and goals, no employee or applicant will face + discrimination or harassment based on race, color, ancestry, national + origin, religion, education, age, gender identity, sexual orientation, + marital domestic partner status, familial status, disability status, or + veteran status. + +

+

+ + We will consider for employment qualified applicants with arrest and + conviction records. + + #banthebox + + +

-
- Back to Jobs +
+ Back to Jobs +
+
- +
diff --git a/_layouts/job_post.html b/_layouts/job_post.html index 75540b4d..ccf4a4c6 100644 --- a/_layouts/job_post.html +++ b/_layouts/job_post.html @@ -1,5 +1,6 @@ --- layout: default +classes: posting title_prefix: "Jobs with Compiler:" --- diff --git a/styles/base.css b/styles/base.css index 65e3472b..e6637552 100644 --- a/styles/base.css +++ b/styles/base.css @@ -159,10 +159,13 @@ h2, } h3, -.h3 { +.h3, +.posting h2 { font-size: var(--h3-font-size); font-weight: var(--h3-font-weight); line-height: var(--h3-line-height); + margin-top: 0; + margin-bottom: 1rem; } h4, @@ -179,6 +182,10 @@ h5, line-height: var(--h5-line-height); } +.posting h2 { + margin-top: 40px; +} + /*#endregion */ /*#region Font Sizes */ From 68bb9fbaf41c8858ab02848c8f78d696b6c05601 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 18:39:19 +0000 Subject: [PATCH 09/40] fix: font declaration --- styles/base.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/styles/base.css b/styles/base.css index e6637552..4ddef301 100644 --- a/styles/base.css +++ b/styles/base.css @@ -10,7 +10,7 @@ --grey: #EDEDED; --white: #FFFFFF; --bs-font-sans-serif: "Roboto, system-ui,-apple-system,"Segoe UI","Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji""; - --bs-font-monospace: "'Source Code Pro Bold', SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace"; + --bs-font-monospace: "Source Code Pro Bold",monospace; } * { @@ -92,11 +92,11 @@ h3, .h3, h4, .h4 { - font-family: 'Source Code Pro Bold', 'Courier New', Courier, monospace; + font-family: var(--bs-font-monospace); } .sans-serif { - font-family: 'Roboto', Arial, Helvetica, sans-serif; + font-family: var(--bs-font-sans-serif); } /*#endregion */ From ac1ad9226a953e6dff3bc30870c89390e95cbfb1 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 18:55:48 +0000 Subject: [PATCH 10/40] fix(css): move Posting styles to bottom section --- styles/base.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/styles/base.css b/styles/base.css index 4ddef301..1b9e48e9 100644 --- a/styles/base.css +++ b/styles/base.css @@ -182,10 +182,6 @@ h5, line-height: var(--h5-line-height); } -.posting h2 { - margin-top: 40px; -} - /*#endregion */ /*#region Font Sizes */ @@ -352,3 +348,9 @@ footer .address { width: 17.5rem; } } + +/* Job Posting Page */ + +.posting h2 { + margin-top: 40px; +} From fcbaf74e08759d77501e28bbf658d400aae47116 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 20:03:04 +0000 Subject: [PATCH 11/40] chore: bad rebase oops --- _layouts/job_post.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_layouts/job_post.html b/_layouts/job_post.html index ccf4a4c6..8b7fd8c0 100644 --- a/_layouts/job_post.html +++ b/_layouts/job_post.html @@ -4,13 +4,9 @@ title_prefix: "Jobs with Compiler:" --- -<<<<<<< HEAD

{{ page.title }}{% if page.type %} ({{ page.type }}){% endif %}

-======= -

{{ page.title }}{% if page.type %} ({{ page.type }}){% endif %}

->>>>>>> 1ddfd80 (feat(css): first pass at header css) {{ content }} {% if page.apply_link %} Date: Thu, 27 Jul 2023 20:16:39 +0000 Subject: [PATCH 12/40] feat(posting): add custom Posting margins/padding, and H1 m/p bottom --- _layouts/job_post.html | 22 ++++++++++++---------- styles/base.css | 13 +++++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/_layouts/job_post.html b/_layouts/job_post.html index 8b7fd8c0..97e48b1a 100644 --- a/_layouts/job_post.html +++ b/_layouts/job_post.html @@ -5,17 +5,19 @@ ---
-
-

{{ page.title }}{% if page.type %} ({{ page.type }}){% endif %}

+
+

{{ page.title }}{% if page.type %} ({{ page.type }}){% endif %}

- {{ content }} {% if page.apply_link %} - - Apply Now - + {{ content }} + + {% if page.apply_link %} + + Apply Now + {% endif %}

diff --git a/styles/base.css b/styles/base.css index 1b9e48e9..29717949 100644 --- a/styles/base.css +++ b/styles/base.css @@ -351,6 +351,19 @@ footer .address { /* Job Posting Page */ +:root { + --posting-margin: 102px 0 96px 0; +} + +@media (min-width: 992px) { + :root { + --posting-margin: 135px 0 104px 0; + } +} +.posting main { + margin: var(--posting-margin); +} + .posting h2 { margin-top: 40px; } From ac15ee366bfd7eb29799d421f59c9aaf5530c502 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 20:50:29 +0000 Subject: [PATCH 13/40] fix(css): put all brand colors on top --- styles/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/base.css b/styles/base.css index 0dd10972..ee38e019 100644 --- a/styles/base.css +++ b/styles/base.css @@ -6,12 +6,12 @@ --brand-primary-black: #1C1C1C; --brand-primary-gray: #ECEDED; --brand-primary-white: #FFFFFF; + --brand-scales-gray-4: #545454; --text-black: #1C1C1C; --bs-body-color-rgb: "255, 255, 255"; --bs-body-bg-rgb: "28, 28, 28"; --bs-body-color: #FFFFFF; --bs-body-bg: #1C1C1C; - --brand-scales-gray-4: #545454; } * { From a6e32d3b7f7991619b60768e8e073f81ef199000 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 21:33:57 +0000 Subject: [PATCH 14/40] refactor(css): use btn, btn-primary, btn-outline-primary Bootstrap CSS variables --- _layouts/job_post.html | 2 +- index.html | 4 +-- styles/base.css | 70 ++++++++++++++++++++++++------------------ 3 files changed, 43 insertions(+), 33 deletions(-) diff --git a/_layouts/job_post.html b/_layouts/job_post.html index 62366c9d..22691ec5 100644 --- a/_layouts/job_post.html +++ b/_layouts/job_post.html @@ -7,7 +7,7 @@

{{ page.title }}{% if page.type %} ({{ page.type }}){% endif %}

{{ content }} {% if page.apply_link %} diff --git a/index.html b/index.html index 235558ad..e8393dba 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,6 @@

we build software for the government

- Capabilities Statement - Get in touch + Capabilities Statement + Get in touch
diff --git a/styles/base.css b/styles/base.css index ee38e019..ff8ad68b 100644 --- a/styles/base.css +++ b/styles/base.css @@ -52,8 +52,8 @@ a { transition: 250ms; } -a:hover, -a:focus { +a:hover:not(.btn), +a:focus:not(.btn) { color: var(--brand-primary-white); } @@ -152,34 +152,44 @@ h6 { /*#endregion */ -.primary-btn { - text-decoration: none; - border: 3px solid var(--brand-primary-green); - background-color: var(--brand-primary-green); - color: var(--text-black); - padding: 1rem; - margin-right: 15px; - margin-bottom: 10px; -} - -.primary-btn:hover { - opacity: 70%; - color: var(--text-black) -} - -.secondary-btn { - text-decoration: none; - border: 3px solid var(--brand-primary-green); - color: var(--brand-primary-white); - padding: 1rem; - margin-right: 15px; - margin-bottom: 10px; -} - -.secondary-btn:hover { - opacity: 70%; - color: var(--brand-primary-white); - background-color: var(--brand-primary-green); +/* Buttons */ + +.btn { + --bs-btn-padding-x: 1rem; + --bs-btn-padding-y: 1rem; + --bs-btn-font-family: "Source Code Pro Bold", monospace; + --bs-btn-font-weight: 1rem; + --bs-btn-line-height: 120%; + --bs-btn-border-radius: 0; + --bs-btn-box-shadow: none; + --bs-btn-focus-box-shadow: 0 0 0 2px #1C1C1C, 0 0 0 4px #88B440; +} + +.btn-primary { + --bs-btn-color: #1C1C1C; + --bs-btn-bg: #88B440; + --bs-btn-border-width: 0; + --bs-btn-border-color: #88B440; + --bs-btn-hover-color: #1C1C1C; + --bs-btn-hover-bg: #A6D15F; + --bs-btn-hover-border-color: #A6D15F; + --bs-btn-disabled-opacity: #7D8084; +} + +.btn-outline-primary { + --bs-btn-color: #FFFFFF; + --bs-btn-border-color: #88B440; + --bs-btn-hover-color: #fff; + --bs-btn-hover-bg: #7A974A; + --bs-btn-hover-border-color: #88B440; + --bs-btn-active-color: #fff; + --bs-btn-active-bg: #5E7734; + --bs-btn-active-border-color: #88B440; + --bs-btn-active-shadow: none; + --bs-btn-disabled-color: #7D8084; + --bs-btn-disabled-bg: transparent; + --bs-btn-disabled-border-color: #7D8084; + --bs-gradient: none; } /* Header */ From e9d6718e7e951ee2c9ad2413c37e76dbbbe71ff7 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 21:36:46 +0000 Subject: [PATCH 15/40] fix(index): add mobile padding --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e8393dba..dff0ccf4 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,6 @@

we build software for the government

- Capabilities Statement + Capabilities Statement Get in touch
From d70237eb3b6b84f4bfa7b911de142d41ca5faf53 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 21:37:06 +0000 Subject: [PATCH 16/40] fix(css): use full color --- styles/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/base.css b/styles/base.css index ff8ad68b..99391204 100644 --- a/styles/base.css +++ b/styles/base.css @@ -179,7 +179,7 @@ h6 { .btn-outline-primary { --bs-btn-color: #FFFFFF; --bs-btn-border-color: #88B440; - --bs-btn-hover-color: #fff; + --bs-btn-hover-color: #FFFFFF; --bs-btn-hover-bg: #7A974A; --bs-btn-hover-border-color: #88B440; --bs-btn-active-color: #fff; From 8d177576b11b45f3f86aaeb9508cc85234bdf2c4 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 21:47:45 +0000 Subject: [PATCH 17/40] fix(index): remove mb from desktop --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index dff0ccf4..1148d69a 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,6 @@

we build software for the government

- Capabilities Statement + Capabilities Statement Get in touch
From 2324a4abc06868cc0a86992faf9450b4cdb2437b Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 21:52:44 +0000 Subject: [PATCH 18/40] feat(css): add disabled style for primary --- styles/base.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/styles/base.css b/styles/base.css index 99391204..683f9395 100644 --- a/styles/base.css +++ b/styles/base.css @@ -168,12 +168,15 @@ h6 { .btn-primary { --bs-btn-color: #1C1C1C; --bs-btn-bg: #88B440; - --bs-btn-border-width: 0; + --bs-btn-border-width: 1px; --bs-btn-border-color: #88B440; --bs-btn-hover-color: #1C1C1C; --bs-btn-hover-bg: #A6D15F; --bs-btn-hover-border-color: #A6D15F; - --bs-btn-disabled-opacity: #7D8084; + --bs-btn-disabled-color: #1C1C1C; + --bs-btn-disabled-bg: #7D8084; + --bs-btn-disabled-border-color: #7D8084; + --bs-btn-disabled-opacity: 1; } .btn-outline-primary { From f410863bbba90d10588438402c37d228376dc093 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 21:57:38 +0000 Subject: [PATCH 19/40] feat(styles): first pass at styles/components page --- styles.html | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 styles.html diff --git a/styles.html b/styles.html new file mode 100644 index 00000000..e06e223c --- /dev/null +++ b/styles.html @@ -0,0 +1,30 @@ +--- +layout: default +description: Internal style guide +--- + +
+
+
+

H1 - This is header one.

+

H2 - This is an example of header two.

+

H3 - Maze screensavers barbie scrunched socks airwalk.

+

H4 - Maze screensavers barbie scrunched socks airwalk. Nerf guns savage garden roseanne barr turquoise full house, bubble tape no fear t-shirts mia hamm enrique iglesias apollo 13

+
H5 - Maze screensavers barbie scrunched socks airwalk. Nerf guns savage garden roseanne barr turquoise full house, bubble tape no fear t-shirts mia hamm enrique iglesias apollo 13
+
+

This is the primary body copy used throughout the site, for both marketing and product pages. Body styles are intended for use in multi-line paragraphs of content and by default is left-aligned for optimized legibility. The ideal line length for paragraphs is 45 to 80 characters, which for this style roughly translates to a container width of 400 to 640px.

+
+ Link to home page +
+ +
+ .btn .btn-outline-primary + .btn .btn-outline-primary .disabled +
+
+
+
+
From 1828798ce4b460a682236a13b15e22b6dcb1dec6 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 22:10:55 +0000 Subject: [PATCH 20/40] feat(style-guide): add ul --- styles.html | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/styles.html b/styles.html index e06e223c..1f28ab8c 100644 --- a/styles.html +++ b/styles.html @@ -25,6 +25,34 @@
H5 - Maze screensavers barbie scrunched socks airwalk. Nerf guns savage gard .btn .btn-outline-primary .disabled
+
    +
  • This is a list.
    • +
  • However, this style only applies to immediate child elements.
    • +
  • Nested lists: +
      +
    • are unaffected by this style
      • +
    • will still show a bullet
      • +
    • and have appropriate left margin
      • +
    +
    • +
  • This may still come in handy in some situations.
    • +
+ +
    +
  • This is a list with class "list-unstyled".
    • +
  • It appears completely unstyled.
    • +
  • Structurally, it's still a list.
    • +
  • However, this style only applies to immediate child elements.
    • +
  • Nested lists: +
      +
    • are unaffected by this style
      • +
    • will still show a bullet
      • +
    • and have appropriate left margin
      • +
    +
    • +
  • This may still come in handy in some situations.
    • +
+
From 9adb331d7b02439faa96c263e929c10cdbf1825f Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Thu, 27 Jul 2023 23:29:55 +0000 Subject: [PATCH 21/40] feat(home): first pass at home and footer --- _includes/certs.html | 8 +-- _layouts/default.html | 41 ++++++------ assets/compiler_brandmark.svg | 24 +++---- index.html | 15 ++--- styles/base.css | 115 ++-------------------------------- 5 files changed, 46 insertions(+), 157 deletions(-) diff --git a/_includes/certs.html b/_includes/certs.html index d297098d..070a9f16 100644 --- a/_includes/certs.html +++ b/_includes/certs.html @@ -1,9 +1,9 @@ {% for cert in site.data.certs %} -
-

{{ cert.name }}

-
    +
    +

    {{ cert.name }}

    +
      {% for value in cert.values %} -
    • {{ value }}
      • +
    • {{ value }}
      • {% endfor %}
    diff --git a/_layouts/default.html b/_layouts/default.html index a85ee2aa..38413371 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -45,29 +45,30 @@ {{ content }} -