From 8785aaf5ce84cbefc38355f230d9679fa09fa2c1 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Fri, 5 Nov 2021 08:58:02 +0200 Subject: [PATCH] new tool styling --- editors/demo/src/HHMI/config/config.js | 1 - .../src/components/tables/TableDropDown.js | 4 ++-- .../EditTableService/EditTableService.js | 2 -- .../MultipleDropDown.js | 15 ++++++++++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/editors/demo/src/HHMI/config/config.js b/editors/demo/src/HHMI/config/config.js index 2ccf3aba4..13c015786 100644 --- a/editors/demo/src/HHMI/config/config.js +++ b/editors/demo/src/HHMI/config/config.js @@ -51,7 +51,6 @@ export default { 'Images', 'Tables', 'MultipleDropDown', - 'MultipleChoice', 'FillTheGap', 'FullScreen', ], diff --git a/wax-prosemirror-components/src/components/tables/TableDropDown.js b/wax-prosemirror-components/src/components/tables/TableDropDown.js index 6f782bfcc..4ffd4e7e1 100644 --- a/wax-prosemirror-components/src/components/tables/TableDropDown.js +++ b/wax-prosemirror-components/src/components/tables/TableDropDown.js @@ -17,6 +17,7 @@ const DropdownStyled = styled(Dropdown)` .Dropdown-control { border: none; + padding-top: 12px; &:hover { box-shadow: none; @@ -24,8 +25,7 @@ const DropdownStyled = styled(Dropdown)` } .Dropdown-arrow { - right: 25px; - top: 14px; + top: 17px; } .Dropdown-menu { diff --git a/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js b/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js index 13cf658c7..83078c2e7 100644 --- a/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js +++ b/wax-prosemirror-services/src/TablesService/EditTableService/EditTableService.js @@ -2,8 +2,6 @@ import Service from '../../Service'; import TableDropDownOptions from './TableDropDownOptions'; class EditTableService extends Service { - boot() {} - register() { this.container.bind('TableDropDownOptions').to(TableDropDownOptions); } diff --git a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js index 31a2f0ba6..0126f7cc7 100644 --- a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js +++ b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js @@ -25,7 +25,7 @@ class MultipleDropDown extends ToolGroup { view: { main }, } = context; - const Wrapper = styled.span` + const Wrapper = styled.div` ${ReactDropDownStyles}; `; const DropdownStyled = styled(Dropdown)` @@ -35,13 +35,19 @@ class MultipleDropDown extends ToolGroup { pointer-events: ${props => (props.select ? 'default' : 'none')}; .Dropdown-control { border: none; + padding-top: 12px; + + &:hover { + box-shadow: none; + } } + .Dropdown-arrow { - right: 25px; - top: 10px; + top: 17px; } + .Dropdown-menu { - width: 120%; + width: 102%; display: flex; flex-direction: column; align-items: flex-start; @@ -52,7 +58,6 @@ class MultipleDropDown extends ToolGroup { `; const { dispatch, state } = view; - console.log('adsasda', this._tools[0]); const dropDownOptions = [ { label: 'Multiple choice ', value: '0', item: this._tools[0] }, { -- GitLab