Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #763 from influxdata/misc-ui-polish 

Misc UI Polish
pull/10616/head
Alex Paxton 2017-01-12 11:10:50 -08:00 committed by GitHub
parent 28dbad2149 1c170634d9
commit 15567e769c
6 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/kapacitor/components/RuleGraph.js
View File

@ -34,7 +34,7 @@ export const RuleGraph = React.createClass({
if (!queryText) { if (!queryText) {
return ( return (
<div className="rule-preview--graph-empty"> <div className="rule-preview--graph-empty">
<p>Select a <strong>Metric</strong> to preview on a graph</p> <p>Select a <strong>Time-Series</strong> to preview on a graph</p>
</div> </div>
); );
} }

2
ui/src/kapacitor/components/ValuesSection.js
View File

@ -98,7 +98,7 @@ const Threshold = React.createClass({
return ( return (
<div className="value-selector"> <div className="value-selector">
<p>Send Alert where</p> <p>Send Alert where</p>
<span>{query.fields.length ? query.fields[0].field : 'Select a Metric'}</span> <span>{query.fields.length ? query.fields[0].field : 'Select a Time-Series'}</span>
<p>is</p> <p>is</p>
<Dropdown className="size-176 dropdown-kapacitor" items={operators} selected={operator} onChoose={this.handleDropdownChange} /> <Dropdown className="size-176 dropdown-kapacitor" items={operators} selected={operator} onChoose={this.handleDropdownChange} />
<input className="form-control input-sm size-166 form-control--green" type="text" ref={(r) => this.valueInput = r} defaultValue={value} onKeyUp={this.handleInputChange} /> <input className="form-control input-sm size-166 form-control--green" type="text" ref={(r) => this.valueInput = r} defaultValue={value} onKeyUp={this.handleInputChange} />

6
ui/src/style/theme/bootstrap-theme.scss
View File

@ -454,17 +454,17 @@ a:active.link-warning {
} }
::-moz-selection { ::-moz-selection {
color: #fff; color: #fff;
background-color: #757888; background-color: #22ADF6;
/* WebKit/Blink Browsers */ /* WebKit/Blink Browsers */
} }
::selection { ::selection {
color: #fff; color: #fff;
background-color: #757888; background-color: #22ADF6;
/* WebKit/Blink Browsers */ /* WebKit/Blink Browsers */
} }
::-moz-selection { ::-moz-selection {
color: #fff; color: #fff;
background-color: #757888; background-color: #22ADF6;
/* Gecko Browsers */ /* Gecko Browsers */
} }
.btn { .btn {

37
ui/src/style/theme/theme-dark.scss
View File

@ -105,20 +105,6 @@
border-color: $g5-pepper !important; border-color: $g5-pepper !important;
color: $g15-platinum !important; color: $g15-platinum !important;
&::-webkit-input-placeholder { color: $g10-wolf; }
&::-moz-placeholder { color: $g10-wolf; }
&:-ms-input-placeholder { color: $g10-wolf; }
&:-moz-placeholder { color: $g10-wolf; }
&::selection {
background-color: $c-laser;
color: $g20-white;
}
&::-moz-selection {
background-color: $c-laser;
color: $g20-white;
}
&:hover { &:hover {
border-color: $g6-smoke !important; border-color: $g6-smoke !important;
} }
@ -143,20 +129,25 @@
.form-group-submit { .form-group-submit {
margin-top: 30px; margin-top: 30px;
} }
textarea {
/* Placeholder Text */
.form-control,
textarea,
input {
&::-webkit-input-placeholder { color: $g10-wolf; } &::-webkit-input-placeholder { color: $g10-wolf; }
&::-moz-placeholder { color: $g10-wolf; } &::-moz-placeholder { color: $g10-wolf; }
&:-ms-input-placeholder { color: $g10-wolf; } &:-ms-input-placeholder { color: $g10-wolf; }
&:-moz-placeholder { color: $g10-wolf; } &:-moz-placeholder { color: $g10-wolf; }
}
&::selection { /* Text Selection Styling */
background-color: $c-laser; ::selection {
color: $g20-white; background-color: $c-pool !important;
} color: $g20-white !important;
&::-moz-selection { }
background-color: $c-laser; ::-moz-selection {
color: $g20-white; background-color: $c-pool !important;
} color: $g20-white !important;
} }

2
ui/webpack/devConfig.js
View File

@ -72,7 +72,7 @@ module.exports = {
$: "jquery", $: "jquery",
jQuery: "jquery", jQuery: "jquery",
}), }),
new ExtractTextPlugin("style.css"), new ExtractTextPlugin("chronograf.css"),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, '..', 'src', 'index.template.html'), template: path.resolve(__dirname, '..', 'src', 'index.template.html'),
inject: 'body', inject: 'body',

2
ui/webpack/prodConfig.js
View File

@ -77,7 +77,7 @@ var config = {
$: "jquery", $: "jquery",
jQuery: "jquery", jQuery: "jquery",
}), }),
new ExtractTextPlugin("style.css"), new ExtractTextPlugin("chronograf.css"),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, '..', 'src', 'index.template.html'), template: path.resolve(__dirname, '..', 'src', 'index.template.html'),
inject: 'body', inject: 'body',