@@ -149,7 +149,7 @@ export default {
background-position: 50% 50%;
.theme-preview-content {
- padding: 1.5em;
+ padding: 20px;
}
.dummy {
@@ -203,21 +203,19 @@ export default {
.avatar-alt {
flex: 0 auto;
- margin-left: 2em;
- font-size: 0.85em;
- min-width: 2.2rem;
- min-height: 2.2rem;
- line-height: 1.5em;
- align-content: center;
+ margin-left: 28px;
+ font-size: 12px;
+ min-width: 20px;
+ min-height: 20px;
+ line-height: 20px;
}
.avatar {
flex: 0 auto;
- width: 3.5em;
- height: 3.5em;
- font-size: 1rem;
- line-height: 3.5em;
- justify-content: center;
+ width: 48px;
+ height: 48px;
+ font-size: 14px;
+ line-height: 48px;
}
.actions {
@@ -243,7 +241,7 @@ export default {
.underlay-preview {
position: absolute;
- inset: 0 0.9em;
+ inset: 0 10px;
}
}
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
index ae2364dcc..d83beffa0 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
@@ -107,7 +107,7 @@
justify-content: space-between;
align-items: baseline;
width: 100%;
- min-height: 2.1em;
+ min-height: 30px;
margin-bottom: 1em;
p {
@@ -212,7 +212,7 @@
.theme-color-cl,
.theme-radius-in,
.theme-color-in {
- margin-left: 0.3em;
+ margin-left: 4px;
}
.theme-radius-in {
diff --git a/src/components/shout_panel/shout_panel.vue b/src/components/shout_panel/shout_panel.vue
index 184fe81e0..1b2b591c2 100644
--- a/src/components/shout_panel/shout_panel.vue
+++ b/src/components/shout_panel/shout_panel.vue
@@ -122,8 +122,8 @@
.shout-avatar {
img {
- height: 0.6em;
- width: 0.6em;
+ height: 24px;
+ width: 24px;
border-radius: var(--roundness);
margin-right: 0.5em;
margin-top: 0.25em;
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 0f325ea7f..93253b1a7 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -76,10 +76,9 @@
}
.status-favicon {
- height: 1.2em;
- width: 1.2em;
+ height: 18px;
+ width: 18px;
margin-right: 0.4em;
- object-fit: contain;
}
.status-heading {
@@ -101,8 +100,7 @@
}
.account-name {
- display: inline-block;
- min-width: 1em;
+ min-width: 1.6em;
margin-right: 0.4em;
white-space: nowrap;
overflow: hidden;
@@ -118,11 +116,10 @@
.heading-right {
display: flex;
flex-shrink: 0;
- align-self: baseline;
.button-unstyled {
- padding: 0.2em;
- margin: -0.2em;
+ padding: 5px;
+ margin: -5px;
}
.svg-inline--fa {
diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index e89d1d173..aa334499e 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -22,7 +22,6 @@ const StatusContent = {
name: 'StatusContent',
props: [
'compact',
- 'collapse', // replaces newlines with spaces
'status',
'focused',
'noHeading',
@@ -96,9 +95,6 @@ const StatusContent = {
attachmentTypes () {
return this.status.attachments.map(file => fileType.fileType(file.mimetype))
},
- collapsedStatus () {
- return this.status.raw_html.replace(/(\n|
)/g, ' ')
- },
...mapGetters(['mergedConfig'])
},
components: {
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index 1035d04c6..0fc024b04 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -38,7 +38,7 @@
v-if="!hideSubjectStatus && !(singleLine && status.summary_raw_html)"
:class="{ '-single-line': singleLine }"
class="text media-body"
- :html="collapse ? collapsedStatus : status.raw_html"
+ :html="status.raw_html"
:emoji="status.emojis"
:handle-links="true"
:faint="compact"
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index f61ba0d05..3bf25c75b 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -53,7 +53,6 @@ const StatusContent = {
props: [
'status',
'compact',
- 'collapse',
'focused',
'noHeading',
'fullContent',
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index fb08186b4..64a1d6a53 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -14,7 +14,6 @@
:toggle-showing-tall="toggleShowingTall"
:toggle-expanding-subject="toggleExpandingSubject"
:toggle-showing-long-subject="toggleShowingLongSubject"
- :collapse="collapse"
@parse-ready="$emit('parseReady', $event)"
>
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index b7274d86d..60413c5f4 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -202,9 +202,9 @@
}
img {
- max-height: 1.9em;
+ max-height: 26px;
vertical-align: top;
- margin-top: -0.3em;
+ margin-top: -5px;
}
}
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index d9e96d52d..c0336d407 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -41,7 +41,7 @@
display: inline-block;
position: relative;
width: 3.5em;
- height: 3.5em;
+ height: 48px;
&.-compact {
width: 2.2em;
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index c0d079575..4fdc73777 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -272,11 +272,6 @@
// big one
z-index: 1;
line-height: 2em;
- text-shadow:
- 0 0 5em var(--profileTint),
- 0 0 1em var(--profileTint),
- 0 0 0.5em var(--profileTint),
- 0 0 0.2em var(--profileTint);
--emoji-size: 1.7em;
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index dbd7e7e56..0e93824b7 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -10,7 +10,7 @@
keypath="user_reporting.title"
class="title"
>
-
+
@@ -74,14 +74,10 @@