Revert "Using css-in-js styling in support-page extension"

This reverts commit 74596b086e.
This commit is contained in:
Alex Andreev committed 2020-11-11 15:29:35 +03:00
1 parent 74596b086e
commit c36528a04a
6 files changed
+30 -38

No files matched your search

+1 -3
View File
@@ -9,15 +9,13 @@
"dev": "webpack --watch",
"test": "echo NO TESTS"
},
"dependencies": {},
"devDependencies": {
"@emotion/core": "^10.1.1",
"@emotion/styled": "^10.0.27",
"@k8slens/extensions": "file:../../src/extensions/npm/extensions",
"@types/react": "^16.9.53",
"@types/react-router": "^5.1.8",
"@types/webpack": "^4.41.17",
"css-loader": "^5.0.0",
"emotion": "^10.0.27",
"mobx": "^5.15.5",
"react": "^16.13.1",
"sass-loader": "^10.0.4",
+5 -15
View File
@@ -2,14 +2,6 @@ import React from "react";
import { Component, LensRendererExtension, Navigation } from "@k8slens/extensions";
import { supportPageRoute, supportPageURL } from "./src/support.route";
import { Support } from "./src/support";
import styled from '@emotion/styled';
const Icon = styled.div`
color: white;
display: flex;
align-items: center;
padding-right: calc(var(--padding) / 2);
`
export default class SupportPageRendererExtension extends LensRendererExtension {
globalPages = [
@@ -26,14 +18,12 @@ export default class SupportPageRendererExtension extends LensRendererExtension
statusBarItems = [
{
item: (
<Icon>
<Component.Icon
className="SupportIcon"
material="help"
smallest
<div
className="flex align-center gaps hover-highlight"
onClick={() => Navigation.navigate(supportPageURL())}
/>
</Icon>
>
<Component.Icon material="help" smallest />
</div>
)
}
]
+13
View File
@@ -0,0 +1,13 @@
.PageLayout.Support {
a[target=_blank] {
text-decoration: none;
border-bottom: 1px solid;
&:after {
content: "launch";
font: small "Material Icons";
vertical-align: middle;
margin-left: 2px;
}
}
}
+2 -17
View File
@@ -1,22 +1,9 @@
// TODO: support localization / figure out how to extract / consume i18n strings
import "./support.scss"
import React from "react"
import { observer } from "mobx-react"
import { App, Component } from "@k8slens/extensions";
import styled from '@emotion/styled';
const SupportPage = styled.div`
a[target=_blank] {
text-decoration: none;
&:after {
content: "launch";
font: small "Material Icons";
vertical-align: middle;
margin-left: 2px;
}
}
`
@observer
export class Support extends React.Component {
@@ -24,8 +11,7 @@ export class Support extends React.Component {
const { PageLayout } = Component;
const { slackUrl, issuesTrackerUrl } = App;
return (
<SupportPage>
<PageLayout showOnTop header={<h2>Support</h2>}>
<PageLayout showOnTop className="Support" header={<h2>Support</h2>}>
<h2>Community Slack Channel</h2>
<p>
Ask a question, see what's being discussed, join the conversation <a href={slackUrl} target="_blank">here</a>
@@ -38,7 +24,6 @@ export class Support extends React.Component {
{/*<h2><Trans>Commercial Support</Trans></h2>*/}
</PageLayout>
</SupportPage>
);
}
}
@@ -2,13 +2,14 @@
$spacing: $padding / 2;
--flex-gap: #{$spacing};
font-size: $font-size-small;
background-color: #3d90ce;
padding: 0 2px;
color: white;
height: 22px;
#current-workspace {
font-size: var(--font-size-small);
padding: $padding / 4 $padding / 2;
color: white;
cursor: pointer;
}
@@ -18,4 +19,10 @@
cursor: pointer;
}
}
.extensions {
> * {
padding: $padding / 4 $padding / 2;
}
}
}
@@ -17,7 +17,6 @@
.BottomBar {
grid-area: bottom-bar;
background-color: var(--blue);
}
#lens-views {