Fix merge

matrix-org · Jan 3, 2019 · 982e037 · 982e037
1 parent 7d161de
commit 982e037
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
@@ -57,10 +57,6 @@ limitations under the License.
     pointer-events: none;
 }
 
-.mx_RightPanel_headerButton_badgeHighlight .mx_RightPanel_headerButton_badge {
-    color: $warning-color;
-}
-
 .mx_RightPanel_headerButton_highlight {
     border-color: $button-bg-color;
 }

diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss
@@ -186,6 +186,8 @@ $lightbox-border-color: #ffffff;
 // unused?
 $progressbar-color: #000;
 
+$room-warning-bg-color: #fff8e3;
+
 /*** form elements ***/
 
 // .mx_textinput is a container for a text input
@@ -320,3 +322,11 @@ input[type=search]::-webkit-search-results-decoration {
     font-size: 15px;
     padding: 0px 1.5em 0px 1.5em;
 }
+
+@define-mixin mx_DialogButton_secondary {
+    // flip colours for the secondary ones
+    font-weight: 600;
+    border: 1px solid $accent-color ! important;
+    color: $accent-color;
+    background-color: $accent-fg-color;
+}
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
@@ -622,31 +622,31 @@ module.exports = React.createClass({
                 list: this.state.lists['im.vector.fake.invite'],
                 label: _t('Invites'),
                 order: "recent",
-                incomingCall={incomingCallIfTaggedAs('im.vector.fake.invite')},
+                incomingCall: incomingCallIfTaggedAs('im.vector.fake.invite'),
                 isInvite: true,
             },
             {
                 list: this.state.lists['m.favourite'],
                 label: _t('Favourites'),
                 tagName: "m.favourite",
                 order: "manual",
-                incomingCall={incomingCallIfTaggedAs('m.favourite')},
+                incomingCall: incomingCallIfTaggedAs('m.favourite'),
             },
             {
                 list: this.state.lists['im.vector.fake.direct'],
                 label: _t('People'),
                 tagName: "im.vector.fake.direct",
                 headerItems: this._getHeaderItems('im.vector.fake.direct'),
                 order: "recent",
-                incomingCall={incomingCallIfTaggedAs('im.vector.fake.direct')},
+                incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'),
                 onAddRoom: () => {dis.dispatch({action: 'view_create_chat'})},
             },
             {
                 list: this.state.lists['im.vector.fake.recent'],
                 label: _t('Rooms'),
                 headerItems: this._getHeaderItems('im.vector.fake.recent'),
                 order: "recent",
-                incomingCall={incomingCallIfTaggedAs('im.vector.fake.recent')},
+                incomingCall: incomingCallIfTaggedAs('im.vector.fake.recent'),
                 onAddRoom: () => {dis.dispatch({action: 'view_create_room'})},
             },
         ];
@@ -660,7 +660,7 @@ module.exports = React.createClass({
                     label: labelForTagName(tagName),
                     tagName: tagName,
                     order: "manual",
-                    incomingCallIfTaggedAs(tagName),
+                    incomingCall: incomingCallIfTaggedAs(tagName),
                 };
             });
         subLists = subLists.concat(tagSubLists);
@@ -670,13 +670,13 @@ module.exports = React.createClass({
                 label: _t('Low priority'),
                 tagName: "m.lowpriority",
                 order: "recent",
-                incomingCall={incomingCallIfTaggedAs('m.lowpriority')},
+                incomingCall: incomingCallIfTaggedAs('m.lowpriority'),
             },
             {
                 list: this.state.lists['im.vector.fake.archived'],
                 label: _t('Historical'),
                 order: "recent",
-                incomingCall={incomingCallIfTaggedAs('im.vector.fake.archived')},
+                incomingCall: incomingCallIfTaggedAs('im.vector.fake.archived'),
                 startAsHidden: true,
                 showSpinner: this.state.isLoadingLeftRooms,
                 onHeaderClick: this.onArchivedHeaderClick,
@@ -686,7 +686,7 @@ module.exports = React.createClass({
                 label: _t('System Alerts'),
                 tagName: "m.lowpriority",
                 order: "recent",
-                incomingCall={incomingCallIfTaggedAs('m.server_notice')},
+                incomingCall: incomingCallIfTaggedAs('m.server_notice'),
             },
         ]);