From 17ae7b52024acf96f70d5ba872717bc901aa0719 Mon Sep 17 00:00:00 2001 From: Huy Chi Nguyen <92219545+leohuynguyenchi@users.noreply.github.com> Date: Sat, 24 Feb 2024 22:14:51 -0500 Subject: [PATCH 01/36] Update README.md --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e328194d2..937dae818 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,12 @@ [![status: active](https://opensource.twitter.dev/status/active.svg)](https://opensource.twitter.dev/status/#active) -This is the Twitter Open Source website at https://opensource.twitter.dev. +Forked Twitter Open Source Website - Huy Nguyen +This repository contains a fork of the Twitter Open Source website (https://opensource.twitter.dev) built with Hugo. I'm collaborating on this project to contribute... + +Current Status: + +Forked from official repository on February 20th, 2024. This site is built with [hugo], using a custom built-in theme. Follow the standard instructions on the hugo website to [install] and [run] hugo. Just @@ -16,3 +21,7 @@ data]. [install]: https://gohugo.io/getting-started/installing/ [run]: https://gohugo.io/getting-started/usage/ [update some repo data]: ./.github/workflows/update-data.yml + +Disclaimer: + +This is a personal fork and not an official Twitter project. From b510145797959f52f713c5d096d4b4398c46060a Mon Sep 17 00:00:00 2001 From: Huy Chi Nguyen <92219545+leohuynguyenchi@users.noreply.github.com> Date: Sat, 24 Feb 2024 22:15:19 -0500 Subject: [PATCH 02/36] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 937dae818..d67401c7c 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![status: active](https://opensource.twitter.dev/status/active.svg)](https://opensource.twitter.dev/status/#active) Forked Twitter Open Source Website - Huy Nguyen + This repository contains a fork of the Twitter Open Source website (https://opensource.twitter.dev) built with Hugo. I'm collaborating on this project to contribute... Current Status: From b58249b2a58e1cf345c7c26089db41fa99f09fe3 Mon Sep 17 00:00:00 2001 From: Huy Chi Nguyen Date: Fri, 19 Apr 2024 15:35:19 -0400 Subject: [PATCH 03/36] dep --- .hugo_build.lock | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .hugo_build.lock diff --git a/.hugo_build.lock b/.hugo_build.lock new file mode 100644 index 000000000..e69de29bb From 4b75ed750a09d276a46f25232d5ac41de4003905 Mon Sep 17 00:00:00 2001 From: Andrew Pipo <93549755+PipoAT@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:42:51 -0400 Subject: [PATCH 04/36] Started on Issues #4 and #5. See Issues and README.md for more info. --- README.md | 18 ++++++++++++++++++ assets/css/projects.scss | 5 +++++ content/_index.html | 11 +++++------ layouts/_default/projects.html | 2 ++ layouts/_default/year-in-review.html | 8 ++++---- layouts/index.html | 3 --- layouts/partials/footer.html | 4 ++-- layouts/partials/nav.html | 2 +- static/assets/logo.svg | 3 +++ 9 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 static/assets/logo.svg diff --git a/README.md b/README.md index d67401c7c..dee671fe8 100644 --- a/README.md +++ b/README.md @@ -26,3 +26,21 @@ data]. Disclaimer: This is a personal fork and not an official Twitter project. + + +## Development/Contributions: +### Andrew T. Pipo + +4/19/2024 - 3 hours + +Started on Update to reflect name change - Twitter to X #5 + +- Started on removing all instances of Twitter and replace with X within the text - content of the main, projects, and memberships pages +- Replaced the logo with the X logo in the header of the main, projects, and memberships pages +- Removed instances of @TwitterOSS twitter handle as that is no longer an active twitter/X account +- Changed instances of Twitter to X in the footer of the main, projects, and memberships pages + +Started on Projects: Improve outlook of each project section #4 + +- Experimented with SCSS +- Implemented background color to each Project card, discovering inconsistencies with the layout diff --git a/assets/css/projects.scss b/assets/css/projects.scss index 4c6a05430..22bc3e3f1 100644 --- a/assets/css/projects.scss +++ b/assets/css/projects.scss @@ -19,6 +19,11 @@ max-width: var(--project-card-max-width); } +.proj-card-bground { + background-color: rgb(54, 47, 148); + padding: 2%; +} + .border { width: 150px; border-bottom-style: solid; diff --git a/content/_index.html b/content/_index.html index 49eee3e2a..fed28035d 100644 --- a/content/_index.html +++ b/content/_index.html @@ -40,15 +40,13 @@

Love

Explore Projects

-

Twitter has been built on open source since the beginning. Openness is part of our DNA. The projects you see here were born at Twitter, and patches are always welcome!

+

X has been built on open source since the beginning. Openness is part of our DNA. The projects you see here were born at X, and patches are always welcome!

View All Projects
- - -
+ @@ -68,9 +66,10 @@

Follow Us Join the Flock

We are always on the lookout for innovative and creative individuals who are passionate about building a platform where all voices can be heard.

View All Careers + Tweets by TwitterCareers
- +
diff --git a/layouts/_default/projects.html b/layouts/_default/projects.html index 9ae1705d0..0932c277f 100644 --- a/layouts/_default/projects.html +++ b/layouts/_default/projects.html @@ -14,6 +14,7 @@

Projects

{{ range sort $.Site.Data.projects "pushedAt" "desc" -}}
+

{{ .name }}

{{ .descriptionHTML | safeHTML }}
@@ -24,6 +25,7 @@

{{ .name }}

{{ with .homepageUrl }}Website{{ end }}
Metrics +
{{ end }} diff --git a/layouts/_default/year-in-review.html b/layouts/_default/year-in-review.html index 4e86e475d..0e7c7345b 100644 --- a/layouts/_default/year-in-review.html +++ b/layouts/_default/year-in-review.html @@ -37,7 +37,7 @@
  • Heat metrics
  • Light metrics
  • Love metrics
    • -
  • @TwitterOSS
    • + @@ -47,7 +47,7 @@

    {{ (now.AddDate -1 0 0).Format "Jan 2006" }} - {{ now.Format "Jan 2006" }}

    Year in Review

    -

    An overview of the past 12 months of activity on Twitter’s Open Source projects.

    +

    An overview of the past 12 months of activity on X’s Open Source projects.

    @@ -222,7 +222,7 @@

    Love metrics

    -
    +
    diff --git a/layouts/index.html b/layouts/index.html index ddcc2fcb0..05e4c74cd 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,7 +1,4 @@ {{ define "header" }} -

    - @TwitterOSS -

    Open Source is Happening

    {{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 545c25ea9..294b1bbd0 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -8,7 +8,7 @@

    About

    - Twitter for Good + Careers @@ -31,7 +31,7 @@

    - © {{ now.Format "2006"}} Twitter, Inc. + © {{ now.Format "2006"}} X, Inc.
    diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index aeaaaecbe..b6f4fcc7a 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -2,7 +2,7 @@
    diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 9a62263da..51f3cef55 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -24,7 +24,7 @@ {{ .Title }}{{ if not .IsHome }} | {{ site.Title }}{{ end }} - + {{- $style := resources.Get "css/style.scss" | toCSS | minify | fingerprint }} diff --git a/static/assets/favicon.ico b/static/assets/favicon.ico deleted file mode 100644 index 3a8b2eeec2b022360baf418dbf7f4b15654df168..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7406 zcmeHLc~n$Y82?aEa6udpWgqrsU_e>t;evZ8kh!9$gW@3g#AQUEnp>JqTBpwGbWYhR zTQM`W-1l6nV`iC^g|^y8X}Qh3*_egCduMy&3}nZ@H10W%dH3G$_q*Tw?i=R*egHnu z5wfxXKmB1_AV3}fh{g84KfsST78GRb*Z2W!=nas9F$jT5yatnmuG$eug z^=Qx@8V~$V85quQ0{sW`!EkOZ7{7TLOg|q2{m09}eDxeyZvP0TUyp*-cpKEOMuJs$ z6*Sv2fq!oZXd05iYT}VA1~l9I0l#NBXx>T#-SJ8=TzDGHO&=om7+7vJg7NFkh`k2p zKhHpm)dH4V-y%+ocrD^aAWnj~8K8bM9{6_$g7(N{(0^19&EIVY{pq>TeCc)McoEEh zT>#^k&qDLJ4ao5w;&sr1m-+fvU^UzT^($e>kpL|gBdA}C1nt4Gh_3_fzEPk%p#a0@ zPlD<9Q;6S+@i)Qr({8Y8{{V~nC&VQpt{E&h8xb1?)@C*0$ARYUEW}nL$7tYp4+Y(^ z>A>$Q1pS8#k?$$wI}O?cWnlW{2pG<;0Q0rakarLA{)xO-kkbUF-;N{iCFIl~cQjb_ ze}QIeDzvm%kxvflH)271coOpVM_wgp-pK*osX1WybUpH&hvx6!f#%C^Af5;F-(Mg$ z4Y4h_Ki?xZ4qD85#N^^0h2#EYfbRV&Fkak@dpr*JcO$NU0{8YM+}nd-{OUQ}+fNYt z17hP5Yry@zh4?(gM}T&3G2&-|8sC%l_TW{ZxV`IC@yC5xhJMoxe(do>e~dUlKTvf6uaV;kF!2)JcBA|p74Q2t4nv`f!i{@vi4ka3t-^oxNs@-3T`t?!NkmaZwU!xk-YE*;i%08$5 zbZAe__H5LF*Fn3#jOtMR$1A|_nFClhrEun52lHWbdsUeAeB)XB`I}$bE3#ds~+BBqHKU!{HMjdzn@qeQZ zJnPhwL`M=m>ClnthD5Ay5$KLqpg%AVb?28(&1h~qO?4yDj6^#U-Kg0nrMi*m$M)7< zfqSh0^Pn^dE0?pKTYDNg3;mM^6opNdv))3g17mx|AA5}qG zs3N1-lcJ<|m!gL|(SV9!`L&(_3|lfYJJc3XA?ofCAQ{vz(LReGS^iW03q|!?H$kH0yd|E6B2;>nH%6k;ZB@EkN zVVkd+T-Cvq0qdJJ(6()o7)lTx7c!%(Yn~|?Ji^wKRA=VSDNhLMRyJCg0ORaP*z_?0 zU09YC!UaqWBawS~L);?nr_R0p|F~B?Ij5k-PR}aNbBg_JLb>ht=Qh=vjbx-qa&UKbiQ|#49Fe4&t*D-&K2H4E2`z_Xblxmw47zzKNb~h?i|Rw~qSF z#NQ=eJUO=z-<{tzfSzT@?|$nFZC`OT(2FnZMF>_L2G{@p<~e;&PR>LsK1&F{#ko;5j>w72#Ov{%5r0s(i?f~C@6 zL6|HpDLY>#b&SY*WMp;DjgN5*$Rc}+b3~%>ILAP6ClF!FO|lInbn8mGB9Wi1pXZZo z>t`}_mAv#Y|LDX(k*HSz4Unev>(e1BL?jCIk&!inJ4S^DNA&jX(mg1Z=8%wpgRy-j W0THxo|08uQFC6r|cdy2O@BIU8!lB9l diff --git a/static/assets/twitter-logo.svg b/static/assets/twitter-logo.svg deleted file mode 100644 index d16b6a7de..000000000 --- a/static/assets/twitter-logo.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/static/assets/twitter.ico b/static/assets/twitter.ico new file mode 100644 index 0000000000000000000000000000000000000000..a71555fea182dfb50364a0834372fb5b92468947 GIT binary patch literal 5498 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 literal 0 HcmV?d00001 From 50c03957cb38855e433297e236a16bf9158b9844 Mon Sep 17 00:00:00 2001 From: Andrew Pipo <93549755+PipoAT@users.noreply.github.com> Date: Sat, 20 Apr 2024 11:21:01 -0400 Subject: [PATCH 06/36] Implemented Issue #5 and Issue #8; Continued work on Issue #4 --- README.md | 14 ++++++++++++-- assets/css/projects.scss | 27 +++++++++++++++++++++------ layouts/_default/projects.html | 27 +++++++++++++++++++++------ 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index abec6fc7f..67acfdb73 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,19 @@ Started on Projects: Improve outlook of each project section #4 --- -### 4/20/2024 - 1 hour +### 4/20/2024 - 2 hours Continued on Update to reflect name change - Twitter to X #5 - Replace the twitter logo with the X logo in the Year In Review Page - Continued to remove instances of @TwitterOSS twitter handle as that is no longer an active twitter/X account -- Replaced the .ico file from the twitter logo to the X logo \ No newline at end of file +- Replaced the .ico file from the twitter logo to the X logo + +Continued on Projects: Improve outlook of each project section #4 + +- Adjusted layout of card to be more consistent +- Applied same style to all buttons/links within card + +Implemented Projects: Display project counts next to Projects title #8 + +- Added counted below the title of the projects page +- Implemented JavaScript to count the number of project-cards to indicate total projects on page \ No newline at end of file diff --git a/assets/css/projects.scss b/assets/css/projects.scss index 22bc3e3f1..e4546b604 100644 --- a/assets/css/projects.scss +++ b/assets/css/projects.scss @@ -24,6 +24,25 @@ padding: 2%; } +.proj-links { + display: inline-block; + padding: 10px 20px; + background-color: #007bff; /* Change to your desired background color */ + color: #fff; /* Change to your desired text color */ + border-radius: 20px; /* Adjust the border radius to make it more or less rounded */ + text-decoration: none; + transition: background-color 0.3s ease; +} + +.proj-links:hover { + background-color: #0056b3; /* Change to a darker shade for hover effect */ +} + + +.project-card a { + color: #ffffff; +} + .border { width: 150px; border-bottom-style: solid; @@ -40,12 +59,6 @@ } } -.project-links a { - display: block; - font-weight: var(--feather-font-weight-bold); - text-decoration: none; -} - .project-links a:link, .project-links a:visited { color: var(--tw-color-text-primary); @@ -86,6 +99,8 @@ background-color: var(--tw-color-blue-light); display: flex; justify-content: space-between; + margin-left: auto; + margin-right: auto; /* Center horizontally */ @media (prefers-color-scheme: dark) { background-color: var(--tw-color-gray-deep); diff --git a/layouts/_default/projects.html b/layouts/_default/projects.html index 0932c277f..7e44c7934 100644 --- a/layouts/_default/projects.html +++ b/layouts/_default/projects.html @@ -1,5 +1,7 @@ {{ define "header" }}

    Projects

    +
    +

    Project Count:

    {{ end }} + {{ end }} + From 299a6b6adc5e354a882c7b3234edfdd96b01ed07 Mon Sep 17 00:00:00 2001 From: Andrew Pipo <93549755+PipoAT@users.noreply.github.com> Date: Sat, 20 Apr 2024 12:22:05 -0400 Subject: [PATCH 07/36] Updated README.md with personal contributions through 4/20 at 12:00 pm --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 67acfdb73..01bfc779f 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,12 @@ This is a personal fork and not an official Twitter project. # Development/Contributions: ## Andrew T. Pipo +### Prior to 4/19/2024 - 2 hours +- Brainstorming/Researching Project Selection and Issues +- Establishing Local Environment + +--- + ### 4/19/2024 - 3 hours Started on Update to reflect name change - Twitter to X #5 @@ -61,4 +67,10 @@ Continued on Projects: Improve outlook of each project section #4 Implemented Projects: Display project counts next to Projects title #8 - Added counted below the title of the projects page -- Implemented JavaScript to count the number of project-cards to indicate total projects on page \ No newline at end of file +- Implemented JavaScript to count the number of project-cards to indicate total projects on page + +### 4/20/2024 - 0.5 hours +Working on Final Report + +--- + From 0b609930298a2a5d534dccfaad187d6850a29a9a Mon Sep 17 00:00:00 2001 From: samwinkelmann Date: Sat, 20 Apr 2024 13:52:35 -0400 Subject: [PATCH 08/36] Hugo file --- .hugo_build.lock | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .hugo_build.lock diff --git a/.hugo_build.lock b/.hugo_build.lock new file mode 100644 index 000000000..e69de29bb From cbd1ecc5b48c155bee5d50427c09aa6cbdff6fe8 Mon Sep 17 00:00:00 2001 From: Huy Chi Nguyen Date: Sat, 20 Apr 2024 15:58:32 -0400 Subject: [PATCH 09/36] front-end switch light-dark --- assets/css/_main.scss | 59 +++++++++++++++++++++++++++++++++++++++ layouts/partials/nav.html | 21 +++++++++++++- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/assets/css/_main.scss b/assets/css/_main.scss index f6e39d578..ffc10f1d0 100644 --- a/assets/css/_main.scss +++ b/assets/css/_main.scss @@ -120,6 +120,65 @@ nav { margin-right: var(--feather-grid-xxsmall); } } +// Switch light-dark slider +.theme-switch-wrapper { + display: inline-block; + align-items: center; + + em { + margin-left: 10px; + font-size: 1rem; + } +} +.theme-switch { + display: inline-block; + height: 25px; + position: relative; + width: 50px; +} + +.theme-switch input { + display:none; +} + +.slider { + margin: 8px -8px -8px 8px; + background-color: #ccc; + bottom: 0; + cursor: pointer; + left: 0; + position: absolute; + right: 0; + top: 0; + transition: .4s; +} + +.slider:before { + background-color: #fff; + bottom: 3px; + content: ""; + height: 20px; + left: 3px; + position: absolute; + transition: .4s; + width: 20px; +} + +input:checked + .slider { + background-color: #2196F3; +} + +input:checked + .slider:before { + transform: translateX(23.5px); +} + +.slider.round { + border-radius: 34px; +} + +.slider.round:before { + border-radius: 50%; +} .home-link { font-weight: var(--feather-font-weight-bold); diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index b6f4fcc7a..dd2d4cf81 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -5,6 +5,13 @@ Twitter Open Source +
    + +
    + @@ -14,4 +21,16 @@
  • {{ .Name }}
    • {{ end }} - \ No newline at end of file + + \ No newline at end of file From de026756d73b45451e6ca50b6b2db983283ed59f Mon Sep 17 00:00:00 2001 From: Huy Chi Nguyen Date: Sat, 20 Apr 2024 22:17:32 -0400 Subject: [PATCH 10/36] SCSS for the Switch --- assets/css/_main.scss | 32 ++++++++++++++++++++++++++++++++ assets/css/index.scss | 4 +++- layouts/partials/nav.html | 4 ++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/assets/css/_main.scss b/assets/css/_main.scss index ffc10f1d0..c6b94ce14 100644 --- a/assets/css/_main.scss +++ b/assets/css/_main.scss @@ -7,6 +7,13 @@ --line-height-xjumbo: 2.5rem; --font-size-mini-jumbo: 1.6rem; --line-height-mini-jumbo: 1.8rem; + //Original Light mode colors + --primary-color: #302AE6; + --secondary-color: #536390; + --font-color: #424242; + --bg-color: #fff; + --heading-color: #292922; + --dark-color: black; } /* Animations */ @@ -66,10 +73,14 @@ main { padding: var(--feather-grid-mega) 0; } .section { + background-color: var(--bg-color); + color: var(--font-color); padding: calc(var(--feather-grid-mega) * 2) 0; } .container { + // background-color: var(--bg-color); + color: var(--font-color); max-width: var(--feather-grid-page-width); margin: 0 auto; } @@ -120,6 +131,14 @@ nav { margin-right: var(--feather-grid-xxsmall); } } +//Dark mode +[data-theme="dark"] { + --primary-color: #9A97F3; + --secondary-color: #818cab; + --font-color: #e1e1ff; + --bg-color: #161625; + --heading-color: #818cab; +} // Switch light-dark slider .theme-switch-wrapper { display: inline-block; @@ -180,6 +199,11 @@ input:checked + .slider:before { border-radius: 50%; } +.theme-label { + padding-left: 10px; + font-family: cursive; +} + .home-link { font-weight: var(--feather-font-weight-bold); } @@ -238,6 +262,8 @@ input:checked + .slider:before { /* Headers */ .header, .footer { + background-color: var(--bg-color); + color: var(--font-color); padding: var(--feather-grid-mega) 0; } @@ -251,6 +277,8 @@ input:checked + .slider:before { } .subtitle { + background-color: var(--bg-color); + color: var(--font-color); margin: var(--feather-grid-large) 0; } @@ -310,15 +338,19 @@ a.foot-link { /* Text */ body { + background-color: var(--bg-color); + color: var(--font-color); font-size: 0.8rem; // 16px line-height: 1.5; // 24px } h2 { + color: var(--secondary-color); margin: 1.5em 0 0.5em; } .center-text { + color: var(--secondary-color); text-align: center; } diff --git a/assets/css/index.scss b/assets/css/index.scss index 97902472c..83d8ea830 100644 --- a/assets/css/index.scss +++ b/assets/css/index.scss @@ -8,7 +8,9 @@ background-color: var(--tw-color-gray-faint); @media (prefers-color-scheme: dark) { - background-color: var(--tw-color-gray-1100); + background-color: var(--bg-color); + color: var(--font-color); + // background-color: var(--tw-color-gray-1100); color: white; } } diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index dd2d4cf81..481d6de9f 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -10,6 +10,7 @@
    + Dark Mode @@ -23,6 +24,7 @@ \ No newline at end of file From ae9c91258199298bd27bfa9a25eec8fd37c70711 Mon Sep 17 00:00:00 2001 From: Andrew Pipo <93549755+PipoAT@users.noreply.github.com> Date: Sun, 21 Apr 2024 09:56:09 -0400 Subject: [PATCH 11/36] Stated on Issue #9 and helped with issue #7 --- README.md | 9 +++++++++ assets/css/index.scss | 18 +++++++---------- content/_index.html | 20 ++----------------- layouts/_default/projects.html | 26 +++++++++++++++++++----- layouts/index.html | 4 +++- static/js/projects.js | 36 +++++++++++++++++++--------------- 6 files changed, 62 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 01bfc779f..2ad0b3da4 100644 --- a/README.md +++ b/README.md @@ -74,3 +74,12 @@ Working on Final Report --- +### 4/21/2024 - 1 hour +Started on Projects: Project counts should be updated and associate to search bar #9 + +- Investigated current search bar integration on Project page +- Removed original counter and replaced with existing counter that displayed the number results after a search inquiry +- Aiming to have it display total projects if search bar query is blank + +Aided in Alignment/layout adjustments throughout website #7 +- Fixed the home page layout to remove unneccesary spacing and remove dead links diff --git a/assets/css/index.scss b/assets/css/index.scss index 83d8ea830..c7911772e 100644 --- a/assets/css/index.scss +++ b/assets/css/index.scss @@ -2,6 +2,7 @@ .content { padding: 0; + text-align: center; } .grey { @@ -55,19 +56,14 @@ #career-text { text-align: center; } -@media (min-width: 600px) { - #career .container { - display: flex; - > div { - flex: 1 1 50%; - } - } - #career-text { - text-align: left; - margin-top: 100px; - } + +#career .container { + + text-align: center; + } + /* Our Philosophy - images */ #emoji-cards { diff --git a/content/_index.html b/content/_index.html index fed28035d..bad2fff31 100644 --- a/content/_index.html +++ b/content/_index.html @@ -41,23 +41,11 @@

    Love

    Explore Projects

    X has been built on open source since the beginning. Openness is part of our DNA. The projects you see here were born at X, and patches are always welcome!

    - View All Projects + View All Projects
    - - -
    - -
    + diff --git a/layouts/_default/projects.html b/layouts/_default/projects.html index 7e44c7934..947eb1011 100644 --- a/layouts/_default/projects.html +++ b/layouts/_default/projects.html @@ -1,7 +1,8 @@ {{ define "header" }}

    Projects


    -

    Project Count:

    +

    Found results for
    +