Skip to content

Commit

Permalink
Replace Polished with Chroma (Graylog2#7694)
Browse files Browse the repository at this point in the history 
* cleanout

* Replace Polished with Chroma

* Updated vendor modules

* revert src/views/pages/ExtendedSearchPage.jsx

* yarn

* less alarming alerts

* curly brackets

* Updated snapshot
  • Loading branch information
@kyleknighted
kyleknighted authored Mar 24, 2020
1 parent acd10fb commit ee8a8e5
Show file tree
Hide file tree
Showing 60 changed files with 1,512 additions and 1,492 deletions.
1 change: 0 additions & 1 deletion graylog2-web-interface/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
"numeral": "^2.0.6",
"opensans-npm-webfont": "^1.0.0",
"plotly.js": "^1.52.2",
"polished": "^3.4.1",
"qs": "^6.3.0",
"react-ace-builds": "^7.3.1",
"react-color": "^2.14.0",
Expand Down
52 changes: 26 additions & 26 deletions graylog2-web-interface/src/components/bootstrap/__snapshots__/Input.test.jsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ exports[`Input renders a addon after the input if addonAfter is passed 1`] = `
"componentStyle": ComponentStyle {
"componentId": "FormControl-sc-1amoaox-0",
"isStatic": false,
"lastClassName": "igyPGR",
"lastClassName": "fcGLmv",
"rules": Array [
[Function],
],
Expand All @@ -118,7 +118,7 @@ exports[`Input renders a addon after the input if addonAfter is passed 1`] = `
>
<FormControl
bsClass="form-control"
className="FormControl-sc-1amoaox-0 igyPGR"
className="FormControl-sc-1amoaox-0 fcGLmv"
componentClass="input"
inputRef={[Function]}
label=""
Expand All @@ -127,7 +127,7 @@ exports[`Input renders a addon after the input if addonAfter is passed 1`] = `
type="text"
>
<input
className="FormControl-sc-1amoaox-0 igyPGR form-control"
className="FormControl-sc-1amoaox-0 fcGLmv form-control"
id="inputWithAddon"
label=""
name="inputWithAddon"
Expand All @@ -152,7 +152,7 @@ exports[`Input renders a addon after the input if addonAfter is passed 1`] = `
"componentStyle": ComponentStyle {
"componentId": "InputGroup__StyledAddon-sc-1a8jz8l-0",
"isStatic": false,
"lastClassName": "eyTRlw",
"lastClassName": "hSAqiz",
"rules": Array [
[Function],
],
Expand All @@ -170,13 +170,13 @@ exports[`Input renders a addon after the input if addonAfter is passed 1`] = `
forwardedRef={null}
>
<StyledBootstrapInputAddon
className="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 eyTRlw"
className="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 hSAqiz"
>
<InputGroupAddon
bsClass="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 eyTRlw"
bsClass="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 hSAqiz"
>
<span
className="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 eyTRlw"
className="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 hSAqiz"
>
.00
</span>
Expand Down Expand Up @@ -296,7 +296,7 @@ exports[`Input renders a button after the input if buttonAfter is passed 1`] = `
"componentStyle": ComponentStyle {
"componentId": "FormControl-sc-1amoaox-0",
"isStatic": false,
"lastClassName": "igyPGR",
"lastClassName": "fcGLmv",
"rules": Array [
[Function],
],
Expand All @@ -320,7 +320,7 @@ exports[`Input renders a button after the input if buttonAfter is passed 1`] = `
>
<FormControl
bsClass="form-control"
className="FormControl-sc-1amoaox-0 igyPGR"
className="FormControl-sc-1amoaox-0 fcGLmv"
componentClass="input"
inputRef={[Function]}
label=""
Expand All @@ -329,7 +329,7 @@ exports[`Input renders a button after the input if buttonAfter is passed 1`] = `
type="text"
>
<input
className="FormControl-sc-1amoaox-0 igyPGR form-control"
className="FormControl-sc-1amoaox-0 fcGLmv form-control"
id="inputWithButton"
label=""
name="inputWithButton"
Expand Down Expand Up @@ -377,7 +377,7 @@ exports[`Input renders a button after the input if buttonAfter is passed 1`] = `
"componentStyle": ComponentStyle {
"componentId": "Button__StyledButton-c9cbmb-0",
"isStatic": false,
"lastClassName": "kojzoH",
"lastClassName": "iWqiEF",
"rules": Array [
[Function],
],
Expand All @@ -399,11 +399,11 @@ exports[`Input renders a button after the input if buttonAfter is passed 1`] = `
block={false}
bsClass="btn"
bsStyle="default"
className="Button__StyledButton-c9cbmb-0 kojzoH"
className="Button__StyledButton-c9cbmb-0 iWqiEF"
disabled={false}
>
<button
className="Button__StyledButton-c9cbmb-0 kojzoH btn btn-default"
className="Button__StyledButton-c9cbmb-0 iWqiEF btn btn-default"
disabled={false}
type="button"
/>
Expand Down Expand Up @@ -527,7 +527,7 @@ exports[`Input renders a checkbox addon after the input if addonAfter is passed
"componentStyle": ComponentStyle {
"componentId": "FormControl-sc-1amoaox-0",
"isStatic": false,
"lastClassName": "igyPGR",
"lastClassName": "fcGLmv",
"rules": Array [
[Function],
],
Expand All @@ -551,7 +551,7 @@ exports[`Input renders a checkbox addon after the input if addonAfter is passed
>
<FormControl
bsClass="form-control"
className="FormControl-sc-1amoaox-0 igyPGR"
className="FormControl-sc-1amoaox-0 fcGLmv"
componentClass="input"
inputRef={[Function]}
label=""
Expand All @@ -560,7 +560,7 @@ exports[`Input renders a checkbox addon after the input if addonAfter is passed
type="text"
>
<input
className="FormControl-sc-1amoaox-0 igyPGR form-control"
className="FormControl-sc-1amoaox-0 fcGLmv form-control"
id="inputWithCheckboxAddon"
label=""
name="inputWithCheckboxAddon"
Expand All @@ -585,7 +585,7 @@ exports[`Input renders a checkbox addon after the input if addonAfter is passed
"componentStyle": ComponentStyle {
"componentId": "InputGroup__StyledAddon-sc-1a8jz8l-0",
"isStatic": false,
"lastClassName": "eyTRlw",
"lastClassName": "hSAqiz",
"rules": Array [
[Function],
],
Expand All @@ -603,13 +603,13 @@ exports[`Input renders a checkbox addon after the input if addonAfter is passed
forwardedRef={null}
>
<StyledBootstrapInputAddon
className="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 eyTRlw"
className="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 hSAqiz"
>
<InputGroupAddon
bsClass="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 eyTRlw"
bsClass="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 hSAqiz"
>
<span
className="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 eyTRlw"
className="input-group-addon InputGroup__StyledAddon-sc-1a8jz8l-0 hSAqiz"
>
<input
aria-label="..."
Expand Down Expand Up @@ -721,7 +721,7 @@ exports[`Input renders input w/ \`name\` attribute w/ setting prop 1`] = `
"componentStyle": ComponentStyle {
"componentId": "FormControl-sc-1amoaox-0",
"isStatic": false,
"lastClassName": "igyPGR",
"lastClassName": "fcGLmv",
"rules": Array [
[Function],
],
Expand All @@ -745,7 +745,7 @@ exports[`Input renders input w/ \`name\` attribute w/ setting prop 1`] = `
>
<FormControl
bsClass="form-control"
className="FormControl-sc-1amoaox-0 igyPGR"
className="FormControl-sc-1amoaox-0 fcGLmv"
componentClass="input"
inputRef={[Function]}
label=""
Expand All @@ -754,7 +754,7 @@ exports[`Input renders input w/ \`name\` attribute w/ setting prop 1`] = `
type="text"
>
<input
className="FormControl-sc-1amoaox-0 igyPGR form-control"
className="FormControl-sc-1amoaox-0 fcGLmv form-control"
id="inputWithoutNameProp"
label=""
name="inputWithNameProp"
Expand Down Expand Up @@ -859,7 +859,7 @@ exports[`Input renders input w/ \`name\` attribute w/o setting prop 1`] = `
"componentStyle": ComponentStyle {
"componentId": "FormControl-sc-1amoaox-0",
"isStatic": false,
"lastClassName": "igyPGR",
"lastClassName": "fcGLmv",
"rules": Array [
[Function],
],
Expand All @@ -883,7 +883,7 @@ exports[`Input renders input w/ \`name\` attribute w/o setting prop 1`] = `
>
<FormControl
bsClass="form-control"
className="FormControl-sc-1amoaox-0 igyPGR"
className="FormControl-sc-1amoaox-0 fcGLmv"
componentClass="input"
inputRef={[Function]}
label=""
Expand All @@ -892,7 +892,7 @@ exports[`Input renders input w/ \`name\` attribute w/o setting prop 1`] = `
type="text"
>
<input
className="FormControl-sc-1amoaox-0 igyPGR form-control"
className="FormControl-sc-1amoaox-0 fcGLmv form-control"
id="inputWithoutNameProp"
label=""
name="inputWithoutNameProp"
Expand Down
4 changes: 2 additions & 2 deletions graylog2-web-interface/src/components/common/Scratchpad.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useContext, useState, useEffect, useRef } from 'react';
import styled, { css } from 'styled-components';
import { rgba } from 'polished';
import chroma from 'chroma-js';
import ClipboardJS from 'clipboard';

import { Alert, Button, MenuItem, SplitButton } from 'components/graylog';
Expand Down Expand Up @@ -33,7 +33,7 @@ const Textarea = styled.textarea(({ copied, theme }) => css`
margin-bottom: 15px;
border: 1px solid ${copied ? theme.color.variant.success : theme.color.gray[80]};
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
0 0 8px ${rgba(copied ? theme.color.variant.success : theme.color.gray[80], 0.6)};
0 0 8px ${chroma(copied ? theme.color.variant.success : theme.color.gray[80]).alpha(0.4).css()};
transition: border 150ms ease-in-out, box-shadow 150ms ease-in-out;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
font-size: 14px;
Expand Down
Loading

0 comments on commit ee8a8e5

Please sign in to comment.