resolved conflicts

gitcoinco · Nov 12, 2019 · 1708c1e · 1708c1e
2 parents c43a47c + 2445d79
commit 1708c1e
Show file tree

Hide file tree

Showing 22 changed files with 1,013 additions and 635 deletions.
diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
@@ -552,12 +552,6 @@ input[type=text].loading {
   text-align: left;
 }
 
-.admin-only {
-  background-color: #5495E1 !important;
-  color:white !important;
-  border: 1px solid white !important;
-}
-
 /* The alert message box */
 
 .alert {

diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css
@@ -156,6 +156,7 @@ body {
 }
 
 #description {
+  border-top: 1px solid #D4D4D4;
   margin-bottom: 2em;
 }
 
@@ -285,10 +286,7 @@ body {
 }
 
 .bounty-actions {
-  margin-top: 2.5em;
   display: inherit;
-  padding-bottom: 5px;
-  border-bottom: 1px solid #D4D4D4;
 }
 
 .bounty-actions .tag.usd {
@@ -364,10 +362,6 @@ a.btn {
   margin-bottom: 10px;
 }
 
-#moderator-admin-actions:not(:empty).sticky {
-  text-align: center;
-}
-
 .sticky {
   position: fixed;
   top: 0;
@@ -490,7 +484,7 @@ a.btn {
 }
 
 #funder_notif_info .bounty-notification {
-  border: orange 1px solid;
+  border: orange 2px solid;
   border-radius: 3px;
   padding: 0.5rem;
 }
@@ -501,7 +495,7 @@ a.btn {
 }
 
 #funder_notif_info img {
-  width: 1.5rem;
+  width: 1.25rem;
   position: relative;
   top: -2px;
 }
@@ -565,15 +559,9 @@ a.btn {
 #moderator-admin-actions:not(:empty) {
   background: #F2F6F9;
   padding: 16px 0 10px;
-  text-align: left;
   left: 0;
 }
 
-#moderator-admin-actions:not(:empty) a {
-  border: none !important;
-  margin: 0 3px 5px;
-}
-
 @media (max-width: 767px) {
 
   #title {

diff --git a/app/assets/v2/css/forms/button.css b/app/assets/v2/css/forms/button.css
@@ -1,13 +1,10 @@
 .button {
   border: none;
-  border-radius: 5px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
+  border-radius: 3px;
   color: #fff;
   cursor: pointer;
   font-size: 14px;
-  font-weight: 400;
-  padding: 10px 20px;
-  -webkit-appearance: none;
+  padding: 6px 20px;
 }
 
 .button:hover {
@@ -17,22 +14,27 @@
 
 .button--primary.button.disabled,
 .button--primary.button.disabled:hover {
-  background-color: #DFDFDF;
+  background-color: #D8D8D8;
+  color: #666666;
   box-shadow: none;
-  color: #9F9F9F;
 }
 
 .button--primary {
-  background-color: #0D0764;
-  font-weight: 500;
+  background-color: #3E00FF;
 }
 
 .button--primary:hover {
-  background-color: #280076;
+  background-color: #3f00ff;
 }
 
-.button--primary:active {
-  background-color: #1B0050;
+.button--secondary {
+  color: #3E00FF;
+  border: 1px solid #3E00FF;
+}
+
+.button--secondary:hover {
+  color: #3f00ff;
+  border-color: #3f00ff;
 }
 
 .button--primary-o {

diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css
@@ -571,12 +571,12 @@ div.button-pink {
 }
 
 .dropdown-menu .dropdown-item {
-  padding: 12px 25px;
+  padding: 12px 25px !important;
 }
 
 .dropdown-menu .dropdown-item:hover {
-  background-color: #0D0764;
-  color: #FFFFFF;
+  background-color: #3E00FF;
+  color: #FFFFFF !important;
 }
 
 #why-gitcoin .dropdown-item {