Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use SASS instead of precss #476

Merged
merged 1 commit into from
Jul 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion allure-generator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ apply plugin: 'maven'
apply plugin: 'com.moowork.node'

node {
version = '7.10.0'
version = '8.1.3'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary for this particular feature, but good to have

yarnVersion = '0.24.6'
download = true
}
Expand Down
9 changes: 4 additions & 5 deletions allure-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@
"jest": "^20.0.4",
"jsdom": "^11.0.0",
"json-loader": "^0.5.4",
"postcss-import": "^10.0.0",
"postcss-loader": "^1.3.2",
"postcss-nesting": "^4.0.1",
"precss": "^1.4.0",
"node-sass": "^4.5.3",
"postcss-loader": "^2.0.6",
"sass-loader": "^6.0.6",
"style-loader": "^0.18.1",
"underscore.string": "^3.3.4",
"url-loader": "^0.5.8",
Expand Down Expand Up @@ -86,7 +85,7 @@
"^.+\\.js$": "babel-jest"
},
"moduleNameMapper": {
"\\.css$": "<rootDir>/src/test/javascript/stubs/css.js"
"\\.s?css$": "<rootDir>/src/test/javascript/stubs/css.js"
}
}
}
4 changes: 2 additions & 2 deletions allure-generator/src/main/javascript/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'font-awesome/css/font-awesome.css';
import './styles.css';
import './blocks/table/styles.css';
import './styles.scss';
import './blocks/table/styles.scss';
import {Application, Behaviors} from 'backbone.marionette';
import {history} from 'backbone';
import router from './router';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import "../../mixins.css";
@import "../../mixins.scss";

.alert {
padding: $gap-size;
&__code {
margin: 0;
word-break: break-word;
}
@mixin status-bg;
@include status-bg();
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.attachment-row {
padding: 5px $gap-size 5px 25px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../variables.css";
@import "../../mixins.css";
@import "../../variables.scss";
@import "../../mixins.scss";

.bar {
height: 18px;
Expand All @@ -16,6 +16,6 @@
color: #fff;
font-size: 12px;
line-height: 18px;
@mixin status-bg-bright;
@include status-bg-bright();
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

$button-border-radius: 3px;
$button-border-color: rgba(0, 0, 0, 0.2);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.island {
background: $content-bg;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../mixins.css";
@import "../../mixins.scss";

.label {
vertical-align: baseline;
Expand All @@ -7,7 +7,7 @@
padding: 2px 4px 2px 5px;
font-size: 80%;
border-radius: 3px;
@mixin status-bg-bright;
@include status-bg-bright();

&__info {
background: #3c58e4;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.link {
color: $link-color;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.splash {
margin: auto;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.step-stats {
&__info {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../variables.css';
@import "../../variables.scss";

.table {
&__row, &__head {
Expand Down
5 changes: 0 additions & 5 deletions allure-generator/src/main/javascript/blocks/text/styles.css

This file was deleted.

5 changes: 5 additions & 0 deletions allure-generator/src/main/javascript/blocks/text/styles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import "../../mixins.scss";

.text {
@include status-text();
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.widget {
margin-bottom: $gap-size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import highlight from '../../util/highlight';
import {View} from 'backbone.marionette';
import $ from 'jquery';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.attachment {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone.marionette';
import {className} from '../../decorators';
import template from './BackPanelView.hbs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone.marionette';
import {className} from '../../decorators';
import template from './ErrorSplashView.hbs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone.marionette';
import template from './ExecutionView.hbs';
import {className} from '../../decorators';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.execution {
&__title {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone';
import {axisLeft, axisBottom} from 'd3-axis';
import {select, event as currentEvent} from 'd3-selection';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../mixins.css";
@import "../../mixins.scss";

.chart {
margin-right: $gap-size;
Expand Down Expand Up @@ -41,7 +41,7 @@
width: 20px;
height: 16px;
margin-right: 5px;
@mixin status-bg-bright;
@include status-bg-bright();
}

&__bar {
Expand All @@ -53,7 +53,7 @@
stop-opacity: 0;
}
&__fill {
@mixin status-fill;
@include status-fill();
}
&__axis {
path, line {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {scaleLinear, scalePoint} from 'd3-scale';
import {max} from 'd3-array';
import {area, stack} from 'd3-shape';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import "../../mixins.css";
@import "../../mixins.scss";

.trend {
&__area {
@mixin status-fill;
@include status-fill();
}
&__tooltip {
display: block;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import PopoverView from '../popover/PopoverView';
import {className, on} from '../../decorators';
import template from './LanguageSelectView.hbs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.language-select {
z-index: 1;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone.marionette';
import {options} from '../../decorators';
import template from './LoaderView.hbs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.loader {
margin: auto;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {on, className} from '../../decorators';
import settings from '../../util/settings';
import template from './NodeSorterView.hbs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.sorter {
overflow: hidden;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone.marionette';
import $ from 'jquery';
import {className} from '../../decorators';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.pane {
position: absolute;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import TooltipView from '../tooltip/TooltipView';
import {className} from '../../decorators';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.popover {
position: absolute;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {className, on} from '../../decorators';
import {findWhere} from 'underscore';
import {View} from 'backbone.marionette';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.side-nav {
background: $app-nav-bg;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {on, className} from '../../decorators';
import settings from '../../util/settings';
import template from './StatusToggleView.hbs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../mixins.css";
@import "../../mixins.scss";

.status-toggle {
&__items {
Expand All @@ -20,7 +20,7 @@
color: #fff;
padding: 2px 4px 2px 5px;
border-radius: 3px;
@mixin status-bg-bright;
@include status-bg-bright();
}

.n-label {
Expand All @@ -30,7 +30,7 @@
border-radius: 3px;
border: 1px solid;
font-weight: bold;
@mixin status-text;
@mixin status-border;
@include status-text();
@include status-border();
}

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone.marionette';
import {on, regions, behavior} from '../../decorators';
import pluginsRegistry from '../../util/pluginsRegistry';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../variables.css";
@import "../../mixins.css";
@import "../../variables.scss";
@import "../../mixins.scss";

.testresult {
&__trace {
Expand Down Expand Up @@ -34,7 +34,7 @@

.message {
border-bottom: 3px solid;
@mixin status-border;
@include status-border();
}

.fullname__copy {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone';
import {className} from '../../decorators';
import bem from 'b_';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone.marionette';
import router from '../../router';
import settings from '../../util/settings';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.node {
margin-left: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './styles.css';
import './styles.scss';
import {View} from 'backbone.marionette';
import $ from 'jquery';
import Sortable from 'sortablejs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../variables.css";
@import "../../variables.scss";

.widgets-grid {
position: absolute;
Expand Down
4 changes: 2 additions & 2 deletions allure-generator/src/main/javascript/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import $ from 'jquery';

import 'file-loader?name=favicon.ico!./favicon.ico';

import './blocks/arrow/styles.css';
import './blocks/executor-icon/styles.css';
import './blocks/arrow/styles.scss';
import './blocks/executor-icon/styles.scss';

import './pluginApi';

Expand Down
Loading