Skip to content

Commit

Permalink
further improve ui contrast and consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
Shawn Erquhart committed May 3, 2017
1 parent 415fe18 commit 9745ac2
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/components/ControlPanel/ControlPane.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/EntryEditor/EntryEditor.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@
}

.ProseMirror {
border: 2px solid rgb(230, 230, 230);
border: 2px solid var(--textFieldBorderColor);
}
4 changes: 1 addition & 3 deletions src/components/EntryListing/EntryListing.css
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/components/UI/card/Card.css
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 1 addition & 5 deletions src/components/UI/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
--topmostZindex: 99999;
--foregroundAltColor: #fff;
--backgroundAltColor: #232528;
--textFieldBorderColor: #e7e7e7;
--textFieldBorderColor: #e6e6e6;
--highlightFGColor: #fff;
--highlightBGColor: #3ab7a5;
--highlightFGAltColor: #eee;
Expand All @@ -40,10 +40,6 @@
border-radius: var(--borderRadius);
}

.depth {
box-shadow: var(--dropShadow);
}

.clearfix:after {
content: '';
display: table;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}

Expand Down Expand Up @@ -70,8 +67,7 @@
padding: 12px;
border-radius: var(--borderRadius);
overflow-x: auto;
border: 2px solid rgb(230, 230, 230);
border-top: 1px solid rgb(230, 230, 230);
border: 2px solid var(--textFieldBorderColor);
min-height: 500px;

& ul {
Expand Down

0 comments on commit 9745ac2

Please sign in to comment.