Fix member avatar initials (I failed at git conflict merging)

dbkr · dbkr · commit c63dd376d878 · 2015-11-17T17:31:03.000Z
diff --git a/src/skins/vector/css/atoms/MemberAvatar.css b/src/skins/vector/css/atoms/MemberAvatar.css
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_MemberAvatar_image {
-    z-index: 20;
-    border-radius: 20px;
+.mx_MemberAvatar {
     position: relative;
 }
 
@@ -27,6 +25,6 @@ limitations under the License.
     speak: none;
 }
 
-.mx_MemberAvatar {
-    position: relative;
+.mx_MemberAvatar_image {
+    border-radius: 20px;
 }

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and`
`14`	`14`	`limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-.mx_MemberAvatar_image {`
`18`		`- z-index: 20;`
`19`		`- border-radius: 20px;`
	`17`	`+.mx_MemberAvatar {`
`20`	`18`	`position: relative;`
`21`	`19`	`}`
`22`	`20`
`@@ -27,6 +25,6 @@ limitations under the License.`
`27`	`25`	`speak: none;`
`28`	`26`	`}`
`29`	`27`
`30`		`-.mx_MemberAvatar {`
`31`		`- position: relative;`
	`28`	`+.mx_MemberAvatar_image {`
	`29`	`+ border-radius: 20px;`
`32`	`30`	`}`