Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make $status-margin fallback only

Browse source
This commit is contained in:
Tusooa Zhu 2022-03-07 19:28:38 -05:00
parent 415a823af0
commit a511250b63
No known key found for this signature in database
GPG key ID: 7B467EDE43A08224
4 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/conversation/conversation.vue
View file

@ -194,7 +194,7 @@
.Conversation { .Conversation {
.conversation-dive-to-top-level-box { .conversation-dive-to-top-level-box {
padding: $status-margin; padding: var(--status-margin, $status-margin);
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-style: solid; border-bottom-style: solid;
border-bottom-color: var(--border, $fallback--border); border-bottom-color: var(--border, $fallback--border);
@ -206,7 +206,7 @@
} }
.thread-ancestors { .thread-ancestors {
margin-left: $status-margin; margin-left: var(--status-margin, $status-margin);
border-left: 2px solid var(--border, $fallback--border); border-left: 2px solid var(--border, $fallback--border);
} }
@ -216,7 +216,7 @@
color: var(--text); color: var(--text);
} }
.thread-ancestor-dive-box { .thread-ancestor-dive-box {
padding-left: $status-margin; padding-left: var(--status-margin, $status-margin);
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-style: solid; border-bottom-style: solid;
border-bottom-color: var(--border, $fallback--border); border-bottom-color: var(--border, $fallback--border);
@ -229,7 +229,7 @@
} }
} }
.thread-ancestor-dive-box-inner { .thread-ancestor-dive-box-inner {
padding: $status-margin; padding: var(--status-margin, $status-margin);
} }
.conversation-status { .conversation-status {

18
src/components/status/status.scss
View file

@ -27,7 +27,7 @@
} }
.gravestone { .gravestone {
padding: $status-margin; padding: var(--status-margin, $status-margin);
color: $fallback--faint; color: $fallback--faint;
color: var(--faint, $fallback--faint); color: var(--faint, $fallback--faint);
display: flex; display: flex;
@ -40,7 +40,7 @@
.status-container { .status-container {
display: flex; display: flex;
padding: $status-margin; padding: var(--status-margin, $status-margin);
&.-repeat { &.-repeat {
padding-top: 0; padding-top: 0;
@ -48,7 +48,7 @@
} }
.pin { .pin {
padding: $status-margin $status-margin 0; padding: var(--status-margin, $status-margin) var(--status-margin, $status-margin) 0;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
@ -64,7 +64,7 @@
} }
.left-side { .left-side {
margin-right: $status-margin; margin-right: var(--status-margin, $status-margin);
} }
.right-side { .right-side {
@ -73,7 +73,7 @@
} }
.usercard { .usercard {
margin-bottom: $status-margin; margin-bottom: var(--status-margin, $status-margin);
} }
.status-username { .status-username {
@ -239,7 +239,7 @@
} }
.repeat-info { .repeat-info {
padding: 0.4em $status-margin; padding: 0.4em var(--status-margin, $status-margin);
.repeat-icon { .repeat-icon {
color: $fallback--cGreen; color: $fallback--cGreen;
@ -285,7 +285,7 @@
position: relative; position: relative;
width: 100%; width: 100%;
display: flex; display: flex;
margin-top: $status-margin; margin-top: var(--status-margin, $status-margin);
> * { > * {
max-width: 4em; max-width: 4em;
@ -353,7 +353,7 @@
} }
.favs-repeated-users { .favs-repeated-users {
margin-top: $status-margin; margin-top: var(--status-margin, $status-margin);
} }
.stats { .stats {
@ -380,7 +380,7 @@
} }
.stat-count { .stat-count {
margin-right: $status-margin; margin-right: var(--status-margin, $status-margin);
user-select: none; user-select: none;
.stat-title { .stat-title {

4
src/components/status_content/status_content.vue
View file

@ -58,10 +58,6 @@
<script src="./status_content.js" ></script> <script src="./status_content.js" ></script>
<style lang="scss"> <style lang="scss">
@import '../../_variables.scss';
$status-margin: 0.75em;
.StatusContent { .StatusContent {
flex: 1; flex: 1;
min-width: 0; min-width: 0;

4
src/components/thread_tree/thread_tree.vue
View file

@ -113,12 +113,12 @@
<style lang="scss"> <style lang="scss">
@import '../../_variables.scss'; @import '../../_variables.scss';
.thread-tree-replies { .thread-tree-replies {
margin-left: $status-margin; margin-left: var(--status-margin, $status-margin);
border-left: 2px solid var(--border, $fallback--border); border-left: 2px solid var(--border, $fallback--border);
} }
.thread-tree-replies-hidden { .thread-tree-replies-hidden {
padding: $status-margin; padding: var(--status-margin, $status-margin);
/* Make the button stretch along the whole row */ /* Make the button stretch along the whole row */
display: flex; display: flex;
align-items: stretch; align-items: stretch;