Skip to content

update popover ui #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gzcqqqqqqqq1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update popover ui #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/AsyncUserSelect/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ const AsyncUserSelect = ({ className, emptyPlaceholder = '', searchPlaceholder =
target={selectorRef.current}
hideArrow={true}
fade={false}
className="dtable-ui-user-select-popover"
className="dtable-ui-user-select-popover seatable-popover"
>
<div className="dtable-ui-user-select-container" ref={userSelectContainerRef} onMouseDown={e => e.stopPropagation()}>
<div className="dtable-ui-user-select-container dtable-popover-container" ref={userSelectContainerRef} onMouseDown={e => e.stopPropagation()} >
<div className="dtable-ui-user-search-container">
<DtableSearchInput
autoFocus
Expand Down
2 changes: 1 addition & 1 deletion src/DTableColorPicker/ColorPickerPortal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default function ColorPickerPortal({ target, scrollContainerId, throttleD

return ReactDOM.createPortal(
<div
className='dtable-color-picker-portal'
className='dtable-color-picker-portal dtable-popover-container'
style={{
position: 'fixed',
zIndex: '1049',
Expand Down
6 changes: 4 additions & 2 deletions src/DTableColorPicker/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
width: 240px;
height: 370px;
background-color: #fff;
border-radius: 3px;
z-index: 100;
padding: 0.75rem;
line-height: 16px;
position: absolute;
box-shadow: rgba(0, 0, 0, 0.3) 0px 0px 2px, rgba(0, 0, 0, 0.3) 0px 4px 4px;
margin-top: 8px;
border: 1px solid #eee !important;
border-radius: 8px !important;
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.1) !important;
}

.dtable-color-picker .chrome-picker {
Expand Down
4 changes: 2 additions & 2 deletions src/DTableCommonAddTool/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
border-top: 1px solid #dedede;
background: #fff;
padding: 0 1rem;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
position: relative;
}

Expand Down
6 changes: 3 additions & 3 deletions src/DTableCustomFooter/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
align-items: center;
justify-content: flex-end;
padding: 0.75rem;
border-top: 1px solid rgba(0, 40, 100, 0.12);
border-bottom-right-radius: 2px;
border-bottom-left-radius: 2px;
border-top: 0 6px 16px rgba(0, 0, 0, 0.1) !important;
border-bottom-right-radius: 8px;
border-bottom-left-radius: 8px;
}

.dtable-custom-footer>* {
Expand Down
4 changes: 2 additions & 2 deletions src/DTableFiltersPopover/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
font-weight: 500;
background: #fff;
color: #666;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
position: relative;
}

Expand Down
4 changes: 2 additions & 2 deletions src/DTablePopover/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ class DTablePopover extends React.Component {
fade={false}
hideArrow={hideArrow}
innerClassName={innerClassName}
className={popoverClassName}
className={`seatable-popover ${popoverClassName}`}
modifiers={modifiers}
>
<div ref={ref => this.dtablePopoverRef = ref} onClick={this.onPopoverInsideClick}>
<div ref={ref => this.dtablePopoverRef = ref} onClick={this.onPopoverInsideClick} className='dtable-popover-container'>
{this.props.children}
</div>
</Popover>
Expand Down
1 change: 0 additions & 1 deletion src/DTableSwitch/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
transform: scale(.8);
display: inline-block;
line-height: 24px;
margin-right: 8px;
}

.dtable-switch.sm .custom-switch .dtable-font.dtable-icon-use-help {
Expand Down
20 changes: 8 additions & 12 deletions src/NotificationPopover/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
.notification-container {
position: absolute;
background: #fff;
width: 320px;
width: 400px;
right: -10px;
top: -1px;
border-radius: 3px;
box-shadow: 0 0 5px #ccc;
border-radius: 8px;
box-shadow: 0 6px 14px rgba(0, 0, 0, .1);
}

.notification-container .notification-header {
display: flex;
align-items: center;
justify-content: center;
height: 50px;
border-bottom: 1px solid #ededed;
border-bottom: 1px solid #eee;
font-size: 16px;
font-weight: 600;
position: relative;
Expand Down Expand Up @@ -161,14 +161,10 @@

.notification-body .notification-footer {
height: 40px;
display: flex;
align-items: center;
justify-content: center;
background: #f9f9f9;
cursor: pointer;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
border-top: 1px solid #ededed;
border-top: 1px solid #eee !important;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
background: #eee;
}

.notification-body .notification-footer:hover {
Expand Down
6 changes: 4 additions & 2 deletions src/NotificationPopover/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default class NotificationPopover extends React.Component {
hideArrow={true}
placement="bottom"
>
<div className="notification-container" ref={ref => this.notificationContainerRef = ref}>
<div className="notification-container dtable-popover-container" ref={ref => this.notificationContainerRef = ref}>
<div className="notification-header">
{headerText}
<IconButton icon="x" onClick={this.props.onNotificationListToggle} />
Expand All @@ -89,7 +89,9 @@ export default class NotificationPopover extends React.Component {
{this.props.children}
</div>
</div>
<div className="notification-footer" onClick={this.onNotificationDialogToggle}>{footerText}</div>
<button className="notification-footer border-0 bg-transparent d-block w-100" onClick={this.onNotificationDialogToggle} >
{footerText}
</button>
</div>
</div>
</Popover>
Expand Down
6 changes: 3 additions & 3 deletions src/SelectOptionGroup/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
min-width: 100%;
max-width: 15rem;
padding: 0.5rem 0;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
background: #fff;
border: 1px solid rgba(0, 40, 100, 0.12);
border-radius: 3px;
z-index: 10001;
border: 1px solid #eee !important;
border-radius: 8px !important;
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.1) !important;
}

.option-group .option-group-search {
Expand Down
Loading