imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration

Browse source 
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
This commit is contained in:
Michael Telatynski 2020-01-27 15:46:38 +00:00
commit ddb0f06005
42 changed files with 1083 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/css/views/right_panel/_UserInfo.scss
View file

@ -109,7 +109,7 @@ limitations under the License.
justify-content: center;
// override the calculated sizes so that the letter isn't HUGE
font-size: 26px !important;
font-size: 56px !important;
width: 100% !important;
}