Removing general hover classes and moving them into each component css
This commit is contained in:
parent
c53ab6423f
commit
a71f7d6b13
10 changed files with 44 additions and 78 deletions
|
@ -50,4 +50,13 @@
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.IconButton {
|
||||||
|
border-radius: 3px;
|
||||||
|
margin-right: 6px;
|
||||||
|
padding: 0;
|
||||||
|
background: rgb(var(--main-fg), 0.1);
|
||||||
|
box-shadow: rgba(var(--main-fg), 0.1) 0px 0px 0px 1px, rgba(var(--main-fg), 0.1) 0px 2px 4px;
|
||||||
|
height: 24px;
|
||||||
|
width: 24px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,7 @@ import Menu from '../widgets/menu'
|
||||||
import OptionsIcon from '../widgets/icons/options'
|
import OptionsIcon from '../widgets/icons/options'
|
||||||
import DeleteIcon from '../widgets/icons/delete'
|
import DeleteIcon from '../widgets/icons/delete'
|
||||||
import DuplicateIcon from '../widgets/icons/duplicate'
|
import DuplicateIcon from '../widgets/icons/duplicate'
|
||||||
|
import IconButton from '../widgets/buttons/iconButton'
|
||||||
|
|
||||||
import PropertyValueElement from './propertyValueElement'
|
import PropertyValueElement from './propertyValueElement'
|
||||||
|
|
||||||
|
@ -88,8 +89,8 @@ class BoardCard extends React.Component<BoardCardProps, BoardCardState> {
|
||||||
className='optionsMenu'
|
className='optionsMenu'
|
||||||
stopPropagationOnToggle={true}
|
stopPropagationOnToggle={true}
|
||||||
>
|
>
|
||||||
<div className='octo-hoverbutton square'><OptionsIcon/></div>
|
<IconButton icon={<OptionsIcon/>}/>
|
||||||
<Menu>
|
<Menu position='left'>
|
||||||
<Menu.Text
|
<Menu.Text
|
||||||
icon={<DeleteIcon/>}
|
icon={<DeleteIcon/>}
|
||||||
id='delete'
|
id='delete'
|
||||||
|
|
|
@ -3,13 +3,19 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.octo-hovercontrols {
|
.add-buttons {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
min-height: 30px;
|
||||||
|
color:rgba(var(--main-fg), 0.4);
|
||||||
|
width: 100%;
|
||||||
|
align-items: flex-start;
|
||||||
.Button {
|
.Button {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
&:hover {
|
&:hover {
|
||||||
.Button {
|
.Button {
|
||||||
display: block;
|
display: flex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@ class CardDetail extends React.Component<Props, State> {
|
||||||
</div>)
|
</div>)
|
||||||
} else {
|
} else {
|
||||||
contentElements = (<div className='octo-content'>
|
contentElements = (<div className='octo-content'>
|
||||||
<div className='octo-block octo-hover-container'>
|
<div className='octo-block'>
|
||||||
<div className='octo-block-margin'/>
|
<div className='octo-block-margin'/>
|
||||||
<MarkdownEditor
|
<MarkdownEditor
|
||||||
text=''
|
text=''
|
||||||
|
@ -126,7 +126,7 @@ class CardDetail extends React.Component<Props, State> {
|
||||||
size='l'
|
size='l'
|
||||||
/>
|
/>
|
||||||
{!icon &&
|
{!icon &&
|
||||||
<div className='octo-hovercontrols'>
|
<div className='add-buttons'>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
const newIcon = BlockIcons.shared.randomIcon()
|
const newIcon = BlockIcons.shared.randomIcon()
|
||||||
|
|
|
@ -80,7 +80,7 @@ class Sidebar extends React.Component<Props, State> {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='Sidebar octo-sidebar'>
|
<div className='Sidebar octo-sidebar'>
|
||||||
<div className='octo-sidebar-header octo-hover-container'>
|
<div className='octo-sidebar-header'>
|
||||||
{'OCTO'}
|
{'OCTO'}
|
||||||
<div className='octo-spacer'/>
|
<div className='octo-spacer'/>
|
||||||
<IconButton
|
<IconButton
|
||||||
|
@ -99,7 +99,7 @@ class Sidebar extends React.Component<Props, State> {
|
||||||
const boardViews = views.filter((view) => view.parentId === board.id)
|
const boardViews = views.filter((view) => view.parentId === board.id)
|
||||||
return (
|
return (
|
||||||
<div key={board.id}>
|
<div key={board.id}>
|
||||||
<div className={'octo-sidebar-item octo-hover-container ' + (collapsedBoards[board.id] ? 'collapsed' : 'expanded')}>
|
<div className={'octo-sidebar-item ' + (collapsedBoards[board.id] ? 'collapsed' : 'expanded')}>
|
||||||
<IconButton
|
<IconButton
|
||||||
icon={<SubmenuTriangleIcon/>}
|
icon={<SubmenuTriangleIcon/>}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
@ -150,7 +150,7 @@ class Sidebar extends React.Component<Props, State> {
|
||||||
{!collapsedBoards[board.id] && boardViews.map((view) => (
|
{!collapsedBoards[board.id] && boardViews.map((view) => (
|
||||||
<div
|
<div
|
||||||
key={view.id}
|
key={view.id}
|
||||||
className='octo-sidebar-item subitem octo-hover-container'
|
className='octo-sidebar-item subitem'
|
||||||
>
|
>
|
||||||
<DotIcon/>
|
<DotIcon/>
|
||||||
<div
|
<div
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
.TableRow {
|
.TableRow {
|
||||||
.open-button {
|
.open-button {
|
||||||
display: none;
|
display: none;
|
||||||
|
.Button {
|
||||||
|
background-color: rgba(var(--main-fg), 0.1);
|
||||||
|
box-shadow: rgba(var(--main-fg), 0.1) 0px 0px 0px 1px, rgba(var(--main-fg), 0.1) 0px 2px 4px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
&:hover {
|
&:hover {
|
||||||
.open-button {
|
.open-button {
|
||||||
|
|
|
@ -8,6 +8,7 @@ import {Card} from '../blocks/card'
|
||||||
import mutator from '../mutator'
|
import mutator from '../mutator'
|
||||||
|
|
||||||
import Editable from '../widgets/editable'
|
import Editable from '../widgets/editable'
|
||||||
|
import Button from '../widgets/buttons/button'
|
||||||
|
|
||||||
import PropertyValueElement from './propertyValueElement'
|
import PropertyValueElement from './propertyValueElement'
|
||||||
import {CardDialog} from './cardDialog'
|
import {CardDialog} from './cardDialog'
|
||||||
|
@ -80,16 +81,13 @@ class TableRow extends React.Component<Props, State> {
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div className='open-button'>
|
||||||
className='octo-hoverbutton open-button'
|
<Button onClick={() => this.setState({showCard: true})}>
|
||||||
onClick={() => {
|
<FormattedMessage
|
||||||
this.setState({showCard: true})
|
id='TableRow.open'
|
||||||
}}
|
defaultMessage='Open'
|
||||||
>
|
/>
|
||||||
<FormattedMessage
|
</Button>
|
||||||
id='TableRow.open'
|
|
||||||
defaultMessage='Open'
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
{this.state.showCard &&
|
{this.state.showCard &&
|
||||||
<RootPortal>
|
<RootPortal>
|
||||||
|
|
|
@ -4,7 +4,12 @@
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
&.octo-hovercontrols {
|
&.add-buttons {
|
||||||
|
flex-direction: column;
|
||||||
|
min-height: 30px;
|
||||||
|
color:rgba(var(--main-fg), 0.4);
|
||||||
|
width: 100%;
|
||||||
|
align-items: flex-start;
|
||||||
.Button {
|
.Button {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ class ViewTitle extends React.Component<Props, State> {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className={'ViewTitle octo-hovercontrols ' + (board.icon ? '' : 'add-visible')}>
|
<div className={'ViewTitle add-buttons ' + (board.icon ? '' : 'add-visible')}>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
const newIcon = BlockIcons.shared.randomIcon()
|
const newIcon = BlockIcons.shared.randomIcon()
|
||||||
|
|
|
@ -121,16 +121,6 @@ hr {
|
||||||
|
|
||||||
/* Icons */
|
/* Icons */
|
||||||
|
|
||||||
.octo-hovercontrols {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: flex-start;
|
|
||||||
|
|
||||||
min-height: 30px;
|
|
||||||
width: 100%;
|
|
||||||
color:rgba(var(--main-fg), 0.4);
|
|
||||||
}
|
|
||||||
|
|
||||||
.octo-icon {
|
.octo-icon {
|
||||||
font-family: "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Noto Color Emoji", "Segoe UI Symbol", "Android Emoji", EmojiSymbols;
|
font-family: "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Noto Color Emoji", "Segoe UI Symbol", "Android Emoji", EmojiSymbols;
|
||||||
line-height: 1.5em;
|
line-height: 1.5em;
|
||||||
|
@ -182,59 +172,12 @@ hr {
|
||||||
box-shadow: rgba(15, 15, 15, 0.05) 0px 0px 0px 1px, rgba(15, 15, 15, 0.1) 0px 3px 6px, rgba(15, 15, 15, 0.2) 0px 9px 24px;
|
box-shadow: rgba(15, 15, 15, 0.05) 0px 0px 0px 1px, rgba(15, 15, 15, 0.1) 0px 3px 6px, rgba(15, 15, 15, 0.2) 0px 9px 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.octo-hoverbutton {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
flex-shrink: 0;
|
|
||||||
border-radius: 3px;
|
|
||||||
|
|
||||||
position: absolute;
|
|
||||||
right: 6px;
|
|
||||||
top: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
background: rgb(var(--main-fg), 0.1);
|
|
||||||
box-shadow: rgba(var(--main-fg), 0.1) 0px 0px 0px 1px, rgba(var(--main-fg), 0.1) 0px 2px 4px;
|
|
||||||
padding: 0 5px;
|
|
||||||
|
|
||||||
&.square {
|
|
||||||
height: 24px;
|
|
||||||
width: 24px;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Hover panel */
|
|
||||||
|
|
||||||
.octo-hoverpanel {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: flex-start;
|
|
||||||
|
|
||||||
min-height: 30px;
|
|
||||||
width: 100%;
|
|
||||||
color:rgba(var(--main-fg), 0.4);
|
|
||||||
}
|
|
||||||
|
|
||||||
.octo-block img {
|
.octo-block img {
|
||||||
max-width: 500px;
|
max-width: 500px;
|
||||||
max-height: 500px;
|
max-height: 500px;
|
||||||
margin: 5px 0;
|
margin: 5px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This needs to be declared after other co-classes */
|
|
||||||
.octo-hover-container {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.octo-hover-item {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.octo-hover-container:hover .octo-hover-item {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
|
|
||||||
.octo-content {
|
.octo-content {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin-right: 50px;
|
margin-right: 50px;
|
||||||
|
|
Loading…
Reference in a new issue