diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss index b6644c1752..e818bb092e 100644 --- a/res/css/structures/_ContextualMenu.scss +++ b/res/css/structures/_ContextualMenu.scss @@ -163,12 +163,6 @@ limitations under the License. bottom: 1px; } -.mx_ContextualMenu_field { - padding: 3px 6px 3px 6px; - cursor: pointer; - white-space: nowrap; -} - .mx_ContextualMenu_spinner { display: block; margin: 0 auto; diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js index edd6f79270..3ce52247d9 100644 --- a/src/components/structures/ContextualMenu.js +++ b/src/components/structures/ContextualMenu.js @@ -1,6 +1,7 @@ /* Copyright 2015, 2016 OpenMarket Ltd Copyright 2018 New Vector Ltd +Copyright 2019 The Matrix.org Foundation C.I.C. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,7 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. */ - import React from 'react'; import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; @@ -48,7 +48,6 @@ export default class ContextualMenu extends React.Component { menuWidth: PropTypes.number, menuHeight: PropTypes.number, chevronOffset: PropTypes.number, - menuColour: PropTypes.string, chevronFace: PropTypes.string, // top, bottom, left, right or none // Function to be called on menu close onFinished: PropTypes.func, @@ -157,25 +156,6 @@ export default class ContextualMenu extends React.Component { chevronOffset.top = Math.max(props.chevronOffset, props.chevronOffset + target - adjusted); } - // To override the default chevron colour, if it's been set - let chevronCSS = ""; - if (props.menuColour) { - chevronCSS = ` - .mx_ContextualMenu_chevron_left:after { - border-right-color: ${props.menuColour}; - } - .mx_ContextualMenu_chevron_right:after { - border-left-color: ${props.menuColour}; - } - .mx_ContextualMenu_chevron_top:after { - border-left-color: ${props.menuColour}; - } - .mx_ContextualMenu_chevron_bottom:after { - border-left-color: ${props.menuColour}; - } - `; - } - const chevron = hasChevron ?
: undefined; @@ -202,10 +182,6 @@ export default class ContextualMenu extends React.Component { menuStyle.height = props.menuHeight; } - if (props.menuColour) { - menuStyle["backgroundColor"] = props.menuColour; - } - if (!isNaN(Number(props.menuPaddingTop))) { menuStyle["paddingTop"] = props.menuPaddingTop; } @@ -236,7 +212,6 @@ export default class ContextualMenu extends React.Component {
{ props.hasBackground &&
} -
; } }