From 9b06260d1320288bda16eefa321e15357f07653e Mon Sep 17 00:00:00 2001 From: Le Thanh Date: Fri, 29 Jan 2021 11:33:23 +0700 Subject: [PATCH 1/2] Add line break --- app/assets/v2/css/bounty.css | 86 +++++++++++--------- app/dashboard/templates/bounty/details.html | 2 +- app/dashboard/templates/bounty/details2.html | 2 +- 3 files changed, 50 insertions(+), 40 deletions(-) diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css index f67db572d9a..54f3bb2d869 100644 --- a/app/assets/v2/css/bounty.css +++ b/app/assets/v2/css/bounty.css @@ -1,5 +1,5 @@ body { - background-color: #FFF; + background-color: #fff; } .none { @@ -8,7 +8,7 @@ body { .explorer { margin-top: 2em; - color: #3E00FF; + color: #3e00ff; } .explorer i { @@ -22,14 +22,14 @@ body { } .progress-bar { - background-color: #D8D8D8; + background-color: #d8d8d8; display: block; height: 2px; overflow: hidden; } .progress-bar .progress { - background-color: #0FCE7C; + background-color: #0fce7c; height: 2px; width: 50%; } @@ -75,11 +75,11 @@ body { .quote-container .quote_text { font-size: 1.1rem; - color: #4A4A4A; + color: #4a4a4a; } .quote-container .quote_author { - color: #4A4A4A; + color: #4a4a4a; font-size: 1rem; font-style: italic; } @@ -99,7 +99,7 @@ body { } #status { - color: #00A55E; + color: #00a55e; text-transform: uppercase; margin-bottom: 5px; } @@ -126,7 +126,7 @@ body { .box { padding: 14px; - border-bottom: 1px solid #DBDBDB; + border-bottom: 1px solid #dbdbdb; border-radius: 3px; margin: 0; } @@ -134,7 +134,7 @@ body { .box .empty { text-align: center; font-size: 16px; - color: #7A7A7A; + color: #7a7a7a; font-weight: 600; } @@ -150,7 +150,7 @@ body { .contributor-box .fa-minus { font-size: 14px; margin: 0; - color: #7A7A7A; + color: #7a7a7a; } .bounty-heading { @@ -162,7 +162,7 @@ body { } #description { - border-top: 1px solid #D4D4D4; + border-top: 1px solid #d4d4d4; margin-bottom: 2em; } @@ -173,7 +173,7 @@ body { .bounty-text { font-size: 14px; - color: #3E00FF; + color: #3e00ff; } .issue_description { @@ -191,7 +191,7 @@ body { } .bounty-info-heading { - color: #0D0764; + color: #0d0764; font-weight: 500; text-transform: capitalize; } @@ -207,6 +207,10 @@ body { text-transform: capitalize; } +.break-line { + white-space: pre-line; +} + .funder-avatar, .activity div { margin: auto; @@ -256,7 +260,7 @@ body { text-align: center; } -.transaction-status a{ +.transaction-status a { color: white; text-decoration: underline; } @@ -272,7 +276,7 @@ body { } .red_warning a, -#network a{ +#network a { color: #fb9470; font-weight: bold; } @@ -291,7 +295,7 @@ body { } .contributor-box { - border-right: 1px solid #DBDBDB; + border-right: 1px solid #dbdbdb; } .contributor-box:last-child { @@ -323,7 +327,7 @@ body { } #bounty_owner_github_username a { - color: #0D0764; + color: #0d0764; margin-bottom: 5px; font-weight: 600; } @@ -345,9 +349,9 @@ a.btn { } #btn-white { - background-color: #FFFFFF; + background-color: #ffffff; border: 1px solid #979797; - color: #0D0764; + color: #0d0764; border-radius: 3px; position: relative; } @@ -358,7 +362,7 @@ a.btn { } .loading_img::before { - content: ''; + content: ""; width: 12rem; height: 12rem; background: #fff; @@ -400,7 +404,7 @@ a.btn { .activity .activity-status i { margin-left: 10px; - color: #0ECF7C; + color: #0ecf7c; } .activity-kudos { @@ -473,7 +477,7 @@ a.btn { .related-bounties .bounty-title, #funder_notif_info #bounty_funded_by, #funder_notif_info i { - color: #3E00FF; + color: #3e00ff; } #funder_notif_info img { @@ -524,13 +528,12 @@ a.btn { } #moderator-admin-actions:not(:empty) { - background: #F2F6F9; + background: #f2f6f9; padding: 16px 0 10px; left: 0; } @media (max-width: 767px) { - #title { padding-top: 1em; } @@ -557,7 +560,7 @@ a.btn { .contributor-box { border-right: 0; - border-bottom: 1px solid #DBDBDB; + border-bottom: 1px solid #dbdbdb; } .contributor-box:last-child { @@ -635,7 +638,8 @@ a.btn { margin-right: 25px; } -.close:hover, .close:focus { +.close:hover, +.close:focus { box-shadow: none; } @@ -668,7 +672,7 @@ a.btn { } .ethereum-issue { - width:100%; + width: 100%; color: #ffffff; } @@ -723,7 +727,7 @@ a.btn { #cs1 { top: 14%; left: 10%; - transform: rotate(75deg) + transform: rotate(75deg); } #cs2 { @@ -734,7 +738,7 @@ a.btn { #cs3 { top: 40%; right: 35%; - transform: rotate(25deg) + transform: rotate(25deg); } #cs4 { @@ -759,7 +763,7 @@ a.btn { border-right: none; max-width: 12rem; outline: none; - color: #03B16B; + color: #03b16b; } .payout-input-amount-container input::-webkit-outer-spin-button, @@ -773,7 +777,6 @@ a.btn { } @media (max-width: 575.98px) { - #timer { margin-bottom: 10px; } @@ -843,11 +846,11 @@ a.btn { } .payout-summary-container { - background: #F9F7FF; + background: #f9f7ff; } #submit_transaction .payout-tx-container { - border: 1px solid #D8D8D8; + border: 1px solid #d8d8d8; border-radius: 3px; } @@ -870,20 +873,27 @@ a.btn { } @media (min-width: 1441px) and (max-width: 2560px) { - .bounty_details .quote-container { margin-top: 1rem; } } @keyframes MoveUpDown { - 0% { transform: translateY(0); } - 100% { transform: translateY(-3rem); } + 0% { + transform: translateY(0); + } + 100% { + transform: translateY(-3rem); + } } @-webkit-keyframes MoveUpDown { - 0% { transform: translateY(0); } - 100% { transform: translateY(-3rem); } + 0% { + transform: translateY(0); + } + 100% { + transform: translateY(-3rem); + } } .qrcode { diff --git a/app/dashboard/templates/bounty/details.html b/app/dashboard/templates/bounty/details.html index 2024e2914af..13b33c1383d 100644 --- a/app/dashboard/templates/bounty/details.html +++ b/app/dashboard/templates/bounty/details.html @@ -466,7 +466,7 @@
{% trans "Funder" %}
[[if issue_message && activity_type == 'worker_applied' || issue_message && permission_type == 'permissionless' && activity_type == 'start_work' ]]

Work Plan

-

[[>issue_message.issue_message]]

+

[[>issue_message.issue_message]]

[[/if]] diff --git a/app/dashboard/templates/bounty/details2.html b/app/dashboard/templates/bounty/details2.html index d0e57be3243..f1379ffaaaf 100644 --- a/app/dashboard/templates/bounty/details2.html +++ b/app/dashboard/templates/bounty/details2.html @@ -866,7 +866,7 @@
APPLICANTS

Work Plan

-

+

[[ interest.issue_message]]

From fd225f1dfae75ac2d0aa3bb45270a1bac788918b Mon Sep 17 00:00:00 2001 From: Le Thanh Date: Fri, 29 Jan 2021 11:36:16 +0700 Subject: [PATCH 2/2] Reverse css file --- app/assets/v2/css/bounty.css | 90 +++++++++++++++++------------------- 1 file changed, 42 insertions(+), 48 deletions(-) diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css index 54f3bb2d869..b5bd3566897 100644 --- a/app/assets/v2/css/bounty.css +++ b/app/assets/v2/css/bounty.css @@ -1,5 +1,5 @@ body { - background-color: #fff; + background-color: #FFF; } .none { @@ -8,7 +8,7 @@ body { .explorer { margin-top: 2em; - color: #3e00ff; + color: #3E00FF; } .explorer i { @@ -22,14 +22,14 @@ body { } .progress-bar { - background-color: #d8d8d8; + background-color: #D8D8D8; display: block; height: 2px; overflow: hidden; } .progress-bar .progress { - background-color: #0fce7c; + background-color: #0FCE7C; height: 2px; width: 50%; } @@ -75,11 +75,11 @@ body { .quote-container .quote_text { font-size: 1.1rem; - color: #4a4a4a; + color: #4A4A4A; } .quote-container .quote_author { - color: #4a4a4a; + color: #4A4A4A; font-size: 1rem; font-style: italic; } @@ -99,7 +99,7 @@ body { } #status { - color: #00a55e; + color: #00A55E; text-transform: uppercase; margin-bottom: 5px; } @@ -126,7 +126,7 @@ body { .box { padding: 14px; - border-bottom: 1px solid #dbdbdb; + border-bottom: 1px solid #DBDBDB; border-radius: 3px; margin: 0; } @@ -134,7 +134,7 @@ body { .box .empty { text-align: center; font-size: 16px; - color: #7a7a7a; + color: #7A7A7A; font-weight: 600; } @@ -150,7 +150,7 @@ body { .contributor-box .fa-minus { font-size: 14px; margin: 0; - color: #7a7a7a; + color: #7A7A7A; } .bounty-heading { @@ -162,7 +162,7 @@ body { } #description { - border-top: 1px solid #d4d4d4; + border-top: 1px solid #D4D4D4; margin-bottom: 2em; } @@ -173,7 +173,7 @@ body { .bounty-text { font-size: 14px; - color: #3e00ff; + color: #3E00FF; } .issue_description { @@ -191,11 +191,15 @@ body { } .bounty-info-heading { - color: #0d0764; + color: #0D0764; font-weight: 500; text-transform: capitalize; } +.break-line { + white-space: pre-line; +} + .bounty-info i { font-size: 11px; top: -1px; @@ -207,10 +211,6 @@ body { text-transform: capitalize; } -.break-line { - white-space: pre-line; -} - .funder-avatar, .activity div { margin: auto; @@ -260,7 +260,7 @@ body { text-align: center; } -.transaction-status a { +.transaction-status a{ color: white; text-decoration: underline; } @@ -276,7 +276,7 @@ body { } .red_warning a, -#network a { +#network a{ color: #fb9470; font-weight: bold; } @@ -295,7 +295,7 @@ body { } .contributor-box { - border-right: 1px solid #dbdbdb; + border-right: 1px solid #DBDBDB; } .contributor-box:last-child { @@ -327,7 +327,7 @@ body { } #bounty_owner_github_username a { - color: #0d0764; + color: #0D0764; margin-bottom: 5px; font-weight: 600; } @@ -349,9 +349,9 @@ a.btn { } #btn-white { - background-color: #ffffff; + background-color: #FFFFFF; border: 1px solid #979797; - color: #0d0764; + color: #0D0764; border-radius: 3px; position: relative; } @@ -362,7 +362,7 @@ a.btn { } .loading_img::before { - content: ""; + content: ''; width: 12rem; height: 12rem; background: #fff; @@ -404,7 +404,7 @@ a.btn { .activity .activity-status i { margin-left: 10px; - color: #0ecf7c; + color: #0ECF7C; } .activity-kudos { @@ -477,7 +477,7 @@ a.btn { .related-bounties .bounty-title, #funder_notif_info #bounty_funded_by, #funder_notif_info i { - color: #3e00ff; + color: #3E00FF; } #funder_notif_info img { @@ -528,12 +528,13 @@ a.btn { } #moderator-admin-actions:not(:empty) { - background: #f2f6f9; + background: #F2F6F9; padding: 16px 0 10px; left: 0; } @media (max-width: 767px) { + #title { padding-top: 1em; } @@ -560,7 +561,7 @@ a.btn { .contributor-box { border-right: 0; - border-bottom: 1px solid #dbdbdb; + border-bottom: 1px solid #DBDBDB; } .contributor-box:last-child { @@ -638,8 +639,7 @@ a.btn { margin-right: 25px; } -.close:hover, -.close:focus { +.close:hover, .close:focus { box-shadow: none; } @@ -672,7 +672,7 @@ a.btn { } .ethereum-issue { - width: 100%; + width:100%; color: #ffffff; } @@ -727,7 +727,7 @@ a.btn { #cs1 { top: 14%; left: 10%; - transform: rotate(75deg); + transform: rotate(75deg) } #cs2 { @@ -738,7 +738,7 @@ a.btn { #cs3 { top: 40%; right: 35%; - transform: rotate(25deg); + transform: rotate(25deg) } #cs4 { @@ -763,7 +763,7 @@ a.btn { border-right: none; max-width: 12rem; outline: none; - color: #03b16b; + color: #03B16B; } .payout-input-amount-container input::-webkit-outer-spin-button, @@ -777,6 +777,7 @@ a.btn { } @media (max-width: 575.98px) { + #timer { margin-bottom: 10px; } @@ -846,11 +847,11 @@ a.btn { } .payout-summary-container { - background: #f9f7ff; + background: #F9F7FF; } #submit_transaction .payout-tx-container { - border: 1px solid #d8d8d8; + border: 1px solid #D8D8D8; border-radius: 3px; } @@ -873,27 +874,20 @@ a.btn { } @media (min-width: 1441px) and (max-width: 2560px) { + .bounty_details .quote-container { margin-top: 1rem; } } @keyframes MoveUpDown { - 0% { - transform: translateY(0); - } - 100% { - transform: translateY(-3rem); - } + 0% { transform: translateY(0); } + 100% { transform: translateY(-3rem); } } @-webkit-keyframes MoveUpDown { - 0% { - transform: translateY(0); - } - 100% { - transform: translateY(-3rem); - } + 0% { transform: translateY(0); } + 100% { transform: translateY(-3rem); } } .qrcode {