{`${data[index]}\n`}
diff --git a/packages/components/src/components/Log/Log.scss b/packages/components/src/components/Log/Log.scss
index 9b2b1c113c..362fec3935 100644
--- a/packages/components/src/components/Log/Log.scss
+++ b/packages/components/src/components/Log/Log.scss
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~@tektoncd/dashboard-components/dist/scss/vars';
-
pre.tkn--log {
position: relative;
padding: 2rem 1.6rem 1.3rem 1.6rem;
diff --git a/packages/components/src/components/LogFormat/LogFormat.js b/packages/components/src/components/LogFormat/LogFormat.js
index 29d875bc42..68af266e66 100644
--- a/packages/components/src/components/LogFormat/LogFormat.js
+++ b/packages/components/src/components/LogFormat/LogFormat.js
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Tekton Authors
+Copyright 2020-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -10,6 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
+
import React from 'react';
import PropTypes from 'prop-types';
import tlds from 'tlds';
@@ -17,8 +18,6 @@ import LinkifyIt from 'linkify-it';
import classNames from 'classnames';
import { colors } from './defaults';
-import './LogFormat.scss';
-
const linkifyIt = LinkifyIt().tlds(tlds);
// eslint-disable-next-line no-control-regex
diff --git a/packages/components/src/components/LogoutButton/LogoutButton.js b/packages/components/src/components/LogoutButton/LogoutButton.js
index 83fca3b848..1db3ead6de 100644
--- a/packages/components/src/components/LogoutButton/LogoutButton.js
+++ b/packages/components/src/components/LogoutButton/LogoutButton.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -15,7 +15,6 @@ import { Logout20 as LogoutIcon } from '@carbon/icons-react';
import { HeaderGlobalAction } from 'carbon-components-react';
import { injectIntl } from 'react-intl';
import React, { Component } from 'react';
-import './LogoutButton.scss';
export class LogoutButton extends Component {
state = {
diff --git a/packages/components/src/components/Param/index.js b/packages/components/src/components/Param/index.js
index 600326beea..32e210092d 100644
--- a/packages/components/src/components/Param/index.js
+++ b/packages/components/src/components/Param/index.js
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Tekton Authors
+Copyright 2020-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,12 +11,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
/* istanbul ignore file */
+
import React from 'react';
import ViewYAML from '../ViewYAML';
-import './Param.scss';
-
export default function Param({ children }) {
if (!children) {
return null;
diff --git a/packages/components/src/components/PipelineRun/PipelineRun.js b/packages/components/src/components/PipelineRun/PipelineRun.js
index 0f5c66f0b2..35d47ee85a 100644
--- a/packages/components/src/components/PipelineRun/PipelineRun.js
+++ b/packages/components/src/components/PipelineRun/PipelineRun.js
@@ -32,8 +32,6 @@ import {
TaskTree
} from '..';
-import '../../scss/Run.scss';
-
export /* istanbul ignore next */ class PipelineRunContainer extends Component {
state = {
isLogsMaximized: false
diff --git a/packages/components/src/components/PipelineRuns/PipelineRuns.js b/packages/components/src/components/PipelineRuns/PipelineRuns.js
index ded1c9711b..0ca273f6b2 100644
--- a/packages/components/src/components/PipelineRuns/PipelineRuns.js
+++ b/packages/components/src/components/PipelineRuns/PipelineRuns.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -20,8 +20,6 @@ import { Pending24 as DefaultIcon } from '@carbon/icons-react';
import { FormattedDate, FormattedDuration, RunDropdown } from '..';
-import './PipelineRuns.scss';
-
const PipelineRuns = ({
batchActionButtons = [],
createPipelineRunURL = urls.pipelineRuns.byName,
diff --git a/packages/components/src/components/Rerun/Rerun.js b/packages/components/src/components/Rerun/Rerun.js
index c6d1e9a859..41b7d138fa 100644
--- a/packages/components/src/components/Rerun/Rerun.js
+++ b/packages/components/src/components/Rerun/Rerun.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -15,7 +15,6 @@ import React, { Component } from 'react';
import { injectIntl } from 'react-intl';
import { Button } from 'carbon-components-react';
import { Restart32 as Restart } from '@carbon/icons-react';
-import './Rerun.scss';
class Rerun extends Component {
handleRerun = event => {
diff --git a/packages/components/src/components/RunHeader/RunHeader.js b/packages/components/src/components/RunHeader/RunHeader.js
index 1cd7016ab5..07926894f7 100644
--- a/packages/components/src/components/RunHeader/RunHeader.js
+++ b/packages/components/src/components/RunHeader/RunHeader.js
@@ -18,8 +18,6 @@ import { copyToClipboard } from '@tektoncd/dashboard-utils';
import { FormattedDate } from '..';
-import './RunHeader.scss';
-
class RunHeader extends Component {
/* istanbul ignore next */
copyStatusMessage = () => {
diff --git a/packages/components/src/components/RunHeader/RunHeader.scss b/packages/components/src/components/RunHeader/RunHeader.scss
index 2c938bb859..ce85141ab8 100644
--- a/packages/components/src/components/RunHeader/RunHeader.scss
+++ b/packages/components/src/components/RunHeader/RunHeader.scss
@@ -16,7 +16,7 @@ limitations under the License.
header.tkn--pipeline-run-header {
@include type-style('body-short-01');
line-height: 1;
- background: white;
+ background: $ui-01;
margin-bottom: 2em;
padding: .4em 0 .4em 1.5em;
diff --git a/packages/components/src/components/Spinner/Spinner.js b/packages/components/src/components/Spinner/Spinner.js
index b7302f87f6..697db775c5 100644
--- a/packages/components/src/components/Spinner/Spinner.js
+++ b/packages/components/src/components/Spinner/Spinner.js
@@ -15,8 +15,6 @@ import React from 'react';
import { Renew20 as SpinnerIcon } from '@carbon/icons-react';
-import './Spinner.scss';
-
export default function Spinner({ children, className }) {
return (
diff --git a/packages/components/src/components/StatusIcon/StatusIcon.js b/packages/components/src/components/StatusIcon/StatusIcon.js
index 64a42556cc..046d340734 100644
--- a/packages/components/src/components/StatusIcon/StatusIcon.js
+++ b/packages/components/src/components/StatusIcon/StatusIcon.js
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import './StatusIcon.scss';
-
import React from 'react';
import classNames from 'classnames';
import {
diff --git a/packages/components/src/components/StatusIcon/StatusIcon.scss b/packages/components/src/components/StatusIcon/StatusIcon.scss
index 83ecb39209..f47e92bf03 100644
--- a/packages/components/src/components/StatusIcon/StatusIcon.scss
+++ b/packages/components/src/components/StatusIcon/StatusIcon.scss
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~carbon-components/scss/globals/scss/vars';
-
.tkn--status-icon {
fill: $ui-04;
width: 20px;
diff --git a/packages/components/src/components/Step/Step.js b/packages/components/src/components/Step/Step.js
index f7f0edf3a9..e01e88df44 100644
--- a/packages/components/src/components/Step/Step.js
+++ b/packages/components/src/components/Step/Step.js
@@ -17,8 +17,6 @@ import { Pending20 as DefaultIcon } from '@carbon/icons-react';
import StatusIcon from '../StatusIcon';
-import './Step.scss';
-
class Step extends Component {
handleClick = event => {
event.preventDefault();
diff --git a/packages/components/src/components/Step/Step.scss b/packages/components/src/components/Step/Step.scss
index 6c7dc7790e..9ac9058e28 100644
--- a/packages/components/src/components/Step/Step.scss
+++ b/packages/components/src/components/Step/Step.scss
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~@tektoncd/dashboard-components/dist/scss/vars';
-
.tkn--step {
list-style-type: none;
@@ -41,7 +39,7 @@ limitations under the License.
font-size: 0.78rem;
letter-spacing: 0.02rem;
text-decoration: none;
- border-left: 3px solid white;
+ border-left: 3px solid $ui-01;
}
.tkn--status-icon {
diff --git a/packages/components/src/components/StepDetails/StepDetails.js b/packages/components/src/components/StepDetails/StepDetails.js
index 1c976f922c..34d46991c0 100644
--- a/packages/components/src/components/StepDetails/StepDetails.js
+++ b/packages/components/src/components/StepDetails/StepDetails.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -18,8 +18,6 @@ import { getStatus, getStepStatusReason } from '@tektoncd/dashboard-utils';
import { DetailsHeader, StepDefinition, StepStatus, Tab, Tabs } from '..';
-import './StepDetails.scss';
-
const tabs = ['logs', 'status', 'details'];
const StepDetails = props => {
diff --git a/packages/components/src/components/Table/Table.js b/packages/components/src/components/Table/Table.js
index 9f426c892f..1466fd8cef 100644
--- a/packages/components/src/components/Table/Table.js
+++ b/packages/components/src/components/Table/Table.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -30,8 +30,6 @@ import { ALL_NAMESPACES } from '@tektoncd/dashboard-utils';
import { DataTableSkeleton } from '..';
-import './Table.scss';
-
const {
TableContainer,
Table: CarbonTable,
diff --git a/packages/components/src/components/Table/Table.scss b/packages/components/src/components/Table/Table.scss
index 000af673fe..dbf043326b 100644
--- a/packages/components/src/components/Table/Table.scss
+++ b/packages/components/src/components/Table/Table.scss
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~@tektoncd/dashboard-components/dist/scss/vars';
-
.tkn--table {
// add space between adjacent tables
~ .tkn--table {
diff --git a/packages/components/src/components/Task/Task.js b/packages/components/src/components/Task/Task.js
index 9747aebc96..c18583572e 100644
--- a/packages/components/src/components/Task/Task.js
+++ b/packages/components/src/components/Task/Task.js
@@ -22,8 +22,6 @@ import {
updateUnexecutedSteps
} from '@tektoncd/dashboard-utils';
-import './Task.scss';
-
class Task extends Component {
state = { selectedStepId: null };
diff --git a/packages/components/src/components/Task/Task.scss b/packages/components/src/components/Task/Task.scss
index cccffcafbf..2f67484cbb 100644
--- a/packages/components/src/components/Task/Task.scss
+++ b/packages/components/src/components/Task/Task.scss
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '../../scss/vars';
-
.tkn--task {
list-style-type: none;
diff --git a/packages/components/src/components/TaskRunDetails/TaskRunDetails.js b/packages/components/src/components/TaskRunDetails/TaskRunDetails.js
index 169b7b71ea..8de89b392a 100644
--- a/packages/components/src/components/TaskRunDetails/TaskRunDetails.js
+++ b/packages/components/src/components/TaskRunDetails/TaskRunDetails.js
@@ -18,8 +18,6 @@ import { getParams } from '@tektoncd/dashboard-utils';
import { DetailsHeader, Param, Tab, Table, Tabs, ViewYAML } from '..';
-import './TaskRunDetails.scss';
-
function getDescriptions(array = []) {
return array.reduce((accumulator, { name, description }) => {
accumulator[name] = description;
diff --git a/packages/components/src/components/TaskTree/TaskTree.js b/packages/components/src/components/TaskTree/TaskTree.js
index 88089eaae4..275911442b 100644
--- a/packages/components/src/components/TaskTree/TaskTree.js
+++ b/packages/components/src/components/TaskTree/TaskTree.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -15,8 +15,6 @@ import React from 'react';
import { getStatus, labels as labelConstants } from '@tektoncd/dashboard-utils';
import Task from '../Task';
-import './TaskTree.scss';
-
const TaskTree = ({ onSelect, selectedStepId, selectedTaskId, taskRuns }) => {
if (!taskRuns) {
return ;
diff --git a/packages/components/src/components/TaskTree/TaskTree.scss b/packages/components/src/components/TaskTree/TaskTree.scss
index 6c749545ee..993e8b0a09 100644
--- a/packages/components/src/components/TaskTree/TaskTree.scss
+++ b/packages/components/src/components/TaskTree/TaskTree.scss
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~carbon-components/scss/globals/scss/vars';
-
.tkn--task-tree {
width: 21%;
min-width: 15rem;
diff --git a/packages/components/src/components/Trigger/Trigger.js b/packages/components/src/components/Trigger/Trigger.js
index bb79892637..0c05126c9d 100644
--- a/packages/components/src/components/Trigger/Trigger.js
+++ b/packages/components/src/components/Trigger/Trigger.js
@@ -23,8 +23,6 @@ import {
import { urls } from '@tektoncd/dashboard-utils';
import { Table, ViewYAML } from '@tektoncd/dashboard-components';
-import './Trigger.scss';
-
const Trigger = ({ intl, namespace, trigger }) => {
const tableHeaders = [
{
diff --git a/packages/components/src/components/Trigger/Trigger.scss b/packages/components/src/components/Trigger/Trigger.scss
index 9bd366e907..c8ead264f4 100644
--- a/packages/components/src/components/Trigger/Trigger.scss
+++ b/packages/components/src/components/Trigger/Trigger.scss
@@ -1,5 +1,5 @@
/*
-Copyright 2019 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~carbon-components/scss/globals/scss/vars';
-
.tkn--trigger-interceptors {
margin-top: $spacing-05;
diff --git a/packages/components/src/components/ViewYAML/ViewYAML.js b/packages/components/src/components/ViewYAML/ViewYAML.js
index d65114291d..e0118a6302 100644
--- a/packages/components/src/components/ViewYAML/ViewYAML.js
+++ b/packages/components/src/components/ViewYAML/ViewYAML.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -16,8 +16,6 @@ import PropTypes from 'prop-types';
import jsYaml from 'js-yaml';
import classNames from 'classnames';
-import './ViewYAML.scss';
-
const ViewYAML = props => {
const { className, dark, resource } = props;
diff --git a/packages/components/src/components/ViewYAML/ViewYAML.scss b/packages/components/src/components/ViewYAML/ViewYAML.scss
index 92eb42cf58..4a73b57d6d 100644
--- a/packages/components/src/components/ViewYAML/ViewYAML.scss
+++ b/packages/components/src/components/ViewYAML/ViewYAML.scss
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Tekton Authors
+Copyright 2020-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~@tektoncd/dashboard-components/dist/scss/vars';
-
.bx--snippet--multi.tkn--view-yaml--dark {
background-color: $gray-90; // TODO: $inverse-02 - see Log.scss
color: $gray-10; // $inverse-01
diff --git a/packages/components/src/scss/Run.scss b/packages/components/src/scss/Run.scss
index 4ce6dc5167..a79a7e4267 100644
--- a/packages/components/src/scss/Run.scss
+++ b/packages/components/src/scss/Run.scss
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import './vars';
-
.tkn--tasks {
display: flex;
flex-wrap: nowrap;
diff --git a/packages/components/src/scss/_vars.scss b/packages/components/src/scss/_vars.scss
deleted file mode 100644
index 78e4847586..0000000000
--- a/packages/components/src/scss/_vars.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 The Tekton Authors
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-@import '~carbon-components/scss/globals/scss/theme';
-
-$carbon--theme: $carbon--theme--g10;
-
-@import '~carbon-components/scss/globals/scss/vars';
diff --git a/src/containers/About/About.js b/src/containers/About/About.js
index 628b4fb532..5ec5eb4215 100644
--- a/src/containers/About/About.js
+++ b/src/containers/About/About.js
@@ -32,8 +32,6 @@ import {
isTriggersInstalled as selectIsTriggersInstalled
} from '../../reducers';
-import './About.scss';
-
/* istanbul ignore next */
export function About({
dashboardNamespace,
diff --git a/src/containers/About/About.scss b/src/containers/About/About.scss
index e183195d18..49b9a352c6 100644
--- a/src/containers/About/About.scss
+++ b/src/containers/About/About.scss
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Tekton Authors
+Copyright 2020-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~carbon-components/scss/globals/scss/vars';
-
.tkn--about {
.tkn--about--content {
display: flex;
diff --git a/src/containers/App/App.js b/src/containers/App/App.js
index 238060c9e0..2a35f3fe5d 100644
--- a/src/containers/App/App.js
+++ b/src/containers/App/App.js
@@ -90,9 +90,10 @@ import {
isWebSocketConnected as selectIsWebSocketConnected
} from '../../reducers';
-import '../../scss/App.scss';
import config from '../../../config_frontend/config.json';
+import '../../scss/App.scss';
+
const { default: defaultLocale, supported: supportedLocales } = config.locales;
/* istanbul ignore next */
diff --git a/src/containers/ClusterTasks/ClusterTasks.js b/src/containers/ClusterTasks/ClusterTasks.js
index 29f946c75c..b7502609f6 100644
--- a/src/containers/ClusterTasks/ClusterTasks.js
+++ b/src/containers/ClusterTasks/ClusterTasks.js
@@ -39,8 +39,6 @@ import {
isReadOnly as selectIsReadOnly
} from '../../reducers';
-import '../../scss/Definitions.scss';
-
/* istanbul ignore next */
function ClusterTasksContainer(props) {
const {
diff --git a/src/containers/ClusterTriggerBinding/ClusterTriggerBinding.js b/src/containers/ClusterTriggerBinding/ClusterTriggerBinding.js
index 8d633bd68f..0b0b838381 100644
--- a/src/containers/ClusterTriggerBinding/ClusterTriggerBinding.js
+++ b/src/containers/ClusterTriggerBinding/ClusterTriggerBinding.js
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Tekton Authors
+Copyright 2020-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -26,8 +26,6 @@ import {
import { getViewChangeHandler } from '../../utils';
import { fetchClusterTriggerBinding } from '../../actions/clusterTriggerBindings';
-import '../../scss/Triggers.scss';
-
export /* istanbul ignore next */ class ClusterTriggerBindingContainer extends Component {
componentDidMount() {
const { match } = this.props;
diff --git a/src/containers/CreatePipelineResource/CreatePipelineResource.js b/src/containers/CreatePipelineResource/CreatePipelineResource.js
index 5c17da4462..bafb4e99e4 100644
--- a/src/containers/CreatePipelineResource/CreatePipelineResource.js
+++ b/src/containers/CreatePipelineResource/CreatePipelineResource.js
@@ -27,8 +27,6 @@ import UniversalFields from './UniversalFields';
import { createPipelineResource } from '../../api';
import { getSelectedNamespace } from '../../reducers';
-import '../../scss/Create.scss';
-
/* istanbul ignore next */
function validateInputs(value, id) {
const trimmed = value.trim();
diff --git a/src/containers/CreatePipelineRun/CreatePipelineRun.js b/src/containers/CreatePipelineRun/CreatePipelineRun.js
index 2bfeba7773..a566797365 100644
--- a/src/containers/CreatePipelineRun/CreatePipelineRun.js
+++ b/src/containers/CreatePipelineRun/CreatePipelineRun.js
@@ -40,8 +40,6 @@ import { createPipelineRun } from '../../api';
import { getStore } from '../../store/index';
import { isValidLabel } from '../../utils';
-import '../../scss/Create.scss';
-
const initialState = {
creating: false,
invalidLabels: {},
diff --git a/src/containers/CreateTaskRun/CreateTaskRun.js b/src/containers/CreateTaskRun/CreateTaskRun.js
index 3883d7c830..ffdc4c13da 100644
--- a/src/containers/CreateTaskRun/CreateTaskRun.js
+++ b/src/containers/CreateTaskRun/CreateTaskRun.js
@@ -43,8 +43,6 @@ import { createTaskRun } from '../../api';
import { getStore } from '../../store/index';
import { isValidLabel } from '../../utils';
-import '../../scss/Create.scss';
-
const clusterTaskItem = { id: 'clustertask', text: 'ClusterTask' };
const taskItem = { id: 'task', text: 'Task' };
const parseTaskInfo = (taskRef, kind, namespace) => {
diff --git a/src/containers/EventListener/EventListener.js b/src/containers/EventListener/EventListener.js
index 37eaf48d97..09b5db12b9 100644
--- a/src/containers/EventListener/EventListener.js
+++ b/src/containers/EventListener/EventListener.js
@@ -28,8 +28,6 @@ import {
import { fetchEventListener } from '../../actions/eventListeners';
import { getViewChangeHandler } from '../../utils';
-import './EventListener.scss';
-
export /* istanbul ignore next */ class EventListenerContainer extends Component {
componentDidMount() {
const { match } = this.props;
diff --git a/src/containers/Extensions/Extensions.js b/src/containers/Extensions/Extensions.js
index eb5a4113b9..65dedb2d82 100644
--- a/src/containers/Extensions/Extensions.js
+++ b/src/containers/Extensions/Extensions.js
@@ -25,8 +25,6 @@ import {
isFetchingExtensions
} from '../../reducers';
-import '../../scss/Definitions.scss';
-
export const Extensions = /* istanbul ignore next */ ({
error,
intl,
diff --git a/src/containers/ImportResources/ImportResources.js b/src/containers/ImportResources/ImportResources.js
index 364a2ada97..e68631bb55 100644
--- a/src/containers/ImportResources/ImportResources.js
+++ b/src/containers/ImportResources/ImportResources.js
@@ -39,8 +39,6 @@ import { importResources } from '../../api';
import { getDashboardNamespace, getSelectedNamespace } from '../../reducers';
import { NamespacesDropdown, ServiceAccountsDropdown } from '..';
-import './ImportResources.scss';
-
const itemToString = item => (item ? item.text : '');
function isValidGitURL(url) {
diff --git a/src/containers/ImportResources/ImportResources.scss b/src/containers/ImportResources/ImportResources.scss
index bfe893e485..9bae134c50 100644
--- a/src/containers/ImportResources/ImportResources.scss
+++ b/src/containers/ImportResources/ImportResources.scss
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~carbon-components/scss/globals/scss/vars';
-
.tkn--importresources {
.bx--form__helper-text,
.bx--label--disabled {
diff --git a/src/containers/ListPageLayout/ListPageLayout.js b/src/containers/ListPageLayout/ListPageLayout.js
index eb3033c4d2..bfc5ffaa53 100644
--- a/src/containers/ListPageLayout/ListPageLayout.js
+++ b/src/containers/ListPageLayout/ListPageLayout.js
@@ -26,8 +26,6 @@ import { selectNamespace as selectNamespaceAction } from '../../actions/namespac
import { getSelectedNamespace, getTenantNamespace } from '../../reducers';
import { LabelFilter, NamespacesDropdown } from '..';
-import './ListPageLayout.scss';
-
export const ListPageLayout = ({
children,
error,
diff --git a/src/containers/ListPageLayout/ListPageLayout.scss b/src/containers/ListPageLayout/ListPageLayout.scss
index 099c56625f..70bb8e988e 100644
--- a/src/containers/ListPageLayout/ListPageLayout.scss
+++ b/src/containers/ListPageLayout/ListPageLayout.scss
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~@tektoncd/dashboard-components/dist/scss/vars';
-
.tkn--list-page--header {
display: flex;
diff --git a/src/containers/Pipelines/Pipelines.js b/src/containers/Pipelines/Pipelines.js
index 9fb658a3ff..fcf70a4b74 100644
--- a/src/containers/Pipelines/Pipelines.js
+++ b/src/containers/Pipelines/Pipelines.js
@@ -46,8 +46,6 @@ import {
isWebSocketConnected
} from '../../reducers';
-import '../../scss/Definitions.scss';
-
export /* istanbul ignore next */ class Pipelines extends Component {
state = {
deleteError: null,
diff --git a/src/containers/SideNav/SideNav.js b/src/containers/SideNav/SideNav.js
index deeb052436..e1efd34418 100644
--- a/src/containers/SideNav/SideNav.js
+++ b/src/containers/SideNav/SideNav.js
@@ -40,8 +40,6 @@ import {
import { ReactComponent as KubernetesIcon } from '../../images/kubernetes.svg';
import { ReactComponent as TektonIcon } from '../../images/tekton-logo-20x20.svg';
-import './SideNav.scss';
-
class SideNav extends Component {
componentDidMount() {
const { match } = this.props;
diff --git a/src/containers/SideNav/SideNav.scss b/src/containers/SideNav/SideNav.scss
index 808f66e755..6b0fbc133f 100644
--- a/src/containers/SideNav/SideNav.scss
+++ b/src/containers/SideNav/SideNav.scss
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~carbon-components/scss/globals/scss/vars';
-
.bx--header ~ {
nav.bx--side-nav {
background-color: $gray-100;
diff --git a/src/containers/TaskRun/TaskRun.js b/src/containers/TaskRun/TaskRun.js
index 2cda3281c5..26b9608b68 100644
--- a/src/containers/TaskRun/TaskRun.js
+++ b/src/containers/TaskRun/TaskRun.js
@@ -52,7 +52,6 @@ import {
isLogStreamingEnabled as selectIsLogStreamingEnabled
} from '../../reducers';
-import '@tektoncd/dashboard-components/dist/scss/Run.scss';
import { fetchTask, fetchTaskByType } from '../../actions/tasks';
import { fetchTaskRun } from '../../actions/taskRuns';
import { rerunTaskRun } from '../../api';
diff --git a/src/containers/Tasks/Tasks.js b/src/containers/Tasks/Tasks.js
index 4d29e37580..f797cdd799 100644
--- a/src/containers/Tasks/Tasks.js
+++ b/src/containers/Tasks/Tasks.js
@@ -46,8 +46,6 @@ import {
isWebSocketConnected
} from '../../reducers';
-import '../../scss/Definitions.scss';
-
export /* istanbul ignore next */ class Tasks extends Component {
state = {
deleteError: null,
diff --git a/src/containers/TriggerBinding/TriggerBinding.js b/src/containers/TriggerBinding/TriggerBinding.js
index ab2780d684..9a01c0d96e 100644
--- a/src/containers/TriggerBinding/TriggerBinding.js
+++ b/src/containers/TriggerBinding/TriggerBinding.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -28,8 +28,6 @@ import { getViewChangeHandler } from '../../utils';
import { fetchTriggerBinding } from '../../actions/triggerBindings';
-import '../../scss/Triggers.scss';
-
export /* istanbul ignore next */ class TriggerBindingContainer extends Component {
componentDidMount() {
const { match } = this.props;
diff --git a/src/containers/TriggerTemplate/TriggerTemplate.js b/src/containers/TriggerTemplate/TriggerTemplate.js
index 55f714e982..55e80fa25c 100644
--- a/src/containers/TriggerTemplate/TriggerTemplate.js
+++ b/src/containers/TriggerTemplate/TriggerTemplate.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2020 The Tekton Authors
+Copyright 2019-2021 The Tekton Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -33,8 +33,6 @@ import { getViewChangeHandler } from '../../utils';
import { fetchTriggerTemplate } from '../../actions/triggerTemplates';
-import '../../scss/Triggers.scss';
-
const {
Table,
TableBody,
diff --git a/src/scss/App.scss b/src/scss/App.scss
index 3fd30a5b94..5fb22c60da 100644
--- a/src/scss/App.scss
+++ b/src/scss/App.scss
@@ -13,6 +13,41 @@ limitations under the License.
@import './carbon';
+@import './Definitions.scss';
+@import './Triggers.scss';
+@import './Create.scss';
+@import '../containers/About/About.scss';
+@import '../containers/EventListener/EventListener.scss';
+@import '../containers/ImportResources/ImportResources.scss';
+@import '../containers/ListPageLayout/ListPageLayout.scss';
+@import '../containers/SideNav/SideNav.scss';
+
+@import '@tektoncd/dashboard-components/dist/scss/Run.scss';
+@import '@tektoncd/dashboard-components/dist/components/DataTableSkeleton/DataTableSkeleton.scss';
+@import '@tektoncd/dashboard-components/dist/components/DeleteModal/DeleteModal.scss';
+@import '@tektoncd/dashboard-components/dist/components/DetailsHeader/DetailsHeader.scss';
+@import '@tektoncd/dashboard-components/dist/components/Header/Header.scss';
+@import '@tektoncd/dashboard-components/dist/components/KeyValueList/KeyValueList.scss';
+@import '@tektoncd/dashboard-components/dist/components/LabelFilter/LabelFilter.scss';
+@import '@tektoncd/dashboard-components/dist/components/LoadingShell/LoadingShell.scss';
+@import '@tektoncd/dashboard-components/dist/components/Log/Log.scss';
+@import '@tektoncd/dashboard-components/dist/components/LogFormat/LogFormat.scss';
+@import '@tektoncd/dashboard-components/dist/components/LogoutButton/LogoutButton.scss';
+@import '@tektoncd/dashboard-components/dist/components/Param/Param.scss';
+@import '@tektoncd/dashboard-components/dist/components/PipelineRuns/PipelineRuns.scss';
+@import '@tektoncd/dashboard-components/dist/components/Rerun/Rerun.scss';
+@import '@tektoncd/dashboard-components/dist/components/RunHeader/RunHeader.scss';
+@import '@tektoncd/dashboard-components/dist/components/Spinner/Spinner.scss';
+@import '@tektoncd/dashboard-components/dist/components/StatusIcon/StatusIcon.scss';
+@import '@tektoncd/dashboard-components/dist/components/Step/Step.scss';
+@import '@tektoncd/dashboard-components/dist/components/StepDetails/StepDetails.scss';
+@import '@tektoncd/dashboard-components/dist/components/Table/Table.scss';
+@import '@tektoncd/dashboard-components/dist/components/Task/Task.scss';
+@import '@tektoncd/dashboard-components/dist/components/TaskRunDetails/TaskRunDetails.scss';
+@import '@tektoncd/dashboard-components/dist/components/TaskTree/TaskTree.scss';
+@import '@tektoncd/dashboard-components/dist/components/Trigger/Trigger.scss';
+@import '@tektoncd/dashboard-components/dist/components/ViewYAML/ViewYAML.scss';
+
.bx--btn.link-btn.bx--btn--ghost {
text-decoration: none;
}
diff --git a/src/scss/Create.scss b/src/scss/Create.scss
index ddf32c4206..8965ce26d9 100644
--- a/src/scss/Create.scss
+++ b/src/scss/Create.scss
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~carbon-components/scss/globals/scss/vars';
-
.tkn--create {
.tkn--create--heading {
display: flex;
diff --git a/src/scss/Triggers.scss b/src/scss/Triggers.scss
index e0d1cef2a1..a2cd8bc785 100644
--- a/src/scss/Triggers.scss
+++ b/src/scss/Triggers.scss
@@ -11,8 +11,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-@import '~@tektoncd/dashboard-components/dist/scss/vars';
-
.tkn--resourcedetails {
.tkn--details {
p:not(:empty) {
diff --git a/src/scss/_carbon.scss b/src/scss/_carbon.scss
index ffc9a9fa75..0478391b13 100644
--- a/src/scss/_carbon.scss
+++ b/src/scss/_carbon.scss
@@ -19,12 +19,21 @@ $css--default-type: true;
$css--plex: true;
$feature-flags: (
- grid-columns-16: true
+ grid-columns-16: true,
+ enable-css-custom-properties: true
);
-@import '~@tektoncd/dashboard-components/dist/scss/vars';
-@include carbon--theme();
+@import '~@carbon/themes/scss/themes';
+:root {
+ @include carbon--theme($carbon--theme--g10, true);
+}
+
+body.tkn--dark-theme {
+ @include carbon--theme($carbon--theme--g90, true);
+}
+
+@import '~carbon-components/scss/globals/scss/vars';
@import '~carbon-components/scss/globals/scss/css--reset';
@import '~carbon-components/scss/globals/scss/css--font-face';
@import '~carbon-components/scss/globals/scss/css--helpers';