diff --git a/_includes/default-header.html b/_includes/default-header.html index 6301b29168cad7..48d6fd196ff367 100644 --- a/_includes/default-header.html +++ b/_includes/default-header.html @@ -22,9 +22,11 @@ {% icon topic aria=false %} {{ topic.title }} {% else %} + {% if page.path == 'index.md' %} {% icon hall-of-fame %} Contributors + {% endif %} {% endif %} diff --git a/_includes/extras.html b/_includes/extras.html index 18ae36b756e3fd..6f787eaf73f605 100644 --- a/_includes/extras.html +++ b/_includes/extras.html @@ -1,54 +1,66 @@
  • -
    - - {% icon github %} Edit on GitHub +
    Preferences
    + +     + {% icon gtn-theme %} Theme + + + + {% icon pref-dataprivate %} Data Privacy + + +
    + +
    For Everyone
    + + + {% icon github %} Propose a change or correction - +
    Instructor Utilities
    + +     {% icon galaxy-barchart %} GTN statistics - - {% icon galaxy-barchart %} Page Metrics + + {% icon galaxy-barchart %} Page View Metrics {% if page.layout == 'topic' %} {% assign fdbk_by_topic = site.data['feedback'] | how_many_topic_feedbacks:site.data[page.topic_name].title %} {% if fdbk_by_topic > 0 %} - + {% icon galaxy-barchart %} Topic feedback {% else %} - + {% icon galaxy-barchart %} GTN feedback {% endif %} {% elsif page.layout == 'tutorial_hands_on' %} {% assign fdbk_by_tutorial = site.data['feedback'] | how_many_tutorial_feedbacks:page.title %} {% if fdbk_by_tutorial > 0} - + {% icon galaxy-barchart %} Tutorial feedback {% else %} - + {% icon galaxy-barchart %} GTN feedback {% endif %} {% else %} - + {% icon galaxy-barchart %} GTN feedback {% endif %} - - {% icon gtn-theme %} User Preferences New - -
    {% icon galaxy-rulebuilder-history %} Previous Versions diff --git a/assets/css/main.scss b/assets/css/main.scss index 69d0c559fdfc91..8a7ad365f66547 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -915,24 +915,30 @@ blockquote { // This applies a "dark" style to the dropdown menus on small devices since // Bootstrap v4 does not do that by default. + +.dropdown-menu { + background-color: var(--color-background); + border-color: var(--border); +} +.dropdown-item { + color: var(--text-color); + + &:hover, &:focus, &:active { + background-color: var(--brand-color); + color: var(--text-color); + } +} + +.dropdown-divider { + border-top-color: var(--border); +} + @media (max-width: 768px) { .navbar { .dropdown-menu { - background-color: var(--color-background); border-color: transparent; } - .dropdown-item { - color: var(--text-color); - - &:hover, - &:focus, - &:active { - background-color: var(--brand-color); - color: var(--text-color); - } - } - .nav-item, .dropdown-item { overflow: hidden; @@ -1593,6 +1599,10 @@ ul.text-list, ol.text-list { .dropdown-item:focus-visible { } +.dropdown-header { + color: var(--text-color-muted); +} + ol.breadcrumb { background: var(--secondary-color); @@ -1682,6 +1692,7 @@ figure > a[target="_blank"]::after { figure { max-width: 20em; margin: 0rem 0.5rem; + border: 0px transparent; img { max-height: 5em; diff --git a/preferences.md b/user/privacy.md similarity index 58% rename from preferences.md rename to user/privacy.md index f2341bdaed3c7e..204c211df42eab 100644 --- a/preferences.md +++ b/user/privacy.md @@ -1,118 +1,26 @@ --- layout: page -title: Your Preferences +title: Data Privacy --- -## Colour Scheme +The GTN is invested in preserving your privacy. We attempt to balance your +rights and needs to private access of the GTN resources, with our needs to +continue receiving funding and provide a good experience for you, the user. -We have attempted to decompose our themes into several axes depending on your accessibility needs: +## Alternative Access -This control responds to [prefers-color-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) +If you do not like the privacy options available to you, the GTN can be +[downloaded and hosted yourself, offline]({% link topics/contributing/tutorials/running-jekyll/tutorial.md %}), +for users needing completely anonymous access to the site and it's tutorials +and slides. - - - -### Preferred Light Theme - - - -### Preferred Dark Theme - - - -### UI Contrast +## Data Collection Systems -This control responds to [prefers-contrast](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-contrast) - - - - -### UI Theme - - - - - - -## Fonts - -While some of our fonts are available on Google Fonts, we **do not** use Google Fonts to serve them. - - - -Font for code blocks: - - - - +We use two data collection systems, for different purposes. Both, to the best +of our knowledge, render you effectively anonymous as they are currently +configured. Each system collects different data, and can be opted out of individually. -## Data Privacy +### Plausible We collect the following information on visitors: diff --git a/user/theme.md b/user/theme.md new file mode 100644 index 00000000000000..a00f539e61b3fc --- /dev/null +++ b/user/theme.md @@ -0,0 +1,117 @@ +--- +layout: page +title: Theme +redirect_from: +- /preferences +--- + +## Colour Scheme + +We have attempted to decompose our themes into several axes depending on your accessibility needs: + +This control responds to [prefers-color-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) + + + + +### Preferred Light Theme + + + +### Preferred Dark Theme + + + +### UI Contrast + +This control responds to [prefers-contrast](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-contrast) + + + + +### UI Theme + + + + + + +## Fonts + +While some of our fonts are available on Google Fonts, we **do not** use Google Fonts to serve them. + + + +Font for code blocks: + + + + + +Are you looking for Data Privacy settings? [They have moved to their own page]({% link user/privacy.md %})