Skip to content

Commit

Permalink
Theme fixes and improvements (Velocidex#2305)
Browse files Browse the repository at this point in the history
* Theme fixes and improvements

* Fix tool buttons

* Changed column widths on artifact selection modal
  • Loading branch information
predictiple authored Dec 4, 2022
1 parent d5944f4 commit c529080
Show file tree
Hide file tree
Showing 12 changed files with 928 additions and 217 deletions.
3 changes: 1 addition & 2 deletions gui/velociraptor/src/components/core/ace.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

/* Used in new artifact ace editor popout */
.velo-ace-editor {
border-width: 4px;
border-style: inset;
border-width: 0;
height: 100%;
overflow-y: auto;
}
Expand Down
4 changes: 2 additions & 2 deletions gui/velociraptor/src/components/flows/new-collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class NewCollectionSelectArtifacts extends React.Component {

<Modal.Body>
<div className="row new-artifact-page">
<div className="col-6 new-artifact-search-table selectable">
<div className="col-4 new-artifact-search-table selectable">
{ this.state.loading && <Spinner loading={this.state.loading}/> }
<BootstrapTable
hover
Expand All @@ -340,7 +340,7 @@ class NewCollectionSelectArtifacts extends React.Component {
/>

</div>
<div name="ArtifactInfo" className="col-6 new-artifact-description">
<div name="ArtifactInfo" className="col-8 new-artifact-description">
{ this.state.selectedDescriptor &&
<VeloReportViewer
artifact={this.state.selectedDescriptor.name}
Expand Down
2 changes: 1 addition & 1 deletion gui/velociraptor/src/components/users/user-label.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class UserSettings extends React.PureComponent {
<option value="ncurses">{T("Ncurses (light)")}</option>
<option value="github-dimmed-dark">{T("Github dimmed (dark)")}</option>
<option value="coolgray-dark">{T("Cool Gray (dark)")}</option>
<option value="midnight">{T("Midnight Inferno <experimental> (dark)")}</option>
<option value="midnight">{T("Midnight Inferno (very dark)")}</option>
</Form.Control>
</Col>
</Form.Group>
Expand Down
3 changes: 2 additions & 1 deletion gui/velociraptor/src/components/users/user.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
float: right;
display: inline;
padding: 0px;
padding-left: 10px;
padding-left: 5px;
padding-right: 5px;
}


Expand Down
4 changes: 2 additions & 2 deletions gui/velociraptor/src/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ code {
color: var(--color-foreground);
content: attr(data-title);
display: none;
font-family: sans-serif;
font-family: var(--font-family-sans-serif);
font-size: 14px;
padding: 4px 8px;
position: absolute;
top: -20px;
top: -32px;
left: 0px;
z-index: 1;
white-space: nowrap;
Expand Down
174 changes: 152 additions & 22 deletions gui/velociraptor/src/themes/coolgray-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@
--color-no-content: var(--color-foreground-dimmed);

--color-form-background: #fceff4;
--color-page-link-active-background: var(--color-btn-border);

--color-page-link-active-background: var(--color-accent-75);
--color-page-link-hover-background: var(--color-accent-25);
--color-page-link-background: var(--color-canvas-background);
--color-pagination-disabled: var(--color-btn-border);

--color-timeline-header: #cdcdcd20;
--color-timeline-table-shown: #dd4b3920;
Expand Down Expand Up @@ -378,6 +382,10 @@ body.coolgray-dark {
margin: 1px;
}

.coolgray-dark .client-link.btn.btn-outline-info {
width: unset;
}

.coolgray-dark .btn-outline-info:hover {
color: whitesmoke !important;
background: var(--color-btn-outline-link-hover) !important;
Expand All @@ -404,9 +412,10 @@ body.coolgray-dark {
.coolgray-dark .btn.btn-link {
border-color: transparent;
width: 100%;
background: none;
background: var(--color-table-heading-background);
color: var(--color-foreground);
border-radius: 0;
font-weight: 500;
}

.coolgray-dark .alert-secondary {
Expand Down Expand Up @@ -435,20 +444,31 @@ body.coolgray-dark {
}

/* Pagination */

.coolgray-dark .page-item .page-link {
background: var(--color-btn-default-background);
background: var(--color-page-link-background);
border-color: var(--color-btn-default-border);
color: var(--color-foreground);
}

.coolgray-dark .page-item.disabled span {
color: var(--color-pagination-disabled);
}

.coolgray-dark .page-item input {
background: var(--color-btn-default-background-hover);
color: var(--color-foreground);
border: 1px solid var(--color-btn-default-border);
}

.coolgray-dark .page-item.active .page-link:hover,
.coolgray-dark .page-item.active .page-link {
background: var(--color-canvas-background);
background: var(--color-page-link-active-background);
border-color: var(--color-btn-default-border);
}

.coolgray-dark .page-item .page-link:hover {
background: var(--color-page-link-hover-background);
border-color: var(--color-btn-default-border);
}

Expand Down Expand Up @@ -507,23 +527,42 @@ body.coolgray-dark {
border: none;
}

.coolgray-dark .table tbody tr.row-selected,
.coolgray-dark .table tbody tr.row_selected td {
background: var(--color-table-row-selected);
color: var(--color-foreground);
}

.coolgray-dark .table-hover tbody tr:hover {
background: var(--color-table-row-hover);
color: unset;
}

.coolgray-dark .table tbody tr.row-selected,
.coolgray-dark .table tbody tr.row_selected td {
background: var(--color-table-row-selected);
color: var(--color-foreground);
.coolgray-dark .new-artifact-search-table.selectable .table.table-bordered,
.coolgray-dark .new-artifact-search-table.selectable .table.table-bordered tbody tr,
.coolgray-dark .new-artifact-search-table.selectable .table.table-bordered thead th {
background: none;
border: none;
}

.coolgray-dark .new-artifact-search-table.selectable .table.table-bordered tbody tr > td > button.btn.btn-link:hover {
background: var(--color-btn-outline-link-hover);
}

.coolgray-dark .new-artifact-search-table.selectable .table.table-bordered tbody > tr.row-selected > td > button.btn.btn-link,
.coolgray-dark .new-artifact-search-table.selectable .table.table-bordered tbody > tr.row-selected > td > button.btn.btn-link:hover {
background: var(--color-accent-75);
color: var(--color-foreground-inverse);
font-weight: 700;
text-decoration: none;
}

.coolgray-dark .new-artifact-search-table.selectable > div > table > tbody > tr.row-selected > td > button.btn.btn-link {
/* .coolgray-dark .new-artifact-search-table.selectable > div > table > tbody > tr.row-selected > td > button.btn.btn-link {
background: var(--color-accent-75);
border: 1px solid var(--color-btn-default-border);
text-decoration: none;
font-weight: 700;
}
} */


/* Column search screen */
Expand Down Expand Up @@ -647,6 +686,11 @@ body.coolgray-dark {

/* Form controls */

.coolgray-dark .estimate.alert-info {
border: none;
background-color: var(--color-card-heading-background);
}

.coolgray-dark .custom-switch .custom-control-input:disabled:checked~.custom-control-label:before {
background-color: var(--color-accent-25);
}
Expand All @@ -656,16 +700,49 @@ body.coolgray-dark {
font-weight: 500 !important;
}

.coolgray-dark .velo__multi-value {
border: 1px solid var(--color-btn-default-border);
background-color: var(--color-canvas-background);
border-radius: 0;
}

.coolgray-dark .velo__multi-value__label {
color: var(--color-foreground);
border: none;
border-radius: 0;
}

.coolgray-dark .velo__multi-value__remove {
color: var(--color-foreground-inverse);
background-color: var(--color-btn-default-border);
border: none;
border-radius: 0;
}

.coolgray-dark .velo__multi-value__remove:hover {
color: var(--color-foreground-inverse);
background-color: var(--color-accent-100);
font-weight: 700;
}

.coolgray-dark .form-control,
.coolgray-dark .velo__control,
.coolgray-dark .velo__menu {
background: var(--color-form-control-background);
border-color: var(--color-btn-default-border);
border-radius: 0;
box-shadow: none;
color: var(--color-foreground);
font-size: var(--font-size-base);
font-weight: 500;
color: var(--color-foreground);
border-radius: 0;
border-color: var(--color-btn-default-border);
}

.coolgray-dark .accordion,
.coolgray-dark .accordion > .card,
.coolgray-dark .accordion > .card > .card-header {
background: var(--color-form-control-background);
box-shadow: none;
border-color: var(--color-btn-default-border);
color: var(--color-foreground);
}

.coolgray-dark .form-control:focus,
Expand Down Expand Up @@ -710,6 +787,14 @@ body.coolgray-dark {
width: 0;
}

.coolgray-dark .velo__indicator {
color: var(--color-foreground);
}

.coolgray-dark .velo__placeholder {
color: var(--color-foreground);
}

.coolgray-dark .input-group-text {
background: var(--color-btn-default-background-hover);
box-shadow: none;
Expand Down Expand Up @@ -888,7 +973,6 @@ body.coolgray-dark {
padding-left: 12px;
}


.coolgray-dark .tree-folder.active {
color: var(--color-header-background);
}
Expand Down Expand Up @@ -916,30 +1000,70 @@ body.coolgray-dark {
}

/* Datepicker */

.coolgray-dark .react-datetime-picker__wrapper {
border: 1px solid var(--color-btn-border);
color: var(--color-foreground);
}

.coolgray-dark .react-datepicker,
.coolgray-dark .react-datetime-picker__calendar .react-calendar,
.coolgray-dark .react-datetime-picker {
background: var(--color-canvas-background);
font-family: var(--font-family-sans-serif);
background: var(--color-form-control-background);
color: var(--color-foreground);
z-index: 10;
}

.coolgray-dark .react-datetime-picker__inputGroup__input,
.coolgray-dark .react-datetime-picker__button {
filter: invert(0.7);
filter: invert(99%) sepia(1%) saturate(437%) hue-rotate(173deg) brightness(99%) contrast(94%);
stroke: var(--color-accent-100) !important;
}

.coolgray-dark .react-datepicker-popper {
z-index: 10;
.coolgray-dark .react-datetime-picker__button:enabled:hover .react-datetime-picker__button__icon,
.coolgray-dark .react-datetime-picker__button:enabled:focus .react-datetime-picker__button__icon,
.coolgray-dark .react-datetime-picker__button:hover {
stroke: var(--color-accent-100) !important;
filter: none;
}

.coolgray-dark .react-datepicker__day {
/* .coolgray-dark .react-calendar__navigation button,
.coolgray-dark .react-calendar__tile {
color: var(--color-foreground);
} */

.coolgray-dark .react-calendar button:enabled:hover {
background-color: var(--color-accent-25);
border: none;
}

.coolgray-dark .react-datepicker__day[aria-disabled="false"] {
background: var(--color-table-row-selected);
.coolgray-dark .react-calendar__navigation button:disabled,
.coolgray-dark .react-calendar__navigation button:enabled:focus {
background-color: unset;
}

.coolgray-dark .react-calendar__tile:enabled:hover {
background-color: var(--color-accent-25);
border: none;
}

.coolgray-dark .react-calendar .react-calendar__tile--now {
background-color: var(--color-accent-50);
color: var(--color-foreground);
}

.coolgray-dark .react-calendar .react-calendar__tile--active,
.coolgray-dark .react-calendar .react-calendar__tile--active:hover {
background-color: var(--color-accent-75);
font-weight: 700;
color: var(--color-foreground-inverse);
}

.coolgray-dark .react-calendar__month-view__days__day--neighboringMonth {
color: var(--color-btn-border);
}

/* Footer */
.coolgray-dark .app-footer.fixed-bottom {
background: var(--color-footer-background);
Expand Down Expand Up @@ -1028,6 +1152,12 @@ body.coolgray-dark {
font-size: var(--font-size-base);
}

.coolgray-dark .tooltip-inner {
font-family: var(--font-family-sans-serif);
font-size: var(--font-size-base);
font-weight: 700;
}

.coolgray-dark .file-hex-view td,
.coolgray-dark .file-hex-view th {
border: 0px;
Expand Down
Loading

0 comments on commit c529080

Please sign in to comment.