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

grant/detail : rebirth #4366

Merged
merged 10 commits into from
May 8, 2019
Merged

grant/detail : rebirth #4366

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fabb3e8
css fix
thelostone-mc May 4, 2019
8f9524d
grant/detail: rebirth
thelostone-mc May 4, 2019
f25a360
minor css fix
thelostone-mc May 6, 2019
c7b1769
Merge branch 'master' into grant_detail
thelostone-mc May 6, 2019
9f56a53
Merge branch 'master' into grant_detail
thelostone-mc May 7, 2019
c39d1c8
remove outdated text
thelostone-mc May 8, 2019
4ee7c47
reuse shadow-none
thelostone-mc May 8, 2019
843d6e9
reuse booststrap class
thelostone-mc May 8, 2019
3e46eb0
re-add matching text
thelostone-mc May 8, 2019
f150943
Merge branch 'master' into grant_detail
thelostone-mc May 8, 2019
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
3 changes: 1 addition & 2 deletions app/assets/v2/css/buttons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,14 @@ button:focus {
}

.btn {
border-radius: 2px;
border-radius: 5px;
}

.btn-gc-blue,
.btn-gc-green,
.btn-gc-purple,
.btn-gc-pink {
color: white;
/* padding: .75rem 1.5rem; */
}

.btn-outline-gc-blue,
Expand Down
11 changes: 7 additions & 4 deletions app/assets/v2/css/forms/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.button {
border: none;
border-radius: 2px;
border-radius: 5px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
color: #fff;
cursor: pointer;
Expand All @@ -17,10 +17,9 @@

.button--primary.button.disabled,
.button--primary.button.disabled:hover {
background-color: rgba(79, 79, 79, 0.26);
background-color: #DFDFDF;
box-shadow: none;
color: rgba(0, 0, 0, 0.26);
border-color: rgba(0,0,0, 0.3);
color: #9F9F9F;
}

.button--primary {
Expand Down Expand Up @@ -63,3 +62,7 @@
padding: 5px 10px;
font-size: 12px;
}

.no-shadow {
thelostone-mc marked this conversation as resolved.
Show resolved Hide resolved
box-shadow: none;
}
5 changes: 4 additions & 1 deletion app/assets/v2/css/grants/card.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.grant-item {
border-radius: 5px;
display: flex;
Expand Down Expand Up @@ -112,4 +111,8 @@

.grant-item__footer #CLR_banner img {
margin-top: 6px;
}

#CLR_banner .logo {
float: right;
}
110 changes: 70 additions & 40 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,6 +4,23 @@
}
}

#CLR_banner img {
bottom: 2rem;
position: relative;
}

#CLR_banner .clr-text {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

d-inline-block

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't do this cause it has diff behavior on a diff screen 😅

display: inline-block;
}

.grant_details {
background-color: #F8FAFC;
}

.summary-container {
background-color: white;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bg-white

}

.grant-item__owner-image,
.grant-item__owner-handle {
display: inline;
Expand All @@ -14,19 +31,13 @@
height: 50px;
}

.grant-item__owner .select2-selection
.grant-item__member .select2-selection,
.grant__header,
.inline-edit {
background-color: #F2F6F9;
}

.grant-item__owner .select2-selection,
.grant-item__member .select2-selection {
border-radius: 2px !important;
font-size: 0.75rem;
margin-top: 0.5rem;
outline: none;
border-color: #e2eaf2 !important;
background: #fff !important;
color: #000 !important;
}

.grant-item__member .select2-container--default .select2-selection--multiple .select2-selection__rendered {
Expand All @@ -35,6 +46,8 @@

.grant-item__member .select2-container--default .select2-selection--multiple .select2-selection__choice {
border-radius: 2px;
background-color: #fff;
border-color: #e2eaf2 !important;
}

.grant-item__members {
thelostone-mc marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -43,27 +56,16 @@
flex-wrap: wrap;
}

.grant__header .grant-item__member-image img {
border-radius: 50%;
width: 40px;
height: 40px;
}

.select2-container--default .select2-selection--single .select2-selection__arrow {
top: 10px;
#grant-profile-tabs .section-tab {
letter-spacing: 1.5px;
}

.grant__header {
position: relative;
}

.grant__title {
color: #43484D;
}

.grant__url a {
text-decoration: none;
color: #0D0764;
.summary-info i {
color: #666666;
}

.inline-edit {
Expand All @@ -80,12 +82,12 @@

#change-logo i {
position: absolute;
right: 3.5rem;
padding: 0.25rem 0.5rem;
background: white;
font-size: 1.2rem;
border-bottom-right-radius: 2px;
border-bottom-left-radius: 2px;
opacity: 0.6;
}

#js-drop span {
Expand All @@ -102,14 +104,20 @@
input.editable,
textarea.editable {
margin-top: 6px;
border: 1px solid #CACACA;
border: 1px solid #e2eaf2;
background: white;
padding: 7px 14px !important;
border-radius: 3px;
}

.form__select2 .select2-container--default .select2-selection--single {
border: 1px solid #CACACA;
border: 1px solid #e2eaf2;
}

.select2-container--default .select2-selection--multiple .select2-selection__choice__remove,
.select2-available__choice__remove,
.select2-tag__choice__remove {
color: #000;
}

#form--input__description,
Expand All @@ -120,8 +128,11 @@ textarea.editable {
resize: none;
}

#form--input__description:disabled {
background: #F8FAFC;
}

.article-title,
.grant__description,
.article-description {
color: #43484D;
}
Expand All @@ -147,12 +158,6 @@ textarea.editable {
border-radius: 2px;
}

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

.grant__stakeholders-list {
display: flex;
thelostone-mc marked this conversation as resolved.
Show resolved Hide resolved
flex-wrap: wrap;
Expand All @@ -163,14 +168,22 @@ textarea.editable {
}

.sub-title {
font-weight: 600;
color: #666;
letter-spacing: 1.5px;
}

.grant-banner img {
height: auto;
width: 100%;
}

.grant-logo img {
height: auto;
width: 100%;
max-width: 25rem;
box-shadow: 0 4px 10px 0 rgba(0,0,0,0.15);
}

.grant-banner {
overflow : hidden;
max-height: 22rem;
Expand All @@ -192,10 +205,6 @@ textarea.editable {
animation: rotation2 0.1s linear;
}

.update-milestone {
background-color: white;
}

.update {
border-bottom: 1px solid #D8D8D8;
}
Expand Down Expand Up @@ -226,6 +235,18 @@ textarea.editable {
}
}

@media (max-width: 991.98px) {
.summary-info i {
float: left;
position: relative;
top: 2px;
}

.logo {
width: 100%;
}
}

@media (max-width: 767.98px) {

#tabs ul {
Expand All @@ -245,4 +266,13 @@ textarea.editable {
#cancelModal .modal-cancel-grants {
margin-top: 1rem;
}
}

#grant-profile-tabs {
text-align: center;
border-bottom: none;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

border-bottom-0
text-center

}

.logo {
display: none;
thelostone-mc marked this conversation as resolved.
Show resolved Hide resolved
}
}
10 changes: 5 additions & 5 deletions app/assets/v2/css/grants/grant.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,13 @@
line-height: 18px;
}

.grant-item__member-handle span,
.grant__stakeholders-item span {
color: #000;
}

.grant-item__owner-handle span,
.grant-item__owner-handle a,
.grant-item__member-handle span,
.progress-text span {
color: #0D0764;
}
Expand Down Expand Up @@ -190,10 +194,6 @@
font-size: 12px;
}

#grants-details {
padding-bottom: 1em;
}

#grants_nav{
border-bottom: 1px solid #333333;
text-align: left;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/css/grants/milestones.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
margin-bottom: auto;
}

a {
.grant_milestones a {
color: #0D0764;
}

Expand Down
10 changes: 0 additions & 10 deletions app/assets/v2/css/labs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,6 @@ body {
margin-left: 1em !important;
}

.row {
padding: 1rem;
justify-content: center;
}

.sub-title {
align-content: center;
text-align: center;
}

.social {
margin-top: 0.2rem;
}
Expand Down
27 changes: 24 additions & 3 deletions app/assets/v2/css/tabs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.tab-container > button {
margin: .5rem 1rem 0 0;
margin: .5rem 3rem 0 0;
transition: none;
}

Expand All @@ -22,7 +22,8 @@
border: none;
cursor: pointer;
color: black;
padding: 0;
padding: 0 0 0.5rem 0;
margin-bottom: 1rem;
font-weight: 600;
}

Expand All @@ -34,7 +35,8 @@

.section-tab.active {
color: var(--gc-blue);
border-bottom: 2px var(--gc-blue) solid;
border-bottom: 4px var(--gc-blue) solid;
font-weight: bold;
}

.tab-sections {
Expand All @@ -52,6 +54,25 @@
display: block;
}

.nav-badge::after {
padding: 4px 11px;
background-color: rgba(62,0,255, 0.10);
content: '';
border-radius: 50%;
position: relative;
left: -1rem;
}

.nav-badge {
font-size: 10px;
color: rgba(62,0,255);
line-height: 10px;
margin-left: 0.5rem;
top: -2px;
position: relative;
font-weight: bold;
}

@media (max-width: 768px) {
.tab-container > button,
.tab-container > button:first-child {
Expand Down
1 change: 0 additions & 1 deletion app/assets/v2/js/grants/detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ const disableEdit = (input) => {
$(input).prop('disabled', true);

$('#contract_owner_button').addClass('hidden');
$('.grant__specs textarea').css('background-color', '#F2F6F9');
};

const copyDuplicateDetails = () => {
Expand Down
Loading