Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get rid of welcome.html's Chat with Riot Bot button #13842

Merged
merged 3 commits into from
Jun 2, 2020
Merged

Get rid of welcome.html's Chat with Riot Bot button #13842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6683ce
Get rid of welcome.html's Chat with Riot Bot button
t3chguy May 28, 2020
bc42545
i18n
t3chguy May 28, 2020
c6688f0
make button margin equal all around
t3chguy May 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions res/welcome.html
View file
Open in desktop
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
View file
Open in desktop
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"
}