Skip to content

Commit

Permalink
Refresh for Odin (elementary#2783)
Browse files Browse the repository at this point in the history 
* Update copy and screenshots for Odin

* Standardize on 2-space tabs, update copy

* Remove unused Terminal scripts

* Remove more unused Pantheon CSS

* Update screenshots, ensure crisp on loDPI

* Update Privacy section for Odin

* Update AppCenter Spotlight link

* Update USN link

* Update privacy page for Odin

* Refresh Privacy styles

* Privacy tweaks

* Expand privacy page

* Fix heading hierarchy

* Fix lint

* home.css: Fix trailing 0

* The Switchboard view "Dock" is now "Dock & Panel" (elementary#2776)

* Update installation guide; always use Etcher

* Way better Etcher copy

* More installation tweaks

* Embed installation video

* Tweak embed

* Remove the Odin event to hide the toast

* Fix image stretching

* Update Open Source logos

* GTK+ → GTK

* Refresh open source page

* Update screenshots and OEM page

* Fix blurry icons on home

* fix shortcuts width

* All the docs

* Fix annotation styles

Co-authored-by: Ryo Nakano <[email protected]>
Co-authored-by: Daniel Foré <[email protected]>
  • Loading branch information
@cassidyjames @ryonakano @danirabbit
3 people authored Aug 9, 2021
1 parent c485a33 commit e63b8ab
Show file tree
Hide file tree
Showing 108 changed files with 3,168 additions and 3,930 deletions.
3 changes: 0 additions & 3 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,4 @@ root = true
end_of_line = 1f
insert_final_newline = true
indent_style = space
indent_size = 4

[*.yml]
indent_size = 2
238 changes: 119 additions & 119 deletions .stylelintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,121 +1,121 @@
{
"rules": {
"at-rule-empty-line-before": [ "always", {
"except": [
"blockless-after-same-name-blockless",
"first-nested"
],
"ignore": ["after-comment"]
}],
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-no-vendor-prefix": true,
"at-rule-semicolon-newline-after": "always",
"block-closing-brace-empty-line-before": "never",
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-case": "lower",
"color-hex-length": "short",
"color-no-invalid-hex": true,
"comment-empty-line-before": [ "always", {
"except": ["first-nested"],
"ignore": ["stylelint-commands"]
}],
"comment-no-empty": true,
"comment-whitespace-inside": "always",
"custom-property-empty-line-before": [ "always", {
"except": [
"after-custom-property",
"first-nested"
],
"ignore": [
"after-comment",
"inside-single-line-block"
]
}],
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-block-trailing-semicolon": "always",
"declaration-colon-newline-after": "always-multi-line",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-empty-line-before": [ "always", {
"except": [
"after-declaration",
"first-nested"
],
"ignore": [
"after-comment",
"inside-single-line-block"
]
}],
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-newline-inside": "always-multi-line",
"function-parentheses-space-inside": "never-single-line",
"function-whitespace-after": "always",
"indentation": 4,
"keyframe-declaration-no-important": true,
"length-zero-no-unit": true,
"max-empty-lines": 1,
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-name-case": "lower",
"media-feature-parentheses-space-inside": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-newline-after": "always-multi-line",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"no-empty-source": true,
"no-eol-whitespace": true,
"no-extra-semicolons": true,
"no-invalid-double-slash-comments": true,
"no-missing-end-of-source-newline": true,
"number-leading-zero": "always",
"number-no-trailing-zeros": true,
"property-case": "lower",
"rule-empty-line-before": ["always-multi-line", {
"ignore": ["after-comment", "inside-block"]
}],
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-list-comma-newline-after": "always",
"selector-list-comma-space-before": "never",
"selector-max-empty-lines": 0,
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-no-unknown": true,
"selector-pseudo-class-parentheses-space-inside": "never",
"selector-pseudo-element-case": "lower",
"selector-pseudo-element-colon-notation": "double",
"selector-pseudo-element-no-unknown": true,
"selector-type-case": "lower",
"selector-type-no-unknown": true,
"shorthand-property-no-redundant-values": true,
"string-no-newline": true,
"unit-case": "lower",
"unit-no-unknown": true,
"value-list-comma-newline-after": "always-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
"value-no-vendor-prefix": true
}
"rules": {
"at-rule-empty-line-before": [ "always", {
"except": [
"blockless-after-same-name-blockless",
"first-nested"
],
"ignore": ["after-comment"]
}],
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-no-vendor-prefix": true,
"at-rule-semicolon-newline-after": "always",
"block-closing-brace-empty-line-before": "never",
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-case": "lower",
"color-hex-length": "short",
"color-no-invalid-hex": true,
"comment-empty-line-before": [ "always", {
"except": ["first-nested"],
"ignore": ["stylelint-commands"]
}],
"comment-no-empty": true,
"comment-whitespace-inside": "always",
"custom-property-empty-line-before": [ "always", {
"except": [
"after-custom-property",
"first-nested"
],
"ignore": [
"after-comment",
"inside-single-line-block"
]
}],
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-block-trailing-semicolon": "always",
"declaration-colon-newline-after": "always-multi-line",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-empty-line-before": [ "always", {
"except": [
"after-declaration",
"first-nested"
],
"ignore": [
"after-comment",
"inside-single-line-block"
]
}],
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-newline-inside": "always-multi-line",
"function-parentheses-space-inside": "never-single-line",
"function-whitespace-after": "always",
"indentation": 2,
"keyframe-declaration-no-important": true,
"length-zero-no-unit": true,
"max-empty-lines": 1,
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-name-case": "lower",
"media-feature-parentheses-space-inside": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-newline-after": "always-multi-line",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"no-empty-source": true,
"no-eol-whitespace": true,
"no-extra-semicolons": true,
"no-invalid-double-slash-comments": true,
"no-missing-end-of-source-newline": true,
"number-leading-zero": "always",
"number-no-trailing-zeros": true,
"property-case": "lower",
"rule-empty-line-before": ["always-multi-line", {
"ignore": ["after-comment", "inside-block"]
}],
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-list-comma-newline-after": "always",
"selector-list-comma-space-before": "never",
"selector-max-empty-lines": 0,
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-no-unknown": true,
"selector-pseudo-class-parentheses-space-inside": "never",
"selector-pseudo-element-case": "lower",
"selector-pseudo-element-colon-notation": "double",
"selector-pseudo-element-no-unknown": true,
"selector-type-case": "lower",
"selector-type-no-unknown": true,
"shorthand-property-no-redundant-values": true,
"string-no-newline": true,
"unit-case": "lower",
"unit-no-unknown": true,
"value-list-comma-newline-after": "always-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
"value-no-vendor-prefix": true
}
}
52 changes: 26 additions & 26 deletions _backend/config.example.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@
// Example of config file, add your own values here, all are imaginary

return array(
'release_title' => 'Hera',
'release_version' => '5.1.7',
'release_filename' => 'elementaryos-5.1-stable.20200814.iso',
'release_size' => '1.49 GB',
'release_magnet' => '73e9c0288c0b62c2646b695219b550fd231fede4',
'release_sha256' => '439110ceadadd13683632ddd273095f72ee9b8d22a7569ac84c2fd1c4d920610',
'release_title' => 'Odin',
'release_version' => '6',
'release_filename' => 'elementaryos-6.0-stable.20210901.iso',
'release_size' => '2.49 GB',
'release_magnet' => '73e9c0288c0b62c2646b695219b550fd231fede4',
'release_sha256' => '439110ceadadd13683632ddd273095f72ee9b8d22a7569ac84c2fd1c4d920610',

'previous_title' => 'Juno',
'previous_version' => '0.4.1',
'previous_filename' => 'elementaryos-0.4.1-stable.20180130.iso',
'previous_size' => '1.50 GB',
'previous_magnet' => 'baab8ca13fd7c83524c3fcba99b4b286b77ae547',
'previous_title' => 'Hera',
'previous_version' => '5.1.7',
'previous_filename' => 'elementaryos-0.5.1-stable.20180130.iso',
'previous_size' => '1.50 GB',
'previous_magnet' => 'baab8ca13fd7c83524c3fcba99b4b286b77ae547',

'chart_enable' => false,
'chart_link_project' => 'elementary',
'chart_link_milestone' => 'loki-rc1',
'chart_link_name' => 'Loki RC1 Milestone',
'chart_enable' => false,
'chart_link_project' => 'elementary',
'chart_link_milestone' => 'loki-rc1',
'chart_link_name' => 'Loki RC1 Milestone',

'stripe_sk' => 'sk_test_hoigesrjgoisrhgilgjrsfjs',
'stripe_pk' => 'pk_test_hoigesrjgoisrhgilgjrsfjs',
'stripe_sk' => 'sk_test_hoigesrjgoisrhgilgjrsfjs',
'stripe_pk' => 'pk_test_hoigesrjgoisrhgilgjrsfjs',

'previous_stripe_sk' => 'sk_test_hoigesrjgoisrhgilgjrsfjs',
'previous_stripe_sk' => 'sk_test_hoigesrjgoisrhgilgjrsfjs',

'slack_token' => 'asdf-1234567890-7418529630-a7854123692-8412487519',
'slack_token' => 'asdf-1234567890-7418529630-a7854123692-8412487519',

'mandrill_key' => 'aaaaaaaaaaaaaaaaaaaaaa',
'mandrill_key' => 'aaaaaaaaaaaaaaaaaaaaaa',

'sentry_key' => false,
'sentry_pub' => false,
'sentry_key' => false,
'sentry_pub' => false,

'twitter_consumer_key' => 'test_ckey',
'twitter_consumer_secret' => 'test_csecret',
'twitter_access_token' => 'test_atoken',
'twitter_access_secret' => 'test_asecret',
'twitter_consumer_key' => 'test_ckey',
'twitter_consumer_secret' => 'test_csecret',
'twitter_access_token' => 'test_atoken',
'twitter_access_secret' => 'test_asecret',
);
1 change: 0 additions & 1 deletion _backend/event.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
'juno 5.0 release' => [new DateTime('2018-10-11T19:00:00Z'), new DateTime('2018-10-16T19:00:00Z')],
'indiegogo appcenter 2/7' => [new DateTime('2020-2-7T18:00:00Z'), new DateTime('2020-3-7T19:00:00Z')],
'edw' => [new DateTime('2021-06-01T00:00:00Z'), new DateTime('2021-06-28T00:00:00Z')],
'odin 6.0 release' => [new DateTime('2021-08-04T16:00:00Z'), new DateTime('2021-08-10T16:00:00Z')],
);

/**
Expand Down
52 changes: 26 additions & 26 deletions _backend/preload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,46 +13,46 @@

$sitewide['title'] = 'elementary';
$sitewide['author'] = 'elementary, Inc.';
$sitewide['description'] = 'The fast, open, and privacy-respecting replacement for Windows and macOS';
$sitewide['description'] = 'The thoughtful, capable, and ethical replacement for Windows and macOS';
$sitewide['image'] = 'https://elementary.io/images/preview.png';
$sitewide['theme-color'] = '#3689e6';

// Autodetect website root path
$serverRoot = $_SERVER['DOCUMENT_ROOT'];
$websiteRoot = dirname(__DIR__);
if (!empty($_SERVER['REQUEST_URI'])) {
$requestUri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
$requestUri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
} else {
$requestUri = '';
$requestUri = '';
}
$sitewide['root'] = '';
$sitewide['path'] = $requestUri;
if ($serverRoot == $websiteRoot) {
$sitewide['root'] = '/';
$sitewide['root'] = '/';
} elseif (strpos($websiteRoot, $serverRoot) === 0) {
$sitewide['root'] = substr($websiteRoot, strlen($serverRoot)).'/';
$sitewide['root'] = substr($websiteRoot, strlen($serverRoot)).'/';
} else {
$websiteArray = explode('/', $websiteRoot);
$reqArray = array_filter(explode('/', $requestUri));
foreach ($websiteArray as $websiteOffset => $websiteDir) {
foreach ($reqArray as $reqOffset => $reqDir) {
if ($websiteDir != $reqDir) {
continue;
}

$max = min(count($websiteArray) - $websiteOffset, count($reqArray) - $reqOffset);
for ($i = 0; $i < $max; $i++) {
if ($websiteArray[$websiteOffset + $i] != $reqArray[$reqOffset + $i]) {
break 2; // Doesn't match
}
}

// Matches
$rootArray = array_slice($reqArray, 0, $reqOffset - $max + 1);
$sitewide['root'] = '/'.implode('/', $rootArray).'/';
break 2;
}
}
$websiteArray = explode('/', $websiteRoot);
$reqArray = array_filter(explode('/', $requestUri));
foreach ($websiteArray as $websiteOffset => $websiteDir) {
foreach ($reqArray as $reqOffset => $reqDir) {
if ($websiteDir != $reqDir) {
continue;
}

$max = min(count($websiteArray) - $websiteOffset, count($reqArray) - $reqOffset);
for ($i = 0; $i < $max; $i++) {
if ($websiteArray[$websiteOffset + $i] != $reqArray[$reqOffset + $i]) {
break 2; // Doesn't match
}
}

// Matches
$rootArray = array_slice($reqArray, 0, $reqOffset - $max + 1);
$sitewide['root'] = '/'.implode('/', $rootArray).'/';
break 2;
}
}
}

$template['header'] = __DIR__.'/../_templates/header.php';
Expand Down
Binary file added _images/docs/learning-the-basics/applications-menu.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _images/docs/learning-the-basics/[email protected]
View file
Binary file not shown.
0 _images/docs/learning-the-basics/[email protected] → _images/docs/learning-the-basics/dock.png
View file
File renamed without changes
Binary file added _images/docs/learning-the-basics/headerbar.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _images/docs/learning-the-basics/[email protected]
View file
Binary file not shown.
Binary file added _images/docs/learning-the-basics/multitasking-view.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/docs/learning-the-basics/panel.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _images/docs/learning-the-basics/[email protected]
View file
Binary file not shown.
Binary file added _images/docs/learning-the-basics/shortcut-overlay.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/docs/learning-the-basics/switchboard.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _images/docs/learning-the-basics/[email protected]
View file
Binary file not shown.
Binary file added _images/docs/learning-the-basics/workspaces.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/home/notebook-desktop.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/home/notebook-desktop.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/home/wallpaper.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/oem/switchboard-about.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/oem/switchboard.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion _images/open-source/bountysource.svg
View file

This file was deleted.

Loading

0 comments on commit e63b8ab

Please sign in to comment.