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.

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

Fix #2015 Update theme and icons for editing workflow #2046

Merged
merged 2 commits into from
Jul 20, 2017
Merged

Fix #2015 Update theme and icons for editing workflow #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd9f047
Fix plugin example style
allyoucanmap Jul 19, 2017
7cc0cfc
Added new less variables
allyoucanmap Jul 19, 2017
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 web/client/examples/plugins/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ const startApp = () => {
<Provider store={store}>
<Localized>
<div style={{width: "100%", height: "100%"}}>
<div id="plugins-list" style={{position: "absolute", zIndex: "10000", backgroundColor: "white", width: "300px", left: 0, height: "100%", overflow: "auto"}}>
<div id="plugins-list" style={{position: "absolute", zIndex: "10000", width: "300px", left: 0, height: "100%", overflow: "auto"}}>
<h5>Configure application plugins</h5>
<ul>
<FormGroup bsSize="small">
Expand Down
34 changes: 28 additions & 6 deletions web/client/themes/default/bootstrap-theme.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
@bootstrap-path: "~bootstrap/less/";
// Core variables and mixins
@import "@{bootstrap-path}variables.less";
// @import "@{bootstrap-path}variables.less";
@import "@{bootstrap-path}mixins.less";
// Reset and dependencies
@import "@{bootstrap-path}normalize.less";
Expand Down Expand Up @@ -50,15 +50,13 @@
@import "@{bootstrap-path}utilities.less";
@import "@{bootstrap-path}responsive-utilities.less";

.modal-header {
background-color: @ms2-color-primary;
color: @ms2-color-text-primary;
}
// Custom theme

// Button
button.close {
opacity: 1.0;
}
// Mixin for generating new styles

.btn-styles(@btn-color-hover) {

&:hover {
Expand All @@ -85,3 +83,27 @@ button.close {
.btn-danger {
.btn-styles(@ms2-color-danger-hover);
}

// Modal
.modal-dialog {
width: 290px;
margin: auto;
}

.modal-header {
background-color: @ms2-color-primary;
color: @ms2-color-text-primary;
}

@media (min-width: @screen-sm-min) {
.modal-dialog {
width: @modal-md;
margin: auto;
margin-top: 150px;
}
}

// Dropdown
.dropdown-menu {
padding: 0;
}
7 changes: 7 additions & 0 deletions web/client/themes/default/less/dock-panel-react-data-grid.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,10 @@
.react-grid-Row:hover .react-grid-Cell.modified {
background-color: @ms2-color-warning-active;
}

.react-grid-Row .react-grid-Cell.modified.invalid,
.react-grid-Row .react-grid-Cell.invalid,
.react-grid-Row.row-selected .react-grid-Cell.invalid,
.react-grid-Row.row-selected .react-grid-Cell.modified.invalid {
background-color: @ms2-color-danger-active;
}
2 changes: 1 addition & 1 deletion web/client/themes/default/less/drawer-menu.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
display: block;
height: @square-btn-size;
width: @square-btn-size;
padding: @padding-left-square 0 0 @padding-left-square;
padding: floor((@padding-left-square - 1) / 1.230769231) 0 0 (@padding-left-square - 1);
}

#mapstore-drawermenu .navHeader .glyphicon-remove {
Expand Down
2 changes: 1 addition & 1 deletion web/client/themes/default/less/square-button.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.square-button {
height: @square-btn-size;
width: @square-btn-size;
padding: 0 @padding-left-square - 1;
padding: floor((@padding-left-square - 1) / 1.230769231 /* font ratio height/width */) (@padding-left-square - 1);
outline: 0 !important;

.glyphicon {
Expand Down
4 changes: 4 additions & 0 deletions web/client/themes/default/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
@ms2-color-warning-light: lighten(@ms2-color-warning, 40%);
@ms2-color-danger-light: lighten(@ms2-color-danger, 40%);

@ms2-color-primary-active: darken(@ms2-color-primary, 20%);
@ms2-color-info-active: darken(@ms2-color-info, 20%);
@ms2-color-success-active: darken(@ms2-color-success, 20%);
@ms2-color-warning-active: darken(@ms2-color-warning, 20%);
@ms2-color-danger-active: darken(@ms2-color-danger, 20%);

@ms2-color-shade: #555555;
@ms2-color-shade-darker: #222222;
Expand Down