Resolve conflicts

Author: Dhruvi16

webpack/sass/main.scss

@@ -3,23 +3,6 @@
 @import "../node_modules/@creativecommons/vocabulary/scss/color.scss";
 @import "../node_modules/@creativecommons/vocabulary/scss/typography.scss";
 
-//Color Variables
-$pumpkin: #e15803;
-$orange: #FB7928;
-$candy: #EE5B32;
-$jet-black: #333333;
-$grey: rgba(255, 255, 255, 0.6);
-$blue: #00b5da;
-$white: #ffffff;
-
-//Color Configs
-$brand-theme: $candy;
-$brand-theme-dark: $pumpkin;
-$brand-theme-light: $orange;
-
-$text-color: $jet-black;
-$project-card-theme: $blue;
-
 .navbar-item {
   &.has-dropdown {
     .navbar-dropdown {
@@ -39,113 +22,9 @@ $project-card-theme: $blue;
 
   .breadcrumb {
     @extend .padding-bigger;
-  
+
     .link {
       @extend .has-color-forest-green;
     }
   }
-}
-
-h2 {
-  font-weight: 600;
-  padding-bottom: 0.5rem;
-}
-
-.page-content {
-  position: relative;
-  min-height: calc(100vh - 21vh);
-  padding-bottom: 3rem;
-}
-
-.card-columns {
-  column-count: 2;
-}
-
-.page-title {
-  background-color: $white;
-  border: {
-    bottom-style: solid;
-    color: $brand-theme;
-    width: 10px;
-  }
-  padding-left: 0px;
-  font-weight: 600;
-  color: $text-color;
-}
-
-@mixin large-border-style {
-  background-color: $white;
-  padding-left: 0px;
-}
-
-.featured-project-card {
-  @include large-border-style();
-  border: {
-    left-color: $project-card-theme !important;
-    left-width: 10px;
-  }
-  min-width: 20rem;
-  max-width: 20rem;
-}
-
-.get-involved-card {
-  min-width: 16rem;
-  max-width: 20rem;
-  border: 0;
-  padding: 0.5rem 0rem;
-}
-
-.project-idea-header {
-  @include large-border-style();
-  border: {
-    bottom-color: $project-card-theme !important;
-    bottom-width: 10px;
-  }
-  font-size: 1.5em;
-}
-
-.badge-featured-project {
-  background-color: $project-card-theme;
-  color: $white;
-  font-size: 0.8rem;
-}
-
-.toc-card {
-  width: 14rem;
-  margin-bottom: 1rem;
-  float: right;
-  margin: 1rem;
-}
-
-.toc {
-  margin-bottom: 0;
-}
-
-img {
-  max-width: 100%;
-}
-
-.github-corner:hover .octo-arm{
-  animation:octocat-wave 560ms ease-in-out
-}
-
-@keyframes octocat-wave{
-  0%,100%{
-    transform:rotate(0)
-  }
-  20%,60%{
-    transform:rotate(-25deg)
-  }
-  40%,80%{
-    transform:rotate(10deg)
-  }
-}
-
-@media (max-width:500px){
-  .github-corner:hover .octo-arm{
-    animation:none
-  }
-  .github-corner .octo-arm{
-    animation:octocat-wave 560ms ease-in-out
-  }
-}
+}