fix: conflicts

This commit is contained in:
pateljannat
2021-06-22 12:28:12 +05:30
61 changed files with 909 additions and 696 deletions

View File

@@ -24,6 +24,7 @@
--send-message: var(--c7);
--received-message: var(--c8);
--checkbox-size: 14px;
--control-bg: var(--gray-100);
}
body {
@@ -83,6 +84,7 @@ body {
border-radius: 10px;
margin: 10px 0px;
background: white;
box-shadow: 0px 5px 10px rgb(0 0 0 / 10%);
border: 1px solid #ddc;
}
@@ -157,19 +159,6 @@ img.profile-photo {
line-height: 51px;
}
.anchor_style {
color: inherit;
}
a:hover {
text-decoration: none;
color: inherit;
}
.anchor_style:hover {
text-decoration: underline
}
section {
padding: 5rem 0 5rem 0;
}
@@ -243,3 +232,36 @@ section {
input[type=checkbox] {
appearance: auto;
}
.partiallycomplete {
background: #FEF4E2;
color: #976417;
}
.partiallycomplete img {
background: #976417;
}
.complete {
background: #EAF5EE;
color: #38A160;
}
.complete img {
background: #38A160;
}
.incomplete {
background: #FEECEC;
color: #E24C4C;
}
.incomplete img {
background: #E24C4C;
}
.progress-image {
margin-right: 3px;
border-radius: 50px;
padding: 5px;
}

View File

@@ -10,6 +10,7 @@ h2 {
.teaser-body {
padding: 20px;
box-shadow: 0px 5px 10px rgb(0 0 0 / 10%)
}
.teaser-footer {
padding: 20px;
@@ -66,6 +67,20 @@ h2 {
}
}
.anchor_style {
color: inherit;
}
.anchor_style:hover {
text-decoration: none
}
.no-preview:hover {
cursor: pointer;
color: #2490ef;
}
section {
padding: 60px 0px;
}
@@ -162,7 +177,6 @@ section.lightgray {
// }
.instructor-title {
font-weight: bold;
color: black;
}
@@ -285,7 +299,7 @@ section.lightgray {
}
.lesson-teaser {
line-height: 35px;
line-height: 40px;
}
#hero h1 {
@@ -331,3 +345,9 @@ section.lightgray {
margin: 40px 0px 0px 20px;
}
}
.no-preview-message {
width: fit-content;
margin: 50px 0px 50px;
color: black;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B