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

Jump to bottom

Color consolidation #1405

Merged
merged 26 commits into from
Feb 3, 2021
Merged

Color consolidation #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
256828a
remove white-1
jameskerr Jan 29, 2021
ab92e8e
removed white-2
jameskerr Jan 29, 2021
fcc09e3
Removed white-3, dead css, react-day-picker
jameskerr Jan 29, 2021
4297c55
Removed white-5
jameskerr Jan 29, 2021
d0341cc
Remove white-6
jameskerr Jan 29, 2021
06b3b71
Remove white-7
jameskerr Jan 29, 2021
8a4716a
Remove white-8
jameskerr Jan 29, 2021
a0baf4e
Remove white-9
jameskerr Jan 29, 2021
a0c41ce
Remove gray-1
jameskerr Jan 29, 2021
59d9370
Remove gray-2
jameskerr Jan 29, 2021
2882dfd
Remove gray-3
jameskerr Jan 29, 2021
5d4712d
Remove gray-4
jameskerr Jan 29, 2021
e4ee972
Remove gray-5
jameskerr Jan 29, 2021
2c9f8e9
Remove gray-6
jameskerr Jan 29, 2021
f0e0bfb
Remove gray-7
jameskerr Jan 29, 2021
5cf2154
Remove gray-8
jameskerr Jan 29, 2021
5bbc827
Removed gray-9
jameskerr Jan 29, 2021
f38933f
Removed gray-base
jameskerr Jan 30, 2021
003929b
Converted sass colors to css vars
jameskerr Jan 30, 2021
ae93b2b
Removed blue
jameskerr Jan 30, 2021
c7df744
Removed Toggle Styles
jameskerr Jan 30, 2021
3db5337
Removed yellow
jameskerr Jan 30, 2021
212a56f
Removed all sass vars within colors.scss
jameskerr Jan 30, 2021
9199c99
Removed javascript defined colors
jameskerr Jan 30, 2021
be2d68f
Gotta get that code prettay
jameskerr Feb 2, 2021
b4e828c
Linty
jameskerr Feb 2, 2021
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
8 changes: 0 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@
"prismjs": "^1.20.0",
"react": "^16.13.1",
"react-beautiful-dnd": "^13.0.0",
"react-day-picker": "^7.4.8",
"react-dom": "^16.13.1",
"react-grid-layout": "^1.2.0",
"react-hot-toast": "^1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions ppl/css/_load-files-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
min-width: 360px;
position: relative;
border-radius: 16px;
border: 2px dashed $brand-orange;
border: 2px dashed var(--orange);
box-shadow: inset 0 0 2px 0px rgba(0, 0, 0, 0.3);
background: white;
width: 100%;
Expand Down Expand Up @@ -50,7 +50,7 @@
}
p {
@include label-small;
color: $slate;
color: var(--slate);
}
}

Expand Down
24 changes: 12 additions & 12 deletions ppl/css/_zeek-colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,35 @@ $unknown-type-color: #afafaf;

@include zeek-bg-color("conn", #86c8b7);
@include zeek-bg-color("dhcp", #00578a);
@include zeek-bg-color("dns", $blue);
@include zeek-bg-color("dns", #1ca0f2);
@include zeek-bg-color("ftp", #392277);
@include zeek-bg-color("http", $yellow-dark);
@include zeek-bg-color("http", hsl(49, 93%, 58%));
@include zeek-bg-color("files", #ad3f95);
@include zeek-bg-color("mysql", #d28204);
@include zeek-bg-color("irc", #00d1a6);
@include zeek-bg-color("radius", #ffd901);
@include zeek-bg-color("kerberos", #fbf758);
@include zeek-bg-color("sip", #006c7b);
@include zeek-bg-color("smtp", #e2e317);
@include zeek-bg-color("ssl", $gray-9);
@include zeek-bg-color("ssh", $gray-5);
@include zeek-bg-color("ssl", hsl(0, 0%, 3%));
@include zeek-bg-color("ssh", #535765);
@include zeek-bg-color("syslog", #ddb81d);
@include zeek-bg-color("tunnel", #007249);
@include zeek-bg-color("dce_rpc", #929292);
@include zeek-bg-color("ntlm", #6284a4);
@include zeek-bg-color("rdp", #081d5b);
@include zeek-bg-color("smb_files", #27eeff);
@include zeek-bg-color("smb_mapping", #0511d4);
@include zeek-bg-color("weird", $gray-4);
@include zeek-bg-color("x509", $orange);
@include zeek-bg-color("pe", $red);
@include zeek-bg-color("dpd", $green-dark);
@include zeek-bg-color("weird", #5e6373);
@include zeek-bg-color("x509", #eeb457);
@include zeek-bg-color("pe", #e65835);
@include zeek-bg-color("dpd", #256453);
@include zeek-bg-color("notice", red);
@include zeek-bg-color("capture_loss", purple);
@include zeek-bg-color("software", $blue-light);
@include zeek-bg-color("stats", $green-light);
@include zeek-bg-color("known_hosts", $orange);
@include zeek-bg-color("known_services", darken($orange, 10%));
@include zeek-bg-color("software", hsl(203, 89%, 68%));
@include zeek-bg-color("stats", #5ec4a8);
@include zeek-bg-color("known_hosts", #eeb457);
@include zeek-bg-color("known_services", darken(#eeb457, 10%));
@include zeek-bg-color("alert-1", var(--alert-1));
@include zeek-bg-color("alert-2", var(--alert-2));
@include zeek-bg-color("alert-3", var(--alert-3));
4 changes: 2 additions & 2 deletions src/css/_about-window.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

a {
color: $blue;
color: var(--havelock);
cursor: pointer;
}

Expand All @@ -42,7 +42,7 @@

hr {
border: none;
box-shadow: 0 0 0 0.5px $chrome-border;
box-shadow: 0 0 0 0.5px var(--pane-border);
margin: 18px 0 12px 0;
}
footer {
Expand Down
137 changes: 5 additions & 132 deletions src/css/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,3 @@
@mixin button-reset {
border: none;
font-family: $body-font;
}

@mixin button-shadow {
box-shadow: 0 1px 2px 0px rgba(0, 0, 0, 0.25);
}

.button-group {
display: flex;
align-items: center;
}

.button {
@include button-reset;
color: white;
background: $blue;
text-transform: uppercase;
font-weight: bold;
height: 24px;
line-height: 24px;
border-radius: 3px;
padding: 0 12px;
display: inline-block;
box-shadow: 0 1px 2px 0px rgba(0, 0, 0, 0.25);
transition: all 100ms;
cursor: pointer;

svg {
fill: white;
display: block;
margin: 0 auto;
}
}

.button:hover {
background: $blue-dark;
transform: scale(1.03);
}

.button:focus {
outline: none;
}

.button:active {
background: $blue-dark;
box-shadow: none;
outline: none;
transform: scale(1);
}

.button-circle {
background: $green;
fill: white;
stroke: white;
height: 36px;
width: 36px;
border: none;
box-shadow: $high-box-shadow;
border-radius: 50%;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
transition: all 150ms;
outline: none;

svg {
height: 17px;
width: 17px;
stroke-width: 0;
}

&:hover {
transform: scale(1.08);
}

&:active {
transform: scale(1);
}
}

.panel-button {
display: flex;
align-items: center;
Expand All @@ -91,11 +8,9 @@
background: none;
border: none;
border-radius: 3px;
cursor: pointer;

svg {
fill: $gray-4;
stroke: $gray-4;
fill: var(--slate);
height: 100%;
width: 100%;
}
Expand All @@ -112,8 +27,7 @@

&:disabled {
svg {
fill: lighten($gray-4, 35%);
stroke: lighten($gray-4, 35%);
fill: var(--cloudy);
}
&:hover {
background: none;
Expand All @@ -129,47 +43,6 @@
}
}

.thin-button {
@include button-reset;
font-family: $data-font;
height: 14px;
background: #dcdcdc;
border-radius: 3px;
display: inline-flex;
align-items: center;
justify-content: center;
padding: 0 10px;
font-size: 11px;
line-height: 12px;
font-weight: bold;
cursor: pointer;

˜ &:hover {
background: darken(#dcdcdc, 5%);
}

&:active,
.active {
background: darken(#dcdcdc, 10%);
}
}

.thin-picker {
width: 22px;
padding: 0 !important;
display: flex;
justify-content: center;
align-items: center;
transition: all 100ms;

svg {
fill: #4a4a4a;
width: 8px;
padding: 0;
margin: 0;
}
}

.close-button {
width: 30px;
height: 30px;
Expand All @@ -186,19 +59,19 @@
height: 10px;
width: 10px;
stroke: none;
fill: lighten($gray-5, 30%);
fill: var(--slate);
transition: fill 50ms;
}

&:hover {
svg {
fill: $gray-5;
fill: var(--aqua);
}
}

&:active {
svg {
fill: $gray-9;
fill: var(--slate);
}
}
}
2 changes: 1 addition & 1 deletion src/css/_chart-elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.hover-line {
fill: $white-9;
fill: var(--slate);
}
28 changes: 7 additions & 21 deletions src/css/_chart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
position: relative;

.selection {
fill: $yellow;
stroke: $yellow-dark;
fill: var(--havelock);
stroke: var(--havelock);
stroke-dasharray: 3px;
}

Expand All @@ -19,10 +19,10 @@
left: 50%;
top: 47%;
transform: translate(-50%, -50%);
color: $white-9;
color: var(--lead);

.burst {
background-color: $white-9;
background-color: var(--lead);
}
}

Expand Down Expand Up @@ -64,7 +64,7 @@
display: block;

.tick line {
stroke: $white-5;
stroke: var(--cloudy);
}

.tick text {
Expand All @@ -77,28 +77,14 @@
}

.domain {
stroke: $white-5;
stroke: var(--cloudy);
}

text {
font-family: $data-font;
fill: $gray-1;
fill: var(--lead);
font-size: 9px;
}

.y-axis-single-tick {
// transform: translateX(12px);
.tick,
.domain {
// display: none;
}
.tick:last-child {
// display: block;
}
.tick line {
display: none;
}
}
}

.chart-tooltip {
Expand Down
Loading