Merge branch 'master' into feature/111-unconfirmed_balances

app/styles/_buttons.scss

@@ -0,0 +1,30 @@
+button, input[type=submit] {
+  display: inline-block;
+  padding: 0.6rem 2rem;
+  background-color: rgba(22, 21, 40, 0.6);
+  border: 1px solid rgba(22, 21, 40, 1);
+  border-radius: 3px;
+  color: $primary-color;
+  font-weight: 500;
+  text-transform: uppercase;
+  cursor: pointer;
+  letter-spacing: 0.1em;
+
+  &:hover {
+    background-color: rgba(22, 21, 40, 0.8);
+  }
+
+  &.small {
+    font-size: 0.8rem;
+    padding: 0.2rem 0.8rem;
+  }
+
+  &.danger {
+    color: $red;
+    background-color: rgba(40, 21, 21, 0.6);
+
+    &:hover {
+      background-color: rgba(40, 21, 21, 0.8);
+    }
+  }
+}

app/styles/app.scss

@@ -87,22 +87,6 @@ section {
   }
 }
 
-button, input[type=submit] {
-  display: inline-block;
-  border: 1px solid rgba(22, 21, 40, 1);
-  background-color: rgba(22, 21, 40, 0.6);
-  color: $primary-color;
-  border-radius: 3px;
-  font-weight: 500;
-  text-transform: uppercase;
-  cursor: pointer;
-  letter-spacing: 0.1em;
-
-  &:hover {
-    background-color: rgba(22, 21, 40, 0.8);
-  }
-}
-
 @media (min-width: 550px) {
   section {
     h2 {
@@ -111,6 +95,7 @@ button, input[type=submit] {
   }
 }
 
+@import "buttons";
 @import "components/topbar";
 @import "components/loading-spinner";
 @import "components/contributor-list";

app/styles/components/_contribution-list.scss

@@ -13,7 +13,7 @@ ul.contribution-list {
 
   li {
     display: grid;
-    grid-template-columns: auto 5rem;
+    grid-template-columns: auto 5rem 5rem;
     grid-row-gap: 0.5rem;
     padding: 1rem 1.2rem;
     background-color: rgba(255,255,255,0.1);
@@ -24,6 +24,16 @@ ul.contribution-list {
       border-top: 1px solid rgba(255,255,255,0.2);
     }
 
+    &.confirmed {
+      grid-template-columns: auto 5rem;
+    }
+
+    &.vetoed {
+      grid-template-columns: auto 5rem;
+      text-decoration: line-through;
+      opacity: 0.6;
+    }
+
     p {
       align-self: center;
       margin: 0;
@@ -33,14 +43,6 @@ ul.contribution-list {
       &.kredits-amount, &.voting {
         text-align: right;
       }
-
-      &.description {
-        grid-column-start: span 2;
-      }
-
-      &.voting {
-        grid-column-start: span 2;
-      }
     }
 
     span {
@@ -92,12 +94,6 @@ ul.contribution-list {
       color: $primary-color;
       margin-right: 0.5rem;
     }
-
-    button {
-      height: 2rem;
-      line-height: 2rem;
-      padding: 0 0.6rem;
-    }
   }
 
 }

app/styles/components/_proposal-list.scss

@@ -73,12 +73,6 @@ ul.proposal-list {
       color: $primary-color;
       margin-right: 0.5rem;
     }
-
-    button {
-      height: 2rem;
-      line-height: 2rem;
-      padding: 0 0.6rem;
-    }
   }
 
 }