From de5f9bc7085ce86b37232617a310315a0f9c918e Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Fri, 28 Apr 2017 10:52:46 -0700 Subject: [PATCH 01/20] Clean up basic colors and type --- src/components/UI/card/Card.css | 1 + src/components/UI/theme.css | 21 +++++++++------------ src/index.css | 6 +++--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/components/UI/card/Card.css b/src/components/UI/card/Card.css index 67dd471b061a..000dfe40f8c0 100644 --- a/src/components/UI/card/Card.css +++ b/src/components/UI/card/Card.css @@ -3,6 +3,7 @@ .card { composes: base container rounded depth; overflow: hidden; + border: 1px solid #F7F8F8; } .card > *:not(iframe, video, img, header, footer) { diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index e4f0ea104f42..4032f7ad50c5 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -1,30 +1,27 @@ :root { --defaultColor: #333; - --defaultColorLight: #eee; + --defaultColorLight: #fff; --backgroundColor: #fff; --backgroundColorShaded: #eee; - --shadowColor: rgba(0, 0, 0, .25); + --shadowColor: rgba(19, 39, 48, .12); --infoColor: #69c; --successColor: #1c7; --warningColor: #fa0; --errorColor: #f52; - --textColor: #272e30; - --borderRadius: 2px; - --borderRadiusLarge: 10px; - --dropShadow: - 0 2px 2px 0 rgba(0, 0, 0, 0.14), - 0 3px 1px -2px rgba(0, 0, 0, 0.2), - 0 1px 5px 0 rgba(0, 0, 0, 0.12); + --textColor: #191919; + --borderRadius: 4px; + --borderRadiusLarge: 8px; + --dropShadow: 0 2px 4px 0 rgba(19, 39, 48, .12); --topmostZindex: 99999; --foregroundAltColor: #fff; - --backgroundAltColor: #272e30; + --backgroundAltColor: #191919; --textFieldBorderColor: #e7e7e7; --highlightFGColor: #fff; --highlightBGColor: #3ab7a5; --highlightFGAltColor: #eee; --controlLabelColor: var(--textColor); --controlBGColor: #fff; - --backgroundTertiaryColor: #f2f5f4; + --backgroundTertiaryColor: #fff; --backgroundTertiaryColorDark: color(var(--backgroundTertiaryColor) lightness(90%)); } @@ -42,7 +39,7 @@ } .depth { - box-shadow: var(--shadowColor) 0 1px 6px; + box-shadow: var(--dropShadow); } .clearfix:after { diff --git a/src/index.css b/src/index.css index 0c66dcd88f66..cbfa2c288927 100644 --- a/src/index.css +++ b/src/index.css @@ -5,7 +5,6 @@ html { -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; margin: 0; - font-family: Roboto, "Helvetica Neue", HelveticaNeue, Helvetica, Arial, sans-serif; } *, *:before, *:after { @@ -13,15 +12,16 @@ html { } body { - font-family: 'Roboto', sans-serif; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; height: 100%; - background-color: #f2f5f4; + background-color: #fff; color: #7c8382; margin: 0; } h1, h2, h3, h4, h5, h6, p { margin: 0; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; } h1 { From 9c1a41f61d52be32ebce7a0020d9f78b93fe7f47 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Fri, 28 Apr 2017 13:25:34 -0700 Subject: [PATCH 02/20] Add hover effect on cards --- src/components/EntryListing/EntryListing.js | 1 - src/components/UI/card/Card.css | 24 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/components/EntryListing/EntryListing.js b/src/components/EntryListing/EntryListing.js index 20692af79a1e..53058ce79b51 100644 --- a/src/components/EntryListing/EntryListing.js +++ b/src/components/EntryListing/EntryListing.js @@ -56,7 +56,6 @@ export default class EntryListing extends React.Component {

{entry.getIn(['data', inferedFields.descriptionField])}

: inferedFields.remainingFields && inferedFields.remainingFields.map(f => (

- {f.get('label')}:{' '} { entry.getIn(['data', f.get('name')], '').toString() }

)) diff --git a/src/components/UI/card/Card.css b/src/components/UI/card/Card.css index 000dfe40f8c0..12f061ba8967 100644 --- a/src/components/UI/card/Card.css +++ b/src/components/UI/card/Card.css @@ -3,7 +3,14 @@ .card { composes: base container rounded depth; overflow: hidden; - border: 1px solid #F7F8F8; + border: 1px solid #f7f8f8; + transition: all .1s ease-in-out; + transform: translateY(0); +} + +.card:hover { + background: #f8f9fa; + transform: translateY(-8px); } .card > *:not(iframe, video, img, header, footer) { @@ -26,9 +33,22 @@ } .card h1 { + font-size: 16px; + font-weight: 500; + letter-spacing: 0; + line-height: 24px; margin: 15px 0; padding: 0; border: none; color: var(--defaultColor); - font-size: 18px; +} + +.card p { + font-size: 14px; + font-weight: 400; + letter-spacing: 0; + line-height: 24px; + padding: 0; + color: var(--defaultColor); + opacity: .5; } From 8a9370fb0ca299365a805fc1b638537189907202 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Sat, 29 Apr 2017 15:14:57 -0700 Subject: [PATCH 03/20] Tweak header and card grid --- src/components/AppHeader/AppHeader.css | 2 +- src/components/EntryListing/EntryListing.css | 13 ++++++++----- src/components/UI/card/Card.css | 15 ++++++++------- src/components/UI/theme.css | 2 +- src/index.css | 8 +++++--- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/components/AppHeader/AppHeader.css b/src/components/AppHeader/AppHeader.css index 445ec3db5a1e..e974826d2806 100644 --- a/src/components/AppHeader/AppHeader.css +++ b/src/components/AppHeader/AppHeader.css @@ -19,7 +19,7 @@ .leftIcon span { /* stylelint-disable */ - color: var(--foregroundAltColor) !important; + color: var(--textColor) !important; font-size: 30px !important; /* stylelint-enable */ diff --git a/src/components/EntryListing/EntryListing.css b/src/components/EntryListing/EntryListing.css index 5021b6c5abce..2f8626f0dda4 100644 --- a/src/components/EntryListing/EntryListing.css +++ b/src/components/EntryListing/EntryListing.css @@ -1,14 +1,17 @@ .card { + flex-grow: 1; + flex-basis: 31%; + flex-basis: 300px; overflow: hidden; - margin-bottom: 10px; - margin-left: 15px; + margin-bottom: 16px; + margin-left: 16px; max-height: 290px; - width: 240px; cursor: pointer; } .cardImage { - width: 240px; + margin: -16px -24px 16px -24px; + width: calc(100% + 24px + 24px); height: 135px; background-position: center center; background-size: cover; @@ -18,7 +21,7 @@ .cardsGrid { display: flex; flex-flow: row wrap; - margin-left: -15px; + margin-left: -16px; } .cardList { diff --git a/src/components/UI/card/Card.css b/src/components/UI/card/Card.css index 12f061ba8967..44bbf74b5804 100644 --- a/src/components/UI/card/Card.css +++ b/src/components/UI/card/Card.css @@ -6,6 +6,7 @@ border: 1px solid #f7f8f8; transition: all .1s ease-in-out; transform: translateY(0); + padding: 16px 24px; } .card:hover { @@ -13,7 +14,7 @@ transform: translateY(-8px); } -.card > *:not(iframe, video, img, header, footer) { +/*.card > *:not(iframe, video, img, header, footer) { margin-right: 10px; margin-left: 10px; } @@ -24,20 +25,21 @@ .card > *:not(iframe, video, img, header, footer):last-child { margin-bottom: 10px; -} +}*/ .card > iframe, .card > video, .card > img { - max-width: 100%; + margin: -16px -24px 16px -24px; + width: calc(100% + 16px + 16px); } .card h1 { font-size: 16px; - font-weight: 500; + font-weight: 600; letter-spacing: 0; line-height: 24px; - margin: 15px 0; + margin: 0; padding: 0; border: none; color: var(--defaultColor); @@ -49,6 +51,5 @@ letter-spacing: 0; line-height: 24px; padding: 0; - color: var(--defaultColor); - opacity: .5; + color: #8c8c8c; } diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index 4032f7ad50c5..d80fad8d48f5 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -14,7 +14,7 @@ --dropShadow: 0 2px 4px 0 rgba(19, 39, 48, .12); --topmostZindex: 99999; --foregroundAltColor: #fff; - --backgroundAltColor: #191919; + --backgroundAltColor: #f8f9fa; --textFieldBorderColor: #e7e7e7; --highlightFGColor: #fff; --highlightBGColor: #3ab7a5; diff --git a/src/index.css b/src/index.css index cbfa2c288927..c652c4a14435 100644 --- a/src/index.css +++ b/src/index.css @@ -25,11 +25,13 @@ h1, h2, h3, h4, h5, h6, p { } h1 { - color: #3ab7a5; - border-bottom: 1px solid #3ab7a5; margin: 30px auto 25px; padding-bottom: 15px; - font-size: 25px; + font-size: 20px; + font-weight: 600; + color: #313D3E; + letter-spacing: 0; + line-height: 24px; } img { From 1c95b5ee1df59955b8a9677edffa02619f3c4dbb Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Sat, 29 Apr 2017 17:13:45 -0700 Subject: [PATCH 04/20] Update editor look and downplay header --- src/components/AppHeader/AppHeader.css | 4 ++- src/components/ControlPanel/ControlPane.css | 26 +++++++++++++++----- src/components/EntryEditor/EntryEditor.css | 4 +-- src/components/EntryListing/EntryListing.css | 6 +++++ src/components/UI/card/Card.css | 18 -------------- src/components/UI/theme.css | 3 ++- src/containers/Sidebar.css | 2 +- src/index.css | 4 +-- 8 files changed, 36 insertions(+), 31 deletions(-) diff --git a/src/components/AppHeader/AppHeader.css b/src/components/AppHeader/AppHeader.css index e974826d2806..f0d0c8fb04de 100644 --- a/src/components/AppHeader/AppHeader.css +++ b/src/components/AppHeader/AppHeader.css @@ -2,6 +2,8 @@ .appBar { background-color: var(--backgroundAltColor); + height: auto; + padding: 8px 2.4rem; } /* Gross stuff below, React Toolbox hacks */ @@ -20,7 +22,7 @@ /* stylelint-disable */ color: var(--textColor) !important; - font-size: 30px !important; + font-size: 24px !important; /* stylelint-enable */ } diff --git a/src/components/ControlPanel/ControlPane.css b/src/components/ControlPanel/ControlPane.css index 64e5dd32259a..8b59694ddf6c 100644 --- a/src/components/ControlPanel/ControlPane.css +++ b/src/components/ControlPanel/ControlPane.css @@ -1,32 +1,42 @@ @import "../UI/theme"; .control { - color: #7c8382; + color: var(--textColor); position: relative; padding: 20px 0 10px 0; + margin-top: 16px; & input, & textarea, & select { - font-family: monospace; + font-family: 'SFMono-Regular', Consolas, "Liberation Mono", Menlo, Courier, monospace; display: block; width: 100%; padding: 12px; margin: 0; border: none; - border-radius: var(--borderRadius); + border-bottom: 1px solid rgb(230, 230, 230); + border-radius: 0; outline: 0; box-shadow: none; background-color: var(--controlBGColor); - font-size: 18px; - color: #7c8382; + font-size: 16px; + color: var(--textColor); + transition: border-color .3s ease; + + &:focus, + &:active { + border-color: var(--primaryColor); + } } } .label { display: block; color: var(--controlLabelColor); - font-size: 14px; + font-size: 12px; + text-transform: uppercase; + font-weight: 600; } .labelWithError { @@ -40,3 +50,7 @@ color: #FF706F; margin-bottom: 5px; } + +p { + font-size: 16px; +} diff --git a/src/components/EntryEditor/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css index 0997aa2c112a..81bb136513c6 100644 --- a/src/components/EntryEditor/EntryEditor.css +++ b/src/components/EntryEditor/EntryEditor.css @@ -18,11 +18,11 @@ } .controlPane { - height: calc(100% - 55px); overflow: auto; padding: 20px 20px 0; + height: calc(100% - 55px); border-right: 1px solid var(--defaultColorLight); - background-color: var(--backgroundTertiaryColorDark); + background-color: var(--backgroundColor); } .previewPane { diff --git a/src/components/EntryListing/EntryListing.css b/src/components/EntryListing/EntryListing.css index 2f8626f0dda4..825ef4d6b71e 100644 --- a/src/components/EntryListing/EntryListing.css +++ b/src/components/EntryListing/EntryListing.css @@ -5,10 +5,16 @@ overflow: hidden; margin-bottom: 16px; margin-left: 16px; + max-width: 31%; max-height: 290px; cursor: pointer; } +.card:hover { + background: #f8f9fa; + transform: translateY(-8px); +} + .cardImage { margin: -16px -24px 16px -24px; width: calc(100% + 24px + 24px); diff --git a/src/components/UI/card/Card.css b/src/components/UI/card/Card.css index 44bbf74b5804..ece14817d73f 100644 --- a/src/components/UI/card/Card.css +++ b/src/components/UI/card/Card.css @@ -9,24 +9,6 @@ padding: 16px 24px; } -.card:hover { - background: #f8f9fa; - transform: translateY(-8px); -} - -/*.card > *:not(iframe, video, img, header, footer) { - margin-right: 10px; - margin-left: 10px; -} - -.card > *:not(iframe, video, img, header, footer):first-child { - margin-top: 10px; -} - -.card > *:not(iframe, video, img, header, footer):last-child { - margin-bottom: 10px; -}*/ - .card > iframe, .card > video, .card > img { diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index d80fad8d48f5..f43e6fa6c36d 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -5,6 +5,7 @@ --backgroundColorShaded: #eee; --shadowColor: rgba(19, 39, 48, .12); --infoColor: #69c; + --primaryColor: #4990e2; --successColor: #1c7; --warningColor: #fa0; --errorColor: #f52; @@ -19,7 +20,7 @@ --highlightFGColor: #fff; --highlightBGColor: #3ab7a5; --highlightFGAltColor: #eee; - --controlLabelColor: var(--textColor); + --controlLabelColor: #8b8b8b; --controlBGColor: #fff; --backgroundTertiaryColor: #fff; --backgroundTertiaryColorDark: color(var(--backgroundTertiaryColor) lightness(90%)); diff --git a/src/containers/Sidebar.css b/src/containers/Sidebar.css index 4c36b882092f..8cee0a8070d3 100644 --- a/src/containers/Sidebar.css +++ b/src/containers/Sidebar.css @@ -1,7 +1,7 @@ @import '../components/UI/theme'; .root { - margin-top: 64px; + margin-top: 54px; } .sidebar { diff --git a/src/index.css b/src/index.css index c652c4a14435..165084aecfda 100644 --- a/src/index.css +++ b/src/index.css @@ -27,8 +27,8 @@ h1, h2, h3, h4, h5, h6, p { h1 { margin: 30px auto 25px; padding-bottom: 15px; - font-size: 20px; - font-weight: 600; + font-size: 24px; + font-weight: 800; color: #313D3E; letter-spacing: 0; line-height: 24px; From 6492eea1c82c8b1322a35850666870b9e677f0d3 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Sat, 29 Apr 2017 17:51:24 -0700 Subject: [PATCH 05/20] Make card take available space in grid --- src/components/EntryListing/EntryListing.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/EntryListing/EntryListing.css b/src/components/EntryListing/EntryListing.css index 825ef4d6b71e..07be5d41a96c 100644 --- a/src/components/EntryListing/EntryListing.css +++ b/src/components/EntryListing/EntryListing.css @@ -5,7 +5,7 @@ overflow: hidden; margin-bottom: 16px; margin-left: 16px; - max-width: 31%; + /*max-width: 31%;*/ max-height: 290px; cursor: pointer; } From ff2a045192bc18c2ca4151ff72c45f123e258727 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Wed, 3 May 2017 07:53:50 -0700 Subject: [PATCH 06/20] Apply changes proposed by review --- src/components/AppHeader/AppHeader.css | 5 +++-- src/components/EntryListing/EntryListing.css | 2 +- src/components/EntryListing/EntryListing.js | 1 + src/components/UI/card/Card.css | 17 +++++++++++++++-- src/components/UI/theme.css | 1 + 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/components/AppHeader/AppHeader.css b/src/components/AppHeader/AppHeader.css index f0d0c8fb04de..90b22a4de9a4 100644 --- a/src/components/AppHeader/AppHeader.css +++ b/src/components/AppHeader/AppHeader.css @@ -1,12 +1,13 @@ @import '../UI/theme'; .appBar { - background-color: var(--backgroundAltColor); + padding: 8px 24px; height: auto; - padding: 8px 2.4rem; + background-color: var(--backgroundAltColor); } /* Gross stuff below, React Toolbox hacks */ + .homeLink, .iconMenu { margin-left: 2%; diff --git a/src/components/EntryListing/EntryListing.css b/src/components/EntryListing/EntryListing.css index 07be5d41a96c..450611547eb5 100644 --- a/src/components/EntryListing/EntryListing.css +++ b/src/components/EntryListing/EntryListing.css @@ -5,7 +5,7 @@ overflow: hidden; margin-bottom: 16px; margin-left: 16px; - /*max-width: 31%;*/ + max-width: 50%; max-height: 290px; cursor: pointer; } diff --git a/src/components/EntryListing/EntryListing.js b/src/components/EntryListing/EntryListing.js index 53058ce79b51..20692af79a1e 100644 --- a/src/components/EntryListing/EntryListing.js +++ b/src/components/EntryListing/EntryListing.js @@ -56,6 +56,7 @@ export default class EntryListing extends React.Component {

{entry.getIn(['data', inferedFields.descriptionField])}

: inferedFields.remainingFields && inferedFields.remainingFields.map(f => (

+ {f.get('label')}:{' '} { entry.getIn(['data', f.get('name')], '').toString() }

)) diff --git a/src/components/UI/card/Card.css b/src/components/UI/card/Card.css index ece14817d73f..f323d7bb3225 100644 --- a/src/components/UI/card/Card.css +++ b/src/components/UI/card/Card.css @@ -12,7 +12,7 @@ .card > iframe, .card > video, .card > img { - margin: -16px -24px 16px -24px; + margin: -16px -24px 16px; width: calc(100% + 16px + 16px); } @@ -33,5 +33,18 @@ letter-spacing: 0; line-height: 24px; padding: 0; - color: #8c8c8c; + color: var(--textMutedColor); +} + +.card > *:not(iframe, video, img, header, footer) { + margin-right: 10px; + margin-left: 10px; +} + +.card > *:not(iframe, video, img, header, footer):first-child { + margin-top: 10px; +} + +.card > *:not(iframe, video, img, header, footer):last-child { + margin-bottom: 10px; } diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index f43e6fa6c36d..f342f7e26549 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -10,6 +10,7 @@ --warningColor: #fa0; --errorColor: #f52; --textColor: #191919; + --textMutedColor: #8c8c8c; --borderRadius: 4px; --borderRadiusLarge: 8px; --dropShadow: 0 2px 4px 0 rgba(19, 39, 48, .12); From 19f34c81d2780d6ed6b15069e97951d192e09c04 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Wed, 3 May 2017 08:32:54 -0700 Subject: [PATCH 07/20] Change to dark sidebar --- src/components/UI/theme.css | 2 +- src/containers/Sidebar.css | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index f342f7e26549..08d3a746cbe3 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -16,7 +16,7 @@ --dropShadow: 0 2px 4px 0 rgba(19, 39, 48, .12); --topmostZindex: 99999; --foregroundAltColor: #fff; - --backgroundAltColor: #f8f9fa; + --backgroundAltColor: #313d3e; --textFieldBorderColor: #e7e7e7; --highlightFGColor: #fff; --highlightBGColor: #3ab7a5; diff --git a/src/containers/Sidebar.css b/src/containers/Sidebar.css index 8cee0a8070d3..2f9f270ae13a 100644 --- a/src/containers/Sidebar.css +++ b/src/containers/Sidebar.css @@ -5,13 +5,15 @@ } .sidebar { - width: 220px; - background-color: #fff; padding: 0 16px; + width: 220px; + background-color: var(--backgroundAltColor); + color: var(--defaultColorLight); } .heading { margin-bottom: 8px; + color: var(--defaultColorLight); } .nav { @@ -19,14 +21,14 @@ } .linkWrapper { - color: var(--defaultColor); + color: #fff; border-radius: var(--borderRadius); display: flex; align-items: center; justify-content: space-between; &:hover { - background-color: var(--defaultColorLight); + background-color: var(--textColor); } } From a1a9ebe4374f156db98ca56bf2ebd8a9ec4e2cf2 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Wed, 3 May 2017 08:45:58 -0700 Subject: [PATCH 08/20] Add back the dark header --- src/components/AppHeader/AppHeader.css | 3 ++- src/components/UI/theme.css | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/AppHeader/AppHeader.css b/src/components/AppHeader/AppHeader.css index 90b22a4de9a4..2a93efb0bdc2 100644 --- a/src/components/AppHeader/AppHeader.css +++ b/src/components/AppHeader/AppHeader.css @@ -4,6 +4,7 @@ padding: 8px 24px; height: auto; background-color: var(--backgroundAltColor); + color: var(--defaultColorLight); } /* Gross stuff below, React Toolbox hacks */ @@ -22,7 +23,7 @@ .leftIcon span { /* stylelint-disable */ - color: var(--textColor) !important; + color: var(--defaultColorLight) !important; font-size: 24px !important; /* stylelint-enable */ diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index 08d3a746cbe3..f244467854f4 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -16,7 +16,7 @@ --dropShadow: 0 2px 4px 0 rgba(19, 39, 48, .12); --topmostZindex: 99999; --foregroundAltColor: #fff; - --backgroundAltColor: #313d3e; + --backgroundAltColor: #232528; --textFieldBorderColor: #e7e7e7; --highlightFGColor: #fff; --highlightBGColor: #3ab7a5; From a6c8a1122382e93b5c3bd32c22a55b03bfe1f6c9 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Wed, 3 May 2017 08:49:11 -0700 Subject: [PATCH 09/20] Make search bar smaller --- src/components/FindBar/FindBar.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/FindBar/FindBar.css b/src/components/FindBar/FindBar.css index d806a0b1b693..50f0a8728bc6 100644 --- a/src/components/FindBar/FindBar.css +++ b/src/components/FindBar/FindBar.css @@ -6,14 +6,14 @@ } .inputField { - width: 80%; - max-width: 800px; + width: 100%; + max-width: 500px; display: block; - margin: 0 auto; + margin: 0 24px; padding: 10px 14px; border: 0; border-radius: var(--borderRadius); box-shadow: none; outline: none; - font-size: 18px; + font-size: 14px; } From 5adbecad779d33a934dd3c7a8659a4591a65e92d Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Wed, 3 May 2017 09:11:27 -0700 Subject: [PATCH 10/20] Increase contrast and focus of input fields --- src/components/ControlPanel/ControlPane.css | 5 ++--- src/components/EntryEditor/EntryEditor.css | 4 ++++ .../Widgets/MarkdownControlElements/VisualEditor/index.css | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/ControlPanel/ControlPane.css b/src/components/ControlPanel/ControlPane.css index 8b59694ddf6c..d0412d03bd30 100644 --- a/src/components/ControlPanel/ControlPane.css +++ b/src/components/ControlPanel/ControlPane.css @@ -14,9 +14,8 @@ width: 100%; padding: 12px; margin: 0; - border: none; - border-bottom: 1px solid rgb(230, 230, 230); - border-radius: 0; + border: 2px solid rgb(230, 230, 230); + border-radius: var(--borderRadius); outline: 0; box-shadow: none; background-color: var(--controlBGColor); diff --git a/src/components/EntryEditor/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css index 81bb136513c6..5fc0c6fd780a 100644 --- a/src/components/EntryEditor/EntryEditor.css +++ b/src/components/EntryEditor/EntryEditor.css @@ -52,3 +52,7 @@ right: 0; height: 100%; } + +.ProseMirror { + border: 2px solid rgb(230, 230, 230); +} diff --git a/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css b/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css index fe962f67a5c7..b7088c139bf6 100644 --- a/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css +++ b/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css @@ -69,8 +69,11 @@ position: relative; background-color: var(--controlBGColor); padding: 12px; - border-radius: 0 0 var(--borderRadius) var(--borderRadius); overflow: hidden; + border-radius: var(--borderRadius); + border: 2px solid rgb(230, 230, 230); + border-top: 1px solid rgb(230, 230, 230); + min-height: 500px; & ul, & ol { From e21a33986fa7c10f99b9a79b4ac03ba6b3618642 Mon Sep 17 00:00:00 2001 From: Shawn Erquhart Date: Wed, 3 May 2017 15:50:50 -0400 Subject: [PATCH 11/20] further improve ui contrast and consistency --- src/components/ControlPanel/ControlPane.css | 2 +- src/components/EntryEditor/EntryEditor.css | 2 +- src/components/EntryListing/EntryListing.css | 4 +--- src/components/UI/card/Card.css | 4 ++-- src/components/UI/theme.css | 6 +----- .../Widgets/MarkdownControlElements/VisualEditor/index.css | 7 ++----- 6 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/components/ControlPanel/ControlPane.css b/src/components/ControlPanel/ControlPane.css index d0412d03bd30..9c3e4d8a3b0e 100644 --- a/src/components/ControlPanel/ControlPane.css +++ b/src/components/ControlPanel/ControlPane.css @@ -14,7 +14,7 @@ width: 100%; padding: 12px; margin: 0; - border: 2px solid rgb(230, 230, 230); + border: 2px solid var(--textFieldBorderColor); border-radius: var(--borderRadius); outline: 0; box-shadow: none; diff --git a/src/components/EntryEditor/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css index 5fc0c6fd780a..90f3f500bdfd 100644 --- a/src/components/EntryEditor/EntryEditor.css +++ b/src/components/EntryEditor/EntryEditor.css @@ -54,5 +54,5 @@ } .ProseMirror { - border: 2px solid rgb(230, 230, 230); + border: 2px solid var(--textFieldBorderColor); } diff --git a/src/components/EntryListing/EntryListing.css b/src/components/EntryListing/EntryListing.css index 450611547eb5..9a079ce3f73b 100644 --- a/src/components/EntryListing/EntryListing.css +++ b/src/components/EntryListing/EntryListing.css @@ -1,7 +1,5 @@ .card { - flex-grow: 1; - flex-basis: 31%; - flex-basis: 300px; + flex: 0 300px; overflow: hidden; margin-bottom: 16px; margin-left: 16px; diff --git a/src/components/UI/card/Card.css b/src/components/UI/card/Card.css index f323d7bb3225..99555972718d 100644 --- a/src/components/UI/card/Card.css +++ b/src/components/UI/card/Card.css @@ -1,9 +1,9 @@ @import '../theme.css'; .card { - composes: base container rounded depth; + composes: base container rounded; overflow: hidden; - border: 1px solid #f7f8f8; + border: 2px solid var(--textFieldBorderColor); transition: all .1s ease-in-out; transform: translateY(0); padding: 16px 24px; diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index f244467854f4..e77c5d2e1a55 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -17,7 +17,7 @@ --topmostZindex: 99999; --foregroundAltColor: #fff; --backgroundAltColor: #232528; - --textFieldBorderColor: #e7e7e7; + --textFieldBorderColor: #e6e6e6; --highlightFGColor: #fff; --highlightBGColor: #3ab7a5; --highlightFGAltColor: #eee; @@ -40,10 +40,6 @@ border-radius: var(--borderRadius); } -.depth { - box-shadow: var(--dropShadow); -} - .clearfix:after { content: ''; display: table; diff --git a/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css b/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css index b7088c139bf6..c49d25eb8eb6 100644 --- a/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css +++ b/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css @@ -1,9 +1,6 @@ @import "../../../UI/theme"; .editorControlBar { - background-color: var(--controlBGColor); - border-bottom: 1px solid var(--backgroundTertiaryColorDark); - border-radius: var(--borderRadius) var(--borderRadius) 0 0; z-index: 1; } @@ -71,8 +68,8 @@ padding: 12px; overflow: hidden; border-radius: var(--borderRadius); - border: 2px solid rgb(230, 230, 230); - border-top: 1px solid rgb(230, 230, 230); + overflow-x: auto; + border: 2px solid var(--textFieldBorderColor); min-height: 500px; & ul, From 996f5a36d4ea05c3ada6e2a978dfed5ef548c351 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Wed, 3 May 2017 14:56:58 -0700 Subject: [PATCH 12/20] Add border to bottom bar and widget --- src/components/EntryEditor/EntryEditor.css | 2 +- src/index.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/EntryEditor/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css index 90f3f500bdfd..e45adc3025ad 100644 --- a/src/components/EntryEditor/EntryEditor.css +++ b/src/components/EntryEditor/EntryEditor.css @@ -41,7 +41,7 @@ left: 0; right: 0; bottom: 0; - border-top: 1px solid var(--defaultColorLight); + border-top: 1px solid var(--textMutedColor); background: var(--backgroundColor); text-align: right; } diff --git a/src/index.css b/src/index.css index 165084aecfda..d6df58160a1a 100644 --- a/src/index.css +++ b/src/index.css @@ -142,8 +142,8 @@ img { margin-top: 1px; z-index: 99999 !important; background: #fff; - box-shadow: 0 1px 3px rgba(0, 0, 0, .1); - border: 1px solid #f9f9f9; + box-shadow: 0 0px 5px rgba(0, 0, 0, 0.26); + border: 1px solid #191919; } & .rdtOpen .rdtPicker { display: block; From 515a08d4d7c0e0068937eada723574720380c5f2 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Wed, 3 May 2017 14:59:29 -0700 Subject: [PATCH 13/20] Tweak border colors --- src/components/EntryEditor/EntryEditor.css | 2 +- src/index.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/EntryEditor/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css index e45adc3025ad..90fd2b8858b7 100644 --- a/src/components/EntryEditor/EntryEditor.css +++ b/src/components/EntryEditor/EntryEditor.css @@ -41,7 +41,7 @@ left: 0; right: 0; bottom: 0; - border-top: 1px solid var(--textMutedColor); + border-top: 2px solid rgb(230, 230, 230); background: var(--backgroundColor); text-align: right; } diff --git a/src/index.css b/src/index.css index d6df58160a1a..bd32a9fea1a4 100644 --- a/src/index.css +++ b/src/index.css @@ -142,8 +142,8 @@ img { margin-top: 1px; z-index: 99999 !important; background: #fff; - box-shadow: 0 0px 5px rgba(0, 0, 0, 0.26); - border: 1px solid #191919; + border: 2px solid rgb(230, 230, 230); + border-radius: 2px; } & .rdtOpen .rdtPicker { display: block; From 3ee5a5e172cf869ebade0e344d3c2ffc138b9cde Mon Sep 17 00:00:00 2001 From: Shawn Erquhart Date: Thu, 4 May 2017 15:19:43 -0400 Subject: [PATCH 14/20] update rich text toolbar styling --- src/components/UI/Sticky/Sticky.css | 2 +- src/components/UI/Sticky/Sticky.js | 6 ++++++ src/components/UI/theme.css | 1 + .../Widgets/MarkdownControlElements/RawEditor/index.css | 7 +++++++ .../Widgets/MarkdownControlElements/RawEditor/index.js | 7 ++++++- .../MarkdownControlElements/VisualEditor/index.css | 9 ++++++++- .../MarkdownControlElements/VisualEditor/index.js | 6 +++++- 7 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/components/UI/Sticky/Sticky.css b/src/components/UI/Sticky/Sticky.css index f3da5abd0bb1..cf4efb631ef0 100644 --- a/src/components/UI/Sticky/Sticky.css +++ b/src/components/UI/Sticky/Sticky.css @@ -8,7 +8,7 @@ .stickyActive:not(.stickyAtBottom) { position: fixed !important; - top: 64px !important; + top: 54px !important; } .stickyAtBottom { diff --git a/src/components/UI/Sticky/Sticky.js b/src/components/UI/Sticky/Sticky.js index 7b7f97a062aa..f14121b6d8eb 100644 --- a/src/components/UI/Sticky/Sticky.js +++ b/src/components/UI/Sticky/Sticky.js @@ -163,6 +163,11 @@ export class Sticky extends Component { static propTypes = { className: PropTypes.string, + /** + * classNameActive: class to apply when Sticky is active. + */ + classNameActive: PropTypes.string, + /** * fillContainerWidth: allows the sticky width to be dynamically set to the width of it's * StickyContainer when sticky (fixed positioning). @@ -201,6 +206,7 @@ export class Sticky extends Component { styles.sticky, { [styles.stickyActive]: state.shouldStick, + [props.classNameActive]: state.shouldStick, [styles.stickyAtBottom]: state.shouldStickAtBottom, }, )} diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index e77c5d2e1a55..3ba6fa2c77a2 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -25,6 +25,7 @@ --controlBGColor: #fff; --backgroundTertiaryColor: #fff; --backgroundTertiaryColorDark: color(var(--backgroundTertiaryColor) lightness(90%)); + --richTextEditorMinHeight: 300px; } .base { diff --git a/src/components/Widgets/MarkdownControlElements/RawEditor/index.css b/src/components/Widgets/MarkdownControlElements/RawEditor/index.css index 07874c7160ed..b0fc74be2c2d 100644 --- a/src/components/Widgets/MarkdownControlElements/RawEditor/index.css +++ b/src/components/Widgets/MarkdownControlElements/RawEditor/index.css @@ -1,3 +1,5 @@ +@import "../../../UI/theme"; + .root { position: relative; } @@ -6,6 +8,10 @@ composes: editorControlBar from "../VisualEditor/index.css"; } +.editorControlBarSticky { + composes: editorControlBarSticky from "../VisualEditor/index.css"; +} + .dragging { } .shim { @@ -28,4 +34,5 @@ .textarea { overflow: hidden; resize: none; + min-height: var(--richTextEditorMinHeight); } diff --git a/src/components/Widgets/MarkdownControlElements/RawEditor/index.js b/src/components/Widgets/MarkdownControlElements/RawEditor/index.js index 10a1b50a76d7..afe62c72430f 100644 --- a/src/components/Widgets/MarkdownControlElements/RawEditor/index.js +++ b/src/components/Widgets/MarkdownControlElements/RawEditor/index.js @@ -320,7 +320,11 @@ export default class RawEditor extends React.Component { onDragOver={this.handleDragOver} onDrop={this.handleDrop} > - + - + Date: Wed, 10 May 2017 08:44:42 -0700 Subject: [PATCH 15/20] Increased contrast on borders --- src/components/EntryEditor/EntryEditor.css | 2 +- src/components/UI/theme.css | 2 +- src/index.css | 2 +- yarn.lock | 381 ++++++++++----------- 4 files changed, 193 insertions(+), 194 deletions(-) diff --git a/src/components/EntryEditor/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css index 90fd2b8858b7..d9ee9e521f52 100644 --- a/src/components/EntryEditor/EntryEditor.css +++ b/src/components/EntryEditor/EntryEditor.css @@ -41,7 +41,7 @@ left: 0; right: 0; bottom: 0; - border-top: 2px solid rgb(230, 230, 230); + border-top: 2px solid rgba(0, 0, 0, .15); background: var(--backgroundColor); text-align: right; } diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index 3ba6fa2c77a2..0db66a2aa35a 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -17,7 +17,7 @@ --topmostZindex: 99999; --foregroundAltColor: #fff; --backgroundAltColor: #232528; - --textFieldBorderColor: #e6e6e6; + --textFieldBorderColor: rgba(0, 0, 0, .15); --highlightFGColor: #fff; --highlightBGColor: #3ab7a5; --highlightFGAltColor: #eee; diff --git a/src/index.css b/src/index.css index bd32a9fea1a4..64d1c1f18f8f 100644 --- a/src/index.css +++ b/src/index.css @@ -142,7 +142,7 @@ img { margin-top: 1px; z-index: 99999 !important; background: #fff; - border: 2px solid rgb(230, 230, 230); + border: 2px solid rgba(0, 0, 0, .15); border-radius: 2px; } & .rdtOpen .rdtPicker { diff --git a/yarn.lock b/yarn.lock index a7688842d6a7..a70c072054ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,7 +1,5 @@ # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. # yarn lockfile v1 - - "@kadira/react-split-pane@^1.4.0": version "1.4.7" resolved "https://registry.yarnpkg.com/@kadira/react-split-pane/-/react-split-pane-1.4.7.tgz#6d753d4a9fe62fe82056e323a6bcef7f026972b5" @@ -52,13 +50,6 @@ webpack-dev-middleware "^1.6.0" webpack-hot-middleware "^2.10.0" -JSONStream@^0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd" - dependencies: - jsonparse "0.0.5" - through ">=2.2.7 <3" - abab@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d" @@ -280,14 +271,14 @@ asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" +assert-plus@^1.0.0, assert-plus@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + assert@^1.1.1: version "1.4.1" resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" @@ -1110,7 +1101,7 @@ babel-register@^6.24.1: mkdirp "^0.5.1" source-map-support "^0.4.2" -babel-runtime@6.x.x, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.5.0, babel-runtime@^6.6.1, babel-runtime@^6.9.2: +babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.5.0, babel-runtime@^6.6.1, babel-runtime@^6.9.2, babel-runtime@6.x.x: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" dependencies: @@ -1158,10 +1149,6 @@ babylon@^6.1.21, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.1 version "6.17.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932" -balanced-match@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a" - balanced-match@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7" @@ -1170,6 +1157,10 @@ balanced-match@^0.4.0, balanced-match@^0.4.1, balanced-match@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" +balanced-match@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a" + base62@0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/base62/-/base62-0.1.1.tgz#7b4174c2f94449753b11c2651c083da841a7b084" @@ -1266,12 +1257,6 @@ browser-resolve@^1.11.2: dependencies: resolve "1.1.7" -browserify-aes@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-0.4.0.tgz#067149b668df31c4b58533e02d01e806d8608e2c" - dependencies: - inherits "^2.0.1" - browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a" @@ -1282,6 +1267,12 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4: evp_bytestokey "^1.0.0" inherits "^2.0.1" +browserify-aes@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-0.4.0.tgz#067149b668df31c4b58533e02d01e806d8608e2c" + dependencies: + inherits "^2.0.1" + browserify-cipher@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a" @@ -1330,18 +1321,18 @@ browserslist@^1.0.0, browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.3 caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -bser@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169" - dependencies: - node-int64 "^0.4.0" - bser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" dependencies: node-int64 "^0.4.0" +bser@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169" + dependencies: + node-int64 "^0.4.0" + buffer-peek-stream@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-peek-stream/-/buffer-peek-stream-1.0.1.tgz#53b47570a1347787c5bad4ca2ca3021f9d8b3cfd" @@ -1672,7 +1663,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.9.x, commander@^2.8.1, commander@^2.9.0: +commander@^2.8.1, commander@^2.9.0, commander@2.9.x: version "2.9.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" dependencies: @@ -1871,15 +1862,6 @@ cryptiles@2.x.x: dependencies: boom "2.x.x" -crypto-browserify@3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.3.0.tgz#b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c" - dependencies: - browserify-aes "0.4.0" - pbkdf2-compat "2.0.1" - ripemd160 "0.2.0" - sha.js "2.2.6" - crypto-browserify@^3.11.0: version "3.11.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522" @@ -1895,6 +1877,15 @@ crypto-browserify@^3.11.0: public-encrypt "^4.0.0" randombytes "^2.0.0" +crypto-browserify@3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.3.0.tgz#b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c" + dependencies: + browserify-aes "0.4.0" + pbkdf2-compat "2.0.1" + ripemd160 "0.2.0" + sha.js "2.2.6" + css-color-function@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.0.tgz#72c767baf978f01b8a8a94f42f17ba5d22a776fc" @@ -2036,7 +2027,7 @@ csso@~2.3.1: clap "^1.0.9" source-map "^0.5.3" -cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": +"cssom@>= 0.3.2 < 0.4.0", cssom@0.3.x: version "0.3.2" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b" @@ -2095,13 +2086,7 @@ dateformat@^1.0.12: get-stdin "^4.0.1" meow "^3.3.0" -debug@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" - dependencies: - ms "0.7.2" - -debug@2.6.4, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0: +debug@^2.1.1, debug@^2.2.0, debug@^2.6.0, debug@2.6.4: version "2.6.4" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0" dependencies: @@ -2117,6 +2102,12 @@ debug@~2.2.0: dependencies: ms "0.7.1" +debug@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" + dependencies: + ms "0.7.2" + decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -2190,7 +2181,7 @@ depcheck@^0.6.3: walkdir "0.0.11" yargs "^6.0.0" -depd@1.1.0, depd@~1.1.0: +depd@~1.1.0, depd@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3" @@ -2258,7 +2249,7 @@ dnd-core@^2.3.0: lodash "^4.2.0" redux "^3.2.0" -doctrine@1.3.x, doctrine@^1.2.2: +doctrine@^1.2.2, doctrine@1.3.x: version "1.3.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.3.0.tgz#13e75682b55518424276f7c173783456ef913d26" dependencies: @@ -2289,7 +2280,7 @@ doiuse@^2.3.0, doiuse@^2.4.1: through2 "^0.6.3" yargs "^3.5.4" -dom-serializer@0, dom-serializer@~0.1.0: +dom-serializer@~0.1.0, dom-serializer@0: version "0.1.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" dependencies: @@ -2304,7 +2295,7 @@ domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" -domelementtype@1, domelementtype@^1.3.0: +domelementtype@^1.3.0, domelementtype@1: version "1.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" @@ -2318,7 +2309,7 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -domutils@1.5.1, domutils@^1.5.1: +domutils@^1.5.1, domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" dependencies: @@ -2331,11 +2322,9 @@ dot-prop@^3.0.0: dependencies: is-obj "^1.0.0" -duplexer2@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - dependencies: - readable-stream "~1.1.9" +duplexer@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" duplexer2@^0.1.4: version "0.1.4" @@ -2343,9 +2332,11 @@ duplexer2@^0.1.4: dependencies: readable-stream "^2.0.2" -duplexer@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" +duplexer2@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" + dependencies: + readable-stream "~1.1.9" ecc-jsbn@~0.1.1: version "0.1.1" @@ -2441,7 +2432,7 @@ err-code@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" -"errno@>=0.1.1 <0.2.0-0", errno@^0.1.3: +errno@^0.1.3, "errno@>=0.1.1 <0.2.0-0": version "0.1.4" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" dependencies: @@ -2495,7 +2486,7 @@ es5-shim@^4.5.9: version "4.5.9" resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.9.tgz#2a1e2b9e583ff5fed0c20a3ee2cbf3f75230a5c0" -es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: +es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@2: version "2.0.1" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" dependencies: @@ -2532,7 +2523,7 @@ es6-shim@^0.35.1: version "0.35.3" resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26" -es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: +es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1, es6-symbol@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: @@ -3294,16 +3285,6 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@5.0.x: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^6.0.1: version "6.0.4" resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" @@ -3325,6 +3306,16 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" +glob@5.0.x: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + global-modules@^0.2.0, global-modules@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d" @@ -3523,7 +3514,7 @@ hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" -hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0: +hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0, hoist-non-react-statics@1.x.x: version "1.2.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" @@ -3622,7 +3613,7 @@ hyphenate-style-name@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b" -iconv-lite@0.4.13, iconv-lite@~0.4.13: +iconv-lite@~0.4.13, iconv-lite@0.4.13: version "0.4.13" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2" @@ -3706,7 +3697,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3, inherits@2, inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -3758,7 +3749,7 @@ interpret@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" -invariant@2.x.x, invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1: +invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.0, invariant@^2.2.1, invariant@2.x.x: version "2.2.2" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" dependencies: @@ -4036,14 +4027,14 @@ is@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/is/-/is-3.2.1.tgz#d0ac2ad55eb7b0bec926a5266f6c662aaa83dca5" +isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -4151,7 +4142,7 @@ jest-changed-files@^19.1.0-alpha.eed82034: version "19.1.0-alpha.eed82034" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-19.1.0-alpha.eed82034.tgz#79351ae50693406e2207018db8e8665f11e6f2da" -jest-cli@19.1.0-alpha.eed82034, jest-cli@^19.1.0-alpha.eed82034: +jest-cli@^19.1.0-alpha.eed82034, jest-cli@19.1.0-alpha.eed82034: version "19.1.0-alpha.eed82034" resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-19.1.0-alpha.eed82034.tgz#507a2cbd66f7f91889973a89c7af876359f4b47a" dependencies: @@ -4477,6 +4468,13 @@ jsonpointer@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" +JSONStream@^0.8.4: + version "0.8.4" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd" + dependencies: + jsonparse "0.0.5" + through ">=2.2.7 <3" + jspm-github@^0.14.11: version "0.14.13" resolved "https://registry.yarnpkg.com/jspm-github/-/jspm-github-0.14.13.tgz#326e5217d3639b21609293b01e7e18775dd3dcc7" @@ -4721,7 +4719,7 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" -loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.14, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@~0.2.2, loader-utils@~0.2.5: +loader-utils@^0.2.11, loader-utils@^0.2.14, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x: version "0.2.17" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" dependencies: @@ -5076,14 +5074,14 @@ lodash.words@^3.0.0: dependencies: lodash._root "^3.0.0" -"lodash@4.6.1 || ^4.16.1", lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.2, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@^4.7.0: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" - lodash@^3.7.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" +lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.2, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@^4.7.0, "lodash@4.6.1 || ^4.16.1": + version "4.17.4" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" + lodash@~4.16.4: version "4.16.6" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777" @@ -5296,7 +5294,7 @@ mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, dependencies: mime-db "~1.27.0" -mime@1.3.4, mime@1.3.x, mime@^1.3.4: +mime@^1.3.4, mime@1.3.4, mime@1.3.x: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" @@ -5314,21 +5312,21 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@3.0.3, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@~3.0.2: +minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@~3.0.2, "minimatch@2 || 3", minimatch@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: brace-expansion "^1.0.0" -minimist@0.0.8, minimist@~0.0.1: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +minimist@~0.0.1, minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -5532,12 +5530,6 @@ node-status-codes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - dependencies: - abbrev "1" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -5545,6 +5537,12 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" +"nopt@2 || 3": + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + dependencies: + abbrev "1" + normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.3.8" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb" @@ -5637,7 +5635,7 @@ npm-which@^3.0.1: npm-path "^2.0.2" which "^1.2.10" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: +npmlog@^4.0.0, npmlog@^4.0.2, "npmlog@0 || 1 || 2 || 3 || 4": version "4.0.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f" dependencies: @@ -5819,7 +5817,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@0, osenv@^0.1.0, osenv@^0.1.4: +osenv@^0.1.0, osenv@^0.1.4, osenv@0: version "0.1.4" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" dependencies: @@ -6788,19 +6786,19 @@ pump@^1.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + q@^1.1.2: version "1.5.0" resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1" -qs@6.4.0, qs@^6.1.0, qs@^6.2.0, qs@~6.4.0: +qs@^6.1.0, qs@^6.2.0, qs@~6.4.0, qs@6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" @@ -6821,7 +6819,7 @@ querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" -querystring@0.2.0, querystring@^0.2.0: +querystring@^0.2.0, querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" @@ -7167,15 +7165,6 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@>=1.0.33-1 <1.1.0-0": - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@^1.0.33, readable-stream@~1.1.9: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" @@ -7197,6 +7186,15 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable string_decoder "~1.0.0" util-deprecate "~1.0.1" +"readable-stream@>=1.0.33-1 <1.1.0-0": + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readdirp@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" @@ -7367,7 +7365,7 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request@2, request@^2.58.0, request@^2.61.0, request@^2.67.0, request@^2.74.0, request@^2.79.0, request@^2.81.0: +request@^2.58.0, request@^2.61.0, request@^2.67.0, request@^2.74.0, request@^2.79.0, request@^2.81.0, request@2: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -7436,16 +7434,16 @@ resolve-from@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57" -resolve@1.1.7, resolve@~1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" - resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2: version "1.3.3" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5" dependencies: path-parse "^1.0.5" +resolve@~1.1.7, resolve@1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -7477,20 +7475,20 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1: +rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@2: version "2.6.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: glob "^7.0.5" -ripemd160@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce" - ripemd160@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e" +ripemd160@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce" + rollup@^0.36.3: version "0.36.4" resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.36.4.tgz#a224494c5386c1d73d38f7bb86f69f5eb011a3d2" @@ -7583,14 +7581,14 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - semver@^4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" +semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5": + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + send@0.15.1: version "0.15.1" resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f" @@ -7650,16 +7648,16 @@ setprototypeof@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" -sha.js@2.2.6: - version "2.2.6" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba" - sha.js@^2.3.6: version "2.4.8" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" dependencies: inherits "^2.0.1" +sha.js@2.2.6: + version "2.2.6" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba" + shallow-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.0.0.tgz#508d1838b3de590ab8757b011b25e430900945f7" @@ -7791,6 +7789,22 @@ source-map-support@~0.2.8: dependencies: source-map "0.1.32" +source-map@^0.4.2, source-map@^0.4.4, source-map@~0.4.1, source-map@~0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + dependencies: + amdefine ">=0.0.4" + +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3, source-map@0.5.x: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" + +source-map@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" + dependencies: + amdefine ">=0.0.4" + source-map@0.1.31: version "0.1.31" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.31.tgz#9f704d0d69d9e138a81badf6ebb4fde33d151c61" @@ -7809,22 +7823,6 @@ source-map@0.1.x: dependencies: amdefine ">=0.0.4" -source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: - version "0.5.6" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" - -source-map@^0.4.2, source-map@^0.4.4, source-map@~0.4.1, source-map@~0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - -source-map@~0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" - dependencies: - amdefine ">=0.0.4" - spdx-correct@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" @@ -7931,6 +7929,16 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" +string_decoder@^0.10.25, string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + +string_decoder@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667" + dependencies: + buffer-shims "~1.0.0" + string-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac" @@ -7980,16 +7988,6 @@ string.prototype.trim@~1.1.2: es-abstract "^1.5.0" function-bind "^1.0.2" -string_decoder@^0.10.25, string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667" - dependencies: - buffer-shims "~1.0.0" - stringstream@~0.0.4: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -8000,16 +7998,16 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" -strip-bom@3.0.0, strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" dependencies: is-utf8 "^0.2.0" +strip-bom@^3.0.0, strip-bom@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -8246,16 +8244,16 @@ systemjs-builder@0.16.4: traceur "0.0.105" uglify-js "^2.6.1" -systemjs@0.20.10: - version "0.20.10" - resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.20.10.tgz#53ece512717fa10fcbf67b4e95fdb7c094219be8" - systemjs@^0.19.46: version "0.19.47" resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.19.47.tgz#c8c93937180f3f5481c769cd2720763fb4a31c6f" dependencies: when "^3.7.5" +systemjs@0.20.10: + version "0.20.10" + resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.20.10.tgz#53ece512717fa10fcbf67b4e95fdb7c094219be8" + table@^3.7.8: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -8375,6 +8373,10 @@ throat@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-3.0.0.tgz#e7c64c867cbb3845f10877642f7b60055b8ec0d6" +through@^2.3.6, "through@>=2.2.7 <3", through@~2.3.4, through@~2.3.8: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + through2@^0.6.1, through2@^0.6.2, through2@^0.6.3, through2@^0.6.5, through2@~0.6.1: version "0.6.5" resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" @@ -8382,10 +8384,6 @@ through2@^0.6.1, through2@^0.6.2, through2@^0.6.3, through2@^0.6.5, through2@~0. readable-stream ">=1.0.33-1 <1.1.0-0" xtend ">=4.0.0 <4.1.0-0" -"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4, through@~2.3.8: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - timed-out@^3.0.0: version "3.1.3" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" @@ -8597,16 +8595,16 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" -url-parse@1.0.x: - version "1.0.5" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b" +url-parse@^1.1.1: + version "1.1.8" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.8.tgz#7a65b3a8d57a1e86af6b4e2276e34774167c0156" dependencies: querystringify "0.0.x" requires-port "1.0.x" -url-parse@^1.1.1: - version "1.1.8" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.8.tgz#7a65b3a8d57a1e86af6b4e2276e34774167c0156" +url-parse@1.0.x: + version "1.0.5" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b" dependencies: querystringify "0.0.x" requires-port "1.0.x" @@ -8632,7 +8630,7 @@ util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" -util@0.10.3, util@^0.10.3: +util@^0.10.3, util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" dependencies: @@ -8836,7 +8834,7 @@ whatwg-encoding@^1.0.1: dependencies: iconv-lite "0.4.13" -whatwg-fetch@>=0.10.0, whatwg-fetch@^1.0.0: +whatwg-fetch@^1.0.0, whatwg-fetch@>=0.10.0: version "1.1.1" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319" @@ -8859,7 +8857,7 @@ which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" -which@1, which@^1.0.9, which@^1.1.1, which@^1.2.10, which@^1.2.12, which@^1.2.8, which@^1.2.9: +which@^1.0.9, which@^1.1.1, which@^1.2.10, which@^1.2.12, which@^1.2.8, which@^1.2.9, which@1: version "1.2.14" resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" dependencies: @@ -8877,10 +8875,6 @@ widest-line@^1.0.0: dependencies: string-width "^1.0.1" -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - window-size@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" @@ -8889,9 +8883,9 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" +window-size@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" wordwrap@~0.0.2: version "0.0.3" @@ -8901,6 +8895,10 @@ wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" +wordwrap@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" + worker-farm@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.3.1.tgz#4333112bb49b17aa050b87895ca6b2cacf40e5ff" @@ -8947,7 +8945,7 @@ xml-name-validator@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0: +xtend@^4.0.0, "xtend@>=4.0.0 <4.1.0-0": version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -9057,3 +9055,4 @@ yargs@~3.10.0: cliui "^2.1.0" decamelize "^1.0.0" window-size "0.1.0" + From cb45997c2447f53578cf2fb3a7bc9bf0c0515389 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Wed, 10 May 2017 08:58:21 -0700 Subject: [PATCH 16/20] Increase contrast of popovers on editor --- src/components/UI/theme.css | 4 ++-- .../MarkdownControlElements/Toolbar/ToolbarPluginForm.css | 3 ++- src/index.css | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index 0db66a2aa35a..793b8e8490dc 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -3,7 +3,7 @@ --defaultColorLight: #fff; --backgroundColor: #fff; --backgroundColorShaded: #eee; - --shadowColor: rgba(19, 39, 48, .12); + --shadowColor: rgba(19, 39, 48, .24); --infoColor: #69c; --primaryColor: #4990e2; --successColor: #1c7; @@ -13,7 +13,7 @@ --textMutedColor: #8c8c8c; --borderRadius: 4px; --borderRadiusLarge: 8px; - --dropShadow: 0 2px 4px 0 rgba(19, 39, 48, .12); + --dropShadow: 0 2px 8px 0 rgba(0, 0, 0, .16); --topmostZindex: 99999; --foregroundAltColor: #fff; --backgroundAltColor: #232528; diff --git a/src/components/Widgets/MarkdownControlElements/Toolbar/ToolbarPluginForm.css b/src/components/Widgets/MarkdownControlElements/Toolbar/ToolbarPluginForm.css index 4b4822296ee6..d3104aac6ea3 100644 --- a/src/components/Widgets/MarkdownControlElements/Toolbar/ToolbarPluginForm.css +++ b/src/components/Widgets/MarkdownControlElements/Toolbar/ToolbarPluginForm.css @@ -2,10 +2,11 @@ .pluginForm { position: absolute; - background-color: var(--backgroundTertiaryColorDark); + background-color: var(--backgroundColor); margin-top: -20px; margin-bottom: 30px; margin-left: 20px; + border: 2px solid rgba(0, 0, 0, .15); border-radius: var(--borderRadius); box-shadow: var(--dropShadow); overflow: hidden; diff --git a/src/index.css b/src/index.css index 64d1c1f18f8f..3523767f9a42 100644 --- a/src/index.css +++ b/src/index.css @@ -144,6 +144,7 @@ img { background: #fff; border: 2px solid rgba(0, 0, 0, .15); border-radius: 2px; + box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .16); } & .rdtOpen .rdtPicker { display: block; From e2120910f68f06326eecc5e0178d3806b45c9195 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Thu, 11 May 2017 08:45:19 -0700 Subject: [PATCH 17/20] Update border on image widget, tweak the copy --- src/components/Widgets/ImageControl.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Widgets/ImageControl.js b/src/components/Widgets/ImageControl.js index 5d9d7006d36c..d0afb50bee1b 100644 --- a/src/components/Widgets/ImageControl.js +++ b/src/components/Widgets/ImageControl.js @@ -96,7 +96,7 @@ export default class ImageControl extends React.Component { onDrop={this.handleChange} > - {imageName ? imageName : 'Tip: Click here to upload an image from your file browser, or drag an image directly into this box from your desktop'} + {imageName ? imageName : 'Click here to upload an image from your computer, or drag and drop a file directly into this box'} Date: Sat, 13 May 2017 10:16:08 -0400 Subject: [PATCH 18/20] fix notification style bugs --- src/components/UI/theme.css | 4 ++++ src/components/UI/toast/Toast.css | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index 793b8e8490dc..f8df10ee7bae 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -41,6 +41,10 @@ border-radius: var(--borderRadius); } +.depth { + box-shadow: var(--dropShadow); +} + .clearfix:after { content: ''; display: table; diff --git a/src/components/UI/toast/Toast.css b/src/components/UI/toast/Toast.css index 9c8dfa4ee9c5..0d711c6dd6da 100644 --- a/src/components/UI/toast/Toast.css +++ b/src/components/UI/toast/Toast.css @@ -4,6 +4,11 @@ --iconSize: 30px; } +/* redux-notifications override */ +:global(.notif__container) { + z-index: 10000; +} + .root { composes: base container rounded depth from '../theme.css'; overflow: hidden; From 3a78626900b10b87e7ab37b0bdfe2931f53cff47 Mon Sep 17 00:00:00 2001 From: Rafael Conde Date: Thu, 18 May 2017 10:29:21 +0100 Subject: [PATCH 19/20] Tweak cards on Editorial Workflow --- .../UnpublishedListing/UnpublishedListing.css | 15 +++++++++++++-- .../UnpublishedListing/UnpublishedListing.js | 1 + .../UnpublishedListingCardMeta.css | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/components/UnpublishedListing/UnpublishedListing.css b/src/components/UnpublishedListing/UnpublishedListing.css index bbdbc05d6e6b..5345ed3fb9fc 100644 --- a/src/components/UnpublishedListing/UnpublishedListing.css +++ b/src/components/UnpublishedListing/UnpublishedListing.css @@ -1,5 +1,6 @@ :root { - --highlightColor: #e1eeea; + --highlightColor: #38ab9b; + --backgroundAltColor: #232528; --defaultFontSize: 1em; } @@ -11,6 +12,7 @@ .column { flex: 1 33%; margin: -10px; + margin-top: 24px; padding: 10px; max-width: 33%; transition: background-color .5s ease; @@ -18,7 +20,8 @@ .columnHovered { composes: column; - background-color: var(--highlightColor); + border: 2px dashed var(--highlightColor); + border-radius: 4px; } .columnHeading { @@ -32,3 +35,11 @@ .card { margin-bottom: 10px; } + +/* Gross stuff below, React Toolbox hacks */ + +.cardTitle h5 { + color: var(--backgroundAltColor) !important; + font-weight: 500 !important; + font-size: 21px !important; +} diff --git a/src/components/UnpublishedListing/UnpublishedListing.js b/src/components/UnpublishedListing/UnpublishedListing.js index 7b064c5afcc8..4f061d72bef3 100644 --- a/src/components/UnpublishedListing/UnpublishedListing.js +++ b/src/components/UnpublishedListing/UnpublishedListing.js @@ -88,6 +88,7 @@ class UnpublishedListing extends React.Component { Last updated: {timeStamp} by {entry.getIn(['metaData', 'user'])} diff --git a/src/components/UnpublishedListing/UnpublishedListingCardMeta.css b/src/components/UnpublishedListing/UnpublishedListingCardMeta.css index a1964d9acd44..5e42be987af9 100644 --- a/src/components/UnpublishedListing/UnpublishedListingCardMeta.css +++ b/src/components/UnpublishedListing/UnpublishedListingCardMeta.css @@ -12,7 +12,8 @@ font-size: .75em; text-transform: uppercase; - background: var(--backgroundColorShaded); + background: var(--backgroundAltColor); + color: #fff; } .meta {} From 62a8de98da9de9b5022827a09b1aa00cb609b0f0 Mon Sep 17 00:00:00 2001 From: Shawn Erquhart Date: Thu, 18 May 2017 11:12:37 -0400 Subject: [PATCH 20/20] improve theme color control via variables --- src/components/ControlPanel/ControlPane.css | 2 +- src/components/EntryEditor/EntryEditor.css | 4 +-- src/components/UI/card/Card.css | 2 +- src/components/UI/theme.css | 8 +++-- .../UnpublishedListing/UnpublishedListing.css | 3 +- src/components/Widgets/ImageControl.css | 21 +++++++++++++ src/components/Widgets/ImageControl.js | 30 ++++--------------- .../Toolbar/ToolbarPluginForm.css | 2 +- .../VisualEditor/index.css | 2 +- src/index.css | 3 +- 10 files changed, 43 insertions(+), 34 deletions(-) create mode 100644 src/components/Widgets/ImageControl.css diff --git a/src/components/ControlPanel/ControlPane.css b/src/components/ControlPanel/ControlPane.css index 9c3e4d8a3b0e..ea8d67d32020 100644 --- a/src/components/ControlPanel/ControlPane.css +++ b/src/components/ControlPanel/ControlPane.css @@ -14,7 +14,7 @@ width: 100%; padding: 12px; margin: 0; - border: 2px solid var(--textFieldBorderColor); + border: var(--textFieldBorder); border-radius: var(--borderRadius); outline: 0; box-shadow: none; diff --git a/src/components/EntryEditor/EntryEditor.css b/src/components/EntryEditor/EntryEditor.css index d9ee9e521f52..2ff69ba589e5 100644 --- a/src/components/EntryEditor/EntryEditor.css +++ b/src/components/EntryEditor/EntryEditor.css @@ -41,7 +41,7 @@ left: 0; right: 0; bottom: 0; - border-top: 2px solid rgba(0, 0, 0, .15); + border-top: var(--border); background: var(--backgroundColor); text-align: right; } @@ -54,5 +54,5 @@ } .ProseMirror { - border: 2px solid var(--textFieldBorderColor); + border: var(--textFieldBorder); } diff --git a/src/components/UI/card/Card.css b/src/components/UI/card/Card.css index 99555972718d..c63fb45530b0 100644 --- a/src/components/UI/card/Card.css +++ b/src/components/UI/card/Card.css @@ -3,7 +3,7 @@ .card { composes: base container rounded; overflow: hidden; - border: 2px solid var(--textFieldBorderColor); + border: var(--textFieldBorder); transition: all .1s ease-in-out; transform: translateY(0); padding: 16px 24px; diff --git a/src/components/UI/theme.css b/src/components/UI/theme.css index f8df10ee7bae..d1a3cb8c2237 100644 --- a/src/components/UI/theme.css +++ b/src/components/UI/theme.css @@ -13,11 +13,12 @@ --textMutedColor: #8c8c8c; --borderRadius: 4px; --borderRadiusLarge: 8px; - --dropShadow: 0 2px 8px 0 rgba(0, 0, 0, .16); + --secondaryColor: #d9d9d9; + --dropShadow: 0 2px 8px 0 var(--secondaryColor); --topmostZindex: 99999; --foregroundAltColor: #fff; --backgroundAltColor: #232528; - --textFieldBorderColor: rgba(0, 0, 0, .15); + --textFieldBorderColor: var(--secondaryColor); --highlightFGColor: #fff; --highlightBGColor: #3ab7a5; --highlightFGAltColor: #eee; @@ -26,6 +27,9 @@ --backgroundTertiaryColor: #fff; --backgroundTertiaryColorDark: color(var(--backgroundTertiaryColor) lightness(90%)); --richTextEditorMinHeight: 300px; + --borderWidth: 2px; + --border: solid var(--borderWidth) var(--secondaryColor); + --textFieldBorder: var(--border); } .base { diff --git a/src/components/UnpublishedListing/UnpublishedListing.css b/src/components/UnpublishedListing/UnpublishedListing.css index 5345ed3fb9fc..aaf6d5c67d09 100644 --- a/src/components/UnpublishedListing/UnpublishedListing.css +++ b/src/components/UnpublishedListing/UnpublishedListing.css @@ -1,6 +1,7 @@ +@import '../UI/theme.css'; + :root { --highlightColor: #38ab9b; - --backgroundAltColor: #232528; --defaultFontSize: 1em; } diff --git a/src/components/Widgets/ImageControl.css b/src/components/Widgets/ImageControl.css new file mode 100644 index 000000000000..ca145c185b65 --- /dev/null +++ b/src/components/Widgets/ImageControl.css @@ -0,0 +1,21 @@ +@import "../UI/theme.css"; + +.input { + display: none !important; +} + +.message { + padding: 20px; + display: block; + font-size: 12px; +} + +.imageUpload { + background-color: #fff; + text-align: center; + color: #999; + border: var(--border); + border-style: dashed; + border-radius: var(--borderRadius); + cursor: pointer; +} diff --git a/src/components/Widgets/ImageControl.js b/src/components/Widgets/ImageControl.js index d0afb50bee1b..f81f1f293ab5 100644 --- a/src/components/Widgets/ImageControl.js +++ b/src/components/Widgets/ImageControl.js @@ -2,6 +2,7 @@ import React, { PropTypes } from 'react'; import { truncateMiddle } from '../../lib/textHelper'; import { Loader } from '../UI'; import AssetProxy, { createAssetProxy } from '../../valueObjects/AssetProxy'; +import styles from './ImageControl.css'; const MAX_DISPLAY_LENGTH = 50; @@ -81,8 +82,8 @@ export default class ImageControl extends React.Component { const imageName = this.renderImageName(); if (processing) { return ( -
- +
+
@@ -90,19 +91,19 @@ export default class ImageControl extends React.Component { } return (
- + {imageName ? imageName : 'Click here to upload an image from your computer, or drag and drop a file directly into this box'}
@@ -110,25 +111,6 @@ export default class ImageControl extends React.Component { } } -const styles = { - input: { - display: 'none', - }, - message: { - padding: '20px', - display: 'block', - fontSize: '12px', - }, - imageUpload: { - backgroundColor: '#fff', - textAlign: 'center', - color: '#999', - border: '2px dashed rgba(0, 0, 0, .15)', - borderRadius: '4px', - cursor: 'pointer', - }, -}; - ImageControl.propTypes = { onAddAsset: PropTypes.func.isRequired, onChange: PropTypes.func.isRequired, diff --git a/src/components/Widgets/MarkdownControlElements/Toolbar/ToolbarPluginForm.css b/src/components/Widgets/MarkdownControlElements/Toolbar/ToolbarPluginForm.css index d3104aac6ea3..b19b33d1674c 100644 --- a/src/components/Widgets/MarkdownControlElements/Toolbar/ToolbarPluginForm.css +++ b/src/components/Widgets/MarkdownControlElements/Toolbar/ToolbarPluginForm.css @@ -6,7 +6,7 @@ margin-top: -20px; margin-bottom: 30px; margin-left: 20px; - border: 2px solid rgba(0, 0, 0, .15); + border: var(--border); border-radius: var(--borderRadius); box-shadow: var(--dropShadow); overflow: hidden; diff --git a/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css b/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css index 67766a98da9a..7a96331e0506 100644 --- a/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css +++ b/src/components/Widgets/MarkdownControlElements/VisualEditor/index.css @@ -76,7 +76,7 @@ overflow: hidden; border-radius: var(--borderRadius); overflow-x: auto; - border: 2px solid var(--textFieldBorderColor); + border: var(--textFieldBorder); min-height: var(--richTextEditorMinHeight); & ul, diff --git a/src/index.css b/src/index.css index 3523767f9a42..9880debbdb5b 100644 --- a/src/index.css +++ b/src/index.css @@ -1,4 +1,5 @@ @import "material-icons.css"; +@import "components/UI/theme.css"; html { box-sizing: border-box; @@ -142,7 +143,7 @@ img { margin-top: 1px; z-index: 99999 !important; background: #fff; - border: 2px solid rgba(0, 0, 0, .15); + border: 2px solid var(--secondaryColor); border-radius: 2px; box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .16); }