scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-10 06:37:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #822 from mlorb/ml-sci-1633

Browse source 
Fixes time zone style [SCI-1633]
This commit is contained in:
mlorb 2017-10-17 13:21:02 +02:00 committed by GitHub
commit 7f3c34b930
4 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/packs/styles.scss
View file

@ -3,7 +3,6 @@ $icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "~font-awesome/scss/font-awesome";
@import "react-bootstrap-timezone-picker/dist/react-bootstrap-timezone-picker.min.css";
@import "~react-bootstrap-table/dist/react-bootstrap-table.min";
@import "react-tagsinput/react-tagsinput.css";

9
app/javascript/src/components/data_table/index.jsx
View file

@ -54,6 +54,15 @@ const StyledBootstrapTable = styled(BootstrapTable)`
display: inline-block !important;
}
}
// fixes issue with dropdown in datatable
.react-bootstrap-table-dropdown-fix {
overflow: inherit !important;
}
.react-bs-container-body {
overflow: inherit !important;
}
`;
class DataTable extends Component {

29
app/javascript/src/scenes/SettingsPage/scenes/preferences/components/InputTimezone.jsx
View file

@ -1,6 +1,6 @@
import React, { Component } from "react";
import { string, func } from "prop-types";
import { Button } from "react-bootstrap";
import { Button, ButtonToolbar } from "react-bootstrap";
import styled from "styled-components";
import TimezonePicker from "react-bootstrap-timezone-picker";
import "react-bootstrap-timezone-picker/dist/react-bootstrap-timezone-picker.min.css";
@ -22,6 +22,10 @@ const Wrapper = styled.div`
.settings-warning {
margin-bottom: 15px;
}
.timezone-picker {
display: block;
}
`;
const WrapperInputDisabled = styled.div`
@ -34,6 +38,13 @@ const WrapperInputDisabled = styled.div`
}
`;
const StyledTimezonePicker = styled(TimezonePicker)`
.timezone-picker-list {
max-height: 400px;
overflow-y: auto;
}
`;
class InputTimezone extends Component {
constructor(props) {
super(props);
@ -94,7 +105,7 @@ class InputTimezone extends Component {
<h4>
<FormattedMessage id="settings_page.time_zone" />
</h4>
<TimezonePicker
<StyledTimezonePicker
absolute
defaultValue="Europe/London"
value={this.state.value}
@ -106,12 +117,14 @@ class InputTimezone extends Component {
<FormattedMessage id="settings_page.time_zone_warning" />
</small>
</div>
<Button bsStyle="primary" onClick={this.disableEdit}>
<FormattedMessage id="general.cancel" />
</Button>
<Button bsStyle="default" onClick={this.handleUpdate}>
<FormattedMessage id="general.update" />
</Button>
<ButtonToolbar>
<Button bsStyle="primary" onClick={this.handleUpdate}>
<FormattedMessage id="general.update" />
</Button>
<Button bsStyle="default" onClick={this.disableEdit}>
<FormattedMessage id="general.cancel" />
</Button>
</ButtonToolbar>
</Wrapper>
);
}

9
app/javascript/src/styles/main.scss
View file

@ -48,15 +48,6 @@ body {
}
}
// // fixes issue with dropdown in datatable
.react-bootstrap-table-dropdown-fix {
overflow: inherit !important;
}
.react-bs-container-body {
overflow: inherit !important;
}
// tags input
.react-tagsinput--focused {
border-color: $color-theme-primary;