diff --git a/app/styles/_buttons.scss b/app/styles/_buttons.scss new file mode 100644 index 0000000..8a6956a --- /dev/null +++ b/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); + } + } +} diff --git a/app/styles/app.scss b/app/styles/app.scss index 84ec881..69555ef 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -90,22 +90,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 { @@ -114,6 +98,7 @@ button, input[type=submit] { } } +@import "buttons"; @import "components/topbar"; @import "components/loading-spinner"; @import "components/contributor-list"; diff --git a/app/styles/components/_contribution-list.scss b/app/styles/components/_contribution-list.scss index c865532..4cc0636 100644 --- a/app/styles/components/_contribution-list.scss +++ b/app/styles/components/_contribution-list.scss @@ -20,6 +20,10 @@ ul.contribution-list { font-size: 1.2rem; border-bottom: 1px solid rgba(255,255,255,0.2); + &.unconfirmed { + grid-template-columns: auto 5rem 5rem; + } + &:first-of-type { border-top: 1px solid rgba(255,255,255,0.2); } @@ -34,13 +38,13 @@ ul.contribution-list { text-align: right; } - &.description { - grid-column-start: span 2; - } + // &.description { + // grid-column-start: span 2; + // } - &.voting { - grid-column-start: span 2; - } + // &.voting { + // grid-column-start: span 2; + // } } span { @@ -92,12 +96,6 @@ ul.contribution-list { color: $primary-color; margin-right: 0.5rem; } - - button { - height: 2rem; - line-height: 2rem; - padding: 0 0.6rem; - } } } diff --git a/app/styles/components/_proposal-list.scss b/app/styles/components/_proposal-list.scss index 2599a0b..2527ad2 100644 --- a/app/styles/components/_proposal-list.scss +++ b/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; - } } }