merge in matthew-css

This commit is contained in:
Matthew Hodgson
2015-07-07 03:44:41 +01:00
15 changed files with 138 additions and 90 deletions
+1 -7
View File
@@ -14,13 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_MessageComposer {
}
.mx_MessageComposer textarea {
position: absolute;
width: 100%;
margin-left: auto;
margin-right: auto;
padding: 0px;
margin: auto;
}
+5
View File
@@ -15,6 +15,11 @@ limitations under the License.
*/
.mx_MessageTile {
display: table-row;
}
.mx_MessageTile .mx_messageTileType {
display: table-cell;
}
.mx_MessageTile.sending {
+3 -5
View File
@@ -23,12 +23,10 @@ limitations under the License.
}
.mx_RoomTile.selected {
border: 2px inset #eee;
text-decoration: underline;
}
.mx_RoomTile_name {
font-size: 80%;
font-weight: bold;
}
.mx_RoomTile div {
@@ -37,7 +35,7 @@ limitations under the License.
}
.mx_RoomTile.unread {
background-color: #66e;
font-weight: bold;
}
.mx_RoomTile.highlight {
@@ -45,7 +43,7 @@ limitations under the License.
}
.mx_RoomTile.invited {
background-color: #6e6;
font-weight: bold;
}
.mx_RoomTile:hover {
+2 -2
View File
@@ -15,6 +15,6 @@ limitations under the License.
*/
.mx_SenderProfile {
display: inline-block;
width: 150px;
display: table-cell;
padding: 0px 1em 0em 1em;
}