Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grants/detail : refactor + design clean + responsive #2482

Merged
merged 1 commit into from
Oct 16, 2018
Merged

grants/detail : refactor + design clean + responsive #2482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions app/assets/v2/css/grants/card.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,6 @@
width: 100%;
}

.grant-item__owner-handle {
color: #9B9B9B;
line-height: 18px;
}

.grant-item__owner-handle span {
color: #0D0764;
}

.grant-item__footer {
margin-top: auto;
}
Expand Down
71 changes: 61 additions & 10 deletions app/assets/v2/css/grants/detail.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,73 @@
}
}

.article-title {
font-size: 20px;
color: #43484D;
.grant-item__owner-image,
.grant-item__owner-handle {
display: inline;
}

.article-date {
font-size: 14px;
color: #CCCCCC;
.grant-item__owner-image img {
width: 50px;
height: 50px;
}

.grant-banner {
max-height: 20rem;
}

.grant__header {
background-color: #F2F6F9;
position: relative;
}

.grant__title,
.grant__title a {
color: #43484D;
}

.article-title,
.grant__description,
.article-description {
font-size: 14px;
color: #43484D;
}

#addUpdate {
background: #F9F9F9;
padding: 20px;
.no-subscriptions a {
text-decoration: none;
color: #007bff;
}

.article-date {
color: #BBBDBF;
}

.form__input {
border-radius: 2px;
}

.grant__specs {
display: flex;
flex-direction: column;
height: 100%;
}

.grant__stakeholders-list {
display: flex;
flex-wrap: wrap;
}

@media (max-width: 767.98px) {

#tabs ul {
list-style-type: none;
padding-left: 0;
}

#tabs ul li {
margin-bottom: 2rem;
}

#tabs > .ui-widget-header {
display: flex;
justify-content: center;
}
}
122 changes: 5 additions & 117 deletions app/assets/v2/css/grants/grant.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
.top-buffer {
margin-top: 30px;
}

.bottom-buffer {
margin-bottom: 30px;
}

.progress {
background-color: #D8D8D8;
border-radius: 2px;
}

.progress-bar {
Expand All @@ -26,120 +19,15 @@

.progress--small {
height: 7px;
border-radius: 2px;
}

/* Grant Details */

.grant__avatar {
border-radius: 20px;
border-color: #43484D;
width: 50px;
height: 50px;
}

.grant__header {
background-color: #F2F6F9;
padding-top: 46px;
padding-bottom: 46px;
position: relative;
}

.grant__header::before {
border-bottom: 1px solid rgba(0, 0, 0, 0.14);
content: '';
position: absolute;
top: 0;
bottom: 0;
right: 0;
left: 0;
}

.grant__image {
max-width: 100%;
}

.grant__reference {
align-items: center;
display: flex;
margin-top: 16px;
.grant-item__owner-handle {
color: #9B9B9B;
line-height: 18px;
}

.grant__reference-url {
color: #000000;
font-size: 14px;
}

.grant__reference-icon {
display: flex;
margin-right: 12px;
}

.grant__image img {
width: 100%;
}

.grant__specs {
display: flex;
flex-direction: column;
height: 100%;
}

.grant__title {
color: #43484D;
font-size: 52px;
letter-spacing: 0;
}

.grant__description {
font-size: 16px;
color: #43484D;
letter-spacing: 0;
}

.grant__profile-details {
font-size: 16px;
color: #43484D;
letter-spacing: 0;
}

.grant__stakeholders {
margin-bottom: 20px;
}

.grant__stakeholders small {
color: rgba(0, 0, 0, 0.54);
}

.grant__stakeholders-list {
display: flex;
flex-wrap: wrap;
}

.grant__stakeholders-item {
margin-bottom: 6px;
margin-right: 6px;
}

.grant__description-title {
letter-spacing: 0;
text-transform: none;
text-align: left;
padding: 0;
}

.current-funding-text {
align-items: baseline;
color: rgba(0, 0, 0, 0.54);
display: flex;
margin-bottom: 3px;
}

.current-funding-text span {
.grant-item__owner-handle span {
color: #0D0764;
font-size: 18px;
font-weight: bold;
margin-right: 5px;
}

.progress-text span {
Expand Down
6 changes: 3 additions & 3 deletions app/grants/templates/grants/cancel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2 class="fund__header">
</h2>

<div class="container">
<div class="row bottom-buffer">
<div class="row mb-4">
<div class="col-6">
<div class="grant__progress cancel">
<div class="progress">
Expand All @@ -46,7 +46,7 @@ <h2 class="fund__header">
</div>
</div>

<div class="progress-text top-buffer bottom-buffer">
<div class="progress-text my-4">
<div class="row">
<div class="col-6">
<span>344.ETH</span>
Expand All @@ -69,7 +69,7 @@ <h2 class="fund__header">
</div>
</div>

<div class="row top-buffer">
<div class="row mt-4">
<div class="col-6">
<button class="button button--cancel button--full">{% trans "Cancel" %}</button>
</div>
Expand Down
Loading