From 8d254c91e3c7859c5c026816d33b9c78140c02e3 Mon Sep 17 00:00:00 2001 From: RMidhunSuresh Date: Thu, 3 Jun 2021 21:03:02 +0530 Subject: [PATCH] Undo formatting/stylistic changes Signed-off-by: RMidhunSuresh --- src/domain/session/RoomGridViewModel.js | 10 +- src/domain/session/SessionViewModel.js | 4 +- .../session/rightpanel/RoomInfoViewModel.js | 4 +- .../web/ui/css/themes/element/theme.css | 130 ++++++++---------- 4 files changed, 65 insertions(+), 83 deletions(-) diff --git a/src/domain/session/RoomGridViewModel.js b/src/domain/session/RoomGridViewModel.js index 8fce26ad..8610f197 100644 --- a/src/domain/session/RoomGridViewModel.js +++ b/src/domain/session/RoomGridViewModel.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { ViewModel } from "../ViewModel.js"; +import {ViewModel} from "../ViewModel.js"; function dedupeSparse(roomIds) { return roomIds.map((id, idx) => { @@ -181,10 +181,10 @@ export class RoomGridViewModel extends ViewModel { } } -import { createNavigation } from "../navigation/index.js"; -import { ObservableValue } from "../../observable/ObservableValue.js"; +import {createNavigation} from "../navigation/index.js"; +import {ObservableValue} from "../../observable/ObservableValue.js"; -export function tests() { +export function tests() { class RoomVMMock { constructor(id) { this.id = id; @@ -200,7 +200,7 @@ export function tests() { } class RoomViewModelObservableMock extends ObservableValue { - async initialize() { } + async initialize() {} dispose() { this.get()?.dispose(); } get id() { return this.get()?.id; } } diff --git a/src/domain/session/SessionViewModel.js b/src/domain/session/SessionViewModel.js index 1ad5d50e..2c0d65bf 100644 --- a/src/domain/session/SessionViewModel.js +++ b/src/domain/session/SessionViewModel.js @@ -16,8 +16,8 @@ limitations under the License. */ import {LeftPanelViewModel} from "./leftpanel/LeftPanelViewModel.js"; -import { RoomViewModel } from "./room/RoomViewModel.js"; -import { RoomInfoViewModel } from "./rightpanel/RoomInfoViewModel.js"; +import {RoomViewModel} from "./room/RoomViewModel.js"; +import {RoomInfoViewModel} from "./rightpanel/RoomInfoViewModel.js"; import {UnknownRoomViewModel} from "./room/UnknownRoomViewModel.js"; import {InviteViewModel} from "./room/InviteViewModel.js"; import {LightboxViewModel} from "./room/LightboxViewModel.js"; diff --git a/src/domain/session/rightpanel/RoomInfoViewModel.js b/src/domain/session/rightpanel/RoomInfoViewModel.js index 7170a803..0765c293 100644 --- a/src/domain/session/rightpanel/RoomInfoViewModel.js +++ b/src/domain/session/rightpanel/RoomInfoViewModel.js @@ -1,5 +1,5 @@ -import { ViewModel } from "../../ViewModel.js"; -import { avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl } from "../../avatar.js"; +import {ViewModel} from "../../ViewModel.js"; +import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar.js"; export class RoomInfoViewModel extends ViewModel { constructor(options) { diff --git a/src/platform/web/ui/css/themes/element/theme.css b/src/platform/web/ui/css/themes/element/theme.css index 7a536b53..dd2ae1c4 100644 --- a/src/platform/web/ui/css/themes/element/theme.css +++ b/src/platform/web/ui/css/themes/element/theme.css @@ -47,37 +47,14 @@ limitations under the License. color: white; } -.hydrogen .avatar.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.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); -} +.hydrogen .avatar.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.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 { height: 48px; @@ -93,11 +70,11 @@ limitations under the License. display: flex; } -.button-row>* { +.button-row > * { margin-right: 10px; } -.button-row>*:last-child { +.button-row > *:last-child { margin-right: 0px; } @@ -196,8 +173,7 @@ a.button-action { border-radius: 16px; height: 32px; align-items: center; - padding-left: 30px; - /* 8 + 14 (icon) + 8*/ + padding-left: 30px; /* 8 + 14 (icon) + 8*/ box-sizing: border-box; } @@ -226,16 +202,13 @@ a.button-action { } .FilterField button { - width: 30px; - /* 32 - 1 (top) - 1 (bottom) */ - height: 30px; - /* 32 - 1 (top) - 1 (bottom) */ + width: 30px; /* 32 - 1 (top) - 1 (bottom) */ + height: 30px; /* 32 - 1 (top) - 1 (bottom) */ background-position: center; background-color: #e1e3e6; background-repeat: no-repeat; background-image: url('icons/clear.svg'); - border: 7px solid transparent; - /* 8 - 1 */ + border: 7px solid transparent; /* 8 - 1 */ border-radius: 100%; box-sizing: border-box; } @@ -271,11 +244,11 @@ a.button-action { padding: 12px 8px 0 8px; } -.LeftPanel> :not(:first-child) { +.LeftPanel > :not(:first-child) { margin-top: 12px; } -.LeftPanel .utilities> :not(:first-child) { +.LeftPanel .utilities > :not(:first-child) { margin-left: 8px; } @@ -295,14 +268,14 @@ a.button-action { margin-right: -8px; } -.RoomList>li { +.RoomList > li { margin: 0; padding: 4px 8px 4px 0; /* vertical align */ align-items: center; } -.RoomList>li>a { +.RoomList > li > a { text-decoration: none; /* vertical align */ align-items: center; @@ -319,7 +292,7 @@ a.button-action { border-radius: 5px; } -.RoomList li>a>* { +.RoomList li > a > * { margin-right: 8px; } @@ -366,7 +339,7 @@ a { text-align: left; } -.SessionStatusView>.end { +.SessionStatusView > .end { flex: 1; display: flex; justify-content: flex-end; @@ -392,7 +365,7 @@ a { } .SessionPickerView li { - font-size: 1.2em; + font-size: 1.2em; } .SessionPickerView .session-info { @@ -411,11 +384,11 @@ a { display: flex; } -.SessionPickerView .session-actions>* { +.SessionPickerView .session-actions > * { margin-right: 10px; } -.SessionPickerView .session-actions>*:last-child { +.SessionPickerView .session-actions > *:last-child { margin-right: 0px; } @@ -429,16 +402,16 @@ a { color: #FF4B55; } -.RoomGridView>div.container { +.RoomGridView > div.container { border-right: 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; } -.RoomGridView> :not(.focused)>.room-placeholder .focused { +.RoomGridView > :not(.focused) > .room-placeholder .focused { display: none; } @@ -446,15 +419,14 @@ a { color: #8D99A5; } -.RoomGridView>div.focus-ring { +.RoomGridView > div.focus-ring { border: 2px solid rgba(134, 193, 165, 1); border-radius: 12px; } .middle-header { box-sizing: border-box; - flex: 0 0 56px; - /* 12 + 32 + 12 to align with filter field + margin */ + flex: 0 0 56px; /* 12 + 32 + 12 to align with filter field + margin */ background: white; padding: 0 16px; border-bottom: 1px solid rgba(245, 245, 245, 0.90); @@ -465,7 +437,7 @@ a { font-weight: 600; } -.middle-header> :not(:last-child) { +.middle-header > :not(:last-child) { /* use margin-right because the first item, .close-middle might be hidden and then we don't want a margin-left on the second item*/ @@ -498,11 +470,11 @@ a { padding: 8px 16px; } -.MessageComposer> :not(:first-child) { +.MessageComposer > :not(:first-child) { margin-left: 12px; } -.MessageComposer>input { +.MessageComposer > input { padding: 0 16px; border: none; border-radius: 24px; @@ -512,7 +484,7 @@ a { font-family: "Inter", sans-serif; } -.MessageComposer>button.send { +.MessageComposer > button.send { width: 32px; height: 32px; display: block; @@ -526,7 +498,7 @@ a { background-position: center; } -.MessageComposer>button.sendFile { +.MessageComposer > button.sendFile { width: 32px; height: 32px; display: block; @@ -540,7 +512,7 @@ a { background-position: center; } -.MessageComposer>button.send:disabled { +.MessageComposer > button.send:disabled { background-color: #E3E8F0; } @@ -553,7 +525,7 @@ a { } .Settings p { - max-width: 700px; + max-width: 700px; } .Settings .row .label { @@ -575,14 +547,14 @@ a { } .Settings .row .content button { - display: inline-block; - margin: 0 8px; + display: inline-block; + margin: 0 8px; } .Settings .row .content input[type=range] { - width: 100%; - max-width: 300px; - min-width: 160px; + width: 100%; + max-width: 300px; + min-width: 160px; } .Settings .row { @@ -617,16 +589,23 @@ button.link { } .lightbox { - background-color: rgba(0, 0, 0, 0.75); + background-color: rgba(0,0,0,0.75); display: grid; - grid-template: "content close" auto "content details" 1fr / 1fr auto; + grid-template: + "content close" auto + "content details" 1fr / + 1fr auto; color: white; padding: 4px; } @media (max-aspect-ratio: 1/1) { .lightbox { - grid-template: "close" auto "content" 1fr "details" auto / 1fr; + grid-template: + "close" auto + "content" 1fr + "details" auto / + 1fr; } .lightbox .details { width: 100% !important; @@ -651,7 +630,7 @@ button.link { display: flex; } -.lightbox .loading> :not(:first-child) { +.lightbox .loading > :not(:first-child) { margin-left: 8px; } @@ -677,7 +656,7 @@ button.link { .menu { 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; background-color: white; list-style: none; @@ -720,7 +699,10 @@ button.link { .InviteView_roomProfile { display: grid; 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; margin-bottom: 24px; }