Fix Tasks styles (#12700)

* re-add previous markdown h3/h4 styles - remove double transition properties

* fix more heading styles

* fix markdown h3 / tasktitle h3
This commit is contained in:
negue
2020-10-29 23:50:29 +01:00
committed by GitHub
parent ea11e302c6
commit d678eb920f
3 changed files with 34 additions and 24 deletions

View File

@@ -1,32 +1,52 @@
@mixin h3Markdown {
font-family: 'Roboto Condensed', sans-serif;
font-size: 16px;
margin-bottom: 4px;
line-height: 1.25;
margin-top: 6px;
color: $gray-10;
font-weight: normal;
}
// task titles are h3 by default
h3.markdown {
@include h3Markdown;
}
.markdown {
p {
margin-bottom: 8px;
}
h1 {
font-size: 24px;
line-height: 1.67;
margin-bottom: 10px;
margin-top: 14px;
line-height: 1.17;
}
h2 {
margin-bottom: 6px;
margin-top: 10px;
font-size: 20px;
line-height: 1.4;
}
h3 {
margin-bottom: 4px;
margin-top: 6px;
color: $gray-10;
@include h3Markdown;
}
h1, h2, h3 {
h1, h2, h3, h4 {
font-weight: normal;
}
h4 {
font-family: 'Roboto', sans-serif;
font-weight: bold;
font-family: 'Roboto Condensed', sans-serif;
font-size: 14px;
line-height: 1.43;
color: $gray-10;
}
a {

View File

@@ -52,10 +52,6 @@ h1, h2, h5, h6 {
color: $gray-10;
}
h3, h4 {
font-weight: bold;
}
h1 {
font-size: 24px;
line-height: 1.67;
@@ -68,15 +64,17 @@ h2 {
margin-bottom: 16px;
}
h3 {
h3, h4 {
font-weight: bold;
font-size: 0.875rem;
line-height: 1.71;
}
h3 {
color: $gray-10;
}
h4 {
font-size: 0.875rem;
line-height: 1.71;
color: $gray-100;
}

View File

@@ -104,7 +104,7 @@
<div class="d-flex justify-content-between">
<h3
v-markdown="task.text"
class="task-title"
class="task-title markdown"
:class="{ 'has-notes': task.notes || (!isUser && task.group.managerNotes)}"
></h3>
<menu-dropdown
@@ -467,13 +467,8 @@
.task-title {
padding-bottom: 8px;
color: $gray-10;
font-weight: normal;
margin-bottom: 0px;
margin-right: 15px;
line-height: 1.43;
font-size: 14px;
min-width: 0px;
overflow-wrap: break-word;
// markdown p-tag, can't find without ::v-deep
@@ -774,9 +769,6 @@
}
.left-control, .right-control, .task-control {
transition-duration: 0.15s;
transition-property: border-color, background, color;
transition-timing-function: ease-in;
border: transparent solid 1px;
&:focus {