From d64b92961381cdf709ad8e691a6e84027d917874 Mon Sep 17 00:00:00 2001 From: BrerorRexha Date: Sun, 17 Sep 2023 19:03:06 +0200 Subject: [PATCH] changes --- assets/css/styles.css | 452 ++++++++++++++---- content/_index.html | 15 +- content/hiring/_index.md | 1 + .../news/2017-beta-released-security-audit.md | 4 +- content/news/2018-1.0-released-new-funding.md | 10 +- content/news/2018-briar-1.1-released.md | 6 +- ...2019-briar-1.2-released-remote-contacts.md | 6 +- content/news/2021-briar-1.3-released.md | 6 +- content/news/2021-briar-1.4-released.md | 2 +- .../news/2022-briar-desktop-nlnet-funding.md | 2 +- .../2022-briar-removed-from-google-play.md | 4 +- .../news/2023-briar-desktop-0.4.0-released.md | 2 +- content/news/2023-briar-mailbox-released.md | 8 +- .../2023-simulating-internet-shutdowns.md | 16 +- ...3-three-security-issues-found-and-fixed.md | 8 +- content/page/about.md | 10 +- content/page/apk.md | 4 +- content/page/code-of-conduct.md | 22 +- content/page/download.md | 2 +- content/page/governance.md | 10 +- content/page/how-it-works.md | 6 +- content/page/mailbox.md | 4 +- content/page/press.md | 6 +- layouts/shortcodes/howitworks.html | 8 + static/img/gitlab.svg | 11 +- static/img/howitworks3(mobile).svg | 49 ++ static/img/mastodon.svg | 4 +- static/img/x-twitter.svg | 4 +- static/img/xmark-solid.svg | 1 + themes/briar/layouts/news/single.html | 2 +- themes/briar/layouts/partials/footer.html | 24 +- themes/briar/layouts/partials/header.html | 19 +- 32 files changed, 546 insertions(+), 182 deletions(-) create mode 100644 layouts/shortcodes/howitworks.html create mode 100644 static/img/howitworks3(mobile).svg create mode 100644 static/img/xmark-solid.svg diff --git a/assets/css/styles.css b/assets/css/styles.css index 3ae4ccf..e99a4a6 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -1,4 +1,5 @@ :root { + --lime-50: #f7fee7; --lime-100: #ECFCCB; --lime-200: #D9F99D; --lime-300: #BEF264; @@ -9,24 +10,15 @@ --lime-800: #3F6212; --lime-900: #365314; --gray-50: #f9fafb; - --gray-100: #F4F4F5; - --gray-200: #E4E4E7; - --gray-300: #D4D4D8; - --gray-400: #A1A1AA; - --gray-500: #71717A; - --gray-600: #52525B; - --gray-700: #3F3F46; - --gray-800: #27272A; - --gray-900: #18181B; - --cool-gray-100: #F3F4F6; - --cool-gray-200: #E5E7EB; - --cool-gray-300: #D1D5DB; - --cool-gray-400: #9CA3AF; - --cool-gray-500: #6B7280; - --cool-gray-600: #4B5563; - --cool-gray-700: #374151; - --cool-gray-800: #1F2937; - --cool-gray-900: #111827; + --gray-100: #F3F4F6; + --gray-200: #E5E7EB; + --gray-300: #D1D5DB; + --gray-400: #9CA3AF; + --gray-500: #6B7280; + --gray-600: #4B5563; + --gray-700: #374151; + --gray-800: #1F2937; + --gray-900: #111827; } body { @@ -53,12 +45,27 @@ html { } #header_container { + position: relative; width: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: flex-start; +} + +.header-bg { + background-color: var(--lime-50); + position: absolute; + top: 0; + height: 338px; + z-index: -1; + width: 100vw; } #header { + position: relative; display: flex; - align-items: center; + align-items: flex-start; justify-content: space-between; width: 100%; padding-top: 28px; @@ -67,6 +74,9 @@ html { #nav { max-width: 570px; width: 100%; + min-height: 40px; + display: flex; + align-items: center; } #menu-toggle { @@ -89,10 +99,9 @@ html { #menu li a { text-decoration: none; - color: var(--cool-gray-700); - font-weight: 600; - font-size: 1rem; - font-family: 'Inter 400'; + color: var(--gray-700); + font-size: 0.875rem; + font-family: 'Sinkin Sans 500'; } #menu li { @@ -104,7 +113,7 @@ html { } #menu li:last-child a { - padding: 12px; + padding: 9px 12px; border-radius: 8px; background-color: var(--lime-400); transition: all .3s ease; @@ -150,17 +159,17 @@ html { text-align: left; line-height: 120%; margin-top: 0; - color: var(--cool-gray-700); + color: var(--gray-700); border-radius: 8px; font-family: 'Sinkin Sans 500'; } #content-news h3 { - color: var(--cool-gray-700); + color: var(--gray-700); } #content-news p { - color: var(--cool-gray-600); + color: var(--gray-600); font-family: 'Inter 400'; } @@ -189,13 +198,28 @@ html { float: right; } +.content-box h2, +.content-box h3, .content-box h4 { - font-size: 1.35rem; font-family: 'Sinkin Sans 600'; - margin: 12px 0 0 0; align-self: flex-start; } +.content-box h2 { + font-size: 1.35rem; + margin: 12px 0 0 0; +} + +.content-box h3 { + font-size: 1.20rem; + margin-bottom: 0px; +} + +.content-box h4 { + font-size: 1.125rem; + margin-bottom: 0px; +} + .content-box p { margin-top: 10px; align-self: flex-start; @@ -231,7 +255,7 @@ html { } #content-news .date-author { - color: var(--cool-gray-500); + color: var(--gray-500); text-transform: uppercase; font-weight: 400; align-self: flex-start; @@ -335,46 +359,22 @@ figure img { #container-bg { position: absolute; - top: 0; - left: 0; - right: 0; - max-height: 780px; - height: 100%; + width: 100vw; + top: -75px; + left: -10vw; + bottom: 0; + justify-self: center; z-index: -1; - overflow-x: hidden; - display: flex; - align-items: flex-start; - justify-content: space-between; -} - -.bg-circle { - border-radius: 100%; - background: var(--lime-100); - filter: blur(139.5px); -} - -.bg-circle:nth-child(1) { - width: 347px; - height: 347px; -} - -.bg-circle:nth-child(2) { - width: 469px; - height: 469px; - align-self: flex-end; -} - -.bg-circle:nth-child(3) { - width: 472px; - height: 472px; + background-color: var(--lime-50); } .home-main { + position: relative; width: 100%; display: flex; justify-content: space-between; align-items: flex-start; - margin-top: 65px; + padding-top: 65px; } .home-main .text { @@ -383,7 +383,7 @@ figure img { } #content .home-main h1 { - color: var(--cool-gray-900); + color: var(--gray-900); font-size: 3rem; font-family: 'Sinkin Sans 700'; letter-spacing: -1.2px; @@ -418,7 +418,7 @@ figure img { .news-banner { width: 100vw; - background-color: var(--cool-gray-700); + background-color: var(--gray-700); padding-top: 54px; padding-bottom: 54px; } @@ -491,7 +491,7 @@ figure img { } .services-container h3 { - color: var(--cool-gray-900); + color: var(--gray-900); font-family: 'Sinkin Sans 700'; font-size: 24px; font-style: normal; @@ -531,7 +531,7 @@ figure img { } .service .text h4 { - color: var(--cool-gray-900); + color: var(--gray-900); font-family: 'Sinkin Sans 700'; font-size: 18px; font-style: normal; @@ -558,7 +558,7 @@ figure img { } .hiring-container h3 { - color: var(--cool-gray-800); + color: var(--gray-800); text-align: center; font-family: 'Sinkin Sans 700'; font-size: 24px; @@ -589,7 +589,7 @@ figure img { } .hiring p { - color: var(--cool-gray-800); + color: var(--gray-800); font-family: 'Sinkin Sans 600'; font-size: 14px; font-style: normal; @@ -628,8 +628,8 @@ figure img { } #footer ul li { - font-family: 'Sinkin Sans 600'; - font-size: 16px; + font-family: 'Sinkin Sans 500'; + font-size: 0.875rem; font-style: normal; line-height: 24px; } @@ -667,13 +667,39 @@ figure img { margin-bottom: 32px; } -#socials img { +#socials svg, #socials rect { height: 24px; + width: 24px; + cursor: pointer; + transition: all .3s ease; +} + +#socials a { + text-decoration: none; + color: none; +} + +#socials svg path { + transition: all .3s ease; +} + +#socials svg:hover path { + fill: var(--gray-700); } #footer_container { margin-top: 60px; border-top: 2px solid var(--gray-200); + width: 100%; +} + +.content-box p { + align-self: flex-start; +} + +.content-box ul { + align-self: flex-start; + padding-left: 16px; } #footer { @@ -834,6 +860,38 @@ tr td:first-child { padding-right: 12px; } +figure.mobile-photo { + display: none; +} + +#close-button { + display: none; +} + +.menu-mobile input { + display: none; +} + +#logo { + cursor: pointer; + height: 40px; +} + +.news_container { + display: flex; + align-items: flex-start; + justify-content: space-between; + width: 90%; + align-self: flex-start; + margin-top: 40px; +} + +@media only screen and (min-width: 1440px) { + #container-bg { + left: calc(-1*((100vw - (1232px))/2)); + } +} + @media only screen and (max-width: 1250px) { #wrapper, @@ -841,28 +899,27 @@ tr td:first-child { max-width: 80vw; } -} + .main-image_container { + margin-right: 0; + } -@media only screen and (max-width: 960px) { + .home-main .text { + max-width: 500px; + } - #menu { - display: none; + #content-smaller { + width: 80%; } - .menu-mobile { - display: inline-block; - float: right; + .news-article { + width: calc(100% - 80px); } +} - .mobile-overlay { +@media only screen and (max-width: 992px) { + + #menu { display: none; - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - padding: 0 10vw; - background-color: transparent; } .home-main { @@ -933,6 +990,92 @@ tr td:first-child { .download-links img { width: 49%; } + + #nav { + display: flex; + flex-direction: column; + align-items: flex-end; + justify-content: flex-start; + } + + .home-main { + padding-top: 20px; + } + + .menu-mobile { + display: inline-block; + float: right; + } + + .mobile-overlay { + display: none; + width: calc(80vw - 140px); + padding: 20px 0; + align-self: flex-end; + margin-top: 60px; + transform: translateX(-140px); + } + + .menu-mobile label { + z-index: 10000; + position: relative; + float: right; + cursor: pointer; + } + + .menu-mobile input:checked~.mobile-overlay { + display: block; + } + + .menu-mobile input:checked~label #hamburger-button { + display: none; + } + + .menu-mobile input:checked~label #close-button { + display: inline-block; + } + + .menu-mobile #menu { + display: inline-block; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: flex-start; + } + + .menu-mobile #menu li:last-child a { + padding: 0; + background-color: transparent; + } + + .menu-mobile #menu li:first-child { + margin-top: 0; + } + + .menu-mobile #menu li { + margin-top: 20px; + } + + .news_container { + flex-direction: column; + width: 100%; + } + + #content-news { + flex: 100; + max-width: 100%; + margin-right: 0; + } + + #sidebar { + margin-top: 0; + flex: 60; + max-width: 60%; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: flex-start; + } } @media only screen and (max-width: 875px) { @@ -944,6 +1087,45 @@ tr td:first-child { } @media only screen and (max-width: 768px) { + + #wrapper, .news-banner-container { + max-width: 93vw; + } + + .mobile-overlay { + width: calc(93vw - 140px); + transform: translateX(-140px); + } + + #container-bg { + position: absolute; + width: 100vw; + top: -75px; + left: -3.5vw; + bottom: 0; + justify-self: center; + z-index: -1; + background-color: var(--lime-50); + } + + #content h1, #content-smaller h1 { + font-size: 24px; + margin-top: 40px !important; + } + + #content h1#main-title { + margin-top: 20px !important; + } + + .content-box, .news-article { + padding: 20px; + width: calc(100% - 40px); + } + + ul { + padding-left: 16px; + } + .services { grid-template-columns: repeat(1, 1fr); } @@ -957,7 +1139,105 @@ tr td:first-child { margin: 0 auto; } + #content-smaller { + width: 100%; + } + .service .text { max-width: 250px; } + + .donate-section { + flex-direction: column; + align-items: center; + } + + #footer .donate-section p { + margin-top: 20px; + line-height: 150%; + margin-left: 0px !important; + } + + #copyright { + margin: 0 20px 40px 20px; + } +} + +@media only screen and (max-width: 426px) { + #logo { + width: 105px; + } + + #header { + padding-top: 12px; + } + + .mobile-overlay { + width: calc(93vw - 105px); + transform: translateX(-105px); + margin-top: 40px; + } + + #logo img { + width: 100%; + } + + figure { + width: 100%; + } + + .news-article .blog-post-meta { + justify-content: flex-start; + } + + #content .news-article .blog-post-title { + text-align: left !important; + margin-top: 12px !important; + margin-bottom: 0 !important; + } + + figure.desktop-photo { + display: none; + } + + figure.mobile-photo { + display: inline-block; + } + + #content .news-article .blog-post-title a { + line-height: 120% !important; + font-size: 20px !important; + } + + .news-article .description { + font-size: 14px; + margin-top: 12px; + } + + .description a { + margin: 0; + margin-top: 12px; + } + + #footer ul { + margin-top: 32px; + } + + #footer ul li { + font-size: 14px; + } + + .news-article:last-child { + margin-bottom: 0; + } + + #content-news .content-box { + padding: 20px; + width: calc(100% - 40px); + } + + #sidebar { + flex: 80; + max-width: 80%; + } } \ No newline at end of file diff --git a/content/_index.html b/content/_index.html index 28c8934..5d618bb 100644 --- a/content/_index.html +++ b/content/_index.html @@ -4,20 +4,17 @@ releaseVersion: "1.5.4" releaseDate: 8 June 2023 --- -
-
-
-
-
+
+
-

Secure messaging anywhere

-

Censorship-resistant peer-to-peer messaging that bypasses centralized servers. Connect privately via Bluetooth, Wi-Fi, or Tor, with privacy built-in.

+

Secure messaging anywhere

+

Censorship-resistant peer-to-peer messaging that bypasses centralized servers. Connect via Bluetooth, Wi-Fi, or Tor, with privacy built-in.

Google Play Badge FDroid Badge
-

Latest Release: {{ .Page.Params.releaseVersion }}

+

Latest Release: {{ .releaseVersion }}

Mobile @@ -32,7 +29,7 @@

Latest News

A better way to communicate

-

Anim aute id magna aliqua ad ad non deserunt sunt. Qui irure qui lorem cupidatat commodo.

+

End-to-end encryption and decentralized technology ensure conversations stay private and available even without internet access.

Encryption diff --git a/content/hiring/_index.md b/content/hiring/_index.md index 52abc43..16a39db 100644 --- a/content/hiring/_index.md +++ b/content/hiring/_index.md @@ -1,4 +1,5 @@ --- +layout: single aliases: - /hiring.html title: Jobs diff --git a/content/news/2017-beta-released-security-audit.md b/content/news/2017-beta-released-security-audit.md index 942876c..6bfdef2 100644 --- a/content/news/2017-beta-released-security-audit.md +++ b/content/news/2017-beta-released-security-audit.md @@ -47,7 +47,7 @@ users will not be able to migrate their accounts to the final version. For security reasons, their **accounts and data will expire** with the beta. -### Media +## Media
@@ -68,7 +68,7 @@ beta. -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. Unlike diff --git a/content/news/2018-1.0-released-new-funding.md b/content/news/2018-1.0-released-new-funding.md index 86d6b7a..9971fef 100644 --- a/content/news/2018-1.0-released-new-funding.md +++ b/content/news/2018-1.0-released-new-funding.md @@ -5,7 +5,7 @@ date: 2018-05-09T00:00:00+00:00 title: 'Briar - Secure P2P Messenger Releases First Version, Receives New Funding' --- -### Press Release +## Press Release The peer-to-peer messenger Briar released its first stable version today. It is available for Android devices from [Google @@ -39,7 +39,7 @@ that will allow users to send each other messages even if they are not online at the same time. This will increase users' reachability and further improve battery life. -### Media +## Media -#### Simplified Architecture +### Simplified Architecture -#### Offline Messaging +### Offline Messaging -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. Unlike diff --git a/content/news/2018-briar-1.1-released.md b/content/news/2018-briar-1.1-released.md index 08e302a..6413210 100644 --- a/content/news/2018-briar-1.1-released.md +++ b/content/news/2018-briar-1.1-released.md @@ -5,7 +5,7 @@ date: 2018-09-14T00:00:00+00:00 title: 'Briar 1.1 released with dark theme, new emoji and more' --- -### Press Release +## Press Release The Briar Project released version 1.1 of its Android app today. This release adds new features following the app's [first public @@ -47,7 +47,7 @@ Work on the next big release is already under way. Among other things, the Briar Project is working on a new way to add contacts securely without meeting in person, and support for attaching images to messages. -### Media +## Media -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. Unlike diff --git a/content/news/2019-briar-1.2-released-remote-contacts.md b/content/news/2019-briar-1.2-released-remote-contacts.md index d5b7a65..7a6ffd3 100644 --- a/content/news/2019-briar-1.2-released-remote-contacts.md +++ b/content/news/2019-briar-1.2-released-remote-contacts.md @@ -5,7 +5,7 @@ date: 2019-11-06T00:00:00+00:00 title: 'Briar 1.2 released, contacts can now be added by exchanging links' --- -### Press Release +## Press Release The Briar Project released version 1.2 of its Android app today. This release allows users to add each other securely by exchanging links. @@ -37,7 +37,7 @@ was carried out by [Ura Design](https://www.ura.design). Work on this feature was supported by the [Open Technology Fund](https://www.opentech.fund/). -### Media +## Media {{< screenshots "12_add_contact_options.png" @@ -46,7 +46,7 @@ Work on this feature was supported by the [Open Technology Fund](https://www.ope "12_add_contact_pending.png" >}} -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. diff --git a/content/news/2021-briar-1.3-released.md b/content/news/2021-briar-1.3-released.md index a8fed18..f0a7944 100644 --- a/content/news/2021-briar-1.3-released.md +++ b/content/news/2021-briar-1.3-released.md @@ -6,7 +6,7 @@ title: 'Briar 1.3 released - image attachments, profile images and disappearing --- -### Press release +## Press release {{< figure src="/img/internet-shutdown.jpg" link="/img/internet-shutdown.jpg" class="fullwidth" alt="Using Briar during internet shutdown" @@ -29,7 +29,7 @@ To improve the user experience, the settings screen has been re-organized and sp Work on the next big release is already underway. Among other things, the team is working on a way to exchange messages over storage media (SD card or USB stick) as well as sharing the app offline. -### Media +## Media {{< screenshots "13_send_image.png" "13_attach_image.png" @@ -39,7 +39,7 @@ Work on the next big release is already underway. Among other things, the team i "13_change_profile_pic.png" >}} -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. diff --git a/content/news/2021-briar-1.4-released.md b/content/news/2021-briar-1.4-released.md index b40d5d6..c23cc6b 100644 --- a/content/news/2021-briar-1.4-released.md +++ b/content/news/2021-briar-1.4-released.md @@ -5,7 +5,7 @@ date: 2021-11-15T00:00:00+00:00 title: 'Briar 1.4 released - offline app sharing, message transfer via SD cards and USB sticks' --- -### Press release +## Press release The Briar Project released version 1.4 of its Android app today. This release adds a couple of new features, highlighted below. diff --git a/content/news/2022-briar-desktop-nlnet-funding.md b/content/news/2022-briar-desktop-nlnet-funding.md index d435a8c..cc4f33e 100644 --- a/content/news/2022-briar-desktop-nlnet-funding.md +++ b/content/news/2022-briar-desktop-nlnet-funding.md @@ -5,7 +5,7 @@ date: 2022-12-05T12:00:00+00:00 title: 'Briar Desktop got another round of funding' --- -### Briar Desktop got another round of funding +## Briar Desktop got another round of funding So far, Briar is only available as an Android app, which is preventing some organizations that work in repressive environments from using it as a secure communications tool and considering it as a more secure alternative to email. To remedy that, we have started working on a desktop app in September 2021 that is supposed to work on three major operating systems: Linux, macOS and Windows. We already released a beta version for Linux, including private chats in January 2022. diff --git a/content/news/2022-briar-removed-from-google-play.md b/content/news/2022-briar-removed-from-google-play.md index 8793b2d..7cfbd58 100644 --- a/content/news/2022-briar-removed-from-google-play.md +++ b/content/news/2022-briar-removed-from-google-play.md @@ -5,13 +5,13 @@ date: 2022-02-28T13:20:00+00:00 title: 'Briar is available on Google Play again' --- -### Status update +## Status update **Update (February 28, 13:20 UTC): Briar is available on Google Play again.** Briar was briefly removed from Google Play because we didn't provide Google's review team with a username and password for testing the app. We provided Google with a username and password for testing and the app is now available again. -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. diff --git a/content/news/2023-briar-desktop-0.4.0-released.md b/content/news/2023-briar-desktop-0.4.0-released.md index 2f6719d..b04c122 100644 --- a/content/news/2023-briar-desktop-0.4.0-released.md +++ b/content/news/2023-briar-desktop-0.4.0-released.md @@ -5,7 +5,7 @@ date: 2023-01-31T12:00:00+00:00 title: 'Briar Desktop 0.4.0-beta released - Windows support and forums' --- -### Briar Desktop 0.4.0-beta for Linux and Windows including the first new feature: *forums* +## Briar Desktop 0.4.0-beta for Linux and Windows including the first new feature: *forums* We are very happy to announce that we have accomplished two big goals! We just released a version of Briar Desktop for Windows so that roughly [one year](https://code.briarproject.org/briar/briar-desktop/-/wikis/Changelog) after our first version, we now support another major operating system in addition to Linux. With the beta release 0.4.0 you can now try out Briar Desktop on your Windows machines with the operating systems Windows 10 and 11. diff --git a/content/news/2023-briar-mailbox-released.md b/content/news/2023-briar-mailbox-released.md index 32da41d..64cfd08 100644 --- a/content/news/2023-briar-mailbox-released.md +++ b/content/news/2023-briar-mailbox-released.md @@ -4,7 +4,7 @@ date: 2023-06-15T11:00:00+00:00 title: 'Briar Mailbox released to improve connectivity' --- -### Press release +## Press release The Briar Project released a new Android app called Briar Mailbox today. @@ -23,7 +23,7 @@ device connected to power and Wi-Fi. The development of Briar Mailbox was supported by [eQualit.ie](https://equalit.ie/). -### Private by design +## Private by design Messaging apps typically use a central server to deliver everyone's messages, so the server can see which users are communicating with each other. Some @@ -37,7 +37,7 @@ you need. Each Mailbox only delivers messages between its owner and their contacts, so no information is exposed to third parties. All connections are made via the Tor network to further protect against surveillance. -### Media +## Media {{< screenshots "mailbox-1.png" @@ -48,7 +48,7 @@ made via the Tor network to further protect against surveillance. "mailbox-6.png" >}} -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. diff --git a/content/news/2023-simulating-internet-shutdowns.md b/content/news/2023-simulating-internet-shutdowns.md index b08ed31..b21df10 100644 --- a/content/news/2023-simulating-internet-shutdowns.md +++ b/content/news/2023-simulating-internet-shutdowns.md @@ -5,7 +5,7 @@ date: 2023-05-04T11:00:00+00:00 title: "Researching Android's behavior during Internet shutdowns" --- -### Background +## Background The Briar team is currently doing some research into the long-term evolution of the project. @@ -20,7 +20,7 @@ for improving Briar's messaging capabilities, especially in situations where Internet access is unavailable, such as during an Internet shutdown. -### Simulated Internet shutdowns +## Simulated Internet shutdowns One aspect of our public mesh research is looking into how Android devices behave in case of an Internet shutdown. @@ -48,7 +48,7 @@ This is good news for apps like Briar that are designed to operate during Internet shutdowns, making use of whatever network connectivity is available. -#### Experiment setup +### Experiment setup The basic setup for our experiments was a Linux-based Wi-Fi router that was configured in different ways to simulate an Internet shutdown. @@ -75,7 +75,7 @@ domain name and created four distinct situations: A combination of `dnsmasq`, `nginx` and `iptables` was used to set up these situations. -#### 1. Fake captive portal +### 1. Fake captive portal If you've used an Android phone on a public Wi-Fi network, you're probably familiar with the basic situation created @@ -101,7 +101,7 @@ We used the Chrome browser to check network access to other websites. Even though the browser showed a black bar at the top saying "No Internet connection", we were able to browse random sites just fine. -#### 2. Manipulating DNS responses for some of Google's domains +### 2. Manipulating DNS responses for some of Google's domains Setup 2) was different from the first one in that Android was unable to connect to `connectivitycheck.gstatic.com/generate_204` and receive any HTTP @@ -136,7 +136,7 @@ As in the first setup, we used Chrome to check random websites. Except for Google, which was really blocked in this setup, we had no problems browsing the web. -#### Summary +### Summary When an Android device thinks that its Internet connection doesn't work, either due to a captive portal or due to certain @@ -154,12 +154,12 @@ While other mechanisms could still influence the ability to form mesh networks, the Android operating system itself doesn't seem to get in our way. -### Thanks +## Thanks This experiment was part of ongoing research funded by [eQualitie](https://equalit.ie/). -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. diff --git a/content/news/2023-three-security-issues-found-and-fixed.md b/content/news/2023-three-security-issues-found-and-fixed.md index 24ee041..096eff5 100644 --- a/content/news/2023-three-security-issues-found-and-fixed.md +++ b/content/news/2023-three-security-issues-found-and-fixed.md @@ -25,7 +25,7 @@ ensure that no other issues remain undiscovered. For those who are interested in the details, a description of each issue is given below. The researchers' report can be found [here](https://ethz.ch/content/dam/ethz/special-interest/infk/inst-infsec/appliedcrypto/education/theses/report_YuanmingSong.pdf). -### Issue 1: Receiving invalid message would have caused app to exit +## Issue 1: Receiving invalid message would have caused app to exit The first issue (fixed in Briar 1.4.22) would have allowed a malicious user to prevent their contacts from using Briar by repeatedly sending them invalid @@ -39,7 +39,7 @@ There was no risk of memory corruption, as the length check took place in memory-safe Java code. Invalid messages were not stored or forwarded to other users. -### Issue 2: Message duplication in blogs, forums and private groups +## Issue 2: Message duplication in blogs, forums and private groups The second issue (fixed in Briar 1.4.22) would have allowed a malicious user to create duplicates of messages written by other users in blogs, forums and @@ -89,7 +89,7 @@ Fortunately, genuine messages in blogs, forums and private groups have always been created in canonical form, so the issue was solved by rejecting any messages that were not in canonical form. -### Issue 3: Poorly designed cryptographic handshake +## Issue 3: Poorly designed cryptographic handshake The third issue (fixed in Briar 1.5.3) involved a poorly designed cryptographic handshake. At first it appeared that design flaws in this @@ -132,7 +132,7 @@ Briar 1.5.3 replaces the insecure handshake with a more secure version, and we have requested an independent security audit of the whole protocol stack to ensure that no other mistakes of this kind were made. -### About Briar +## About Briar Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. Unlike traditional diff --git a/content/page/about.md b/content/page/about.md index 33e2bd1..853d571 100644 --- a/content/page/about.md +++ b/content/page/about.md @@ -5,7 +5,7 @@ aliases: title: About --- -#### Core Team +## Core Team **Michael Rogers** started the Briar project to support freedom of expression, freedom of association and the right to privacy. He has @@ -35,7 +35,7 @@ security and privacy. He's contributing to Briar in his spare time. **Nico Alt** started the development of Briar Desktop to bring Briar to non-Android platforms. Having been an F-Droid developer for a long time, he sincerely wishes free alternatives to Android to succeed and is mainly interested in free software to empower people. -#### Past Contributors +## Past Contributors **Benedikt Wieder** has contributed to a variety of open source projects ranging from artistic tools to security applications. During his @@ -59,14 +59,14 @@ researcher. He is interested in privacy and applying user-centred design to usable security. He is a long-time supporter of the Open Rights Group, Tor and free software projects. -#### Governance +## Governance The project is governed by a voluntary [board](/governance). All contributors must adhere to the [code of conduct](/code-of-conduct). -#### Funding +## Funding {{% funding %}} -#### Contact +## Contact To contact the team, please email {{}}. diff --git a/content/page/apk.md b/content/page/apk.md index 927f510..6418bcf 100644 --- a/content/page/apk.md +++ b/content/page/apk.md @@ -13,7 +13,7 @@ You can usually find this information in the **About phone** section of the **Settings** app. -### Android 8 or later (most users) +## Android 8 or later (most users) If your phone uses Android 8 or later, follow these steps to download Briar or Briar Mailbox: @@ -42,7 +42,7 @@ open the permission screen. 6\) If installation doesn't continue automatically, tap the back button to continue installing the app. -### Android 7.1.1 or earlier +## Android 7.1.1 or earlier If your phone uses Android 7.1.1 or earlier, follow these steps to download Briar or Briar Mailbox: diff --git a/content/page/code-of-conduct.md b/content/page/code-of-conduct.md index d631b33..db911b8 100644 --- a/content/page/code-of-conduct.md +++ b/content/page/code-of-conduct.md @@ -4,7 +4,7 @@ aliases: title: Code of Conduct --- -### Our Pledge +## Our Pledge We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body @@ -16,7 +16,7 @@ and orientation. We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community. -### Our Standards +## Our Standards Examples of behavior that contributes to a positive environment for our community include: @@ -40,7 +40,7 @@ Examples of unacceptable behavior include: * Other conduct which could reasonably be considered inappropriate in a professional setting -### Enforcement Responsibilities +## Enforcement Responsibilities Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in @@ -52,7 +52,7 @@ comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate. -### Scope +## Scope This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. @@ -62,7 +62,7 @@ representative at an online or offline event. The Code of Conduct does not apply to public or private communication in the Briar app, unless it takes place in a community space of the Briar project or is written by an individual officially representing the community. -### Enforcement +## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at @@ -72,12 +72,12 @@ All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the reporter of any incident. -### Enforcement Guidelines +## Enforcement Guidelines Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct: -#### 1. Correction +### 1. Correction **Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community. @@ -86,7 +86,7 @@ unprofessional or unwelcome in the community. clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested. -#### 2. Warning +### 2. Warning **Community Impact**: A violation through a single incident or series of actions. @@ -97,7 +97,7 @@ includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban. -#### 3. Temporary Ban +### 3. Temporary Ban **Community Impact**: A serious violation of community standards, including sustained inappropriate behavior. @@ -108,7 +108,7 @@ private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban. -#### 4. Permanent Ban +### 4. Permanent Ban **Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an @@ -117,7 +117,7 @@ individual, or aggression toward or disparagement of classes of individuals. **Consequence**: A permanent ban from any sort of public interaction within the community. -### Attribution +## Attribution This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0, available at diff --git a/content/page/download.md b/content/page/download.md index f476765..056229d 100644 --- a/content/page/download.md +++ b/content/page/download.md @@ -17,7 +17,7 @@ If you prefer not to use Google Play, you can [install the app via F-Droid](/fdroid) or [download the APK file](/apk) directly from our site. -### Further information +## Further information If you'd like to be informed about future releases of our apps, please [join the announcement mailing diff --git a/content/page/governance.md b/content/page/governance.md index ff7b31f..acc4f68 100644 --- a/content/page/governance.md +++ b/content/page/governance.md @@ -4,11 +4,11 @@ aliases: title: Governance --- -### Basics +## Basics An annually self-appointed board of no more than 5 members determines policies and implements them. -### Participants +## Participants The board's policies determine the criteria for community membership. @@ -18,7 +18,7 @@ Each year current board members elect the board members for the subsequent year. Board members can serve an unlimited number of 1-year terms. -### Policy +## Policy The board is expected to operate according to this Rule and the explicit agreements it has created. @@ -28,11 +28,11 @@ Board members or their designees are responsible for implementing agreements, an Community participants unhappy with the board's implementation with the agreements may voice their concerns to individual board members or in the community at large. -### Evolution +## Evolution Changes to this Rule require 2/3 approval of the board. -### Current Board Members +## Current Board Members As of 25 April 2023, the board members are Nico Alt, Julian Dehm, Torsten Grote and Michael Rogers. diff --git a/content/page/how-it-works.md b/content/page/how-it-works.md index 171f32c..0128f03 100644 --- a/content/page/how-it-works.md +++ b/content/page/how-it-works.md @@ -30,10 +30,8 @@ caption="Briar uses direct, encrypted connections between users to prevent surve caption="Typical messaging software relies on central servers and exposes messages and relationships to surveillance." >}} -{{< figure class="bigger-width" src="/img/howitworks3.svg" link="/img/howitworks3.svg" -alt="Sharing data with Briar via Wi-Fi, Bluetooth and Internet" -caption="Briar can share data via Wi-Fi, Bluetooth and the Internet." ->}} +{{< howitworks url="https://play.google.com/store/apps/details?id=org.briarproject.briar.android" >}} + Briar provides private messaging, public forums and blogs that are protected against the following surveillance and censorship threats: diff --git a/content/page/mailbox.md b/content/page/mailbox.md index 85c773a..5aaf282 100644 --- a/content/page/mailbox.md +++ b/content/page/mailbox.md @@ -21,7 +21,7 @@ If you prefer not to use Google Play, you can [install the app via F-Droid](/fdroid) or [download the APK file](/apk) directly from our site. -### Screenshots +## Screenshots {{< screenshots "mailbox-1.png" @@ -32,7 +32,7 @@ our site. "mailbox-6.png" >}} -### Further information +## Further information If you'd like to be informed about future releases of our apps, please [join the announcement mailing diff --git a/content/page/press.md b/content/page/press.md index 66afb26..3e3911b 100644 --- a/content/page/press.md +++ b/content/page/press.md @@ -3,14 +3,14 @@ description: Briar press links and videos title: Press --- -### Announcements and press releases +## Announcements and press releases The general purpose announcements that we publish are available on the [news page](https://briarproject.org/news/) and [briar-announce mailing list](https://sourceforge.net/projects/briar/lists/briar-announce). If you have a press inquiry, write to us at {{}}. You can also send press articles about Briar to this address, so we can add them to this page. -### Media appearances +## Media appearances Briar is occasionally mentioned in the press. This list is not comprehensive, but illustrates some articles that have been published about Briar. @@ -81,7 +81,7 @@ Briar is occasionally mentioned in the press. This list is not comprehensive, bu | 2014-05-19 | Wired | [Out in the Open: Take Back Your Privacy With This Open Source WhatsApp](https://www.wired.com/2014/05/briar/) | -### Videos and Talks +## Videos and Talks - 2022-08-22: [P2P Messaging with Briar](https://www.dailymotion.com/video/x8d7gcb) - 2022-03-05: [How to keep communicating with no internet using Briar](https://www.youtube.com/watch?v=AzJrd0Doz0M) - 2022-03-01: [Application bu am solo lool ci Android | Message sans Internet | Wolof](https://www.youtube.com/watch?v=Z71PPmOkI5A) diff --git a/layouts/shortcodes/howitworks.html b/layouts/shortcodes/howitworks.html new file mode 100644 index 0000000..d54a86e --- /dev/null +++ b/layouts/shortcodes/howitworks.html @@ -0,0 +1,8 @@ +
Sharing data with Briar via Wi-Fi, Bluetooth and Internet
+

Briar can share data via Wi-Fi, Bluetooth and the Internet.

+
+
+
Sharing data with Briar via Wi-Fi, Bluetooth and Internet
+

Briar can share data via Wi-Fi, Bluetooth and the Internet.

+
+
\ No newline at end of file diff --git a/static/img/gitlab.svg b/static/img/gitlab.svg index 2d0d284..9ee57da 100644 --- a/static/img/gitlab.svg +++ b/static/img/gitlab.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + + + + + + + + diff --git a/static/img/howitworks3(mobile).svg b/static/img/howitworks3(mobile).svg new file mode 100644 index 0000000..8d8ce19 --- /dev/null +++ b/static/img/howitworks3(mobile).svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/img/mastodon.svg b/static/img/mastodon.svg index 9fae84c..83ec241 100644 --- a/static/img/mastodon.svg +++ b/static/img/mastodon.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/static/img/x-twitter.svg b/static/img/x-twitter.svg index f5feed7..f222ec7 100644 --- a/static/img/x-twitter.svg +++ b/static/img/x-twitter.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/static/img/xmark-solid.svg b/static/img/xmark-solid.svg new file mode 100644 index 0000000..73cf951 --- /dev/null +++ b/static/img/xmark-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/briar/layouts/news/single.html b/themes/briar/layouts/news/single.html index 6565ecc..29c4dba 100644 --- a/themes/briar/layouts/news/single.html +++ b/themes/briar/layouts/news/single.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+

diff --git a/themes/briar/layouts/partials/footer.html b/themes/briar/layouts/partials/footer.html index b1529a9..b1a1737 100644 --- a/themes/briar/layouts/partials/footer.html +++ b/themes/briar/layouts/partials/footer.html @@ -11,16 +11,30 @@

  • Jobs
    • -

    Content on this website is (c) 2023 Sublime Software Ltd.

    +
    diff --git a/themes/briar/layouts/partials/header.html b/themes/briar/layouts/partials/header.html index 0766d0c..232c491 100644 --- a/themes/briar/layouts/partials/header.html +++ b/themes/briar/layouts/partials/header.html @@ -1,16 +1,13 @@
    +