diff --git a/svgicons/fullscreen.svg b/svgicons/fullscreen.svg deleted file mode 100644 index d40aa9d9e67b..000000000000 --- a/svgicons/fullscreen.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/svgicons/fullscreencollapse.svg b/svgicons/fullscreencollapse.svg deleted file mode 100644 index 3bdb286a41a1..000000000000 --- a/svgicons/fullscreencollapse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/theme/common.less b/theme/common.less index 20207663a97c..6a983b5a7025 100644 --- a/theme/common.less +++ b/theme/common.less @@ -232,6 +232,14 @@ pre { filter: none; } } + + .fullscreen-button { + i { + margin: 0; + width: inherit; + opacity: 0.9; + } + } } .editor-sidebar .simtoolbar .ui.button:focus-visible { diff --git a/webapp/src/simtoolbar.tsx b/webapp/src/simtoolbar.tsx index 961ec6c4b645..1985f4fa3cf2 100644 --- a/webapp/src/simtoolbar.tsx +++ b/webapp/src/simtoolbar.tsx @@ -141,7 +141,7 @@ export class SimulatorToolbar extends data.Component {
{make && } {run && !targetTheme.bigRunButton && } - {fullscreen && } + {fullscreen && } {restart && } {run && debug && } {audio && isTabTutorial && } @@ -171,7 +171,7 @@ export class SimulatorToolbar extends data.Component {
} {!isHeadless &&
{screenshot && } - {fullscreen && } + {fullscreen && }
} ; } diff --git a/webapp/src/sui.tsx b/webapp/src/sui.tsx index 8800653efa44..9faf4e3ca05c 100644 --- a/webapp/src/sui.tsx +++ b/webapp/src/sui.tsx @@ -25,6 +25,7 @@ export interface UiProps { tabIndex?: number; rightIcon?: boolean; inverted?: boolean; + fontAwesome?: boolean; } export type SIZES = 'mini' | 'tiny' | 'small' | 'medium' | 'large' | 'big' | 'huge' | 'massive'; @@ -43,7 +44,7 @@ function genericClassName(cls: string, props: UiProps, ignoreIcon: boolean = fal export function genericContent(props: UiProps) { let retVal = [ - props.icon ? () : null, + props.icon ? () : null, props.text ? ({props.text}) : null, ] if (props.icon && props.rightIcon) retVal = retVal.reverse(); @@ -836,11 +837,12 @@ export interface IconProps extends UiProps { icon?: string; onClick?: () => void; onKeyDown?: () => void; + fontAwesome?: boolean; } export const Icon: React.FunctionComponent = (props: IconProps) => { - const { icon, className, onClick, onKeyDown, children, ...rest } = props; - return