eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Jannat Patel
2021-11-15 13:29:02 +05:30
parent 1697c5d5b5 e67b37be28
commit f7a23e629c
12 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
school/public/css/school.bundle.less
View File

@@ -1,3 +1,2 @@
@import "./style.css";
@import "./vars.css";

56
school/public/css/style.css
View File

@@ -1,26 +1,5 @@
:root {
--c1: #fefae0;
--c2: #264653;
--c3: #e9c46a;
--c4: #2a9d8f;
--c5: #f4a261;
--c6: #e76f51;
--c7: #ccd5ae;
--c8: #EEEEEE;
--bg: var(--c1);
--header-bg: var(--c2);
--header-color: var(--c3);
--tag-color: var(--c7);
--sidebar-bg: var(--c7);
--h-color: var(--c2);
--text-color: #192734;
--text-color-light: #ccc;
--cta-color: var(--c4);
--send-message: var(--c7);
--received-message: var(--c8);
--checkbox-size: 14px;
--control-bg: var(--gray-100);
--button-background: #EEF0F2;
--text-color-dark: #192734;
--text-xs: 11px;
--text-sm: 12px;
--text-md: 13px;
@@ -29,6 +8,7 @@
--text-xl: 18px;
--text-2xl: 20px;
--text-3xl: 22px;
--navbar-shadow: 0px 1px 8px rgba(0, 0, 0, 0.08)
}
input[type=checkbox] {
@@ -106,7 +86,7 @@ input[type=checkbox] {
border-radius: 8px;
position: relative;
border: 1px solid #EEF0F2;
box-shadow: 0 0px 4px 2px #19273405;
box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.08);
}
.course-card {
@@ -138,7 +118,7 @@ input[type=checkbox] {
font-size: 18px;
line-height: 156%;
letter-spacing: -0.014em;
color: var(--text-color);
color: var(--text-color-dark);
align-self: stretch;
margin-bottom: 1.5rem;
height: 56px;
@@ -164,7 +144,7 @@ input[type=checkbox] {
margin-left: 8px;
font-size: 12px;
line-height: 135%;
color: var(--text-color);
color: var(--text-color-dark);
}
.course-student-count {
@@ -414,7 +394,7 @@ input[type=checkbox] {
font-weight: 600;
font-size: 40px;
line-height: 120%;
color: #192734;
color: var(--text-color-dark);
margin-bottom: 8px;
}
@@ -485,7 +465,7 @@ input[type=checkbox] {
.is-default {
background: #F4F5F6;
color: #1F272E;
color: var(--text-color-dark);
}
@media (max-width: 600px) {
@@ -730,7 +710,7 @@ input[type=checkbox] {
font-weight: 600;
font-size: var(--text-3xl);
letter-spacing: -0.0175em;
color: #192734;
color: var(--text-color-dark);
margin-bottom: 1rem;
}
@@ -903,7 +883,7 @@ input[type=checkbox] {
align-items: center;
font-size: 12px;
line-height: 135%;
color: var(--text-color);
color: var(--text-color-dark);
}
.course-details-outline {
@@ -1313,7 +1293,7 @@ pre {
.certificate-heading {
font-size: 3rem;
font-weight: 500;
color: var(--text-color);
color: var(--text-color-dark);
}
.certificate-para {
@@ -1372,3 +1352,19 @@ pre {
display: flex;
align-items: center;
}
.navbar {
box-shadow: var(--navbar-shadow);
}
.interactive-arrow {
background-image: url("/assets/school/icons/arrow.svg");
width: 1.5rem;
height: 1.5rem;
margin-left: 0.5rem;
}
.intercative-link:hover .interactive-arrow{
background-image: url("/assets/school/icons/blue-arrow.svg");
margin-left: 1.5rem;
}

6
school/public/css/vars.css
View File

@@ -1,6 +0,0 @@
/* Define all your css variables here. */
:root {
--tag-color: #737373;
--sidebar-bg: #F6F6F6;
--sidebar-border: #C4C4C4;
}

3
school/public/icons/arrow.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5205 6.64645C15.3253 6.45118 15.0087 6.45118 14.8134 6.64645C14.6182 6.84171 14.6182 7.15829 14.8134 7.35355L18.9598 11.4999L4.00014 11.4958C3.724 11.4957 3.50008 11.7195 3.5 11.9956C3.49992 12.2718 3.72372 12.4957 3.99986 12.4958L18.9599 12.4999L14.8134 16.6464C14.6182 16.8417 14.6182 17.1583 14.8134 17.3536C15.0087 17.5488 15.3253 17.5488 15.5205 17.3536L20.5205 12.3536C20.7158 12.1583 20.7158 11.8417 20.5205 11.6464L15.5205 6.64645Z" fill="#1F272E"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 614 B

3
school/public/icons/black-arrow.svg
View File

@@ -1,3 +0,0 @@
<svg width="13" height="8" viewBox="0 0 13 8" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.9649 0.313118C8.76964 0.117856 8.45306 0.117856 8.2578 0.313118C8.06253 0.50838 8.06253 0.824963 8.2578 1.02023L10.7374 3.49985L1.16683 3.49719C0.890684 3.49712 0.666764 3.72091 0.666687 3.99705C0.66661 4.2732 0.890406 4.49712 1.16655 4.49719L10.7377 4.49985L8.2578 6.97978C8.06253 7.17505 8.06253 7.49163 8.2578 7.68689C8.45306 7.88215 8.76964 7.88215 8.9649 7.68689L12.2982 4.35356C12.4935 4.1583 12.4935 3.84171 12.2982 3.64645L8.9649 0.313118Z" fill="#4C5A67"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 619 B

3
school/public/icons/blue-arrow.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5205 6.64645C15.3253 6.45118 15.0087 6.45118 14.8134 6.64645C14.6182 6.84171 14.6182 7.15829 14.8134 7.35355L18.9598 11.4999L4.00014 11.4958C3.724 11.4957 3.50008 11.7195 3.5 11.9956C3.49992 12.2718 3.72372 12.4957 3.99986 12.4958L18.9599 12.4999L14.8134 16.6464C14.6182 16.8417 14.6182 17.1583 14.8134 17.3536C15.0087 17.5488 15.3253 17.5488 15.5205 17.3536L20.5205 12.3536C20.7158 12.1583 20.7158 11.8417 20.5205 11.6464L15.5205 6.64645Z" fill="#2490EF"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 614 B

3
school/public/icons/down-arrow1.svg
View File

@@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
<path d="M6 9l6 6 6-6"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 206 B