From 691f41a599507c2400c58b92921ad8582d98d3e0 Mon Sep 17 00:00:00 2001 From: Deano Centrella Date: Fri, 31 Jan 2020 10:18:32 +1030 Subject: [PATCH 1/4] Improved the language selector with improved navigation. - On small screens the user can now trigger the language selector via a new menu button at the top of the page, rather than having to scroll down below the content to access it. - Language selector no longer requires javascript - Also brings the user to the same page they were viewing but in the selected language, rather than sending the user to the landing page and having them try to navigate their way back to the page that they wanted to read. - The icon for the language selector has a retina display variant (not hugely important to include a low resolution version of the icon except for the fact that some rendering engines add white artifacts to the edges of png images if they are shown much smaller than what the resolution of the image actually is (Firefox). --- _data/navigation.yaml | 96 ++++- _data/strings.json | 29 +- _docs/Security_Model.md | 2 +- _includes/header.html | 48 ++- _includes/language-selector.html | 25 ++ _includes/nav-generator.html | 12 + _includes/sidebar-lang.html | 26 -- _includes/sidebar-search.html | 15 +- _includes/underlined-search.html | 20 + _layouts/default-package-sidebar.html | 4 +- _layouts/default.html | 4 +- _sass/_base.scss | 469 ++++++++++++++++++++++- _sass/_layout.scss | 155 +++++++- assets/icon_language-select_dark.png | Bin 0 -> 583 bytes assets/icon_language-select_dark_2x.png | Bin 0 -> 977 bytes assets/icon_language-select_white.png | Bin 0 -> 309 bytes assets/icon_language-select_white_2x.png | Bin 0 -> 515 bytes assets/icon_search_white_24px.png | Bin 0 -> 553 bytes assets/icon_search_white_48px.png | Bin 0 -> 994 bytes assets/social_fediverse_mastodon.png | Bin 0 -> 1950 bytes assets/social_rss.png | Bin 0 -> 1856 bytes assets/social_twitter.png | Bin 0 -> 2202 bytes css/main.scss | 4 + js/sidebar-lang.js | 26 -- 24 files changed, 854 insertions(+), 81 deletions(-) create mode 100644 _includes/language-selector.html create mode 100644 _includes/nav-generator.html delete mode 100644 _includes/sidebar-lang.html create mode 100644 _includes/underlined-search.html create mode 100644 assets/icon_language-select_dark.png create mode 100644 assets/icon_language-select_dark_2x.png create mode 100644 assets/icon_language-select_white.png create mode 100644 assets/icon_language-select_white_2x.png create mode 100644 assets/icon_search_white_24px.png create mode 100644 assets/icon_search_white_48px.png create mode 100644 assets/social_fediverse_mastodon.png create mode 100644 assets/social_rss.png create mode 100644 assets/social_twitter.png delete mode 100644 js/sidebar-lang.js diff --git a/_data/navigation.yaml b/_data/navigation.yaml index 0a3990cd..0ffdc148 100644 --- a/_data/navigation.yaml +++ b/_data/navigation.yaml @@ -1,15 +1,101 @@ - key : browse + title : browse__title url : /packages/ -- key : forum - url : https://forum.f-droid.org - external : true + locations : {"hero", + "dropMenu", # drop-down menu AND footer + "internal"} + +- key : about + url : /about/ + locations : {"hero", + "dropMenu", + "internal"} + +- key : installation + title : installation__title + url : /docs/Security_Model/#secure-initial-installation + locations : {"dropMenu"} + +- key : faq + url : /docs/ + locations : {"hero", + "dropMenu", + "internal"} + - key : documentation url : /docs/ + locations : {"community"} # first of the 'Community' links + - key : news + title : news__title url : /news/ + locations : {"hero", + "dropMenu", + "internal"} + +- key : forum + url : https://forum.f-droid.org + external : true + locations : {"hero", + "internal", + "community"} + +# drop-down menu and footer 'secondary links' +- key : security + title : security__title + url : /docs/Security_Model/ + locations : {"drop2"} + +- key : privacy + url : /2019/05/05/trust-privacy-and-free-software.html + locations : {"drop2"} + +- key : contacts + title : contacts__title + url : /about/#contact + locations : {"drop2"} + +# the remaining 'Community' links +- key : repo + url : https://gitlab.com/fdroid/fdroidclient + external : true + locations : {"community"} + - key : issues + title : issues__title url : /issues/ + locations : {"community"} + +- key : become_a_mirror + url : /docs/Running_a_Mirror/ + locations : {"community"} + - key : contribute url : /contribute/ -- key : about - url : /about/ + locations : {"internal", + "community"} + +- key : social__fediverse__alt + title : social__fediverse__title + url : https://mastodon.technology/@fdroidorg + class : fediverse + external : true + locations : {"social"} + +- key : social__twitter__alt + title : social__twitter__title + url : https://twitter.com/fdroidorg + class : twitter + external : true + locations : {"social"} + +- key : social__rss__alt + title : social__rss__title + url : https://f-droid.org/en/feed.xml + class : rss + external : true + locations : {"social"} + +# Search +- key : search_site + url : https://search.f-droid.org/ diff --git a/_data/strings.json b/_data/strings.json index 01bec46a..f73bd9f9 100644 --- a/_data/strings.json +++ b/_data/strings.json @@ -20,12 +20,35 @@ }, "navigation": { "about": "About", - "browse": "Browse", + "become_a_mirror": "Become a Mirror", + "browse": "Apps", + "browse__title": "App list from A to Z", + "celebrating_10yrs_service": "Celebrating 10 years of service since 2010", + "community": "Community", + "contacts": "Contacts", + "contacts__title": "Contributors and Consultants", "contribute": "Contribute", "documentation": "Docs", + "documentation__alt": "Documentation", + "faq": "FAQs", "forum": "Forum", - "issues": "Issues", - "news": "News" + "gitlab__title": "F-Droid source-code", + "installation": "Installation", + "installation__title": "Secure download and install", + "issues": "Report issues", + "issues__title": "See and report issues", + "news": "News", + "news__title": "Posts by F-Droid Contributors", + "privacy": "Privacy", + "repo": "Gitlab", + "security": "Security", + "security__title": "Our Security Model", + "social__fediverse__alt": "Mastodon icon", + "social__fediverse__title": "Toot us on the Fediverse", + "social__rss__alt": "RSS icon", + "social__rss__title": "Our RSS feed", + "social__twitter__alt": "Twitter icon", + "social__twitter__title": "Our tweets" }, "package": { "anti_features": "Anti-Features", diff --git a/_docs/Security_Model.md b/_docs/Security_Model.md index cc00ea40..727c89ee 100644 --- a/_docs/Security_Model.md +++ b/_docs/Security_Model.md @@ -62,7 +62,7 @@ and the [Signing Process](../Signing_Process) are documented separately. -## Initial Installs +## Secure Initial Installation Most users of F-Droid download the APK from _f-droid.org_ and install it. This is a potential vector of attack that built-in app stores do diff --git a/_includes/header.html b/_includes/header.html index 23f5e0d2..9aa84361 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -3,18 +3,40 @@ {{ site.header-title }} +
+ {% include language-selector.html checkbox_menu_id="header-lang" hideOnPhone=true %} - - +
+ {% assign menu_id = "header-ellipsis" %} + + +
+ + +
+
+ {% include underlined-search.html %} +
+
+
Community
+ {% include nav-generator.html nav_location="community" %} + +
+
+
+ {% include language-selector.html checkbox_menu_id="moreLinks-lang" secondLevel=true %} +
+ {% include nav-generator.html nav_location="dropMenu" %} +
 
+ {% include nav-generator.html nav_location="drop2" %} +
+
+
+
+
+ diff --git a/_includes/language-selector.html b/_includes/language-selector.html new file mode 100644 index 00000000..617eb241 --- /dev/null +++ b/_includes/language-selector.html @@ -0,0 +1,25 @@ +{% comment %} + The language chooser is now a checkbox/radio button hack that opens a dropdown list of the languages + that can be scrolled through on small screens which link to the same page but in the different language. +{% endcomment %} + +{% assign strings = site.data.strings.sidebars.lang %} + +
+ + +
+ + +
+
+
+ {% for lang in site.languages %} + + {{ site.data.languagenames[lang] }} + + {% endfor %} +
+
+
diff --git a/_includes/nav-generator.html b/_includes/nav-generator.html new file mode 100644 index 00000000..580c0d23 --- /dev/null +++ b/_includes/nav-generator.html @@ -0,0 +1,12 @@ +{% for nav-item in site.data.navigation %} + {% if nav-item.key and nav-item.locations contains include.nav_location %} + {% assign text = site.data.strings.navigation[nav-item.key] %} + {% assign title = site.data.strings.navigation[nav-item.title] %} + {% if nav-item.external %} + {{ text }} + {% else %} + {{ text }} + {% endif %} + {% endif %} +{% endfor %} + diff --git a/_includes/sidebar-lang.html b/_includes/sidebar-lang.html deleted file mode 100644 index c8c20d29..00000000 --- a/_includes/sidebar-lang.html +++ /dev/null @@ -1,26 +0,0 @@ -{% comment %} - The language chooser is a drop down list which displays the relevant flag to the left. - If JavaScript is enabled, then it will automatically redirect to the relevant translation when changed. - If the user has JavaScript disabled, then it will show a submit button, and the .htaccess file will rewrite - the incoming "?lang=..." query parameter to the correct translated path. -{% endcomment %} - -{% assign strings = site.data.strings.sidebars.lang %} - -
- - - - - - - -
diff --git a/_includes/sidebar-search.html b/_includes/sidebar-search.html index cea8b6d5..4d4c7a49 100644 --- a/_includes/sidebar-search.html +++ b/_includes/sidebar-search.html @@ -1,7 +1,20 @@ + +{% comment %} + See 'post.html' for reasoning on the below annoying loop +{% endcomment %} + +{% assign searchUrl = 0 %} +{% for navItem in site.data.navigation %} + {% if navItem.key == 'search_site' %} + {% assign searchUrl = navItem.url %} + {% break %} + {% endif %} +{% endfor %} +

{{ site.data.strings.sidebars.search.heading }}

-
+
diff --git a/_includes/underlined-search.html b/_includes/underlined-search.html new file mode 100644 index 00000000..da68cebf --- /dev/null +++ b/_includes/underlined-search.html @@ -0,0 +1,20 @@ + +{% comment %} + See 'post.html' for reasoning on the below annoying loop +{% endcomment %} + +{% assign searchUrl = 0 %} +{% for navItem in site.data.navigation %} + {% if navItem.key == 'search_site' %} + {% assign searchUrl = navItem.url %} + {% break %} + {% endif %} +{% endfor %} + + +
+ + + +
+
diff --git a/_layouts/default-package-sidebar.html b/_layouts/default-package-sidebar.html index 7b818d0c..14c0f80a 100644 --- a/_layouts/default-package-sidebar.html +++ b/_layouts/default-package-sidebar.html @@ -21,7 +21,9 @@
- {% include sidebar-lang.html %} +
+ {% include language-selector.html checkbox_menu_id="afterContent-lang" %} +
diff --git a/_layouts/default.html b/_layouts/default.html index ff1ff4b7..af66f279 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -21,7 +21,9 @@
- {% include sidebar-lang.html %} +
+ {% include language-selector.html checkbox_menu_id="afterContent-lang" %} +
diff --git a/_sass/_base.scss b/_sass/_base.scss index ed9acc80..48d3370e 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -66,6 +66,471 @@ pre { } } +/** + * ------------------------ + * Checkbox menu hack based on a version from CSS-Tricks and adapted for F-Droid by Dario Centrella + * ------------------------ + */ + +// At the outset, use the following (customised) CSS-normaliser (aka reset) for consistency. +// Only a small part of the normaliser has been used. For the full normaliser check out: +// normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +// /** +// * 1. Change the font styles in all browsers. +// * 2. Remove the margin in Firefox and Safari. +// * 3. Dario added this custom CSS to the normaliser because Firefox would not +// * use the prescribed font weight (300). At time if writing, Dario is in process of having +// * this fixed upstream. +// */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; // /* 1 */ + font-size: 100%; // /* 1 */ + line-height: 1.15; // /* 1 */ + margin: 0; // /* 2 */ + font-weight: inherit; // ******************* 3 ******************** +} + +.site-wrapper { + overflow: hidden; // stops the scale(1.5) (below) from introducing a horizontal scrollbar to the site on small devices. +} +.cb-menu--outer { + position: relative; + margin: 0 ($spacing-unit /2); + line-height: 5em; + max-height: 5em; // Without this you'll get a buggy hit-box below the buttons + clear: both; + text-align: right; + + html[dir=rtl] & { + text-align: left; + } + .checkbox-menu & { // second level + margin: 0; + } +} +.checkbox-menu { + position: relative; + display: inline-block; + label { + display: table-cell; + padding: 0 ($spacing-unit/2.5); + cursor: pointer; + transition: background-color .05s; + text-align: right; + border-top-left-radius:10px; + border-top-right-radius:10px; + overflow: hidden; + html[dir=rtl] & { + text-align: left; + } + } + [type="radio"]:hover ~ label{ + background-color: rgba(0,0,0, .04); + } + &.close-checkbox-menu [type="radio"]:hover ~ label { + background-color: lighten($text-color, 4%); + } + [type="radio"] { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + opacity: 0; + margin: 0; + z-index: 1; + cursor: pointer; + } + .cbm-content .checkbox-menu { // ie. second level + label { + border-radius: 10px; + } + &.close-checkbox-menu > label { + html:not([dir=rtl]) & { + right: 0; + position: fixed; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + html[dir=rtl] & { + left: 0; + position: fixed; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + } + } + &.with-caret { + $padding-caret-side: 27px; + > label, + > .close-checkbox-menu > label { + html:not([dir=rtl]) & { + padding-right: $padding-caret-side; + } + html[dir=rtl] & { + padding-left: $padding-caret-side; + } + &:before { + content: ""; + position: absolute; + color: $text-color; + font-size: $small-font-size; + + html:not([dir=rtl]) & { + right: 12px; + } + html[dir=rtl] & { + left: 12px; + } + } + } + > label:before { // the (down) caret itself + display: block; + top: 39px; + border: 4px solid transparent; + border-top-color: $text-color; + } + + > .close-checkbox-menu > label:before { + content: "\2716"; + color: #fff; + display: inline-; + + html:not([dir=rtl]) & { + right: $padding-caret-side/2 - 3; + } + html[dir=rtl] & { + left: $padding-caret-side/2 - 3; + } + } + } +} +.close-checkbox-menu { + position: absolute; + z-index: -1; + top: 0; + left: 0; + width: 100%; + height: 100%; + opacity: 0; + label { + color: #fff; + background-color: $text-color; + } +} +.cbm-content { + position: absolute; + top: 99%; + background-color: $text-color; + color: white; + padding: $spacing-unit / 2; + display: none; + border-radius: 10px; + text-align: right; + line-height: $small-font-size * 1.6; + z-index: 2; + + h1,h2,h3,h4,h5,h6 { + font-variant-caps: all-petite-caps; + letter-spacing: 0.2em; + color: lighten($text-color, 50%); + } + + html:not([dir=rtl]) & { + right: 0; + border-top-right-radius: 0; + } + html[dir=rtl] & { + left: 0; + text-align:left; + border-top-left-radius: 0; + } + ul { + margin: 0; + padding: 0; + list-style: none; + } + a { + color: white; + display: block; + white-space: nowrap; + text-decoration: none; + padding: 5px; + &:hover { + background-color: lighten($text-color, 7%); + } + &.selected { + background-color: lighten($text-color, 4%); + } + } + + .cbm-content { // second level + html:not([dir=rtl]) & { + text-align:left; + } + html[dir=rtl] & { + text-align:right; + } + } +} +header { + .cb-menu--outer:not(.second-level) { + @include media-query($phone) { + html:not([dir=rtl]) & { + margin-right: 0; + } + html[dir=rtl] & { + margin-left: 0; + } + } + > .checkbox-menu > input[type="radio"]:checked ~ .close-checkbox-menu > label { + position: fixed; + top: 0px; + } + } +} +header .cbm-content { + position: fixed; + padding-top: 3em; + top: 2.8em; + bottom: 10%; + > div { + height: 100%; + overflow: auto; + } + html:not([dir=rtl]) & { + left: 64%; + right: $spacing-unit; + border-top-right-radius: 10px; + @include media-query($tablet) { + right: 0; + left: 53%; + border-top-right-radius: 0; + } + @include media-query($phone) { + left: 34%; + } + } + html[dir=rtl] & { + right: 64%; + left: $spacing-unit; + border-top-left-radius: 10px; + @include media-query($tablet) { + left: 0; + right: 53%; + border-top-left-radius: 0; + } + @include media-query($phone) { + right: 34%; + } + } + &.wide { + html:not([dir=rtl]) & { + left: 57%; + + @include media-query($tablet) { + left: 34%; + } + @include media-query($phone) { + left: 7%; + } + } + + html[dir=rtl] & { + right: 57%; + + @include media-query($tablet) { + right: 34%; + } + @include media-query($phone) { + right: 7%; + } + } + } +} + +header .cb-menu--outer > .checkbox-menu > .cbm-content { + html:not([dir=rtl]) & { + @include media-query($tablet) { + border-bottom-right-radius: 0; + } + } + html[dir=rtl] & { + @include media-query($tablet) { + border-bottom-left-radius: 0; + } + } +} + +[type="radio"]:checked ~ label { + z-index: 2; +} +[type="radio"]:checked ~ label ~ .cbm-content { + // z-index: 1; + // opacity: 1; + display: inherit; // fallback + display: flex; + flex-direction: column; +} +[type="radio"]:checked ~ label ~ .close-checkbox-menu { + opacity: 1; + z-index: 3; +} + +// Checkbox menu customisers ----------------------- + + +.on-white .checkbox-menu {} // Default +.on-dark .checkbox-menu { + > label { + color: #fff; + } + &.with-caret > label:before { + border-top-color: #fff; + } + > [type="radio"]:hover ~ label { + background-color: rgba(255,255,255, .04); + } + .close-checkbox-menu > label, + .cbm-content { + color: #fff; + background-color: $primary-color; + @include shadow; + } + .close-checkbox-menu > [type="radio"]:hover ~ label { + background-color: lighten($primary-color, 7%); + } +} + +// Bolder text on busy background +.on-busy .checkbox-menu.text-button { + label { + font-weight: $bold-font-weight; + } +} + +.on-dark .cbm-content a:hover { + background-color: lighten($primary-color, 7%); +} +.on-dark .cbm-content a.selected { + background-color: lighten($primary-color, 4%); +} + + +header .checkbox-menu label { + border-radius:10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +// Generates individual 'radiobox-hacked' menu-item with icons +// +// $iconWidthInPixels You'll only need to provide the icon width here (eg. 47px) +// $bgImgDark: \ +// $bgImgDark2x: \__ The image files placed in FDroid's 'assets/' folder eg. "icon_language-select_dark_2x.png" +// $bgImgWhite: / +// $bgImgWhite2x: / +// $bgYPos: Default is center but you may want to tweak it. +// +@mixin checkbox-menuitem-with-icon ($iconWidthInPixels, $bgImgDark, $bgImgDark2x, $bgImgWhite, $bgImgWhite2x, $bgYPos: center) { + label { + width: $iconWidthInPixels; + background-image:url("../assets/#{$bgImgDark}"); + background-repeat: no-repeat; + background-position: center $bgYPos; + background-size: $iconWidthInPixels; + @media (-webkit-min-device-pixel-ratio: 1.05), + (min-device-pixel-ratio: 1.05), + (min-resolution: 192dpi) { + background-image: url("../assets/#{$bgImgDark2x}"); + } + html[dir=rtl] { + background-position: center $bgYPos; + } + } + .close-checkbox-menu > label { + background-image:url("../assets/#{$bgImgWhite}"); + @media (-webkit-min-device-pixel-ratio: 1.05), + (min-device-pixel-ratio: 1.05), + (min-resolution: 192dpi) { + background-image: url("../assets/#{$bgImgWhite2x}"); + } + } + &.with-caret label { + width: $iconWidthInPixels + 3px; + background-position: 14px $bgYPos; + html[dir=rtl] & { + background-position: 29px $bgYPos; + } + } + .on-dark & label { + background-image:url("../assets/#{$bgImgWhite}"); + @media (-webkit-min-device-pixel-ratio: 1.05), + (min-device-pixel-ratio: 1.05), + (min-resolution: 192dpi) { + background-image: url("../assets/#{$bgImgWhite2x}"); + } + } +} + + +.checkbox-menu.icon { + > label, + .close-checkbox-menu > label { + font-size: 0em; + } + + &:not(.ellipsis) { + > label, + .close-checkbox-menu > label { + color: rgba(0,0,0,0); + } + } + + &.ellipsis { + > label, + > .close-checkbox-menu > label { + width: 18px; + @include media-query($phone) { + width: 45px; + } + &:after { + display: inline-block; + position: absolute; + left: 0; + right: 0; + text-align: center; + content: '\22EE'; + font-size: $base-font-size; + font-weight: bold; + transform: scale(1.5); + + @include media-query($phone) { + content: '\2261'; + } + } + } + } +} + + + +// ---------------------------------------------- +// END Checkbox hack +// ---------------------------------------------- + +.hide-on-phone { + @include media-query($phone) { + display: none; + } +} + /** Remove default list styles from UL elements. */ @mixin reset-ul { list-style: none; @@ -73,13 +538,11 @@ pre { margin: 0; } - %shadow { - box-shadow: 0 2px 8px rgba(0, 0, 0, .3); + @include shadow; position: relative; } - %clearfix { &:after { content: ""; diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 2fa60be9..2e51b91c 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -20,6 +20,11 @@ body { background: $content-background; z-index: 1; @extend %shadow; + display: flex; + justify-content: space-between; // title on one side language selector on other + @include media-query($phone) { + height: 6em; + } } .site-title { @@ -43,9 +48,149 @@ body { height: $spacing-unit * 1.5; } } +} +.language-select { + @include checkbox-menuitem-with-icon ( + 47px, + "icon_language-select_dark.png", + "icon_language-select_dark_2x.png", + "icon_language-select_white.png", + "icon_language-select_white_2x.png", + 55% + ); } +header .cbm-content.dropdown-menu { + @include media-query($tablet) { + padding-top: $spacing-unit; + } + form { + margin: ($spacing-unit/4) (-$spacing-unit/2) 0; + padding: ($spacing-unit / 1.5) $spacing-unit; + background-color: rgba(0,0,0, 0.2); + font-size: 1.7em; + &:hover { + background-color: rgba(0,0,0, 0.3); + } + input[type="search"] { + padding: 0; + border: none; + background: none; + color: white; + transition: none; + &:hover { + background: none; + } + &:focus { + outline: none; + } + } + input[type="submit"] { + position: absolute; + top: 0; + bottom: 0; + padding: 0; + border: none; + background: none; + color: rgba(0,0,0,0); + opacity: $less-opaque-text; + width:1em; + background-image: url("../assets/icon_search_white_24px.png"); + background-repeat: no-repeat; + background-position: center center; + background-size: 0.7em; + cursor: pointer; + transition: opacity 0.05s; + + @media // Retina + (-webkit-min-device-pixel-ratio: 1.3), + (min-device-pixel-ratio: 1.3), + (min-resolution: 192dpi) { + background-image: url("../assets/icon_search_white_48px.png"); + } + &:hover { + opacity:1; + } + html:not([dir=rtl]) & { + right: 0; + } + html[dir=rtl] & { + left: 0; + } + } + .underliner { + position: relative; + border-bottom: 0.05em solid rgba(white,0.5); + } + } + .community-links { + flex: 1 1 0px; + padding-top: 4.6em; + } + .main-links { + flex: 1 1 0px; + padding: $spacing-unit / 4; + + .cb-menu--outer { + margin-bottom: $spacing-unit / 4; + } + .checkbox-menu { + // Normally the opposite would be done for html[dir=rtl] but that introduces an extra scrollbar! + margin-right: -$spacing-unit / 4; + } + } +} + +// Bespoke headings in darker regions +.cbm-content, +footer { + h1,h2,h3,h4,h5,h6 { + font-variant-caps: all-petite-caps; + letter-spacing: 0.3em; + color: rgba(white, $less-opaque-text); + } + .community-links { + a { + color: rgba(white, $less-opaque-text); + } + } + .social-links a { + display: inline-block; + position: relative; + width: 32px; + height: 32px; + padding: 0; + overflow: hidden; + margin: 20px 3px; + text-indent: 500px; + opacity: $less-opaque-text; + transition: opacity 0.05s; + + &:hover { + opacity: 1; + background-color: rgba(0,0,0,0); + } + + &.fediverse { + background-image: url("../assets/social_fediverse_mastodon.png"); + } + &.twitter { + background-image: url("../assets/social_twitter.png"); + } + &.rss { + background-image: url("../assets/social_rss.png"); + } + background-repeat: no-repeat; + background-position: center; + background-size: contain; + } +} +.cbm-content .two-columns { + display: flex; + justify-content:space-around; + padding: 0 ($spacing-unit / 4); +} .site-nav { display: flex; flex-wrap: wrap; @@ -389,8 +534,16 @@ body { * Language chooser */ .sidebar-widget.language { - padding-bottom: 0.5em; + display: none; + padding-bottom: $spacing-unit/4; text-align: right; + html[dir=rtl] & { + text-align: left; + } + + @include media-query($tablet) { + display: inherit; + } .lang-flag { margin: 0 0.1em; diff --git a/assets/icon_language-select_dark.png b/assets/icon_language-select_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..149e4a0534d8ed8c5071ce18e4e052172e4fae11 GIT binary patch literal 583 zcmV-N0=WH&P)(j<|C?G$868cae|X%v+V=ZG z?;oPw7&jegUuUCYBioOILhFPUKJ~And3q*0~J~p{^D2l!FCS9q9zo-_O3*#?e*pe_$U{JcLF*mAPp0qzz%%}*x`}lm%ebio< zo?0rKQp4bC1Lc}JpQlgx;>{E;is8w>isICGBT4O*n2KIgi_WlO;0eTMpdJX~l4u1L${ss;K zy9@7p0Gh>E666=m;PC858Uq8fxu=U`NX4zUcM_{-D+n+=h>kXvKBo9K>)(I-ySr3E z4LRBy%C&2<&o;krW-4F6l%gH6O5;SNiI|S$T&}=2k-)YsTZE7A35Z<~lfBJyp|Xf( z%PW^7b+GkGcwurzGS<7z1#66 z?2Z$wp00MDpSS6u)brIR)`iIL$~atY_lc)xq3p{;@(it-^OSQ-W!YU_Z%tawANzLJ z#LG{UZZ|g3Gv17)`UY)n+y{Z(PPUr2El>fpmu&}h;P_*{?hp@99rAwdRoXF25 zqV4?rbY=bT$uBc6Okz$~IRBi%w(^yo_WKP7xUE_*o{28G_cwm0^ZN$l`WMf8tdu+& zm}+HmFR=A;UPyM!R10{*<6FTnkx}HRL#faet@y(0rFO%-x&d{-rCbbb<_;49k? z$Cy?f4oG3V`(Q&;o@w-v*&;Rz)b1={cetj^vItonig}UJzLKLu zuqh6XzJSm-kv@n>9wB3gV$2W(fAT0E1nfrFx;`D9a)4Re7Gft)k%n77ecY)=0~d&Mkg3n#nD zbKmt24egm+Uzo4x@lrPnQ$!2N59Wc{Gdt#v*)k`>1{U)HI8CSq58Vzn00000NkvXX Hu0mjf?Ztly literal 0 HcmV?d00001 diff --git a/assets/icon_language-select_white_2x.png b/assets/icon_language-select_white_2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ee97db5b194b6a6b7950e8c2613be53aed59ad03 GIT binary patch literal 515 zcmV+e0{s1nP)L_t(Y$KBRFQpO+<2H<5VV&Rz9j%(O)Ej#dL zWGpN_f^ob+tW1GHNchXg>zJ9(8Gp8XCIP}`7l=|wmt)FE1>KyHRcfIwS$U=IE3GD$ ze@4~xJ5_|e9e-ARh>^}zY0gvE=(wuVJ7osx8cI7ltOHUxEJ$B0Q1J$JE5H-&UCex6 zmt>bz)Mds)eu7q|?lgC1Q&lTV&(?)%D6L_yGJdhG)@A(M8fXudLnW*d%|;zm`c{?p zxT@v2x~N@9lkcNZ-KPDPkP{85HO#+hx8AF>PEcp&e~g`maV_(|id{RhGHGReVLs2R zE=8F`O71RdXXThx4M^p4)ZWS|YyX;b7Dc;vq})XnvzW88tW#f zMVF#oRJ9#+Q90DKXYrs*na6qy^=8%ec-2L(p;A;oh&fgMsj5c9=c@6z%0|QHh9vK` zsjUB^Ycb}ISSfE+xwX<;%}rca*D@oTi<0l6MmATiupVWoiQZJ>6&)M_y971jU%002ovPDHLk FV1mXp=q3OF literal 0 HcmV?d00001 diff --git a/assets/icon_search_white_24px.png b/assets/icon_search_white_24px.png new file mode 100644 index 0000000000000000000000000000000000000000..3f4cf3f745a584fecf548aeb704b4bff71749ba5 GIT binary patch literal 553 zcmV+^0@nSBP)LpT*h1oiTI6G_GpFeBbw9duH!F z5v4*8m+=&f_c zk@V``XS#RT+Z5g_y_S0@YV`ZCkn5WOS4xvthG(8b_?$fJI8rBmmI3;e!oPjDGvD<( z;ZhPUw+&Ce;~C&dm97^N6RBV70*Hv^i1?NIi7HVqA~sULyCYyUB1TfbUI$o7{VD9~ z05}~Hn;T-a4ltMc0}*kl1K?`b&sB*6XAF-&e8B#uWSqlB@_fQrli_)`BVOZhjrP2) zr+%twpuo7TSHK$X;3P&dhDkiiCf}?ZjerC>W_TrctpR4*LiXUU;Xk0NR&fn8{(QRu zX1B}S_TIsGL|ll7$%r@_!+pLI!`(7p6vfY^n~sRbDMv)yDvIJ^tJSnEOto3bPD5_~ rw~*Nqr1^~eBjoFj0}^B!U+~~J3`(*kOHo1|00000NkvXXu0mjf`Yi7# literal 0 HcmV?d00001 diff --git a/assets/icon_search_white_48px.png b/assets/icon_search_white_48px.png new file mode 100644 index 0000000000000000000000000000000000000000..1c7b83ba4829bc0542ee3d5ef7e471040b3e454d GIT binary patch literal 994 zcmV<810DQ{P)}yr8^#@j@sfmj^{e2_@0wN$z4Mpqw{B@LG}P0}1mg$bYEZ;aXD8#q=#3Gg^(dQHG#U}^%V6j%qmNcc83 zgbZ(h%Q0rRfJvUrLSQ@a)4^;2W`}BEO-%TsKv4$vEa07k{RAk;8omgqb{HJb1pn<( z2Glt`)@Oxpb%1YYnY_iPg6JvKS#N;iEZ}DrXfuCc2L;YLhP65^aE1eTByje2zp+G% zx3ey$1@3Y*P#!pYN6&K>zj`2P@93hOq?wlbGh@u7>`|RMZ>jZ{Uq=}Y#l`qIs zcN}$FmRRK^4Yky3d_kUiEvd;;w`GY{PEub>z1|n(BV$af!=s-sD<}ITf<60V)Z0>P z^o8Uk)miGpyyJKXD3N{IwZ5#Jq-sljiZ94hF248L%Sn1@sm}&%Ya^5vSZX-3#0#i& zY-AfV$F%zu0xvCo57GilfbSOI8=z0%`~tQ(2DUc~^rQp2GhlWB1Az|~pB7+z7Vre1 z(E@G)<^>Ah3%KGK)Ugl-2OaQF!1Rpl0^qcR{{t8mqJg16t;6Iyureig5OBl61=yE4 zd}OY(zO^-$R)3_4O6>bXR=Eb#OxkmCOcPUqyMcm#19lVLcDvSD_$JyK zSpqyy8N3BJ0SxQFTak|@3V?aQ0pL|a=my{_uo)QP;00+S^%XZTPSONPBNV;c|4?+w zs+RQB81uCoj1`hjNwQrnwn$oQj5(7wV~;2=Kc~?8SDILp?~IB1-^Aad|4sZYB6{s` zy(BgP3-g^ZQ3*|?yUFNj#We9b-`Tn?V3nnb6Zy{NC15epUm!jaz2Oe{1%^;U4$&#> Q*8l(j07*qoM6N<$g5_r zVgj@fA0Q$A5Un;Oz9>GJ7)^}Ph=c?P;k6i*NP)(N7eNr(O8+3mQqV#gq=^d5Oldna zozI7Tr(O={Z{In0?tIBfd(PQ=?X}iDXaB6d&IEdlIv=K1i}dfb^Y)|T@J94t9vNQ5KJ|LF)o%x^SD%_?`)WO+u zz{Sq~qhFVU>c@KRfQ`o9dM-1jUe_xJeA~J6_*XHd-rBSSe$;QPy5xsVIpCIlTQWno zRM}WM;ZQdM_XFLG#V-TT0tbLsfLDQI?PH`}=FJeolyTy-xP9&2zTT+&nmRtKE=XzM&YFU!tntqE67@^!$(s7!QCH|?)*lLg+*=dtVSEMaFsW{+ z64p|mt|@S*I&YTjtVG>jQ}5lDExL@WvbxOvqNN0NU4rhLI_riGApzJ2e7r`RyFv)H zoS?1%t_9Ws1Hg;G))2z;Ib~M@H?_+K;4rW)gz)E@ZS4XsuTgX#Fcd;CE8waGPky(C zLi5#M8{fk$lj=`0?$vw1wBexyd5wCl**~&|6C^5~L6&<4SSFOWIV_@b`&GHXcw0n*^UQ^b%x}>x6mYNk+U#w7M zKs}rwZ#1FolodmqdNe`aX88X+{L5v6GyJ#W{uhCd=3L(o{1mtgc(ddB!jAu+0`3OB z1KbBpW@H55=8E=Tuejey>=%q3SV~xYN10UhmpOIrvtw*l*O>nVd^IC0Z^(YBqW#Ac zY#CM0Lj8O~CDrW}N@N4CC)D$D%4MhKdkW+o%+cZehMb`K*%mNVW>gMUOWEvDwm*dM z@0@b`GUv|~$a^&B+RBpl7na=1W2i;k7E7Tp24UQC%kB~#DJVXYIX_-dF0Ugl8!A(s za8Zl6KbS&UAm*%`Yo`+BXL+k;JJXz-D1UW}7`aKI>~+X<&^d|n>$GRiHH@8aYCvcC z0O_79d=f$kW9k@hen!L`a4v$5qbnz+j0Kk zTp=MGAjTi7Sdnw>p9N*#UqfD&b6Y^_)>V}g9?P6xsHXlpon-s0qalQ%xxxp#kU!WW zzvC%me#QO!Gv@=84{23o1Eg8`ourO*0B^O3*&!(`F1r~*cmlY$+nL0m?f4cb;jD2w0(Q0fJL0SFa*>VFdCk0k0-myMmeg^Z#t;3;B9 zRF}tqD?PwGGQF)gPV6vW0rnC%akBA=nX(i3ObB7BOvw%A?{c6{POHlrb%EZV()ge;+bfj`^)B_YhMe$~1|4v~ zg6y@jjg&ROZsMe+8~#BItUL)k4IBy~OjK1e22qBAuMrbCn_vvMJcRJ~yqi@St=9p+ zrMryQEEB}tq{GDQ*4K!$$oa&ryH&&``jR36U2+=O6he5QYYFPN8hj-CL1k)DT}Ry3 zZ%ex52aPzO!x1;zyRY1uW>USSQ3rH5;#%kamoKC0H9c`aha*-yx4(f}TWv)%j#yxv zP^Hc+d&Q)ByD3@h4LW0;`q%#2?=x!3TBj$DXsMe_Uxv?=y~eNe`ul}!C&qZhu)59q z36-ggx8)Bzm%f$GLtUb7Hm2XFBx~j|+Lp7~oGiE|=(#tIQRXXv^~C*w>A#<_uzf5d kCU=fe{Pz>GNu7=IKZZBX_uerl0ssI207*qoM6N<$g79m%2LJ#7 literal 0 HcmV?d00001 diff --git a/assets/social_rss.png b/assets/social_rss.png new file mode 100644 index 0000000000000000000000000000000000000000..1e3af08680000d5f508a8dbff089faf5bccb69fe GIT binary patch literal 1856 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 literal 0 HcmV?d00001 diff --git a/css/main.scss b/css/main.scss index 7ad31895..825c539e 100644 --- a/css/main.scss +++ b/css/main.scss @@ -26,12 +26,16 @@ $content-background: #fff; $text-color: lighten(#000, 13%); $text-color-light: lighten(#000, 46%); $primary-color: #1976d2; +$less-opaque-text: 0.62; $content-width: 1000px; $phone: 500px; $tablet: 750px; +@mixin shadow { + box-shadow: 0 2px 8px rgba(0, 0, 0, .3); +} @mixin media-query($device) { @media screen and (max-width: $device) { diff --git a/js/sidebar-lang.js b/js/sidebar-lang.js deleted file mode 100644 index 375ae842..00000000 --- a/js/sidebar-lang.js +++ /dev/null @@ -1,26 +0,0 @@ -//@license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3 - -/** - * When the user changes the language via the language drop down, redirect the user to the relevant translation. - */ -(function() { - var chooser = document.getElementById('language-chooser-select'); - chooser.onchange = function() { - var lang = this.value; - var activeLang = 'en'; - var pageUrl = '/'; - - /* - * If we are already on "/fr" and select "ES", we don't want to redirect to "/fr/es". - * The apache docs website achieves this via AliasMatch in their apache config, but that - * is not able to go into the .htaccess file and so makes the deployment of the site more - * difficult. This solves the problem in JavaScript. - */ - if (new RegExp('^' + activeLang + '/').test(pageUrl)) { - pageUrl = pageUrl.substring(activeLang.length + 1); - } - - document.location = '' + '/' + lang + pageUrl; - } -})(); -// @license-end \ No newline at end of file -- GitLab From 3a7acaf6e9793f28ddf9aee89f901ec9fe98fd3f Mon Sep 17 00:00:00 2001 From: Deano Centrella Date: Sat, 29 Feb 2020 00:16:26 +1030 Subject: [PATCH 2/4] "Gitlab__title" => "repo__title" and other minor menu tweaks. --- _data/navigation.yaml | 2 ++ _data/strings.json | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/_data/navigation.yaml b/_data/navigation.yaml index 0ffdc148..0d8e48f5 100644 --- a/_data/navigation.yaml +++ b/_data/navigation.yaml @@ -47,6 +47,7 @@ locations : {"drop2"} - key : privacy + title : privacy__title url : /2019/05/05/trust-privacy-and-free-software.html locations : {"drop2"} @@ -57,6 +58,7 @@ # the remaining 'Community' links - key : repo + title : repo__title url : https://gitlab.com/fdroid/fdroidclient external : true locations : {"community"} diff --git a/_data/strings.json b/_data/strings.json index f73bd9f9..601794a9 100644 --- a/_data/strings.json +++ b/_data/strings.json @@ -32,7 +32,6 @@ "documentation__alt": "Documentation", "faq": "FAQs", "forum": "Forum", - "gitlab__title": "F-Droid source-code", "installation": "Installation", "installation__title": "Secure download and install", "issues": "Report issues", @@ -40,15 +39,17 @@ "news": "News", "news__title": "Posts by F-Droid Contributors", "privacy": "Privacy", + "privacy__title": "Trust, Privacy, and Free Software", "repo": "Gitlab", + "repo__title": "F-Droid source-code", "security": "Security", - "security__title": "Our Security Model", + "security__title": "The Security Model", "social__fediverse__alt": "Mastodon icon", "social__fediverse__title": "Toot us on the Fediverse", "social__rss__alt": "RSS icon", - "social__rss__title": "Our RSS feed", + "social__rss__title": "RSS feed", "social__twitter__alt": "Twitter icon", - "social__twitter__title": "Our tweets" + "social__twitter__title": "On Twitter" }, "package": { "anti_features": "Anti-Features", -- GitLab From 0ebd177a46adad9362afbe4c6e03a73033fa5acc Mon Sep 17 00:00:00 2001 From: Deano Centrella Date: Sat, 28 Mar 2020 21:53:03 +1030 Subject: [PATCH 3/4] Cosmetic changes that affect the navigation. - Removed capitalisation and small text from the internal navbar - Made the background of the dropdown list (and text) dark blue. --- _sass/_base.scss | 2 -- css/main.scss | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/_sass/_base.scss b/_sass/_base.scss index 48d3370e..95cc2bd8 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -50,8 +50,6 @@ pre { background-color: $background-color; color: #fff !important; font-weight: $bold-font-weight; - font-size: $small-font-size; - text-transform: uppercase; text-decoration: none; transition: background-color .2s; diff --git a/css/main.scss b/css/main.scss index 825c539e..72e59085 100644 --- a/css/main.scss +++ b/css/main.scss @@ -23,7 +23,7 @@ $spacing-unit: 32px; $global-background: #e5e5e5; $content-background: #fff; -$text-color: lighten(#000, 13%); +$text-color: #2f3f4f; $text-color-light: lighten(#000, 46%); $primary-color: #1976d2; $less-opaque-text: 0.62; -- GitLab From 2d83215f595bdaa0f02f7e748ce2b149e93c02f4 Mon Sep 17 00:00:00 2001 From: Deano Centrella Date: Mon, 6 Apr 2020 14:58:29 +0930 Subject: [PATCH 4/4] Revert heading change and "Browse => Apps" change. --- _data/navigation.yaml | 2 +- _data/strings.json | 2 +- _docs/Security_Model.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/navigation.yaml b/_data/navigation.yaml index 0d8e48f5..023ba46f 100644 --- a/_data/navigation.yaml +++ b/_data/navigation.yaml @@ -13,7 +13,7 @@ - key : installation title : installation__title - url : /docs/Security_Model/#secure-initial-installation + url : /docs/Security_Model/#initial-installs locations : {"dropMenu"} - key : faq diff --git a/_data/strings.json b/_data/strings.json index 601794a9..f885edeb 100644 --- a/_data/strings.json +++ b/_data/strings.json @@ -21,7 +21,7 @@ "navigation": { "about": "About", "become_a_mirror": "Become a Mirror", - "browse": "Apps", + "browse": "Browse", "browse__title": "App list from A to Z", "celebrating_10yrs_service": "Celebrating 10 years of service since 2010", "community": "Community", diff --git a/_docs/Security_Model.md b/_docs/Security_Model.md index 727c89ee..cc00ea40 100644 --- a/_docs/Security_Model.md +++ b/_docs/Security_Model.md @@ -62,7 +62,7 @@ and the [Signing Process](../Signing_Process) are documented separately. -## Secure Initial Installation +## Initial Installs Most users of F-Droid download the APK from _f-droid.org_ and install it. This is a potential vector of attack that built-in app stores do -- GitLab