github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-16 20:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Locked sass deps; fixed .matched-text fade function

Browse Source
This commit is contained in:
jpellizzari
2017-01-20 09:30:39 -08:00
parent 1efbb933d0
commit df85fa577b
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/app/styles/main.scss
View File

@@ -70,7 +70,7 @@ $search-border-width: 1px;
/* specific elements */
$body-background-color: linear-gradient(30deg, $background-color 0%, $background-lighter-color 100%);
$label-background-color: fade($background-average-color, 70%);
$label-background-color: fade-out($background-average-color, .7);
/* add this class to truncate text with ellipsis, container needs width */
@@ -197,7 +197,7 @@ h2 {
bottom: 11px;
right: 43px;
color: $text-tertiary-color;
background-color: fade($background-average-color, 90%);
background-color: fade-out($background-average-color, .9);
font-size: 0.7rem;
display: flex;
@@ -578,7 +578,7 @@ h2 {
display: inline-block;
margin: 1px;
padding: 2px 4px;
background-color: fade($weave-blue, 10%);
background-color: fade-out($weave-blue, .9);
}
&-label {
@@ -665,7 +665,7 @@ h2 {
}
.match {
background-color: fade($weave-blue, 30%);
background-color: fade-out($weave-blue, .7);
border: 1px solid $weave-blue;
}
@@ -1523,7 +1523,7 @@ h2 {
}
.search-item {
background-color: fade($weave-blue, 20%);
background-color: fade-out($weave-blue, .2);
border-radius: $border-radius / 2;
margin: 1px 0 1px 1.5em;
display: inline-block;

4
client/package.json
View File

@@ -65,13 +65,13 @@
"immutable-devtools": "0.0.7",
"jest-cli": "17.0.3",
"json-loader": "0.5.4",
"node-sass": "^3.13.1",
"node-sass": "3.13.1",
"postcss-loader": "1.2.0",
"react-addons-perf": "15.4.1",
"redux-devtools": "3.3.1",
"redux-devtools-dock-monitor": "1.1.1",
"redux-devtools-log-monitor": "1.1.1",
"sass-loader": "^4.1.1",
"sass-loader": "4.1.1",
"style-loader": "0.13.1",
"url": "0.11.0",
"url-loader": "0.5.7",

4
client/webpack.local.config.js
View File

@@ -82,7 +82,7 @@ module.exports = {
module: {
// Webpack is opionated about how pkgs should be laid out:
// https://github.com/webpack/webpack/issues/1617
noParse: /xterm\/(.*).map$/,
noParse: [/xterm\/(.*).map$/, /xterm\/dist\/xterm\.js/],
include: [
path.resolve(__dirname, 'app/scripts', 'app/styles')
],
@@ -114,7 +114,7 @@ module.exports = {
},
{
test: /\.(scss|css)$/,
loader: 'style-loader!css-loader!sass-loader'
loader: 'style-loader!css-loader!postcss-loader!sass-loader'
}
]
},

4
client/webpack.production.config.js
View File

@@ -48,7 +48,7 @@ module.exports = {
module: {
// Webpack is opionated about how pkgs should be laid out:
// https://github.com/webpack/webpack/issues/1617
noParse: [/xterm\/lib/],
noParse: [/xterm\/dist\/xterm\.js/],
include: [
path.resolve(__dirname, 'app/scripts', 'app/styles')
],
@@ -79,7 +79,7 @@ module.exports = {
},
{
test: /\.scss$/,
loader: ExtractTextPlugin.extract('style-loader', 'css-loader!sass-loader?minimize')
loader: ExtractTextPlugin.extract('style-loader', 'css-loader!postcss!sass-loader?minimize')
}
]
},