diff --git a/app/app/urls.py b/app/app/urls.py index 64b2fbe13f6..ca97b251f56 100644 --- a/app/app/urls.py +++ b/app/app/urls.py @@ -469,7 +469,6 @@ re_path(r'^modal/extend_issue_deadline/?', dashboard.views.extend_issue_deadline, name='extend_issue_deadline'), # brochureware views - re_path(r'^sass_experiment/?', retail.views.sass_experiment, name='sass_experiment'), re_path(r'^homeold/?$', retail.views.index_old, name='homeold'), re_path(r'^home/?$', retail.views.index, name='home'), re_path(r'^landing/?$', retail.views.index, name='landing'), @@ -485,6 +484,7 @@ re_path(r'^activity/?', retail.views.activity, name='activity'), re_path(r'^townsquare/?', townsquare.views.town_square, name='townsquare'), re_path(r'^$', townsquare.views.landing_toggle, name='index'), + re_path(r'^styleguide/components/?', retail.views.styleguide_components, name='styleguide_components'), path('action///go', townsquare.views.offer_go, name='townsquare_offer_go'), path('action/new', townsquare.views.offer_new, name='townsquare_offer_new'), path( diff --git a/app/assets/v2/js/base.js b/app/assets/v2/js/base.js index 012c7c2d70e..f0a7d7d2b2f 100644 --- a/app/assets/v2/js/base.js +++ b/app/assets/v2/js/base.js @@ -154,7 +154,7 @@ $(document).ready(function() { $top_nav_notif.parents('.row').remove(); localStorage['top_nav_notification_remove_' + top_nav_salt] = true; }; - + // display (if it holds a message and hasn't been closed) or remove #top_nav_notification if (top_nav_salt == 0 || localStorage['top_nav_notification_remove_' + top_nav_salt]) { remove_top_row(); @@ -225,32 +225,17 @@ $(document).ready(function() { $(event.target).parents('.faq_parent').find('.answer').toggleClass('show'); }); - - $('body').on('click', '.accordion', event => { - const element = $(event.target); - const panel = element[0].nextElementSibling; - - if (panel) { - if (element.hasClass('active')) { - panel.style.maxHeight = 0; - panel.style.marginBottom = 0 + 'px'; - } else { - panel.style.maxHeight = panel.scrollHeight + 'px'; - panel.style.marginBottom = 10 + 'px'; - } - } - element.toggleClass('active'); - }); attach_close_button(); }); + const attach_close_button = function() { $('body').delegate('.alert .closebtn', 'click', function(e) { $(this).parents('.alert').remove(); - $('.alert').each(function(index) { + $('.alert').not('.alert-static').each(function(index) { if (index == 0) $(this).css('top', 0); else { - let new_top = (index * 66) + 'px'; + let new_top = (index * 70) + 'px'; $(this).css('top', new_top); } @@ -277,12 +262,12 @@ const _alert = function(msg, _class, remove_after_ms) { }; } var numAlertsAlready = $('body > .alert:visible').length; - var top = numAlertsAlready * 44; + var top = numAlertsAlready * 70; var id = 'msg_' + parseInt(Math.random() * 10 ** 10); var html = function() { return ( - `
+ `
${alertMessage(msg)} diff --git a/app/assets/v2/js/grants/_new.js b/app/assets/v2/js/grants/_new.js index dbbd30ccb4f..881ed9be210 100644 --- a/app/assets/v2/js/grants/_new.js +++ b/app/assets/v2/js/grants/_new.js @@ -139,10 +139,6 @@ Vue.mixin({ vm.$set(vm.errors, 'description', 'Please enter description for the grant'); } - if (!vm.$refs.formNewGrant.reportValidity()) { - return false; - } - if (Object.keys(vm.errors).length) { return false; // there are errors the user must correct } diff --git a/app/assets/v2/js/pages/quests.new.js b/app/assets/v2/js/pages/quests.new.js index 3898b0050f2..5b360a490f7 100644 --- a/app/assets/v2/js/pages/quests.new.js +++ b/app/assets/v2/js/pages/quests.new.js @@ -5,7 +5,9 @@ $(document).ready(function() { const question_template = $('.form-group.question:last').clone(); const answer_template = question_template.children('span:last').clone(); - let video_toggle = function(e) { + $('.select2').select2(); + + const video_toggle = function(e) { var is_checked = $('#video_enabled').is(':checked'); if (is_checked) { @@ -17,14 +19,8 @@ $(document).ready(function() { }; $(document).on('click', '#video_enabled', video_toggle); - video_toggle(); - - $(document).on('form#newkudos', 'submit', function(e) { - // e.preventDefault(); - // console.log($(this).formdata); - // alert('hi'); - }); + video_toggle(); $(document).on('click', '.add_answer', function(e) { e.preventDefault(); @@ -37,8 +33,8 @@ $(document).ready(function() { var last_answer = $(this).parents('.form-group.question').children('span:last'); last_answer.after(answer_template.clone()); - }); + $(document).on('click', '.new_quest_background', function(e) { e.preventDefault(); $('.new_quest_background').removeClass('selected'); @@ -62,7 +58,6 @@ $(document).ready(function() { last_question.after(question_template.clone()); }); - $(document).on('click', '.close_answer', function(e) { e.preventDefault(); if ($(this).parents('.question').find('span').length <= 1) { @@ -73,6 +68,7 @@ $(document).ready(function() { ele.remove(); }); + $(document).on('click', '.remove', function(e) { e.preventDefault(); $(this).parents('.form-group').find('.hidden').removeClass('hidden'); @@ -83,7 +79,6 @@ $(document).ready(function() { $(this).remove(); }); - $(document).on('click', '.close_question', function(e) { e.preventDefault(); if ($('div.question').length <= 1) { diff --git a/app/assets/v2/js/pages/quests.quest.quiz_style.js b/app/assets/v2/js/pages/quests.quest.quiz_style.js index ae75c1afe85..74779df2846 100644 --- a/app/assets/v2/js/pages/quests.quest.quiz_style.js +++ b/app/assets/v2/js/pages/quests.quest.quiz_style.js @@ -51,7 +51,7 @@ var start_quiz = async function() { await toggle_character_class($('#protagonist'), [ 'heal', '' ]); await toggle_character_class($('#enemy'), [ 'harm', '' ]); } - + var question_level_seconds_to_respond = response['question']['seconds_to_respond']; var prefix = '(' + question_number + '/' + question_count + ') - '; var question = prefix + response['question']['question']; @@ -387,5 +387,5 @@ $(document).ready(function() { if (document.quest) { start_quest(); } - -}); \ No newline at end of file + +}); diff --git a/app/assets/v2/js/pages/styleguide-components.js b/app/assets/v2/js/pages/styleguide-components.js new file mode 100644 index 00000000000..21e313fc4de --- /dev/null +++ b/app/assets/v2/js/pages/styleguide-components.js @@ -0,0 +1,223 @@ +Vue.component('v-select', VueSelect.VueSelect); +Vue.use(VueQuillEditor); + +const djangoExample = `{% load i18n static compress %} + +... + +{% compress css file example_name %} + +{% endcompress %}`; + +const buttonExample = ''; + +const inputExample = ` + + + +
+ This is an error message +
`; + +const selectExample = ` + + + + + + +
+ This is an error message +
`; + +const radioExample = `Example Required + +
+ + +
+ +
+ + +
+ +
+ This is an error message +
`; + +const checkboxExample = `Example Required + +
+ + +
+ +
+
+ +
+ This is an error message +
`; + +const btnRadioExample = `Example 2 Required + +
+ + + + + +
+ +
+ This is an error message +
`; + +const btnCheckboxExample = `Example 2 Required + +
+ + + + + +
+ +
+ This is an error message +
`; + +const richEditorExample = ` + + + +
+ This is an error message +
`; + +const alertExample = `
+
+
Message
+
+ × +
`; + +const alertExample2 = '_alert(msg, type, closeAfter);'; + +const accordionExample = `
+ +
+

Accordion 1 content

+
+
`; + +const tabsExample = ` + + +

Tab 1 content

+ + + + +

Tab 2 content

+ +`; + +Vue.mixin({ + methods: { + openAlert: function(type) { + _alert('Message', type); + } + } +}); + +if (document.getElementById('styleguide-components')) { + appFormBounty = new Vue({ + delimiters: [ '[[', ']]' ], + el: '#styleguide-components', + components: { + 'vue-select': 'vue-select' + }, + data() { + return { + djangoExample: djangoExample, + buttonExample: buttonExample, + inputExample: inputExample, + selectExample: selectExample, + radioExample: radioExample, + checkboxExample: checkboxExample, + btnRadioExample: btnRadioExample, + btnCheckboxExample: btnCheckboxExample, + richEditorExample: richEditorExample, + alertExample: alertExample, + alertExample2: alertExample2, + accordionExample: accordionExample, + tabsExample: tabsExample, + selectOptions: [ + { 'name': 'north_america', 'label': 'North America'}, + { 'name': 'oceania', 'label': 'Oceania'}, + { 'name': 'latin_america', 'label': 'Latin America'}, + { 'name': 'europe', 'label': 'Europe'}, + { 'name': 'africa', 'label': 'Africa'}, + { 'name': 'middle_east', 'label': 'Middle East'}, + { 'name': 'india', 'label': 'India'}, + { 'name': 'east_asia', 'label': 'East Asia'}, + { 'name': 'southeast_asia', 'label': 'Southeast Asia'} + ], + tabSelected: 0, + form: { + select1: [], + select2: [], + btnCheckbox: [], + btnCheckbox2: [], + rich_editor: '', + rich_editor2: '' + }, + editorOptionPrio: { + modules: { + toolbar: [ + [ 'bold', 'italic', 'underline' ], + [{ 'align': [] }], + [{ 'list': 'ordered'}, { 'list': 'bullet' }], + [ 'link', 'code-block' ], + ['clean'] + ] + }, + theme: 'snow', + placeholder: 'Example rich text-editor' + } + }; + } + }); +} diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index d9344974aaa..d24684cbbc2 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -50,12 +50,9 @@ $(document).ready(function() { $('body').on('click', '.townsquare_block-header', function(e, triggered) { const target_id = $(this).data('target'); - $('#' + target_id).toggleClass('hidden'); - $(this).toggleClass('closed'); if (!triggered) { - localStorage.setItem(target_id, $(this).hasClass('closed')); + localStorage.setItem(target_id.replace(/^#/, ''), $(this).hasClass('collapsed')); } - }); $(window).on('resize', () => { @@ -63,13 +60,13 @@ $(document).ready(function() { $('.townsquare_block-header').each(function(e) { const target_id = $(this).data('target'); - const item = localStorage.getItem(target_id); + const item = localStorage.getItem(target_id.replace(/^#/, '')); if (window_width <= 992) { - if (item == 'false' && !$(this).hasClass('closed')) { + if (item && item !== 'false' && !$(this).hasClass('collapsed')) { $(this).trigger('click', true); } - } else if (item == 'false' && $(this).hasClass('closed')) { + } else if (item && item !== 'false' && $(this).hasClass('collapsed')) { $(this).trigger('click', true); } }); @@ -186,11 +183,12 @@ $(document).ready(function() { } $('.townsquare_block-header').each(function() { const target_id = $(this).data('target'); - const item = localStorage.getItem(target_id); + const item = localStorage.getItem(target_id.replace(/^#/, '')); if ($('body').width() > 992) { - if (item && item !== String($(this).hasClass('closed'))) { - $(this).trigger('click', true); + if (item && item == 'true') { + $(this).removeClass('collapsed'); + $(target_id).addClass('show'); } } }); diff --git a/app/assets/v2/js/vue-components.js b/app/assets/v2/js/vue-components.js index 23a03c9b3bc..c855e18343a 100644 --- a/app/assets/v2/js/vue-components.js +++ b/app/assets/v2/js/vue-components.js @@ -650,11 +650,11 @@ Vue.component('project-card', { [[ project.summary | truncate(500) ]]

- View Project - View Bounty - + View Project + View Bounty + @ [[ profile.handle ]] diff --git a/app/assets/v2/scss/activity_stream.scss b/app/assets/v2/scss/activity_stream.scss index 27fcb990078..74f67d32a38 100644 --- a/app/assets/v2/scss/activity_stream.scss +++ b/app/assets/v2/scss/activity_stream.scss @@ -105,7 +105,7 @@ .selector-bar { - background-color: #3E00FF; + background-color: #6F3FF5; height: 0.15em; width: 100%; margin-top: 0.2em; diff --git a/app/assets/v2/scss/avatar_landing.scss b/app/assets/v2/scss/avatar_landing.scss index 0d87eeb9632..c80a6ee9b14 100644 --- a/app/assets/v2/scss/avatar_landing.scss +++ b/app/assets/v2/scss/avatar_landing.scss @@ -1,5 +1,5 @@ .products{ - background-color: #fafafa; + background-color: #fafafa; padding: 30px; height: 330px; border-top: 1px solid #ddd; @@ -8,7 +8,7 @@ height: 430px; } .products:nth-child(even){ - background-color: #eee; + background-color: #eee; } .products img{ @@ -31,7 +31,7 @@ border: 5px #8E2ABE solid; } .products:nth-child(5n+5) img{ - border: 5px #3E00FF solid; + border: 5px #6F3FF5 solid; } .intro-sub-header{ max-width: 900px; diff --git a/app/assets/v2/scss/base.scss b/app/assets/v2/scss/base.scss index 887bb80db35..be964e54c7d 100644 --- a/app/assets/v2/scss/base.scss +++ b/app/assets/v2/scss/base.scss @@ -195,7 +195,7 @@ span { } p a { - color: #3E00FF; + color: #6F3FF5; } .modal a.close-modal { @@ -394,7 +394,7 @@ input[type=text].loading { } #primary_form { - max-width: 550px; /* TODO: REMOVE */ + max-width: 740px; /* TODO: REMOVE */ margin: 0 auto; padding: 0 2em; } @@ -458,22 +458,12 @@ input[type=text].loading { /* The alert message box */ -.alert:not(.bs-alert) { - align-items: center; - background-color: #3E00FF; - border-radius: 0px; - box-shadow: 0 6px 6px 0 rgba(0, 0, 0, 0.24); - color: white; - display: flex; - justify-content: space-between; - padding: 10px 20px; - margin-bottom: 1px; +.alert-fixed { + width: 99.6%; position: fixed; top: 0px; - width: 100%; + left: 0.2%; z-index: 999999; - font-weight: 600; - font-size: 14px; } .alert .message { @@ -483,59 +473,44 @@ input[type=text].loading { .alert .message .content{ display: inline; - word-break: break-all; + word-break: break-word; } .alert .message::before { font-family: 'Font Awesome\ 5 Pro', sans-serif; - content: "\f06a"; + content: "\f05a"; margin-right: 10px; font-size: 1.25rem; position: relative; top: 1px; } -.alert:not(.bs-alert) a { - color: white; - text-decoration: underline; -} - -.alert.error { - background-color: #C70018; -} - -.alert.error .message::before { - content: "\f057"; -} - -.alert.success { - background-color: #00A652; -} - -.alert.success .message::before { +.alert-success .message::before { content: "\f058"; + color: #11BC92; } -.alert.info { - background-color: #008EFF; +.alert-warning .message::before { + content: "\f071"; + color: #E1B815; } -.alert.info .message::before { - content: "\f05a"; +.alert-danger .message::before { + content: "\f06a"; + color: #D44D6E; } -.alert.warning { - background-color: #FF7F00; +.alert-error .message::before { + content: "\f057"; } -.alert.warning .message::before { - content: "\f071"; +.alert-info .message::before { + content: "\f05a"; } /* The close button */ .closebtn { - color: white; cursor: pointer; font-weight: bold; float: right; @@ -569,7 +544,7 @@ input[type=text].loading { .bottom_notification { padding: 10px 30px; - background: #3e00ff; + background: #6F3FF5; color: white; width: 100%; margin-left: 0px; @@ -629,12 +604,12 @@ input[type=text].loading { } #gitcoin_buttons .btn.delta_2 { - background-color: #3e00ff; + background-color: #6F3FF5; border: 1px solid white; } #gitcoin_buttons .btn.delta_2 span { - color: #3e00ff; + color: #6F3FF5; background-color: white; } @@ -787,7 +762,7 @@ input.is-invalid { .ui-selectmenu-button.ui-button:focus { border: none !important; background: #FFF !important; - color: #3E00FF; + color: #6F3FF5; outline: none; font-weight: 600; } @@ -817,8 +792,8 @@ input.is-invalid { .ui-state-active, .ui-widget-content .ui-state-active, .ui-button.ui-state-active:hover { - border: 1px solid #3E00FF !important; - background: #3E00FF !important; + border: 1px solid #6F3FF5 !important; + background: #6F3FF5 !important; } .ui-button:hover, @@ -1463,7 +1438,7 @@ div.busyOverlay { .daterangepicker td.active, .daterangepicker td.active:hover { - background-color: #3E00FF !important; + background-color: #6F3FF5 !important; } .daterangepicker .ranges li.active { diff --git a/app/assets/v2/scss/bounty.scss b/app/assets/v2/scss/bounty.scss index b5bd3566897..a73cad8a802 100644 --- a/app/assets/v2/scss/bounty.scss +++ b/app/assets/v2/scss/bounty.scss @@ -8,7 +8,7 @@ body { .explorer { margin-top: 2em; - color: #3E00FF; + color: #6F3FF5; } .explorer i { @@ -173,7 +173,7 @@ body { .bounty-text { font-size: 14px; - color: #3E00FF; + color: #6F3FF5; } .issue_description { @@ -477,7 +477,7 @@ a.btn { .related-bounties .bounty-title, #funder_notif_info #bounty_funded_by, #funder_notif_info i { - color: #3E00FF; + color: #6F3FF5; } #funder_notif_info img { diff --git a/app/assets/v2/scss/bulk_payout_bounty.scss b/app/assets/v2/scss/bulk_payout_bounty.scss index c6151ae9faf..633606e9e0e 100644 --- a/app/assets/v2/scss/bulk_payout_bounty.scss +++ b/app/assets/v2/scss/bulk_payout_bounty.scss @@ -157,7 +157,7 @@ tr div { } .badge-primary { - background-color: #3E00FF; + background-color: #6F3FF5; font-size: 0.75rem; } diff --git a/app/assets/v2/scss/buttons.scss b/app/assets/v2/scss/buttons.scss index e4ecd5caef3..a878b7e7d8f 100644 --- a/app/assets/v2/scss/buttons.scss +++ b/app/assets/v2/scss/buttons.scss @@ -282,6 +282,7 @@ button:focus { .btn-radio { border: 1px solid #D3D3D3; + min-height: 40px; } .btn-radio.active { diff --git a/app/assets/v2/scss/dashboard-hackathon.scss b/app/assets/v2/scss/dashboard-hackathon.scss index 679e8a828d7..d9bc9210d9b 100644 --- a/app/assets/v2/scss/dashboard-hackathon.scss +++ b/app/assets/v2/scss/dashboard-hackathon.scss @@ -323,10 +323,10 @@ body { } .navigation .nav-link.active { - background-color: transparent !important; font-weight: bold !important; - color: #4700FF !important; - border-bottom: 4px solid #4700FF !important; + border-bottom: 4px solid #6F3FF5!important; + color: #6F3FF5; + background-color: transparent !important; } li.navigation > a.nav-link { diff --git a/app/assets/v2/scss/dashboard-vue-hackathon.scss b/app/assets/v2/scss/dashboard-vue-hackathon.scss index bb2916b1285..9206dac9ff9 100644 --- a/app/assets/v2/scss/dashboard-vue-hackathon.scss +++ b/app/assets/v2/scss/dashboard-vue-hackathon.scss @@ -271,7 +271,7 @@ font-size: 12px; line-height: 22px; letter-spacing: 1px; - color: #3E00FF; + color: #6F3FF5; } .info-card-desc { diff --git a/app/assets/v2/scss/external_bounties/checkboxes.scss b/app/assets/v2/scss/external_bounties/checkboxes.scss index a001958e449..7a838415754 100644 --- a/app/assets/v2/scss/external_bounties/checkboxes.scss +++ b/app/assets/v2/scss/external_bounties/checkboxes.scss @@ -13,13 +13,13 @@ .checkbox_container label::after { content: ''; position: absolute; - width: 0.5em; - height: 0.9em; + width: 0.4em; + height: 0.8em; border: solid white; border-width: 0 0.15em 0.15em 0; - -webkit-transform: rotate(45deg) translate(-0.7em, -1.25em); - -ms-transform: rotate(45deg) translate(-0.7em, -1.25em); - transform: rotate(45deg) translate(-0.7em, -1.25em); + -webkit-transform: rotate(45deg) translate(-0.6em, -1.2em); + -ms-transform: rotate(45deg) translate(-0.6em, -1.2em); + transform: rotate(45deg) translate(-0.6em, -1.2em); display: none; } @@ -49,8 +49,8 @@ .checkbox_container input:checked ~ label::before, .checkbox_container input:checked ~ * label::before { - background-color:#3E00FF; - border: 1px solid #3E00FF; + background-color:#6F3FF5; + border: 1px solid #6F3FF5; display: block; } diff --git a/app/assets/v2/scss/forms/button.scss b/app/assets/v2/scss/forms/button.scss deleted file mode 100644 index 8b5bdfe830d..00000000000 --- a/app/assets/v2/scss/forms/button.scss +++ /dev/null @@ -1,66 +0,0 @@ -.button { - border-radius: 3px; - color: #fff; - cursor: pointer; - font-size: 14px; - padding: 5px 20px; - border: 1px solid transparent; -} - -.button:hover { - color: #fff; - text-decoration: none; -} - -.button--primary.button.disabled, -.button--primary.button.disabled:hover { - background-color: #D8D8D8; - color: #666666; - box-shadow: none; -} - -.button--primary { - background-color: #3E00FF; -} - -.button--primary:hover { - background-color: var(--gc-blue-hover); -} - -.button--secondary { - color: var(--gc-blue); - border: 1px solid var(--gc-blue); -} - -.button--secondary:hover { - color: var(--gc-blue-hover); - border-color: var(--gc-blue-hover); -} - -.button--primary-o { - background-color: #fff; - border: 1px solid #0D0764; - color: #0D0764; - padding: 9px 18px; -} - -.button--primary-o:hover { - color: #0D0764; -} - -.button--warning { - background-color: #ca001a; -} - -.button--full { - width: 100%; -} - -.button--warning:hover { - background-color: #d43247; -} - -.button__small { - padding: 5px 10px; - font-size: 12px; -} diff --git a/app/assets/v2/scss/forms/checkbox.scss b/app/assets/v2/scss/forms/checkbox.scss index 0971f0c241b..10fe4958e34 100644 --- a/app/assets/v2/scss/forms/checkbox.scss +++ b/app/assets/v2/scss/forms/checkbox.scss @@ -15,7 +15,7 @@ .form__checkbox .form__label::before { background: #fff; border: 1px solid #dbdbdb; - border-radius: 2px; + border-radius: 4px; content: ''; display: inline-flex; justify-content: center; @@ -41,7 +41,7 @@ } .form__checkbox input:checked ~ .form__label::before { - background-color: #3E00FF; - border-color: #3E00FF; + background-color: #6F3FF5; + border-color: #6F3FF5; content: url('/static/v2/images/check.svg'); } diff --git a/app/assets/v2/scss/forms/radio.scss b/app/assets/v2/scss/forms/radio.scss index 016fc6d99fc..6392eef4a2c 100644 --- a/app/assets/v2/scss/forms/radio.scss +++ b/app/assets/v2/scss/forms/radio.scss @@ -19,7 +19,7 @@ align-items: center; position: absolute; background: #fff; - border: 2px solid #D2D2D2; + border: 1px solid #D2D2D2; border-radius: 100%; content: ''; display: inline-flex; @@ -32,12 +32,12 @@ } .form__radio label::before { - background-color: #3E00FF; - border: 2px solid #3E00FF; + background-color: #6F3FF5; + border: 1px solid #6F3FF5; } .form__radio input:checked + label::after { - background-color: #3E00FF; + background-color: #6F3FF5; border: 2px solid #fff; - transform: scale(0.7); -} \ No newline at end of file + transform: scale(0.9); +} diff --git a/app/assets/v2/scss/forms/select.scss b/app/assets/v2/scss/forms/select.scss index 9f034e9bbd7..20ffd581714 100644 --- a/app/assets/v2/scss/forms/select.scss +++ b/app/assets/v2/scss/forms/select.scss @@ -74,8 +74,8 @@ li.select2-available__choice, li.select2-tag__choice { align-items: center; - border: 1px solid #3E00FF; - background-color: #3E00FF; + border: 1px solid #6F3FF5; + background-color: #6F3FF5; display: flex; color: #ffffff; height: 100%; @@ -101,7 +101,7 @@ li.select2-tag__choice { } .select2-container--default .select2-results__option--highlighted[aria-selected] { - background-color: #3E00FF; + background-color: #6F3FF5; color: #fff; } diff --git a/app/assets/v2/scss/gc-mixins.scss b/app/assets/v2/scss/gc-mixins.scss index 0c257273267..036173174b9 100644 --- a/app/assets/v2/scss/gc-mixins.scss +++ b/app/assets/v2/scss/gc-mixins.scss @@ -3,7 +3,7 @@ @import "./lib/bootstrap/variables"; @import "./lib/bootstrap/mixins"; // overwrite bootstrap variables in this file -@import "./lib/bootstrap-overwrites"; +@import "./lib/bootstrap-overrides"; // define borders for $position of $width @mixin border($position, $minWidth, $maxWidth) { diff --git a/app/assets/v2/scss/gc-utilities.scss b/app/assets/v2/scss/gc-utilities.scss index 78b318898ab..9c1d5e94cf0 100644 --- a/app/assets/v2/scss/gc-utilities.scss +++ b/app/assets/v2/scss/gc-utilities.scss @@ -18,10 +18,37 @@ 'light' $light ); +// Hover effects .hover-underline:not(:disabled):not(.disabled):not(.active):hover { text-decoration: underline!important } +.text-primary-hover:hover { + color: $gc-violet-500!important; +} + +// Invalid form state +.invalid { + + input.invalid, input:invalid, .form__checkbox input:invalid + .form__label::before, + & > .btn-radio:not(.disabled), & > .btn-group-toggle .btn-radio:not(.disabled), + .quill-editor.invalid .ql-snow, .form__radio input:invalid + label:after, + .checkbox_container input:invalid + span + .filter-label > label:before { + border-color:#D44D6E; + } + + .vs__selected-options > input:invalid { + min-height: 21px; + box-shadow: + -7px -9px 0px 0px #fff, 30px -9px 0px 0px #fff, 30px 5px 0px 0px #fff, -7px 5px 0px 0px #fff, + -8px -10px 0px 0px #D44D6E, 31px -10px 0px 0px #D44D6E, 31px 6px 0px 0px #D44D6E, -8px 6px 0px 0px #D44D6E; + border-radius: 1px; + border: none; + z-index: 0; + } +} + +// Helpers to fix top and bottom positions .bottom-0 { bottom: 0px; } diff --git a/app/assets/v2/scss/gc-variables.scss b/app/assets/v2/scss/gc-variables.scss index 3e2e07d816e..046c7e0791d 100644 --- a/app/assets/v2/scss/gc-variables.scss +++ b/app/assets/v2/scss/gc-variables.scss @@ -27,53 +27,9 @@ $gc-yellow-300: #FFDB4C; $gc-yellow-200: #ffeea8; $gc-yellow-100: #FFF8DB; -// Bootstrap color overrides -$blue: $gc-violet-400; -$green: $gc-teal-400; -$pink: $gc-pink-400; -$yellow: $gc-yellow-400; -$primary: $blue; -$secondary: $green; -$dark: $gc-purple; -$light: $gc-grey; - -// Link color overrides -$link-color: $gc-violet-400; -$link-hover-color: $gc-violet-500; - -// Dropdown overrides -$dropdown-link-hover-color: $white; -$dropdown-link-hover-bg: $gc-violet-400; -$dropdown-link-active-color: $white; -$dropdown-link-active-bg: $gc-violet-500; - -// Nav-pills overrides -$nav-pills-link-active-color: $white; -$nav-pills-link-active-bg: $blue; - // Font overrides $font-family-base: 'Libre Franklin', sans-serif; $headings-font-family: 'Miriam Libre', sans-serif; -$enable-responsive-font-sizes: true; -$font-size-base: 0.85rem; -$dropdown-font-size: 0.8rem; -$btn-font-size: 0.8rem; - -// Button overrides -$input-btn-focus-width: 0.1rem; - -$border-radius: 4px; -$border-radius-lg: 6px; -$border-radius-sm: 2px; - -$btn-font-size-lg: 1rem; -$btn-line-height-lg: 2; - -$btn-font-size-sm: 0.7rem; -$btn-line-height-sm: 2; - -$modal-backdrop-bg: $black; -$modal-backdrop-opacity: 0.7; -$navbar-dark-toggler-icon-bg: unset; -$navbar-light-toggler-icon-bg: unset; +// Vue-select overrides +$vs-state-active-bg: $gc-violet-400; diff --git a/app/assets/v2/scss/gitcoin.scss b/app/assets/v2/scss/gitcoin.scss index 267a1f5e3aa..ce5a0cded4b 100644 --- a/app/assets/v2/scss/gitcoin.scss +++ b/app/assets/v2/scss/gitcoin.scss @@ -8,7 +8,7 @@ .sticky-top { position: sticky!important; top: 0; - z-index: 2; + z-index: 3; } .no-gutter { @@ -472,18 +472,6 @@ transition: 0.4s; } -.panel { - max-height: 0; - overflow: hidden; - transition: max-height 0.2s ease-out; -} - -.panel-active { - max-height: 100%; - overflow: hidden; - transition: max-height 0.2s ease-out; -} - .accordion:after { /* stylelint-disable-next-line */ font-family: 'Font Awesome 5 Pro'; @@ -492,15 +480,74 @@ margin-right: auto; margin-top: auto; float: right; - font-weight: 600; - top: 1px; - position: relative; } -.accordion.active:after { +.accordion:not(.collapsed):after { content: '\f106'; } +.gc-accordion { + margin-left: -38px; + + + &:after { + content: ""; + display: block; + border-bottom: 1px solid #eee; + position: relative; + left: 26px; + width: calc(100% - 16px); + } + + .accordion { + padding: 20px 0px 20px 22px; + margin-bottom: 0px; + transition: none; + border-left: 4px solid transparent; + } + + .accordion-title { + display: inline-block; + width: calc(100% - 50px); + } + + .accordion:not(.collapsed) { + border-left: 4px solid #02e2ac; + + .accordion-title { + font-weight: bold; + } + } + + .accordion-panel { + padding-left: 28px; + } + + .accordion:after { + content: "\f067"; + } + + .accordion:not(.collapsed):after { + content: "\f068"; + } + + .accordion:before { + content: ""; + display: block; + min-height: 4px; + width: calc(100% + 10px); + position: relative; + top: -22px; + border-top: 1px solid #eee; + } + + .accordion:not(.collapsed):before { + border-top: 4px solid #000; + border-radius: 2px; + } + +} + .dropdown-menu { background-color: #FAFAFA; border-radius: 0px; @@ -516,11 +563,6 @@ padding: 12px 25px; } -// .dropdown-menu .dropdown-item:hover { -// background-color: #3E00FF; -// color: #FFFFFF !important; -// } - #why-gitcoin .dropdown-item { padding-left: 15px; } @@ -628,12 +670,12 @@ } .nav-tabs .nav-line { - color: rgb(25, 15, 175); + color: #6F3FF5; border-width: 0px 0px 3px 0; } .nav-tabs .nav-line.active { - color: rgb(25, 15, 175); - border-color: rgb(25, 15, 175); + color: #6F3FF5; + border-color: #6F3FF5; background-color: transparent; } @@ -940,3 +982,26 @@ input[type="search"]::-webkit-search-cancel-button { .web3modal-modal-lightbox { z-index: 1001; } + +.btn-radio.chain-btn:hover { + background-color: #f9f9f9; + border-color: #3E00FF!important; +} + +.vs__dropdown-toggle { + padding: 5px 5px 5px 5px; + border-radius: 2px; +} + +.vs__dropdown-toggle .vs__no-options { + text-align: left; + padding-left: 1em; +} + +.vs__dropdown-toggle .vs__selected { + margin: 0px 2px 0px 2px; +} + +.vs__selected-options > input::placeholder { + color: var(--form-input-color); +} diff --git a/app/assets/v2/scss/grants/detail.scss b/app/assets/v2/scss/grants/detail.scss index 7a4be791f47..f177047a842 100644 --- a/app/assets/v2/scss/grants/detail.scss +++ b/app/assets/v2/scss/grants/detail.scss @@ -97,10 +97,6 @@ border: none; } -.button__small { - font-weight: 500; -} - #change-logo { cursor: pointer; } diff --git a/app/assets/v2/scss/grants/grant.scss b/app/assets/v2/scss/grants/grant.scss index 334a9f3f751..79791b64aba 100644 --- a/app/assets/v2/scss/grants/grant.scss +++ b/app/assets/v2/scss/grants/grant.scss @@ -312,7 +312,7 @@ .grant-item__owner-handle span, .grant-item__owner-handle a, .progress-text span { - color: #3E00FF; + color: #6F3FF5; } .progress-text p { @@ -424,7 +424,7 @@ } #top-filters .select2-selection span, #search_form .select2-selection span { - color: #3E00FF; + color: #6F3FF5; font-weight: bold; } @@ -434,7 +434,7 @@ } .grants_keyword_nav a.selected:hover { - border-color: #3E00FF; + border-color: #6F3FF5; } .grants_nav a { @@ -550,9 +550,6 @@ } /* sidebar_search.css */ -.accordion:after { - float: none; -} .subheading { margin-bottom: 0 !important; diff --git a/app/assets/v2/scss/grants/profile.scss b/app/assets/v2/scss/grants/profile.scss index 26717e09265..d0a465373dd 100644 --- a/app/assets/v2/scss/grants/profile.scss +++ b/app/assets/v2/scss/grants/profile.scss @@ -32,7 +32,7 @@ h2.title { } .no-profile-button { - background-color: #3E00FF; + background-color: #6F3FF5; color: #FFFFFF; font-size: 0.875rem; } diff --git a/app/assets/v2/scss/help.scss b/app/assets/v2/scss/help.scss index 7a891054620..81d06b8b751 100644 --- a/app/assets/v2/scss/help.scss +++ b/app/assets/v2/scss/help.scss @@ -46,7 +46,7 @@ h3 { } .question:hover { - color: #3E00FF; + color: #6F3FF5; } .show { diff --git a/app/assets/v2/scss/home.scss b/app/assets/v2/scss/home.scss index 09f9af3ff45..b555dfcc498 100644 --- a/app/assets/v2/scss/home.scss +++ b/app/assets/v2/scss/home.scss @@ -1,7 +1,3 @@ -.navbar { - // background-color: #0d023b; -} - .banner { background-image: url(/static/v2/images/tribes-bg.png); background-size: contain; @@ -30,18 +26,10 @@ } .testimonial-card { - border: 4px solid #3E00FF; + border: 4px solid #6F3FF5; width: 32rem; } -.testimonial-card:first-child { - /* margin-left: -25%; */ -} - -.testimonial-card:last-child { - /* margin-right: -25%; */ -} - .card-description { font-size: 18px; line-height: 24px; @@ -79,7 +67,7 @@ width: 6rem; height: 6rem; border-radius: 50%; - border: 3px solid #3E00FF; + border: 3px solid #6F3FF5; object-fit: contain; } @@ -113,7 +101,7 @@ } .issue span { - color: #3E00FF; + color: #6F3FF5; } .navbar .interior .dropdown-item span { @@ -121,26 +109,11 @@ font-size: 12px; } -// .navbar .interior .dropdown-item:hover span { -// color: #fff; -// } - -// .navbar .nav-link:hover, -// .navbar .nav-link:active { -// border-bottom: 3px solid #fff; -// border-radius: 0; -// background-color: transparent; -// } - .banner__h2 { font-size: 2.4rem; line-height: 3rem; } -.homepage .banner #fund-issue { - // border: 2px solid #3E00FF; -} - .optimize_oss p, .realign p { color: #4A4A4A; @@ -214,8 +187,8 @@ img.play { } .button__home { - border: 3px solid #3E00FF; - color: #3E00FF; + border: 3px solid #6F3FF5; + color: #6F3FF5; font-weight: 600; text-align: left; padding: 1rem 1.8rem; @@ -230,13 +203,13 @@ img.play { } .button__home:hover { - background-color: #3E00FF; + background-color: #6F3FF5; color: #fff !important; border-radius: 3px; } .products { - background-color: #3E00FF; + background-color: #6F3FF5; margin-top: 10rem; text-align: center; color: #fff; @@ -354,14 +327,14 @@ p.video-preview__index { .button__blue { - background-color: #3E00FF; + background-color: #6F3FF5; color: #fff !important; font-weight: 600; } .button__blue:hover { background-color: #fff; - color: #3E00FF !important; + color: #6F3FF5 !important; } .button__green { @@ -478,13 +451,6 @@ figure:hover::before { } } -// @media (min-width: 992px) { -// .mx-auto .nav-item { -// margin-left: 0.75rem; -// margin-right: 0.75rem; -// } -// } - @media (max-width: 1024px) { .realign-img, @@ -514,7 +480,7 @@ figure:hover::before { .box-cta { margin: 0 !important; } - + .work-internet { width: 17rem; } @@ -558,12 +524,12 @@ figure:hover::before { } .box-cta__left { - box-shadow: 33px 33px 0 -20px #3E00FF; + box-shadow: 33px 33px 0 -20px #6F3FF5; } .box-cta__right { - box-shadow: -33px 33px 0 -20px #3E00FF; + box-shadow: -33px 33px 0 -20px #6F3FF5; } .box-cta__title { diff --git a/app/assets/v2/scss/howitworks.scss b/app/assets/v2/scss/howitworks.scss index 65d5aa08b47..42b6ccbe1f1 100644 --- a/app/assets/v2/scss/howitworks.scss +++ b/app/assets/v2/scss/howitworks.scss @@ -30,11 +30,11 @@ .howworks-container li a { text-decoration: none; - color: #3E00FF; + color: #6F3FF5; } .howworks-container li a:hover { - border-bottom: 2px solid #3E00FF; + border-bottom: 2px solid #6F3FF5; } .how-it-works__step:nth-child(even) { diff --git a/app/assets/v2/scss/kudos/styles.scss b/app/assets/v2/scss/kudos/styles.scss index 8295248c2af..80a8997578b 100644 --- a/app/assets/v2/scss/kudos/styles.scss +++ b/app/assets/v2/scss/kudos/styles.scss @@ -147,8 +147,8 @@ background-position: center; } .kd-card a:hover .img-thumbnail { - border-color: #3e00ff; - box-shadow: inset 0 0 0px 2px #3e00ff; } + border-color: #6F3FF5; + box-shadow: inset 0 0 0px 2px #6F3FF5; } .kd-card .kd-name { font-weight: 300; padding: 0.5em; } @@ -198,7 +198,7 @@ header .kd-card .kd-name { padding: 1.3rem 1.3rem 0.7rem; } .kd-content a, .kd-content b { - color: #3e00ff; } + color: #6F3FF5; } .content-hover { position: absolute; @@ -229,7 +229,7 @@ header .kd-card .kd-name { color: white; } .bg-light-blue { - background-color: #3e00ff; + background-color: #6F3FF5; color: white; } .bg-cellarius { @@ -245,7 +245,7 @@ header .kd-card .kd-name { align-items: center; border-radius: .25rem; color: #fff; - background-color: #3e00ff; + background-color: #6F3FF5; font-size: 2em; } .cta-square:after { content: ' '; @@ -393,7 +393,7 @@ a:hover #shape-hexagon { color: #F9006C; grid-column: 2/5; } .hexagon-group .paging-animation:nth-child(3) { - color: #3E00FF; + color: #6F3FF5; grid-column: 1/4; } .hexagon-group .paging-animation:nth-child(4) { color: #0ECF7C; @@ -534,7 +534,7 @@ a.cellarius-partner:before { color: #4A4A4A; } .kudos-details__address { - color: #3E00FF; } + color: #6F3FF5; } .text-color_blue { color: #0D0764; } @@ -584,7 +584,7 @@ a.cellarius-partner:before { margin-top: -90px; display: none; position: relative; - background-color: #3e00ff; + background-color: #6F3FF5; border-radius: 10px; color: white; padding: 3px 10px; @@ -598,7 +598,7 @@ a.cellarius-partner:before { width: 0; height: 0; border: 20px solid transparent; - border-top-color: #3e00ff; + border-top-color: #6F3FF5; border-bottom: 0; border-left: 0; margin-left: -10px; @@ -676,20 +676,6 @@ a.cellarius-partner:before { top: -0.5em; left: 1em; } -.faq-item { - border-bottom: 1px solid #eee; - padding: 10px 15px; - transition: 0.1s ease-in-out; -} - -.faq-item > h5 { - font-weight: 600; -} - -.faq-item > h5:after { - color: #0D0764; -} - /* CK Enggagement */ body.ck{ background-image: url("/static/v2/images/ck.png") !important; diff --git a/app/assets/v2/scss/landing_page.scss b/app/assets/v2/scss/landing_page.scss index 718f43212aa..c9d2aedddb0 100644 --- a/app/assets/v2/scss/landing_page.scss +++ b/app/assets/v2/scss/landing_page.scss @@ -281,7 +281,7 @@ body.funder-page { } .contributors-cta { - background: #3E00FF; + background: #6F3FF5; } .contributors-cta__robot { diff --git a/app/assets/v2/scss/landingpage/core.scss b/app/assets/v2/scss/landingpage/core.scss index 3d85f71cc6b..e816736c423 100644 --- a/app/assets/v2/scss/landingpage/core.scss +++ b/app/assets/v2/scss/landingpage/core.scss @@ -2,7 +2,7 @@ --cosmicteal : #25E899; --darkcosmicteal: #0FCE7C; --stardustyellow: #FFCE08; - --polarisblue: #3E00FF; + --polarisblue: #6F3FF5; --vinuspurple: #8E2ABE; --regulusred: #F9006C; --milkywayblue : #15003E; diff --git a/app/assets/v2/scss/lib/bootstrap-overrides.scss b/app/assets/v2/scss/lib/bootstrap-overrides.scss new file mode 100644 index 00000000000..54ff0bbc890 --- /dev/null +++ b/app/assets/v2/scss/lib/bootstrap-overrides.scss @@ -0,0 +1,70 @@ +// Gitcoins shared variable set... +@import "../gc-variables"; + +// Bootstrap color overrides +$blue: $gc-violet-400; +$green: $gc-teal-400; +$pink: $gc-pink-400; +$yellow: $gc-yellow-400; +$primary: $blue; +$success: $gc-teal-500; +$danger: $gc-pink-500; +$secondary: $green; +$dark: $gc-purple; +$light: $gc-grey; + +$theme-colors: ( + "primary": $gc-violet-400, + "secondary": $secondary, + "success": $success, + "info": $info, + "warning": $warning, + "danger": $danger, + "light": $light, + "dark": $dark +); + +// Link color overrides +$link-color: $gc-violet-400; +$link-hover-color: $gc-violet-500; + +// Dropdown overrides +$dropdown-link-hover-color: $white; +$dropdown-link-hover-bg: $gc-violet-400; +$dropdown-link-active-color: $white; +$dropdown-link-active-bg: $gc-violet-500; + +// Nav-pills overrides +$nav-pills-link-active-color: $white; +$nav-pills-link-active-bg: $blue; + +// Font overrides +$font-family-base: 'Libre Franklin', sans-serif; +$headings-font-family: 'Miriam Libre', sans-serif; +$enable-responsive-font-sizes: true; +$font-size-base: 0.85rem; +$dropdown-font-size: 0.8rem; +$btn-font-size: 0.8rem; + +// Button overrides +$input-btn-focus-width: 0.1rem; + +$border-radius: 4px; +$border-radius-lg: 6px; +$border-radius-sm: 2px; + +$btn-font-size-lg: 1rem; +$btn-line-height-lg: 2; + +$btn-font-size-sm: 0.7rem; +$btn-line-height-sm: 2; + +$modal-backdrop-bg: $black; +$modal-backdrop-opacity: 0.7; + +$navbar-dark-toggler-icon-bg: unset; +$navbar-light-toggler-icon-bg: unset; + +// Custom-control overrides +$custom-control-indicator-checked-color: $gc-violet-400; +$custom-control-indicator-checked-border-color: $gc-violet-500; diff --git a/app/assets/v2/scss/lib/bootstrap-overwrites.scss b/app/assets/v2/scss/lib/bootstrap-overwrites.scss deleted file mode 100644 index e1672150f7b..00000000000 --- a/app/assets/v2/scss/lib/bootstrap-overwrites.scss +++ /dev/null @@ -1,18 +0,0 @@ -// Gitcoins shared variable set... -@import "../gc-variables"; - -$primary: $gc-violet-400; -$success: $gc-teal-500; -$danger: $gc-pink-500; - -$theme-colors: ( - "primary": $gc-violet-400, - "secondary": $secondary, - "success": $success, - "info": $info, - "warning": $warning, - "danger": $danger, - "light": $light, - "dark": $dark -); - diff --git a/app/assets/v2/scss/mission.scss b/app/assets/v2/scss/mission.scss index ccacbae6a22..5c4b1bd2fe5 100644 --- a/app/assets/v2/scss/mission.scss +++ b/app/assets/v2/scss/mission.scss @@ -29,7 +29,7 @@ background: linear-gradient(270deg, #74F7FF -11.02%, #FFFFFF 103.41%); } .card-text-container p { - color: #3E00FF; + color: #6F3FF5; } } @media (min-width: 374px) { @@ -250,7 +250,7 @@ } @media (min-width: 319px) and (max-width: 769px) { #we-value { - color: #3E00FF; + color: #6F3FF5; } } @media (min-width: 959px) { @@ -308,7 +308,7 @@ line-height: 20px; text-align: center; letter-spacing: 0.02em; - color: #3E00FF; + color: #6F3FF5; } } @media (min-width: 767px) { diff --git a/app/assets/v2/scss/products.scss b/app/assets/v2/scss/products.scss index 460199cc060..a295bdb925b 100644 --- a/app/assets/v2/scss/products.scss +++ b/app/assets/v2/scss/products.scss @@ -10,7 +10,7 @@ } .kudos{ - background-color: #3e00ff; + background-color: #6F3FF5; color: #ffffff; overflow-x:hidden; } @@ -42,7 +42,7 @@ margin: 0px 60px; } .Chat{ - background-color: #3E00FF; + background-color: #6F3FF5; color: #ffffff; } .Chat-logo{ @@ -112,7 +112,7 @@ font-size:20px; } } - + @media(min-width: 768px) and (max-width:1199px) { .intro-header{ font-size:52px; @@ -131,7 +131,7 @@ } .product-desc{ font-size:16px; - } + } } @media (min-width: 0px) and (max-width:767px) { @@ -152,7 +152,7 @@ } .product-desc{ font-size:16px; - } + } } .product-left{ @@ -180,7 +180,7 @@ color: #000000; } .button-bounties{ - background-color: #3e00ff; + background-color: #6F3FF5; color: #fff; } .button-quests{ diff --git a/app/assets/v2/scss/profile.scss b/app/assets/v2/scss/profile.scss index ce55c0d7fbe..56837b7e861 100644 --- a/app/assets/v2/scss/profile.scss +++ b/app/assets/v2/scss/profile.scss @@ -426,7 +426,7 @@ } .profile_details .works_with_list .plus-img { - color: #3E00FF; + color: #6F3FF5; width: 30px; height: 30px; display: inline-flex; @@ -466,7 +466,7 @@ } .no-profile-button { - background-color: #3E00FF; + background-color: #6F3FF5; color: #FFFFFF; font-size: 0.875rem; } diff --git a/app/assets/v2/scss/quests.scss b/app/assets/v2/scss/quests.scss index 7ba74aaa18a..ec834c3dba1 100644 --- a/app/assets/v2/scss/quests.scss +++ b/app/assets/v2/scss/quests.scss @@ -1,6 +1,6 @@ /* table properties */ -.table td, +.table td, .table th { padding: 4px; border: none; @@ -201,7 +201,7 @@ } .referrals a { - color: #3E00FF; + color: #6F3FF5; font-size: 14px; } @@ -602,7 +602,7 @@ body.quest_battle .bottom_notification { .button { font-weight: bold; color: white; - background-color: #3E00FF; + background-color: #6F3FF5; border: 2px solid white; padding: 20px; } @@ -1086,7 +1086,7 @@ body.green.quest_battle { } #desc li.selected { - background-color: #3E00FF; + background-color: #6F3FF5; } body.back1 #desc li:hover, @@ -1413,11 +1413,11 @@ body.green .tl { } - .table td, + .table td, .table th { padding: 0.55rem; border: none; - position: relative; + position: relative; } body.quest_battle { @@ -1497,7 +1497,7 @@ body.green .tl { border: none; } - .table td, + .table td, .table th { padding: 0.25rem; } diff --git a/app/assets/v2/scss/quickstart.scss b/app/assets/v2/scss/quickstart.scss index 716eac382dd..e58ba16f250 100644 --- a/app/assets/v2/scss/quickstart.scss +++ b/app/assets/v2/scss/quickstart.scss @@ -36,7 +36,7 @@ } .steps-container a { - color: #3e00ff; + color: #6F3FF5; } .steps-list { diff --git a/app/assets/v2/scss/retail/plans.scss b/app/assets/v2/scss/retail/plans.scss index b3e51e3caad..9850b04e410 100644 --- a/app/assets/v2/scss/retail/plans.scss +++ b/app/assets/v2/scss/retail/plans.scss @@ -48,12 +48,6 @@ color: #cacaca; } -.plan-button .button--full { - color: #fff !important; - padding: .75rem 1.5rem; - font-weight: 600; -} - .ribbon { height: 100px; width: 125px; @@ -66,7 +60,7 @@ display: block; width: 201px; padding: 3px 0; - background-color: #3E00FF; + background-color: #6F3FF5; color: #fff; text-shadow: 0 1px 1px rgba(0,0,0,.2); text-align: center; @@ -87,4 +81,4 @@ .plan-info { text-align: center !important; } -} \ No newline at end of file +} diff --git a/app/assets/v2/scss/retail/tribes_landing.scss b/app/assets/v2/scss/retail/tribes_landing.scss index 8070acd2a0e..dbcf2e7972e 100644 --- a/app/assets/v2/scss/retail/tribes_landing.scss +++ b/app/assets/v2/scss/retail/tribes_landing.scss @@ -68,12 +68,12 @@ } .testimonial-section .testimonial-box { - border: 3px solid #3E00FF; + border: 3px solid #6F3FF5; border-radius: 5px; } .testimonial-section .testimonial-box .img-container { - border: 2px solid #3E00FF; + border: 2px solid #6F3FF5; height: 5rem; width: 5rem; top: -7px; @@ -142,4 +142,4 @@ .newsletter { border-top: none !important; -} \ No newline at end of file +} diff --git a/app/assets/v2/scss/scroll-carousel.scss b/app/assets/v2/scss/scroll-carousel.scss index d999e0d3afc..cc01e1eddf9 100644 --- a/app/assets/v2/scss/scroll-carousel.scss +++ b/app/assets/v2/scss/scroll-carousel.scss @@ -28,8 +28,8 @@ .scroll-carousel__item:hover, .scroll-carousel__item.selected { - border-color: #3e00ff; - box-shadow: inset 0 0 0px 2px #3e00ff; + border-color: #6F3FF5; + box-shadow: inset 0 0 0px 2px #6F3FF5; } .scroll-carousel__btn { diff --git a/app/assets/v2/scss/search.scss b/app/assets/v2/scss/search.scss index 8f63608fb5d..03fe776f7a2 100644 --- a/app/assets/v2/scss/search.scss +++ b/app/assets/v2/scss/search.scss @@ -17,8 +17,8 @@ } .gc-search-nav.nav-tabs .nav-line.active { - color: #3E00FF !important; - border-color: #3E00FF; + color: #6F3FF5 !important; + border-color: #6F3FF5; } .gc-search-box.dropdown-menu { diff --git a/app/assets/v2/scss/search_bar.scss b/app/assets/v2/scss/search_bar.scss index 9c05413c7e9..1484b3f4088 100644 --- a/app/assets/v2/scss/search_bar.scss +++ b/app/assets/v2/scss/search_bar.scss @@ -37,7 +37,7 @@ .filter-tag { margin: 2px; text-transform: lowercase; - background-color: #3E00FF; + background-color: #6F3FF5; color: white !important; border-radius: 2px; font-size: 12px; diff --git a/app/assets/v2/scss/select2-kudos.scss b/app/assets/v2/scss/select2-kudos.scss index 4340a144bdd..8752bfe1f61 100644 --- a/app/assets/v2/scss/select2-kudos.scss +++ b/app/assets/v2/scss/select2-kudos.scss @@ -5,7 +5,7 @@ } .select2 { - width: 100%; + width: 100%!important; } .select2-container--kudos { @@ -64,7 +64,7 @@ .select2-container--open .select2-dropdown.select2-dropdown--below { top: -3px; - left: -1px; + // left: -1px; } .select2-container--open .select2-dropdown.select2-dropdown--above { diff --git a/app/assets/v2/scss/sidebar_search.scss b/app/assets/v2/scss/sidebar_search.scss index 9c19da53cf6..4ff7c8cd6c9 100644 --- a/app/assets/v2/scss/sidebar_search.scss +++ b/app/assets/v2/scss/sidebar_search.scss @@ -60,11 +60,11 @@ .sidebar_search #clear { margin-top: 2px; - color: #3E00FF; + color: #6F3FF5; } #new_search { - color: #3E00FF; + color: #6F3FF5; position: absolute; right: 10px; top: 11px; diff --git a/app/assets/v2/scss/submit_bounty.scss b/app/assets/v2/scss/submit_bounty.scss index 15b6fa6e835..985897ecb5c 100644 --- a/app/assets/v2/scss/submit_bounty.scss +++ b/app/assets/v2/scss/submit_bounty.scss @@ -172,7 +172,7 @@ input:read-only { } .fee-circle p { - color: #3E00FF; + color: #6F3FF5; } @media (max-width: 767.98px) { diff --git a/app/assets/v2/scss/test1.scss b/app/assets/v2/scss/test1.scss deleted file mode 100644 index 2d18707d312..00000000000 --- a/app/assets/v2/scss/test1.scss +++ /dev/null @@ -1,3 +0,0 @@ -$bg-color: rgb(49, 230, 49); - -@import './test2.scss'; diff --git a/app/assets/v2/scss/test2.scss b/app/assets/v2/scss/test2.scss deleted file mode 100644 index 46eafbf5885..00000000000 --- a/app/assets/v2/scss/test2.scss +++ /dev/null @@ -1,7 +0,0 @@ -body { - background: $bg-color; - & > div:after { - font-weight: bold; - content: "working" - } -} diff --git a/app/assets/v2/scss/town_square.scss b/app/assets/v2/scss/town_square.scss index 1e3f42034a2..e2c2f2f255c 100644 --- a/app/assets/v2/scss/town_square.scss +++ b/app/assets/v2/scss/town_square.scss @@ -179,13 +179,13 @@ body { } .daily #circle{ - background-image:radial-gradient(#6E00FF, #3E00FF 30%); + background-image:radial-gradient(#6E00FF, #6F3FF5 30%); } .daily .speech_label{ - background-color: #3E00FF; + background-color: #6F3FF5; } .daily .speech_label:after{ - border-bottom-color: #3E00FF; + border-bottom-color: #6F3FF5; } .daily #ribbon:before, .daily #giftbox:after, @@ -251,7 +251,7 @@ body { background-color:#8E2ABE; } .weekly #circle:after{ - border:7px dashed #3E00FF; + border:7px dashed #6F3FF5; } .monthly #circle{ background-image:radial-gradient(#0fde9c, #0fce7c 30%); @@ -275,7 +275,7 @@ body { background-image:radial-gradient(#FFCEd8, #FFCE08 70%); } .daily #circle:hover{ - background-image:radial-gradient(#6E00FF, #3E00FF 70%); + background-image:radial-gradient(#6E00FF, #6F3FF5 70%); } .monthly #circle:hover{ background-image:radial-gradient(#0fde9c, #0fce7c 70%); @@ -938,6 +938,7 @@ body.green.offer_view .announce { background-color: var(--badge-blue-bg); color: var(--badge-blue-text); border: 1px solid transparent; + min-height: auto; } #status .btn-group-toggle .btn-radio.active { @@ -976,7 +977,7 @@ body.green.offer_view .announce { .filter-tag { margin: 2px; text-transform: lowercase; - background-color: #3E00FF; + background-color: #6F3FF5; color: white !important; border-radius: 2px; font-size: 12px; diff --git a/app/assets/v2/scss/users.scss b/app/assets/v2/scss/users.scss index bd80806fdd9..07b7d9f928e 100644 --- a/app/assets/v2/scss/users.scss +++ b/app/assets/v2/scss/users.scss @@ -116,8 +116,3 @@ background: #0C023B; } -.btn-search { - background: white; - border-left: 0; - color: #3E00FF; -} diff --git a/app/assets/v2/scss/vision.scss b/app/assets/v2/scss/vision.scss index c61bea0dfa8..a0262277e71 100644 --- a/app/assets/v2/scss/vision.scss +++ b/app/assets/v2/scss/vision.scss @@ -1,6 +1,6 @@ :root { --tl-color: white; - --tl-bg: #3E00FF; + --tl-bg: #6F3FF5; --tl-date-color: var(--gc-green-hover); } @@ -56,7 +56,7 @@ .tl-event b { font-size: 1.8rem; - font-weight: 800; + font-weight: 800; margin-bottom: 1rem; display: block; } diff --git a/app/assets/v2/scss/vue-loader.scss b/app/assets/v2/scss/vue-loader.scss index 830558cae03..d5bd386dfdc 100644 --- a/app/assets/v2/scss/vue-loader.scss +++ b/app/assets/v2/scss/vue-loader.scss @@ -69,7 +69,7 @@ width: calc(65px / 3); top: calc(65px / 3); left: calc(65px / 3); - background-color: #3E00FF; + background-color: #6F3FF5; animation: rhombus-spinner-animation-child-big 2s infinite; animation-duration: 2000ms; animation-delay: 0.5s; diff --git a/app/avatar/templates/wallpaper/lines.txt b/app/avatar/templates/wallpaper/lines.txt index c595e0baed0..4a6c5edf882 100644 --- a/app/avatar/templates/wallpaper/lines.txt +++ b/app/avatar/templates/wallpaper/lines.txt @@ -27,4 +27,4 @@ - \ No newline at end of file + diff --git a/app/avatar/templates/wallpaper/sunburst.txt b/app/avatar/templates/wallpaper/sunburst.txt index ee4db356c70..39fb9155f17 100644 --- a/app/avatar/templates/wallpaper/sunburst.txt +++ b/app/avatar/templates/wallpaper/sunburst.txt @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/app/dashboard/templates/board/funder.html b/app/dashboard/templates/board/funder.html index f591ed312ec..2293546c05d 100644 --- a/app/dashboard/templates/board/funder.html +++ b/app/dashboard/templates/board/funder.html @@ -78,7 +78,7 @@
- +
Feature Bounty Invite Contributors @@ -174,7 +174,7 @@

- +
Feature Bounty Invite Contributors @@ -264,7 +264,7 @@

- +
    diff --git a/app/dashboard/templates/bounty/details2.html b/app/dashboard/templates/bounty/details2.html index 27a46a2cd8b..b59a4aaa3d9 100644 --- a/app/dashboard/templates/bounty/details2.html +++ b/app/dashboard/templates/bounty/details2.html @@ -404,7 +404,7 @@
    {% trans "SUBMISSIONS" %}
    [[ bounty.token_name ]]

    -
- - @@ -800,7 +800,7 @@
{% trans "SUBMISSIONS" %}

- +

- + Issue Explorer - Freelance Code Bounties

@@ -416,7 +416,7 @@

nothing found

No users found

- +
diff --git a/app/dashboard/templates/dashboard/hackathon/index.html b/app/dashboard/templates/dashboard/hackathon/index.html index c560efd95f1..7f4dab2881c 100644 --- a/app/dashboard/templates/dashboard/hackathon/index.html +++ b/app/dashboard/templates/dashboard/hackathon/index.html @@ -38,7 +38,7 @@
{% if register_link %} - {% endif %} @@ -118,7 +118,7 @@

{{ section.title }}

{% if section.register_link %}
{% if register_link %} - {% endif %} diff --git a/app/dashboard/templates/dashboard/hackathon/new_bounty.html b/app/dashboard/templates/dashboard/hackathon/new_bounty.html index d09363bff44..f65921efc95 100644 --- a/app/dashboard/templates/dashboard/hackathon/new_bounty.html +++ b/app/dashboard/templates/dashboard/hackathon/new_bounty.html @@ -57,20 +57,6 @@ box-shadow: 0 0 4px 0 #d2d2d2; } - .vs__dropdown-toggle { - padding: 5px 5px 5px 5px; - border-radius: 2px; - } - - .chain-btn { - min-height: 64px; - } - - .chain-btn:hover { - background-color: #f9f9f9; - border-color: #3E00FF; - } - .issue_description { color: #000000; font-size: 14px; @@ -134,7 +120,7 @@ {% endif %}
- +
@@ -149,12 +135,12 @@

Fund Prize

Fund your GitHub issue and work with talented developers!

-

Pick the chain you are funding the bounty with

+

Pick the chain you are funding the bounty with

-
+