From e21a33986fa7c10f99b9a79b4ac03ba6b3618642 Mon Sep 17 00:00:00 2001 From: Shawn Erquhart Date: Wed, 3 May 2017 15:50:50 -0400 Subject: [PATCH] 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 d0412d03..9c3e4d8a 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 5fc0c6fd..90f3f500 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 45061154..9a079ce3 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 f323d7bb..99555972 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 f2444678..e77c5d2e 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 b7088c13..c49d25eb 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,