Skip to content

Commit

Permalink
[7.8] Fix branding (#64712) (#68030)
Browse files Browse the repository at this point in the history
* Additional branding updates (#64712)

* branding updates

* update snapshots

* update loginPage snapshot

* removed unused EuiText imports

* update button label for exiting full screen

* remove unused translations

* update loading_news snapshot

* update functional baseline screenshots
# Conflicts:
#	src/core/public/chrome/ui/header/header_logo.tsx
#	x-pack/plugins/translations/translations/zh-CN.json

* update snapshots

* update more snapshots

* clean then update snapshots
  • Loading branch information
ryankeairns authored Jun 3, 2020
1 parent 7ca221a commit 4035283
Show file tree
Hide file tree
Showing 32 changed files with 57 additions and 179 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/core/public/chrome/ui/header/header_logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export function HeaderLogo({ href, navigateToApp, ...observables }: Props) {
return (
<EuiHeaderLogo
data-test-subj="logo"
iconType="logoKibana"
iconType="logoElastic"
onClick={(e) => onClick(e, forceNavigation, navLinks, navigateToApp)}
href={href}
aria-label={i18n.translate('core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel', {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified src/core/server/core_app/assets/favicons/apple-touch-icon.png
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 src/core/server/core_app/assets/favicons/favicon-16x16.png
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 src/core/server/core_app/assets/favicons/favicon-32x32.png
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 src/core/server/core_app/assets/favicons/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions src/core/server/core_app/assets/favicons/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "",
"short_name": "",
"icons": [
{
"src": "/android-chrome-192x192.png",
Expand Down
Binary file not shown.
Binary file modified src/core/server/core_app/assets/favicons/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
47 changes: 23 additions & 24 deletions src/core/server/core_app/assets/favicons/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/core/server/rendering/views/template.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const Template: FunctionComponent<Props> = ({
<meta charSet="utf-8" />
<meta httpEquiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width" />
<title>Elastic Kibana</title>
<title>Elastic</title>
<Fonts url={uiPublicUrl} />
{/* Favicons (generated from http://realfavicongenerator.net/) */}
<link
Expand Down Expand Up @@ -126,10 +126,10 @@ export const Template: FunctionComponent<Props> = ({
className="kbnWelcomeText"
data-error-message={i18n('core.ui.welcomeErrorMessage', {
defaultMessage:
'Elastic Kibana did not load properly. Check the server output for more information.',
'Elastic did not load properly. Check the server output for more information.',
})}
>
{i18n('core.ui.welcomeMessage', { defaultMessage: 'Loading Elastic Kibana' })}
{i18n('core.ui.welcomeMessage', { defaultMessage: 'Loading Elastic' })}
</div>
<div className="kbnProgress" />
</div>
Expand All @@ -146,7 +146,7 @@ export const Template: FunctionComponent<Props> = ({
<div className="kbnWelcomeText">
{i18n('core.ui.legacyBrowserMessage', {
defaultMessage:
'This Kibana installation has strict security requirements enabled that your current browser does not meet.',
'This Elastic installation has strict security requirements enabled that your current browser does not meet.',
})}
</div>
</div>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 1 addition & 13 deletions src/plugins/home/public/application/components/welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
EuiSpacer,
EuiFlexGroup,
EuiFlexItem,
EuiText,
EuiIcon,
EuiPortal,
} from '@elastic/eui';
Expand Down Expand Up @@ -141,20 +140,9 @@ export class Welcome extends React.Component<Props> {
</span>
<EuiTitle size="l" className="homWelcome__title">
<h1>
<FormattedMessage
id="home.welcomeTitle"
defaultMessage="Welcome to Elastic Kibana"
/>
<FormattedMessage id="home.welcomeTitle" defaultMessage="Welcome to Elastic" />
</h1>
</EuiTitle>
<EuiText size="s" color="subdued" className="homWelcome__subtitle">
<p>
<FormattedMessage
id="home.welcomeDescription"
defaultMessage="Your window into the Elastic Stack"
/>
</p>
</EuiText>
<EuiSpacer size="m" />
</div>
</header>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
bottom: $euiSizeS;
position: fixed;
display: block;
padding: 0;
padding: $euiSizeXS $euiSizeS;
border: none;
background: none;
z-index: 5;
background: $euiColorFullShade;
padding: $euiSizeXS;
border-radius: $euiBorderRadius;
text-align: left;

Expand All @@ -28,11 +27,6 @@
}
}

.dshExitFullScreenButton__title {
line-height: 1.2;
color: $euiColorEmptyShade;
}

.dshExitFullScreenButton__text {
line-height: 1.2;
color: makeHighContrastColor($euiColorMediumShade, $euiColorFullShade);
Expand Down
Loading

0 comments on commit 4035283

Please sign in to comment.