Skip to content

Commit

Permalink
Merge pull request #13888 from vector-im/t3chguy/riotbot
Browse files Browse the repository at this point in the history
Get rid of welcome.html's Chat with Riot Bot button to release
  • Loading branch information
t3chguy authored Jun 2, 2020
2 parents 9e36e7f + c6688f0 commit e1f264c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 21 deletions.
25 changes: 8 additions & 17 deletions res/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,10 @@
color: #2e2f32 !important;
}

.mx_ButtonHeadline {
margin-bottom: 14px;
}

.mx_ButtonLabel {
margin-left: 20px;
}

.mx_ButtonWrapperText {
font-size: 13px;
margin-bottom: 10px;
}

.mx_Header_title {
font-size: 24px;
font-weight: 600;
Expand Down Expand Up @@ -158,6 +149,13 @@
display: none;
}

.mx_ButtonRow.mx_WelcomePage_guestFunctions {
margin-top: 20px;
}
.mx_ButtonRow.mx_WelcomePage_guestFunctions > div {
margin: 0 auto;
}

@media only screen and (max-width: 480px) {
.mx_ButtonRow {
flex-direction: column;
Expand Down Expand Up @@ -192,15 +190,8 @@ <h4 class="mx_Header_subtitle">_t("Decentralised, encrypted chat &amp; collabora
<!-- BEGIN Ansible: Remove these lines when guest access is disabled -->
<div class="mx_ButtonRow mx_WelcomePage_guestFunctions">
<div>
<div class="mx_ButtonWrapperText">_t("Need help?")</div>
<a href="#/user/@riot-bot:matrix.org?action=chat" class="mx_ButtonParent mx_SecondaryButton mx_Button_iconHelp">
<div class="mx_ButtonLabel">_t("Chat with Riot Bot")</div>
</a>
</div>
<div>
<div class="mx_ButtonWrapperText">_t("Explore rooms")</div>
<a href="#/directory" class="mx_ButtonParent mx_SecondaryButton mx_Button_iconRoomDirectory">
<div class="mx_ButtonLabel">_t("Room Directory")</div>
<div class="mx_ButtonLabel">_t("Explore rooms")</div>
</a>
</div>
</div>
Expand Down
5 changes: 1 addition & 4 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,5 @@
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
"Sign In": "Sign In",
"Create Account": "Create Account",
"Need help?": "Need help?",
"Chat with Riot Bot": "Chat with Riot Bot",
"Explore rooms": "Explore rooms",
"Room Directory": "Room Directory"
"Explore rooms": "Explore rooms"
}

0 comments on commit e1f264c

Please sign in to comment.