PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix RoomDropTarget and emptySubListTip to have containers

Browse source 
so that the correct background colour can be used to surround both.
This commit is contained in:
Luke Barnard 2018-02-15 14:09:38 +00:00
parent f6255906d8
commit 9e1e7e0dbe
3 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/rooms/RoomDropTarget.js
View file

@ -23,9 +23,11 @@ module.exports = React.createClass({
render: function() { render: function() {
return ( return (
<div className="mx_RoomDropTarget"> <div className="mx_RoomDropTarget_container">
<div className="mx_RoomDropTarget_label"> <div className="mx_RoomDropTarget">
{ this.props.label } <div className="mx_RoomDropTarget_label">
{ this.props.label }
</div>
</div> </div>
</div> </div>
); );

12
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss
View file

@ -39,12 +39,16 @@ limitations under the License.
z-index: 6; z-index: 6;
} }
.mx_RoomList_emptySubListTip_container {
background-color: $secondary-accent-color;
padding-left: 18px;
padding-right: 18px;
padding-top: 8px;
padding-bottom: 7px;
}
.mx_RoomList_emptySubListTip { .mx_RoomList_emptySubListTip {
font-size: 13px; font-size: 13px;
margin-left: 18px;
margin-right: 18px;
margin-top: 8px;
margin-bottom: 7px;
padding: 5px; padding: 5px;
border: 1px dashed $accent-color; border: 1px dashed $accent-color;
color: $primary-fg-color; color: $primary-fg-color;

21
src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss
View file

@ -14,12 +14,21 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_RoomDropTarget_container {
background-color: $secondary-accent-color;
padding-left: 18px;
padding-right: 18px;
padding-top: 8px;
padding-bottom: 7px;
}
.collapsed .mx_RoomDropTarget_container {
padding-right: 10px;
padding-left: 10px;
}
.mx_RoomDropTarget { .mx_RoomDropTarget {
font-size: 13px; font-size: 13px;
margin-left: 18px;
margin-right: 18px;
margin-top: 8px;
margin-bottom: 7px;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
border: 1px dashed $accent-color; border: 1px dashed $accent-color;
@ -28,10 +37,6 @@ limitations under the License.
border-radius: 4px; border-radius: 4px;
} }
.collapsed .mx_RoomDropTarget {
margin-right: 10px;
margin-left: 10px;
}
.mx_RoomDropTarget_label { .mx_RoomDropTarget_label {
position: relative; position: relative;