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

Merge branch 'threecolumn' into shigusegubu-vue3

Browse source 
* threecolumn:
  minor fixes
  sort and optimize panel.scss
  fix panel footer colors
This commit is contained in:
Henry Jameson 2022-04-28 16:37:14 +03:00
commit 95fa0b4156
2 changed files with 32 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/timeline/timeline.scss
View file

@ -20,9 +20,11 @@
padding: 0 0.5em;
}
.button-default, .alert {
line-height: 2em;
width: 100%;
.timeline-heading {
.button-default, .alert {
line-height: 2em;
width: 100%;
}
}
}
}

65
src/panel.scss
View file

@ -25,11 +25,21 @@
}
}
.panel-body:empty::before {
content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations
display: block;
margin: 1em;
text-align: center;
.panel-body {
padding: var(--panel-body-padding, 0);
&:empty::before {
content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations
display: block;
margin: 1em;
text-align: center;
}
> p {
line-height: 1.3;
padding: 1em;
margin: 0;
}
}
.panel-heading,
@ -89,17 +99,6 @@
font-size: 1.3em;
}
.faint {
background-color: transparent;
color: $fallback--faint;
color: var(--panelFaint, $fallback--faint);
}
.faint-link {
color: $fallback--faint;
color: var(--faintLink, $fallback--faint);
}
.alert {
white-space: nowrap;
text-overflow: ellipsis;
@ -127,7 +126,7 @@
border-radius: $fallback--panelRadius $fallback--panelRadius 0 0;
border-radius: var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius) 0 0;
border-width: 0 0 1px 0;
align-items: left;
align-items: start;
// panel theme
color: var(--panelText);
background-color: $fallback--bg;
@ -148,6 +147,17 @@
color: var(--panelLink, $fallback--link);
}
.faint {
background-color: transparent;
color: $fallback--faint;
color: var(--panelFaint, $fallback--faint);
}
.faint-link {
color: $fallback--faint;
color: var(--faintLink, $fallback--faint);
}
&:not(.-flexible-height) {
> .button-default {
flex-shrink: 0;
@ -185,25 +195,4 @@
border-width: 1px 0 0 0;
border-style: solid;
border-color: var(--border, $fallback--border);
.faint {
color: $fallback--faint;
color: var(--panelFaint, $fallback--faint);
}
a,
.-link {
color: $fallback--link;
color: var(--panelLink, $fallback--link);
}
}
.panel-body > p {
line-height: 1.3;
padding: 1em;
margin: 0;
}
.panel-body {
padding: var(--panel-body-padding, 0);
}