From 620a1763baccf88c4ccf1003c258f42678add508 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Mon, 22 Mar 2021 17:08:47 +0200 Subject: [PATCH] css-fixes --- editors/editoria/src/Editoria.js | 4 ++++ editors/editoria/src/layout/EditoriaLayout.js | 2 +- .../findAndReplace/ExpandedFindAndReplaceComponent.js | 9 +++++---- .../src/components/findAndReplace/FindComponent.js | 4 ++-- .../trackChanges/TrackChangeOptionsComponent.js | 5 ++--- .../src/components/trackChanges/TrackChangesBox.js | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/editors/editoria/src/Editoria.js b/editors/editoria/src/Editoria.js index 9696eab0b..46e64b34c 100644 --- a/editors/editoria/src/Editoria.js +++ b/editors/editoria/src/Editoria.js @@ -17,6 +17,10 @@ const GlobalStyle = createGlobalStyle` #root { height:100vh; width:100vw; + + * { + box-sizing: border-box; + } } `; diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js index be563e198..81a4b1f09 100644 --- a/editors/editoria/src/layout/EditoriaLayout.js +++ b/editors/editoria/src/layout/EditoriaLayout.js @@ -32,7 +32,7 @@ const Wrapper = styled.div` background: ${th('colorBackground')}; font-family: ${th('fontInterface')}; font-size: ${th('fontSizeBase')}; - + line-height: ${grid(4)}; display: flex; flex-direction: column; diff --git a/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js index 6c499c69b..54c924076 100644 --- a/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js +++ b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js @@ -46,16 +46,16 @@ const InputLabel = styled.div` const SearchInputWrapper = styled.div` input { padding: ${grid(1)} ${grid(10)} ${grid(1)} ${grid(1)}; - width: 89%; + width: 98%; } `; const CounterInput = styled.span` font-size: 12px; position: absolute; - right: 14px; + right: 19px; -webkit-text-fill-color: rgba(27, 43, 75, 0.28); - top: 72px; + top: 69px; z-index: 1; `; @@ -93,7 +93,7 @@ const CheckBoxWrapper = styled.div` const ControlContainer = styled.div` display: flex; flex-direction: row; - margin-top: 70px; + margin-top: 62px; `; const ButtonReplace = styled.button` @@ -120,6 +120,7 @@ const PreviousNextContainer = styled.div` margin: 3px 0 0 auto; svg { + box-sizing: unset !important; padding: ${grid(2)}; &:hover { diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js index d313bfe58..462ddf569 100644 --- a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js +++ b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js @@ -41,7 +41,7 @@ const SearchInput = styled.input` font-size: 15px; font-weight: 400; padding: ${grid(1)} ${grid(10)} ${grid(1)} ${grid(1)}; - width: calc(100% - ${grid(10)}); + width: 100%; ::placeholder { color: #d8dae0; @@ -61,7 +61,7 @@ const ControlsWrapper = styled.div` const CounterInput = styled.span` font-size: 12px; position: absolute; - right: 145px; + right: 141px; -webkit-text-fill-color: rgba(27, 43, 75, 0.28); top: 13px; z-index: 1; diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js index f9e8748d0..2bc6ea0fe 100644 --- a/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js +++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangeOptionsComponent.js @@ -34,11 +34,11 @@ const ShowComments = styled.div` color: #bdc2ca; display: flex; flex-direction: row; - height: 23px; + height: 25px; padding-top: ${grid(2)}; svg { - bottom: 12px; + bottom: 14px; cursor: not-allowed; fill: #85adff; height: 45px !important; @@ -118,7 +118,6 @@ const AcceptRejectAllControls = styled.div` const AcceptRejectAllRow = styled.div` background: none; border: none; - cursor: pointer; padding-bottom: 3px; padding-top: 8px; text-align: start; diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js index dc9447762..d385794bb 100644 --- a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js +++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js @@ -68,10 +68,10 @@ const Text = styled.span``; const Icon = styled.div` border-radius: 3px; display: inline-block; - height: 16px; + height: 20px; padding: 4px; transition: background 0.1s ease-in; - width: 16px; + width: 20px; &:hover { background: #bfc4cd; -- GitLab