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.

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 #2032

Merged
merged 3 commits into from
Jul 17, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Added new variable in less
  • Loading branch information
allyoucanmap committed Jul 12, 2017
commit 3f7965aa012fffc368b9d8923cccf936b65fd596
16 changes: 12 additions & 4 deletions web/client/themes/default/less/dock-panel-react-data-grid.less
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@
border-bottom: 1px solid @ms2-color-shade-lighter;
}

.react-grid-Canvas, .react-grid-Grid {
background-color: @ms2-color-background;
}

.react-grid-Row.row-context-menu .react-grid-Cell, .react-grid-Row:hover .react-grid-Cell {
background-color: @ms2-color-shade-lighter;
cursor: pointer;
Expand Down Expand Up @@ -145,3 +141,15 @@
.react-grid-Cell:focus {
outline: 2px solid @ms2-color-text;
}

.react-grid-Row .react-grid-Cell.modified,
.react-grid-Row.row-selected .react-grid-Cell.modified,
.react-grid-Row.row-selected:active .react-grid-Cell.modified,
.react-grid-Row:hover .react-grid-Cell.modified {
background-color: @ms2-color-warning-active;
}

.react-grid-Row.row-selected:active .react-grid-Cell.modified,
.react-grid-Row:hover .react-grid-Cell.modified {
background-color: @ms2-color-warning-active;
}
4 changes: 4 additions & 0 deletions web/client/themes/default/less/home.less
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@
font-size: @grid-icon-size;
margin-top: -2px; /* remove after new icons */
}

.gridcard-title {
color: @ms2-color-text-primary;
}
2 changes: 2 additions & 0 deletions web/client/themes/default/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
@ms2-color-warning-light: lighten(@ms2-color-warning, 40%);
@ms2-color-danger-light: lighten(@ms2-color-danger, 40%);

@ms2-color-warning-active: darken(@ms2-color-warning, 20%);

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