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

Jump to bottom

CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475 #5295

Merged
merged 3 commits into from
Oct 16, 2017
Merged

CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475 #5295

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
2cefa58
CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475
Oct 16, 2017
0807a2a
rethemendex.sh
Oct 16, 2017
12ebe91
"Add room..." -> "Add rooms..."
Oct 16, 2017
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
2 changes: 1 addition & 1 deletion src/components/structures/RightPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ module.exports = React.createClass({
<div className="mx_RightPanel_icon" >
<TintableSvg src="img/icons-room-add.svg" width="35" height="35" />
</div>
<div className="mx_RightPanel_message">{ _t('Add room to this group') }</div>
<div className="mx_RightPanel_message">{ _t('Add rooms to this group') }</div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this have a matching i18n change?

</AccessibleButton>
);
}
Expand Down
3 changes: 1 addition & 2 deletions src/i18n/strings/de_DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,5 @@
"State Key": "Status-Schlüssel",
"Invite to this group": "In diese Gruppe einladen",
"Filter results": "Ergebnisse filtern",
"You must specify an event type!": "Du musst einen Event-Typ spezifizieren!",
"Add room to this group": "Raum zu dieser Gruppe hinzufügen"
"You must specify an event type!": "Du musst einen Event-Typ spezifizieren!"
}
2 changes: 1 addition & 1 deletion src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,5 +207,5 @@
"Set Password": "Set Password",
"Couldn't load home page": "Couldn't load home page",
"Invite to this group": "Invite to this group",
"Add room to this group": "Add room to this group"
"Add rooms to this group": "Add rooms to this group"
}
1 change: 0 additions & 1 deletion src/i18n/strings/gl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@
"Set Password": "Establecer contrasinal",
"Couldn't load home page": "Non se cargou a páxina de inicio",
"Invite to this group": "Convidar a este grupo",
"Add room to this group": "Engadir sala a este grupo",
"You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurase nun cliente diferente de Riot. Non pode establecelos desde Riot pero aínda así aplicaranse",
"Riot/Android &amp; matrix-android-sdk chat": "Chat para Riot/Android &amp; matrix-android-sdk"
}
3 changes: 1 addition & 2 deletions src/i18n/strings/hu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,5 @@
"State Key": "Állapot kulcs",
"Invite to this group": "Meghívás ebbe a csoportba",
"Filter results": "Találatok szűrése",
"You must specify an event type!": "Meg kell határoznod az esemény típusát!",
"Add room to this group": "Szoba hozzáadása ehhez a csoporthoz"
"You must specify an event type!": "Meg kell határoznod az esemény típusát!"
}
3 changes: 1 addition & 2 deletions src/i18n/strings/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,5 @@
"Event Type": "Tipo di Evento",
"Event Content": "Contenuto dell'Evento",
"State Key": "Chiave dello Stato",
"Invite to this group": "Invita in questo gruppo",
"Add room to this group": "Aggiungi stanza a questo gruppo"
"Invite to this group": "Invita in questo gruppo"
}
3 changes: 1 addition & 2 deletions src/i18n/strings/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,5 @@
"Event sent!": "Event verstuurd!",
"Event Type": "Event-type",
"Event Content": "Event-inhoud",
"State Key": "Toestandssleutel",
"Add room to this group": "Voeg een ruimte aan deze groep toe"
"State Key": "Toestandssleutel"
}
3 changes: 1 addition & 2 deletions src/i18n/strings/pt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,5 @@
"Couldn't load home page": "Não foi possível carregar a página inicial",
"Invite to this group": "Convidar para este grupo",
"Filter results": "Filtrar resultados",
"You must specify an event type!": "Tem que especificar um tipo de evento!",
"Add room to this group": "Adicionar sala a este grupo"
"You must specify an event type!": "Tem que especificar um tipo de evento!"
}
3 changes: 1 addition & 2 deletions src/i18n/strings/pt_BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,5 @@
"Event Type": "Tipo do Evento",
"Event Content": "Conteúdo do Evento",
"State Key": "Chave do Estado",
"Invite to this group": "Convide para este grupo",
"Add room to this group": "Adicione sala para este grupo"
"Invite to this group": "Convide para este grupo"
}
3 changes: 1 addition & 2 deletions src/i18n/strings/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,5 @@
"State Key": "Ключ состояния",
"Invite to this group": "Пригласить в эту группу",
"Filter results": "Фильтрация результатов",
"You must specify an event type!": "Необходимо указать тип мероприятия!",
"Add room to this group": "Добавить комнату в эту группу"
"You must specify an event type!": "Необходимо указать тип мероприятия!"
}
3 changes: 1 addition & 2 deletions src/i18n/strings/uk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,5 @@
"Event Type": "Тип західу",
"Event Content": "Зміст заходу",
"State Key": "Ключ стану",
"Invite to this group": "Запросити в цю групу",
"Add room to this group": "Додати кімнату в цю группу"
"Invite to this group": "Запросити в цю групу"
}
3 changes: 1 addition & 2 deletions src/i18n/strings/zh_Hant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,5 @@
"State Key": "狀態金鑰",
"Invite to this group": "邀請進入此群組",
"Filter results": "過濾結果",
"You must specify an event type!": "您必須指定事件類型！",
"Add room to this group": "新增聊天室到此群組"
"You must specify an event type!": "您必須指定事件類型！"
}
55 changes: 50 additions & 5 deletions src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ limitations under the License.
width: 100%;
margin-left: auto;
margin-right: auto;
display: flex;
flex-direction: column;
overflow: hidden;
}

.mx_GroupView_error {
Expand All @@ -27,15 +30,13 @@ limitations under the License.

.mx_GroupView_header {
max-width: 960px;
margin: auto;
height: 70px;
align-items: center;
display: flex;
margin-bottom: 20px;
}

.mx_GroupView_header_view {
border-bottom: 1px solid #e5e5e5;
border-bottom: 1px solid $primary-hairline-color;
}

.mx_GroupView_header_avatar, .mx_GroupView_header_info {
Expand Down Expand Up @@ -133,9 +134,53 @@ limitations under the License.
top: 5px;
}

.mx_GroupView_body {
display: flex;
flex-direction: column;
flex-grow: 1;
}

.mx_GroupView_rooms {
flex-grow: 1;
display: flex;
flex-direction: column;
min-height: 200px;
user-select: none;
}

.mx_GroupView_rooms_header h3 {
margin-bottom: 10px
}

.mx_GroupView_rooms_header .mx_AccessibleButton {
padding-left: 14px;
margin-bottom: 14px;
height: 24px;
}

.mx_GroupView_rooms_header_addButton {
display: inline-block;
}

.mx_GroupView_rooms_header_addButton_label {
display: inline-block;
vertical-align: top;
line-height: 24px;
padding-left: 28px;
color: $accent-color;
}

.mx_GroupView_rooms .mx_RoomDetailList {
flex-grow: 1;
border-top: 1px solid $primary-hairline-color;
padding-top: 10px;
}

.mx_GroupView .mx_RoomView_messageListWrapper {
justify-content: flex-start;
}

.mx_GroupView_membershipSection {
margin-left: auto;
margin-right: auto;
margin-bottom: 11px;
color: $greyed-fg-color;
}
Expand Down