Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Undo formatting/stylistic changes

Browse source 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
This commit is contained in:
RMidhunSuresh 2021-06-03 21:03:02 +05:30
parent 3273682155
commit 8d254c91e3
4 changed files with 65 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/domain/session/RoomGridViewModel.js
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import { ViewModel } from "../ViewModel.js"; import {ViewModel} from "../ViewModel.js";
function dedupeSparse(roomIds) { function dedupeSparse(roomIds) {
return roomIds.map((id, idx) => { return roomIds.map((id, idx) => {
@ -181,8 +181,8 @@ export class RoomGridViewModel extends ViewModel {
} }
} }
import { createNavigation } from "../navigation/index.js"; import {createNavigation} from "../navigation/index.js";
import { ObservableValue } from "../../observable/ObservableValue.js"; import {ObservableValue} from "../../observable/ObservableValue.js";
export function tests() { export function tests() {
class RoomVMMock { class RoomVMMock {
@ -200,7 +200,7 @@ export function tests() {
} }
class RoomViewModelObservableMock extends ObservableValue { class RoomViewModelObservableMock extends ObservableValue {
async initialize() { } async initialize() {}
dispose() { this.get()?.dispose(); } dispose() { this.get()?.dispose(); }
get id() { return this.get()?.id; } get id() { return this.get()?.id; }
} }

4
src/domain/session/SessionViewModel.js
View file

@ -16,8 +16,8 @@ limitations under the License.
*/ */
import {LeftPanelViewModel} from "./leftpanel/LeftPanelViewModel.js"; import {LeftPanelViewModel} from "./leftpanel/LeftPanelViewModel.js";
import { RoomViewModel } from "./room/RoomViewModel.js"; import {RoomViewModel} from "./room/RoomViewModel.js";
import { RoomInfoViewModel } from "./rightpanel/RoomInfoViewModel.js"; import {RoomInfoViewModel} from "./rightpanel/RoomInfoViewModel.js";
import {UnknownRoomViewModel} from "./room/UnknownRoomViewModel.js"; import {UnknownRoomViewModel} from "./room/UnknownRoomViewModel.js";
import {InviteViewModel} from "./room/InviteViewModel.js"; import {InviteViewModel} from "./room/InviteViewModel.js";
import {LightboxViewModel} from "./room/LightboxViewModel.js"; import {LightboxViewModel} from "./room/LightboxViewModel.js";

4
src/domain/session/rightpanel/RoomInfoViewModel.js
View file

@ -1,5 +1,5 @@
import { ViewModel } from "../../ViewModel.js"; import {ViewModel} from "../../ViewModel.js";
import { avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl } from "../../avatar.js"; import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar.js";
export class RoomInfoViewModel extends ViewModel { export class RoomInfoViewModel extends ViewModel {
constructor(options) { constructor(options) {

130
src/platform/web/ui/css/themes/element/theme.css
View file

@ -47,37 +47,14 @@ limitations under the License.
color: white; color: white;
} }
.hydrogen .avatar.usercolor1 { .hydrogen .avatar.usercolor1 { background-color: var(--usercolor1); }
background-color: var(--usercolor1); .hydrogen .avatar.usercolor2 { background-color: var(--usercolor2); }
} .hydrogen .avatar.usercolor3 { background-color: var(--usercolor3); }
.hydrogen .avatar.usercolor4 { background-color: var(--usercolor4); }
.hydrogen .avatar.usercolor2 { .hydrogen .avatar.usercolor5 { background-color: var(--usercolor5); }
background-color: var(--usercolor2); .hydrogen .avatar.usercolor6 { background-color: var(--usercolor6); }
} .hydrogen .avatar.usercolor7 { background-color: var(--usercolor7); }
.hydrogen .avatar.usercolor8 { background-color: var(--usercolor8); }
.hydrogen .avatar.usercolor3 {
background-color: var(--usercolor3);
}
.hydrogen .avatar.usercolor4 {
background-color: var(--usercolor4);
}
.hydrogen .avatar.usercolor5 {
background-color: var(--usercolor5);
}
.hydrogen .avatar.usercolor6 {
background-color: var(--usercolor6);
}
.hydrogen .avatar.usercolor7 {
background-color: var(--usercolor7);
}
.hydrogen .avatar.usercolor8 {
background-color: var(--usercolor8);
}
.logo { .logo {
height: 48px; height: 48px;
@ -93,11 +70,11 @@ limitations under the License.
display: flex; display: flex;
} }
.button-row>* { .button-row > * {
margin-right: 10px; margin-right: 10px;
} }
.button-row>*:last-child { .button-row > *:last-child {
margin-right: 0px; margin-right: 0px;
} }
@ -196,8 +173,7 @@ a.button-action {
border-radius: 16px; border-radius: 16px;
height: 32px; height: 32px;
align-items: center; align-items: center;
padding-left: 30px; padding-left: 30px; /* 8 + 14 (icon) + 8*/
/* 8 + 14 (icon) + 8*/
box-sizing: border-box; box-sizing: border-box;
} }
@ -226,16 +202,13 @@ a.button-action {
} }
.FilterField button { .FilterField button {
width: 30px; width: 30px; /* 32 - 1 (top) - 1 (bottom) */
/* 32 - 1 (top) - 1 (bottom) */ height: 30px; /* 32 - 1 (top) - 1 (bottom) */
height: 30px;
/* 32 - 1 (top) - 1 (bottom) */
background-position: center; background-position: center;
background-color: #e1e3e6; background-color: #e1e3e6;
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: url('icons/clear.svg'); background-image: url('icons/clear.svg');
border: 7px solid transparent; border: 7px solid transparent; /* 8 - 1 */
/* 8 - 1 */
border-radius: 100%; border-radius: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
@ -271,11 +244,11 @@ a.button-action {
padding: 12px 8px 0 8px; padding: 12px 8px 0 8px;
} }
.LeftPanel> :not(:first-child) { .LeftPanel > :not(:first-child) {
margin-top: 12px; margin-top: 12px;
} }
.LeftPanel .utilities> :not(:first-child) { .LeftPanel .utilities > :not(:first-child) {
margin-left: 8px; margin-left: 8px;
} }
@ -295,14 +268,14 @@ a.button-action {
margin-right: -8px; margin-right: -8px;
} }
.RoomList>li { .RoomList > li {
margin: 0; margin: 0;
padding: 4px 8px 4px 0; padding: 4px 8px 4px 0;
/* vertical align */ /* vertical align */
align-items: center; align-items: center;
} }
.RoomList>li>a { .RoomList > li > a {
text-decoration: none; text-decoration: none;
/* vertical align */ /* vertical align */
align-items: center; align-items: center;
@ -319,7 +292,7 @@ a.button-action {
border-radius: 5px; border-radius: 5px;
} }
.RoomList li>a>* { .RoomList li > a > * {
margin-right: 8px; margin-right: 8px;
} }
@ -366,7 +339,7 @@ a {
text-align: left; text-align: left;
} }
.SessionStatusView>.end { .SessionStatusView > .end {
flex: 1; flex: 1;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@ -392,7 +365,7 @@ a {
} }
.SessionPickerView li { .SessionPickerView li {
font-size: 1.2em; font-size: 1.2em;
} }
.SessionPickerView .session-info { .SessionPickerView .session-info {
@ -411,11 +384,11 @@ a {
display: flex; display: flex;
} }
.SessionPickerView .session-actions>* { .SessionPickerView .session-actions > * {
margin-right: 10px; margin-right: 10px;
} }
.SessionPickerView .session-actions>*:last-child { .SessionPickerView .session-actions > *:last-child {
margin-right: 0px; margin-right: 0px;
} }
@ -429,16 +402,16 @@ a {
color: #FF4B55; color: #FF4B55;
} }
.RoomGridView>div.container { .RoomGridView > div.container {
border-right: 1px solid rgba(245, 245, 245, 0.90); border-right: 1px solid rgba(245, 245, 245, 0.90);
border-bottom: 1px solid rgba(245, 245, 245, 0.90); border-bottom: 1px solid rgba(245, 245, 245, 0.90);
} }
.RoomGridView>.focused>.room-placeholder .unfocused { .RoomGridView > .focused > .room-placeholder .unfocused {
display: none; display: none;
} }
.RoomGridView> :not(.focused)>.room-placeholder .focused { .RoomGridView > :not(.focused) > .room-placeholder .focused {
display: none; display: none;
} }
@ -446,15 +419,14 @@ a {
color: #8D99A5; color: #8D99A5;
} }
.RoomGridView>div.focus-ring { .RoomGridView > div.focus-ring {
border: 2px solid rgba(134, 193, 165, 1); border: 2px solid rgba(134, 193, 165, 1);
border-radius: 12px; border-radius: 12px;
} }
.middle-header { .middle-header {
box-sizing: border-box; box-sizing: border-box;
flex: 0 0 56px; flex: 0 0 56px; /* 12 + 32 + 12 to align with filter field + margin */
/* 12 + 32 + 12 to align with filter field + margin */
background: white; background: white;
padding: 0 16px; padding: 0 16px;
border-bottom: 1px solid rgba(245, 245, 245, 0.90); border-bottom: 1px solid rgba(245, 245, 245, 0.90);
@ -465,7 +437,7 @@ a {
font-weight: 600; font-weight: 600;
} }
.middle-header> :not(:last-child) { .middle-header > :not(:last-child) {
/* use margin-right because the first item, /* use margin-right because the first item,
.close-middle might be hidden and then we don't .close-middle might be hidden and then we don't
want a margin-left on the second item*/ want a margin-left on the second item*/
@ -498,11 +470,11 @@ a {
padding: 8px 16px; padding: 8px 16px;
} }
.MessageComposer> :not(:first-child) { .MessageComposer > :not(:first-child) {
margin-left: 12px; margin-left: 12px;
} }
.MessageComposer>input { .MessageComposer > input {
padding: 0 16px; padding: 0 16px;
border: none; border: none;
border-radius: 24px; border-radius: 24px;
@ -512,7 +484,7 @@ a {
font-family: "Inter", sans-serif; font-family: "Inter", sans-serif;
} }
.MessageComposer>button.send { .MessageComposer > button.send {
width: 32px; width: 32px;
height: 32px; height: 32px;
display: block; display: block;
@ -526,7 +498,7 @@ a {
background-position: center; background-position: center;
} }
.MessageComposer>button.sendFile { .MessageComposer > button.sendFile {
width: 32px; width: 32px;
height: 32px; height: 32px;
display: block; display: block;
@ -540,7 +512,7 @@ a {
background-position: center; background-position: center;
} }
.MessageComposer>button.send:disabled { .MessageComposer > button.send:disabled {
background-color: #E3E8F0; background-color: #E3E8F0;
} }
@ -553,7 +525,7 @@ a {
} }
.Settings p { .Settings p {
max-width: 700px; max-width: 700px;
} }
.Settings .row .label { .Settings .row .label {
@ -575,14 +547,14 @@ a {
} }
.Settings .row .content button { .Settings .row .content button {
display: inline-block; display: inline-block;
margin: 0 8px; margin: 0 8px;
} }
.Settings .row .content input[type=range] { .Settings .row .content input[type=range] {
width: 100%; width: 100%;
max-width: 300px; max-width: 300px;
min-width: 160px; min-width: 160px;
} }
.Settings .row { .Settings .row {
@ -617,16 +589,23 @@ button.link {
} }
.lightbox { .lightbox {
background-color: rgba(0, 0, 0, 0.75); background-color: rgba(0,0,0,0.75);
display: grid; display: grid;
grid-template: "content close" auto "content details" 1fr / 1fr auto; grid-template:
"content close" auto
"content details" 1fr /
1fr auto;
color: white; color: white;
padding: 4px; padding: 4px;
} }
@media (max-aspect-ratio: 1/1) { @media (max-aspect-ratio: 1/1) {
.lightbox { .lightbox {
grid-template: "close" auto "content" 1fr "details" auto / 1fr; grid-template:
"close" auto
"content" 1fr
"details" auto /
1fr;
} }
.lightbox .details { .lightbox .details {
width: 100% !important; width: 100% !important;
@ -651,7 +630,7 @@ button.link {
display: flex; display: flex;
} }
.lightbox .loading> :not(:first-child) { .lightbox .loading > :not(:first-child) {
margin-left: 8px; margin-left: 8px;
} }
@ -677,7 +656,7 @@ button.link {
.menu { .menu {
border-radius: 8px; border-radius: 8px;
box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5); box-shadow: 2px 2px 10px rgba(0,0,0,0.5);
padding: 4px; padding: 4px;
background-color: white; background-color: white;
list-style: none; list-style: none;
@ -720,7 +699,10 @@ button.link {
.InviteView_roomProfile { .InviteView_roomProfile {
display: grid; display: grid;
gap: 4px; gap: 4px;
grid-template: "avatar name" auto "avatar description" 1fr / 72px 1fr; grid-template:
"avatar name" auto
"avatar description" 1fr /
72px 1fr;
align-self: center; align-self: center;
margin-bottom: 24px; margin-bottom: 24px;
} }