Skip to content

fix issue with placeholder; #11

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 14, 2017
Merged

fix issue with placeholder; #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion gulpfile.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var specific = JSON.parse(fs.readFileSync(`./config/${target}.json`));
var context = Object.assign({}, generic, specific);

var manifest = {
//Add this to the manifest file So the livereload scritpt is also enqluded in the development
//Add this to the manifest file So the livereload scritpt is also included in the development
dev: {
'background': {
'scripts': [
Expand Down Expand Up @@ -268,6 +268,7 @@ function buildJS(target) {
];

let tasks = files.map(file => {

return browserify({
entries: 'src/scripts/' + file.source,
debug: !production
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/components/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ class Setup extends Component {
<div>
<h1>{translate('setupStepTwoTitle')}</h1>
<p>{translate('setupStepTwoBody')}</p>
<Input label={`${this.state.toolName} url`} helperText={translate('setupHelperTextUrl')} type="url" name="toolUrl" placeholder="https://bugtracker.uncinc.nl" value={this.state.toolUrl} onchange={this._handleStateChange}/>
<Input label={`${this.state.toolName} url`} helperText={translate('setupHelperTextUrl')} type="url" name="toolUrl" placeholder="https://bugs.example.com" value={this.state.toolUrl} onchange={this._handleStateChange}/>
<Input label={'Username'} type="text" helperText={translate('setupHelperTextUserName')} name="accountUserName" placeholder="username" value={this.state.accountUserName} onchange={this._handleStateChange}/>
<Input label={'Password'} type="password" helperText={translate('setupHelperTextPassword')} name="accountPassword" placeholder="Password" value={this.state.accountPassword} onchange={this._handleStateChange}/>
</div>
Expand Down
3 changes: 0 additions & 3 deletions src/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
top: 0;
width: 100%;
z-index: 99999999999;

// ::-moz-selection {
// background: $font-color-dark;
// color: $font-color;
// }

::selection {
background: $font-color-dark;
color: $font-color;
}

}
2 changes: 1 addition & 1 deletion src/styles/vars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $secondary-color-dark: #c92424;
$font-color: #fff;
$font-color-hover: #dfdfdf;
$font-color-dark: #000;
$font-color-dark-semitransparant: rgba(0, 0, 0, .42);
$font-color-dark-semitransparant: rgba(0, 0, 0, .32);
$font-color-semitransparant: rgba(255, 255, 255, .38);
$color-transparant: rgba(255, 255, 255, 0);

Expand Down