gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added set icons

This commit is contained in:
wmwragg 2016-08-10 12:06:03 +01:00
parent b1dd7efed8
commit ff13782ab5
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/context_menus/RoomTagContextMenu.js
View File

@ -142,10 +142,12 @@ module.exports = React.createClass({
<div> <div>
<div className={ favouriteClasses } onClick={this._onClickFavourite} > <div className={ favouriteClasses } onClick={this._onClickFavourite} >
<img className="mx_RoomTagContextMenu_icon" src="img/icon_context_fave.svg" width="15" height="15" /> <img className="mx_RoomTagContextMenu_icon" src="img/icon_context_fave.svg" width="15" height="15" />
<img className="mx_RoomTagContextMenu_icon_set" src="img/icon_context_fave_on.svg" width="15" height="15" />
Favourite Favourite
</div> </div>
<div className={ lowPriorityClasses } onClick={this._onClickLowPriority} > <div className={ lowPriorityClasses } onClick={this._onClickLowPriority} >
<img className="mx_RoomTagContextMenu_icon" src="img/icon_context_low.svg" width="15" height="15" /> <img className="mx_RoomTagContextMenu_icon" src="img/icon_context_low.svg" width="15" height="15" />
<img className="mx_RoomTagContextMenu_icon_set" src="img/icon_context_low_on.svg" width="15" height="15" />
Low Priority Low Priority
</div> </div>
<hr className="mx_RoomTagContextMenu_separator" /> <hr className="mx_RoomTagContextMenu_separator" />

17
src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css
View File

@ -33,10 +33,20 @@ limitations under the License.
color: #ff0064; color: #ff0064;
} }
.mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldSet { .mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldSet {
font-weight: bold; font-weight: bold;
} }
.mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldSet .mx_RoomTagContextMenu_icon {
display: none;
}
.mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldSet .mx_RoomTagContextMenu_icon_set {
display: inline-block;
}
.mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldDisabled { .mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldDisabled {
color: rgba(0, 0, 0, 0.2); color: rgba(0, 0, 0, 0.2);
} }
@ -44,6 +54,13 @@ limitations under the License.
.mx_RoomTagContextMenu_icon { .mx_RoomTagContextMenu_icon {
padding-right: 8px; padding-right: 8px;
padding-left: 4px; padding-left: 4px;
display: inline-block
}
.mx_RoomTagContextMenu_icon_set {
padding-right: 8px;
padding-left: 4px;
display: none;
} }
.mx_RoomTagContextMenu_separator { .mx_RoomTagContextMenu_separator {