diff --git a/app/app/settings.py b/app/app/settings.py index 6cb712a980e..edaf8a62b6b 100644 --- a/app/app/settings.py +++ b/app/app/settings.py @@ -91,6 +91,7 @@ 'django.contrib.messages', 'collectfast', # Collectfast | static file collector 'django.contrib.staticfiles', + 'livereload', 'cacheops', 'storages', 'social_django', diff --git a/app/app/templates/search/search.html b/app/app/templates/search/search.html index eabc9a83fea..80510a95e66 100644 --- a/app/app/templates/search/search.html +++ b/app/app/templates/search/search.html @@ -30,133 +30,135 @@ - {% include 'shared/tag_manager_2.html' %} -
- {% include 'shared/top_nav.html' with class='d-md-flex' %} - {% include 'home/nav.html' %} -
- {% block content %} -

Search

- -
- - {{ form.as_table }} - - - - -
  - -
- - {% if query %} -

Results

- - {% for result in page.object_list %} -

- {{ result.object.title }} -

- {% empty %} -

No results found.

- {% endfor %} - - {% if page.has_previous or page.has_next %} -
- {% if page.has_previous %}{% endif %}« Previous{% if page.has_previous %}{% endif %} - | - {% if page.has_next %}{% endif %}Next »{% if page.has_next %}{% endif %} -
- {% endif %} - {% else %} - {# Show some example queries to run, maybe query syntax, something else? #} - {% endif %} -
- {% endblock %} -
- -
-

Hacky User Directory

- -
- -
- - - - - - - -
- -
-
+
+ {% include 'shared/tag_manager_2.html' %} +
+ {% include 'shared/top_nav.html' with class='d-md-flex' %} + {% include 'home/nav.html' %} +
+ {% block content %} +

Search

+ +
+ + {{ form.as_table }} + + + + +
  + +
+ + {% if query %} +

Results

+ + {% for result in page.object_list %} +

+ {{ result.object.title }} +

+ {% empty %} +

No results found.

+ {% endfor %} + + {% if page.has_previous or page.has_next %}
- - - + {% if page.has_previous %}{% endif %}« Previous{% if page.has_previous %}{% endif %} + | + {% if page.has_next %}{% endif %}Next »{% if page.has_next %}{% endif %}
+ {% endif %} + {% else %} + {# Show some example queries to run, maybe query syntax, something else? #} + {% endif %} +
+ {% endblock %} +
+ +
+

Hacky User Directory

+ +
+ +
+ + + + + + +
-
-
- - - - - - - - - -
- - + +
+
+
+ + + +
+
+
+
+ + + + + + + + + +
+ + +
+ + + + +
- - - - -
-
-
+
+
+ + + + {% csrf_token %} + {% include 'shared/analytics.html' %} + {% include 'shared/footer_scripts.html' with slim=1 %} + {% include 'shared/footer.html' %} - - - - {% csrf_token %} - {% include 'shared/analytics.html' %} - {% include 'shared/footer_scripts.html' with slim=1 %} - {% include 'shared/footer.html' %} diff --git a/app/app/templates/shared/hackathon-list.html b/app/app/templates/shared/hackathon-list.html index 7d67b67dcc9..62a713da822 100644 --- a/app/app/templates/shared/hackathon-list.html +++ b/app/app/templates/shared/hackathon-list.html @@ -52,26 +52,26 @@
{% if event.end_date|timesince_fromisoformat <= "1 min" %} - + Join {% endif %} {% if event.display_showcase %} - + Showcase {% endif %} {% if event.start_date|timesince_fromisoformat >= "1 min" and event.end_date|timesince_fromisoformat <= "1 min"%} - + Prizes {% endif %} {% if event.show_results %} - + Projects diff --git a/app/app/wsgi.py b/app/app/wsgi.py index ee1f18de131..3d00918ff75 100644 --- a/app/app/wsgi.py +++ b/app/app/wsgi.py @@ -27,4 +27,5 @@ from raven.contrib.django.raven_compat.middleware.wsgi import Sentry application = Sentry(get_wsgi_application()) else: - application = get_wsgi_application() + from dj_static import Cling + application = Cling(get_wsgi_application()) diff --git a/app/assets/onepager/css/main.css b/app/assets/onepager/css/main.css index f8dc6719dc4..7c16a5273d8 100644 --- a/app/assets/onepager/css/main.css +++ b/app/assets/onepager/css/main.css @@ -553,7 +553,7 @@ body #main a.no-pink:hover { color: var(--gc-blue-hover); } -body #main a.no-pink.btn-gc-blue { +body #main a.no-pink.btn-primary { color: #ffffff; } diff --git a/app/assets/v2/fonts/futura/FuturaStd-Medium.otf b/app/assets/v2/fonts/futura/FuturaStd-Medium.otf deleted file mode 100644 index 2efba0f8095..00000000000 Binary files a/app/assets/v2/fonts/futura/FuturaStd-Medium.otf and /dev/null differ diff --git a/app/assets/v2/fonts/futura/font1.ttf b/app/assets/v2/fonts/futura/font1.ttf deleted file mode 100644 index ebfa6cc15bc..00000000000 Binary files a/app/assets/v2/fonts/futura/font1.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/futura/font2.ttf b/app/assets/v2/fonts/futura/font2.ttf deleted file mode 100644 index e50fff4e81c..00000000000 Binary files a/app/assets/v2/fonts/futura/font2.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/futura/font3.ttf b/app/assets/v2/fonts/futura/font3.ttf deleted file mode 100644 index 2fb17aaf7f8..00000000000 Binary files a/app/assets/v2/fonts/futura/font3.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/futura/font4.ttf b/app/assets/v2/fonts/futura/font4.ttf deleted file mode 100644 index f21c0389b5b..00000000000 Binary files a/app/assets/v2/fonts/futura/font4.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/futura/font5.ttf b/app/assets/v2/fonts/futura/font5.ttf deleted file mode 100644 index b4da4252d8a..00000000000 Binary files a/app/assets/v2/fonts/futura/font5.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/futura/font6.ttf b/app/assets/v2/fonts/futura/font6.ttf deleted file mode 100644 index f2bfa930c7f..00000000000 Binary files a/app/assets/v2/fonts/futura/font6.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/futura/font7.ttf b/app/assets/v2/fonts/futura/font7.ttf deleted file mode 100644 index 4a9eea80ae8..00000000000 Binary files a/app/assets/v2/fonts/futura/font7.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/libre-franklin/LibreFranklin-Italic-VariableFont_wght.ttf b/app/assets/v2/fonts/libre-franklin/LibreFranklin-Italic-VariableFont_wght.ttf new file mode 100644 index 00000000000..9058abc37e2 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/LibreFranklin-Italic-VariableFont_wght.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/LibreFranklin-VariableFont_wght.ttf b/app/assets/v2/fonts/libre-franklin/LibreFranklin-VariableFont_wght.ttf new file mode 100644 index 00000000000..c1d1e31c57c Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/LibreFranklin-VariableFont_wght.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.eot b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.eot new file mode 100644 index 00000000000..913f80af44a Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.eot differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.svg b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.svg new file mode 100644 index 00000000000..2a94966e813 --- /dev/null +++ b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.svg @@ -0,0 +1,439 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.ttf b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.ttf new file mode 100644 index 00000000000..26381c69d0b Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.woff b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.woff new file mode 100644 index 00000000000..b6897ee1318 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.woff differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.woff2 b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.woff2 new file mode 100644 index 00000000000..24c41e38cd5 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.woff2 differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.eot b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.eot new file mode 100644 index 00000000000..639f918c5c0 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.eot differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.svg b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.svg new file mode 100644 index 00000000000..1cdc44b6ef9 --- /dev/null +++ b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.svg @@ -0,0 +1,480 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.ttf b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.ttf new file mode 100644 index 00000000000..2525960d67b Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.woff b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.woff new file mode 100644 index 00000000000..cefd32e1642 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.woff differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.woff2 b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.woff2 new file mode 100644 index 00000000000..7869371204f Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.woff2 differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.eot b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.eot new file mode 100644 index 00000000000..fe2519fbe00 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.eot differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.svg b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.svg new file mode 100644 index 00000000000..585b7308b8b --- /dev/null +++ b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.svg @@ -0,0 +1,440 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.ttf b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.ttf new file mode 100644 index 00000000000..67c083877f2 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.woff b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.woff new file mode 100644 index 00000000000..7a15674aa03 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.woff differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.woff2 b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.woff2 new file mode 100644 index 00000000000..5dbc25977a0 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.woff2 differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.eot b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.eot new file mode 100644 index 00000000000..5340dc4fee7 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.eot differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.svg b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.svg new file mode 100644 index 00000000000..7913db9d2ea --- /dev/null +++ b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.svg @@ -0,0 +1,485 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.ttf b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.ttf new file mode 100644 index 00000000000..97524971ba2 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.woff b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.woff new file mode 100644 index 00000000000..14ae3c37f25 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.woff differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.woff2 b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.woff2 new file mode 100644 index 00000000000..8efe240c6c8 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.woff2 differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.eot b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.eot new file mode 100644 index 00000000000..097cbcf58ca Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.eot differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.svg b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.svg new file mode 100644 index 00000000000..62cb26472aa --- /dev/null +++ b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.svg @@ -0,0 +1,438 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.ttf b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.ttf new file mode 100644 index 00000000000..85b34ade0c7 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.woff b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.woff new file mode 100644 index 00000000000..19484e94ab9 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.woff differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.woff2 b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.woff2 new file mode 100644 index 00000000000..693e0fe811e Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.woff2 differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.eot b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.eot new file mode 100644 index 00000000000..8f879e7a216 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.eot differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.svg b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.svg new file mode 100644 index 00000000000..c30170a32e0 --- /dev/null +++ b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.svg @@ -0,0 +1,486 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.ttf b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.ttf new file mode 100644 index 00000000000..dcee6ca115f Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.woff b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.woff new file mode 100644 index 00000000000..e0cccac3083 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.woff differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.woff2 b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.woff2 new file mode 100644 index 00000000000..85ec8d414d5 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.woff2 differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.eot b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.eot new file mode 100644 index 00000000000..5b65ef63d83 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.eot differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.svg b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.svg new file mode 100644 index 00000000000..557869fe238 --- /dev/null +++ b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.svg @@ -0,0 +1,482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.ttf b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.ttf new file mode 100644 index 00000000000..f00d58b3b96 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.woff b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.woff new file mode 100644 index 00000000000..0a152b53a2d Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.woff differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.woff2 b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.woff2 new file mode 100644 index 00000000000..956313d0624 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.woff2 differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.eot b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.eot new file mode 100644 index 00000000000..42859ea9a95 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.eot differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.svg b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.svg new file mode 100644 index 00000000000..553728f7de1 --- /dev/null +++ b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.svg @@ -0,0 +1,438 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.ttf b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.ttf new file mode 100644 index 00000000000..d63ff0077e3 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.ttf differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.woff b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.woff new file mode 100644 index 00000000000..f4eeeb70097 Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.woff differ diff --git a/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.woff2 b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.woff2 new file mode 100644 index 00000000000..2a17813b74d Binary files /dev/null and b/app/assets/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.woff2 differ diff --git a/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.eot b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.eot new file mode 100644 index 00000000000..6571f7966ad Binary files /dev/null and b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.eot differ diff --git a/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.svg b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.svg new file mode 100644 index 00000000000..2e3878944ac --- /dev/null +++ b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.svg @@ -0,0 +1,454 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.ttf b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.ttf new file mode 100644 index 00000000000..3b4096cb0e9 Binary files /dev/null and b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.ttf differ diff --git a/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.woff b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.woff new file mode 100644 index 00000000000..d5c58ac3416 Binary files /dev/null and b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.woff differ diff --git a/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.woff2 b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.woff2 new file mode 100644 index 00000000000..c5c9de801af Binary files /dev/null and b/app/assets/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.woff2 differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-200.eot b/app/assets/v2/fonts/muli/muli-v12-latin-200.eot deleted file mode 100644 index 8c1335c5833..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-200.eot and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-200.svg b/app/assets/v2/fonts/muli/muli-v12-latin-200.svg deleted file mode 100644 index de110a3d8ee..00000000000 --- a/app/assets/v2/fonts/muli/muli-v12-latin-200.svg +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-200.ttf b/app/assets/v2/fonts/muli/muli-v12-latin-200.ttf deleted file mode 100644 index baf81f3f9f9..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-200.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-200.woff b/app/assets/v2/fonts/muli/muli-v12-latin-200.woff deleted file mode 100644 index b1abdda87d5..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-200.woff and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-200.woff2 b/app/assets/v2/fonts/muli/muli-v12-latin-200.woff2 deleted file mode 100644 index 12c58e9647e..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-200.woff2 and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-600.eot b/app/assets/v2/fonts/muli/muli-v12-latin-600.eot deleted file mode 100644 index 5ce0d8f04d4..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-600.eot and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-600.svg b/app/assets/v2/fonts/muli/muli-v12-latin-600.svg deleted file mode 100644 index 77d31a12e46..00000000000 --- a/app/assets/v2/fonts/muli/muli-v12-latin-600.svg +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-600.ttf b/app/assets/v2/fonts/muli/muli-v12-latin-600.ttf deleted file mode 100644 index e3fa78d637b..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-600.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-600.woff b/app/assets/v2/fonts/muli/muli-v12-latin-600.woff deleted file mode 100644 index 82534d6795d..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-600.woff and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-600.woff2 b/app/assets/v2/fonts/muli/muli-v12-latin-600.woff2 deleted file mode 100644 index 797ce473d9d..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-600.woff2 and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-700.eot b/app/assets/v2/fonts/muli/muli-v12-latin-700.eot deleted file mode 100644 index d49849317c9..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-700.eot and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-700.svg b/app/assets/v2/fonts/muli/muli-v12-latin-700.svg deleted file mode 100644 index 32bac76a2a4..00000000000 --- a/app/assets/v2/fonts/muli/muli-v12-latin-700.svg +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-700.ttf b/app/assets/v2/fonts/muli/muli-v12-latin-700.ttf deleted file mode 100644 index b3ec4d97760..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-700.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-700.woff b/app/assets/v2/fonts/muli/muli-v12-latin-700.woff deleted file mode 100644 index 46bf34a8e1e..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-700.woff and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-700.woff2 b/app/assets/v2/fonts/muli/muli-v12-latin-700.woff2 deleted file mode 100644 index feba72d965a..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-700.woff2 and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-regular.eot b/app/assets/v2/fonts/muli/muli-v12-latin-regular.eot deleted file mode 100644 index fe3eb74c3c2..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-regular.eot and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-regular.svg b/app/assets/v2/fonts/muli/muli-v12-latin-regular.svg deleted file mode 100644 index 384c0cc0ea3..00000000000 --- a/app/assets/v2/fonts/muli/muli-v12-latin-regular.svg +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-regular.ttf b/app/assets/v2/fonts/muli/muli-v12-latin-regular.ttf deleted file mode 100644 index 0753befd327..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-regular.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-regular.woff b/app/assets/v2/fonts/muli/muli-v12-latin-regular.woff deleted file mode 100644 index 798ef0cb2a0..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-regular.woff and /dev/null differ diff --git a/app/assets/v2/fonts/muli/muli-v12-latin-regular.woff2 b/app/assets/v2/fonts/muli/muli-v12-latin-regular.woff2 deleted file mode 100644 index f81ba6ba827..00000000000 Binary files a/app/assets/v2/fonts/muli/muli-v12-latin-regular.woff2 and /dev/null differ diff --git a/app/assets/v2/images/helmet-purple-animated.svg b/app/assets/v2/images/helmet-purple-animated.svg new file mode 100644 index 00000000000..cbffd440a06 --- /dev/null +++ b/app/assets/v2/images/helmet-purple-animated.svg @@ -0,0 +1,73 @@ + + + + + helmet-purple-animated + Created with Sketch. + + + + + + + + + + diff --git a/app/assets/v2/images/new-logos/gc-h-pos.svg b/app/assets/v2/images/new-logos/gc-h-pos.svg new file mode 100644 index 00000000000..d8e18154517 --- /dev/null +++ b/app/assets/v2/images/new-logos/gc-h-pos.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/app/assets/v2/images/top-bar/kernel-symbol-neg.svg b/app/assets/v2/images/top-bar/kernel-symbol-neg.svg new file mode 100644 index 00000000000..a84418fd310 --- /dev/null +++ b/app/assets/v2/images/top-bar/kernel-symbol-neg.svg @@ -0,0 +1,12 @@ + + + kernel + + + + + + + + + \ No newline at end of file diff --git a/app/assets/v2/js/activity.js b/app/assets/v2/js/activity.js index 5ef28091419..544bc063dfe 100644 --- a/app/assets/v2/js/activity.js +++ b/app/assets/v2/js/activity.js @@ -877,7 +877,7 @@ $(document).ready(function() {
- COMMENT + COMMENT `; @@ -1027,7 +1027,7 @@ $(document).ready(function() { let comment_id = $(this).data('pk'); let commentContainer = $(`.comment_row[data-id="${comment_id}"] .activity_comments_main_comment`); let content = commentContainer.html().replace(/
/g, '\n').trim(); - let editableContainer = $(`
CANCEL
`); + let editableContainer = $(`
CANCEL
`); $(`.comment_row[data-id="${comment_id}"] .comment_options`).prop('disabled', true).addClass('hidden'); $(`.comment_row[data-id="${comment_id}"]`).parent().closest('.box') diff --git a/app/assets/v2/js/base.js b/app/assets/v2/js/base.js index 60235021395..b8f9da15e80 100644 --- a/app/assets/v2/js/base.js +++ b/app/assets/v2/js/base.js @@ -128,25 +128,6 @@ $(document).ready(function() { Cookies.set('last_github_auth_mutation', timestamp); }); - - // preload hover image - var url = $('#logo').data('hover'); - - $.get(url, function() { - // … - }); - - $('#logo').mouseover(function(e) { - $(this).attr('old-src', $(this).attr('src')); - var new_src = $(this).data('hover'); - - $(this).attr('src', new_src); - e.preventDefault(); - }); - - $('#logo').mouseleave(function(e) { - $(this).attr('src', $(this).attr('old-src')); - }); if (!$.fn.collapse) { $('.navbar-toggler').on('click', function() { var toggle = $(this).attr('aria-expanded'); @@ -162,19 +143,21 @@ $(document).ready(function() { }); } + // control display of #top_nav_notification + var $top_nav_notif = $('#top_nav_notification'); var top_nav_salt = document.nav_salt; var remove_top_row = function() { - $('#top_nav_notification').parents('.row').remove(); + $top_nav_notif.parents('.row').remove(); localStorage['top_nav_notification_remove_' + top_nav_salt] = true; }; - - if (localStorage['top_nav_notification_remove_' + top_nav_salt]) { - remove_top_row(); - } - if (top_nav_salt == 0) { + + // 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(); + } else { + $top_nav_notif.parents('.row').removeClass('d-none'); } - $('#top_nav_notification').click(remove_top_row); + $top_nav_notif.click(remove_top_row); // pulse animation on click $('.pulseClick').on('click', (event) => { @@ -220,7 +203,7 @@ $(document).ready(function() { $(this).parents('.offer_container').addClass('animate').removeClass('empty'); $(this).removeAttr('data-time'); - // let btn = `View Action`; + // let btn = `View Action`; // return $(this).parent().next().html(btn); return $(this).parent().append('
Refresh to view offer!
'); } @@ -340,8 +323,8 @@ var show_persona_modal = function(e) {

${gettext('Let us know so we could optimize the
best experience for you!')}

- - + +
@@ -434,7 +417,7 @@ const gitcoinUpdates = () => { ${response.body}
- +
diff --git a/app/assets/v2/js/grants/_new.js b/app/assets/v2/js/grants/_new.js index 178772ff4f2..dbbd30ccb4f 100644 --- a/app/assets/v2/js/grants/_new.js +++ b/app/assets/v2/js/grants/_new.js @@ -26,7 +26,7 @@ Vue.mixin({ ${docArticle}
- +
diff --git a/app/assets/v2/js/onboard.js b/app/assets/v2/js/onboard.js index 7bde0669ba8..f69141ac8a6 100644 --- a/app/assets/v2/js/onboard.js +++ b/app/assets/v2/js/onboard.js @@ -224,7 +224,7 @@ if (document.getElementById('gc-onboard')) { `).join(' ') : ''}
- +
`; } diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js index b2f0ef9705b..0ea81eca1dd 100644 --- a/app/assets/v2/js/pages/bounty_details.js +++ b/app/assets/v2/js/pages/bounty_details.js @@ -1650,7 +1650,7 @@ const show_invite_users = () => {

- + Yes, invite to one of my bounties

@@ -1672,7 +1672,7 @@ const show_invite_users = () => { ${user}

- + Invite
`; diff --git a/app/assets/v2/js/pages/change_bounty.js b/app/assets/v2/js/pages/change_bounty.js index d9c7e6deb17..9c7474f6e64 100644 --- a/app/assets/v2/js/pages/change_bounty.js +++ b/app/assets/v2/js/pages/change_bounty.js @@ -7,7 +7,7 @@ let usersBySkills; let processedData; const populateFromAPI = bounty => { - if (bounty.is_featured) { + if (bounty && bounty.is_featured) { $('#featuredBounty').prop('checked', true); $('#featuredBounty').prop('disabled', true); } @@ -43,7 +43,7 @@ const populateFromAPI = bounty => { } }); - if (bounty.keywords) { + if (bounty && bounty.keywords) { let keywords = bounty['keywords'].split(','); @@ -218,7 +218,7 @@ $(document).ready(function() { $('#invite-contributors.js-select2').val(null).trigger('change'); }); - const reservedForHandle = bounty.reserved_for_user_handle ? bounty.reserved_for_user_handle : []; + const reservedForHandle = bounty && bounty.reserved_for_user_handle ? bounty.reserved_for_user_handle : []; userSearch('#reservedFor', false, '', reservedForHandle, true); @@ -295,7 +295,7 @@ $(document).ready(function() { formData['invite'] = inviteContributors; } - if (document.result.is_featured) { + if (document.result && document.result.is_featured) { formData['is_featured'] = true; } else if (formData['featuredBounty'] === '1') { formData['is_featured'] = true; diff --git a/app/assets/v2/js/pages/join_tribe.js b/app/assets/v2/js/pages/join_tribe.js index b97bf79d770..a0d74e8e1c7 100644 --- a/app/assets/v2/js/pages/join_tribe.js +++ b/app/assets/v2/js/pages/join_tribe.js @@ -119,7 +119,7 @@ const build_suggested_tribe = (tribe) => {
- @@ -170,16 +170,16 @@ $(document).on('click', '.remove-tribe', function(e) { const newManageTribe = () => { $('[data-tribe]').each(function(index, elem) { $(elem).on('mouseenter focus', function(e) { - if ($(elem).hasClass('btn-outline-gc-green')) { - $(elem).addClass('btn-gc-outline-red').text('Unfollow'); - $(elem).removeClass('btn-outline-gc-green'); + if ($(elem).hasClass('btn-outline-secondary')) { + $(elem).addClass('btn-outline-danger').text('Unfollow'); + $(elem).removeClass('btn-outline-secondary'); } }); $(elem).on('mouseleave focusout', function(e) { - if ($(elem).hasClass('btn-gc-outline-red')) { - $(elem).removeClass('btn-gc-outline-red'); - $(elem).addClass('btn-outline-gc-green').text('Following'); + if ($(elem).hasClass('btn-outline-danger')) { + $(elem).removeClass('btn-outline-danger'); + $(elem).addClass('btn-outline-secondary').text('Following'); } }); @@ -198,9 +198,9 @@ const newManageTribe = () => { $(elem).attr('disabled', false); $(elem).attr('member', response.is_member); if (response.is_member) { - $(elem).addClass('btn-outline-gc-green').removeClass([ 'btn-gc-blue', 'btn-gc-outline-red' ]).text('Following'); + $(elem).addClass('btn-outline-secondary').removeClass([ 'btn-primary', 'btn-outline-danger' ]).text('Following'); } else { - $(elem).removeClass([ 'btn-outline-gc-green', 'btn-gc-outline-red' ]).addClass('btn-gc-blue').text('Follow'); + $(elem).removeClass([ 'btn-outline-secondary', 'btn-outline-danger' ]).addClass('btn-primary').text('Follow'); } }, function(error) { $(elem).attr('disabled', false); diff --git a/app/assets/v2/js/pages/kudos_bulk_receive.js b/app/assets/v2/js/pages/kudos_bulk_receive.js index c11deb0b2f9..974bc2f305f 100644 --- a/app/assets/v2/js/pages/kudos_bulk_receive.js +++ b/app/assets/v2/js/pages/kudos_bulk_receive.js @@ -57,7 +57,7 @@ $(document).ready(function() { setTimeout(function() { $('label[for=pay_gas]').fadeOut(); $('#free_countdown').remove(); - $('.btn-gc-purple').removeAttr('disabled'); + $('.btn-dark').removeAttr('disabled'); }, 1000); }, 1000); }, 1000); @@ -72,7 +72,7 @@ $(document).ready(function() { setTimeout(function() { $('#free_countdown').remove(); - $('.btn-gc-purple').removeAttr('disabled'); + $('.btn-dark').removeAttr('disabled'); var gasLabel = $('label[for=pay_gas]')[0].innerText; $('label[for=pay_gas]')[0].innerText = $('label[for=pay_gas]')[0].innerText.substring(0, gasLabel.length - 28) + '(Optional, but recommended)'; diff --git a/app/assets/v2/js/pages/new_bounty.js b/app/assets/v2/js/pages/new_bounty.js index e7e6265bbd3..e910e604cc6 100644 --- a/app/assets/v2/js/pages/new_bounty.js +++ b/app/assets/v2/js/pages/new_bounty.js @@ -262,14 +262,17 @@ Vue.mixin({ .then(function(response) { return response.text(); }).then(function(html) { - let parser = new DOMParser(); - let doc = parser.parseFromString(html, 'text/html'); + const parser = new DOMParser(); + const doc = parser.parseFromString(html, 'text/html'); + const guide = doc.querySelector('.btn-closeguide'); doc.querySelector('.show_video').href = 'https://www.youtube.com/watch?v=m1X0bDpVcf4'; doc.querySelector('.show_video').target = '_blank'; - doc.querySelector('.btn-closeguide').dataset.dismiss = 'modal'; - let docArticle = doc.querySelector('.content').innerHTML; + if (guide && guide.dataset) + guide.dataset.dismiss = 'modal'; + + const docArticle = doc.querySelector('.content').innerHTML; const content = $.parseHTML( `
diff --git a/app/assets/v2/js/pages/onboard.js b/app/assets/v2/js/pages/onboard.js index a78bee7e1a9..d719004bdfc 100644 --- a/app/assets/v2/js/pages/onboard.js +++ b/app/assets/v2/js/pages/onboard.js @@ -68,7 +68,7 @@ onboard.watchMetamask = function() { } else if (typeof web3 == 'undefined') { $('.step #metamask').html(`
- + ` + gettext('Install Metamask') + ` @@ -77,7 +77,7 @@ onboard.watchMetamask = function() { } else if (!web3.eth.getCoinbase) { $('.step #metamask').html(`
- + ` + gettext('Unlock Metamask') + ` diff --git a/app/assets/v2/js/pages/profile-trust.js b/app/assets/v2/js/pages/profile-trust.js index 674d021f276..69947f6f0ca 100644 --- a/app/assets/v2/js/pages/profile-trust.js +++ b/app/assets/v2/js/pages/profile-trust.js @@ -39,7 +39,7 @@ Vue.component('sms-verify-modal', {

read more about why we are asking for your phone number or how Gitcoin preserves your privacy.

- Verify + Verify Phone Number
@@ -71,7 +71,7 @@ Vue.component('sms-verify-modal', {
[[ errorMessage ]]
- Send verification + Send verification code
Cancel @@ -90,7 +90,7 @@ Vue.component('sms-verify-modal', {
[[ errorMessage ]]
- Submit + Submit
Change number Resend Code @@ -246,7 +246,7 @@ Vue.component('twitter-verify-modal', { [[tweetText]]

- + Send Tweet
@@ -267,7 +267,7 @@ Vue.component('twitter-verify-modal', {
[[validationError]]
- + Validate @@ -278,7 +278,7 @@ Vue.component('twitter-verify-modal', {
Your Twitter verification was successful. Thank you for helping make Gitcoin more sybil resistant! - Done + Done
@@ -385,7 +385,7 @@ Vue.component('poap-verify-modal', {

- + Pull from Wallet
@@ -400,7 +400,7 @@ Vue.component('poap-verify-modal', {
[[validationError]]
- + Validate @@ -415,7 +415,7 @@ Vue.component('poap-verify-modal', {
Your POAP verification was successful. Thank you for helping make Gitcoin more sybil resistant! - Done + Done
@@ -592,7 +592,7 @@ Vue.component('brightid-verify-modal', {

- Done Connecting + Done Connecting
@@ -626,7 +626,7 @@ Vue.component('brightid-verify-modal', {
- Register
on [[call.platform]] + Register
on [[call.platform]]
@@ -743,7 +743,7 @@ Vue.component('active-trust-row-template', { Verified diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index 08c7747f449..d9344974aaa 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -24,7 +24,7 @@ $(document).ready(function() { // effects when an offer is clicked upon $('body').on('click', '.offer a', function(e) { - var speed = 500; + const speed = 500; $(this).addClass('clicked'); $(this).find('#ribbon').effect('puff', speed, function() { @@ -32,7 +32,7 @@ $(document).ready(function() { }); }); - var get_redir_location = function(tab) { + const get_redir_location = function(tab) { let trending = $('#trending').is(':checked') ? 1 : 0; let personal = $('#personal').is(':checked') ? 1 : 0; @@ -47,12 +47,36 @@ $(document).ready(function() { }); // collapse menu items - $('body').on('click', '.townsquare_block-header', function(e) { - let target_id = $(this).data('target'); + $('body').on('click', '.townsquare_block-header', function(e, triggered) { + const target_id = $(this).data('target'); $('#' + target_id).toggleClass('hidden'); $(this).toggleClass('closed'); - localStorage.setItem(target_id, $(this).hasClass('closed')); + if (!triggered) { + localStorage.setItem(target_id, $(this).hasClass('closed')); + } + + }); + + $(window).on('resize', () => { + const window_width = $('body').width(); + + $('.townsquare_block-header').each(function(e) { + const target_id = $(this).data('target'); + const item = localStorage.getItem(target_id); + + if (window_width <= 992) { + if (item == 'false' && !$(this).hasClass('closed')) { + $(this).trigger('click', true); + } + } else if (item == 'false' && $(this).hasClass('closed')) { + $(this).trigger('click', true); + } + }); + if (window_width > 768) { + $('#mobile_nav_toggle li a').removeClass('active'); + $('.feed_container,.actions_container').removeClass('hidden'); + } }); $('body').on('click', '#trending', function(e) { @@ -81,8 +105,8 @@ $(document).ready(function() { $('body').on('change', '#receive_daily_offers_in_inbox', function(e) { _alert('Your email subscription preferences have been updated', 'success', 2000); - var url = '/api/v0.1/emailsettings/'; - var params = { + const url = '/api/v0.1/emailsettings/'; + const params = { 'new_bounty_notifications': $(this).is(':checked'), 'csrfmiddlewaretoken': $('input[name=csrfmiddlewaretoken]').val() }; @@ -135,10 +159,11 @@ $(document).ready(function() { loadImages(); - var load_dressing = function() { - var url = document.location.href; + const load_dressing = function() { + let url = document.location.href.replace('#', ''); url = url + (url.indexOf('?') == -1 ? '?' : '&') + 'dressing=1'; + console.log('url is', url); $.get(url, function(response) { // load content @@ -159,13 +184,14 @@ $(document).ready(function() { if (!hide_promo) { $('.promo').removeClass('hidden'); } - $('.townsquare_block-header').each(function() { - let target_id = $(this).data('target'); - var item = localStorage.getItem(target_id); + const target_id = $(this).data('target'); + const item = localStorage.getItem(target_id); - if (item == 'true') { - $(this).click(); + if ($('body').width() > 992) { + if (item && item !== String($(this).hasClass('closed'))) { + $(this).trigger('click', true); + } } }); }); diff --git a/app/assets/v2/js/pages/tribe-edit.js b/app/assets/v2/js/pages/tribe-edit.js index 8dd8bd74f92..60cf157f0f4 100644 --- a/app/assets/v2/js/pages/tribe-edit.js +++ b/app/assets/v2/js/pages/tribe-edit.js @@ -24,7 +24,7 @@ $('#edit-btn').on('click', function() { $('#edit-btn i').removeClass('fa-edit'); $('#edit-btn i').addClass('fa-times'); $('#edit-btn span').text('Cancel'); - $('#edit-btn').addClass('btn-gc-pink'); + $('#edit-btn').addClass('btn-danger'); return quill; }; @@ -87,7 +87,7 @@ const destroyQuill = () => { $('#edit-btn i').addClass('fa-edit'); $('#edit-btn span').text('Edit'); $('#edit-btn i').removeClass('fa-times'); - $('#edit-btn').removeClass('btn-gc-pink'); + $('#edit-btn').removeClass('btn-danger'); }; const rebuildQuill = () => { @@ -96,7 +96,7 @@ const rebuildQuill = () => { editorContainer.removeClass('inactive'); quill.enable(true); $('#save-description-btn').removeClass('d-none'); - $('#edit-btn').addClass('btn-gc-pink'); + $('#edit-btn').addClass('btn-danger'); $('#edit-btn i').removeClass('fa-edit'); $('#edit-btn i').addClass('fa-times'); $('#edit-btn span').text('Cancel'); diff --git a/app/assets/v2/js/theme_switcher.js b/app/assets/v2/js/theme_switcher.js index ba03596a754..e43668cda50 100644 --- a/app/assets/v2/js/theme_switcher.js +++ b/app/assets/v2/js/theme_switcher.js @@ -12,6 +12,7 @@ if (theme === 'dark' || (!theme && window.matchMedia('(prefers-color-scheme: dar document.addEventListener('DOMContentLoaded', subscribe, false); function subscribe() { + if (!document.contxt['github_handle']) { return; } @@ -58,7 +59,14 @@ function activateDarkMode() { function activateMode(mode) { CURRENT_MODE = mode; - + // reference the nav + const nav = document.getElementsByClassName('navbar'); // Toggle root dark-mode class + document.documentElement.classList.toggle('dark-mode', mode === DARK_MODE); + // Toggle class definition on nav + nav[0].className = nav[0].className.replace( + (mode === DARK_MODE ? 'navbar-light' : 'navbar-dark'), + (mode === DARK_MODE ? 'navbar-dark' : 'navbar-light') + ); } diff --git a/app/assets/v2/js/user_card.js b/app/assets/v2/js/user_card.js index b43356a7c0b..b40c9217646 100644 --- a/app/assets/v2/js/user_card.js +++ b/app/assets/v2/js/user_card.js @@ -162,9 +162,9 @@ const renderPopOverData = function(data) { const followBtn = function(data) { if (data.is_following) { - return ``; + return ``; } - return ``; + return ``; }; return ` @@ -185,19 +185,19 @@ const renderPopOverData = function(data) {
- + - + - + | - +
diff --git a/app/assets/v2/js/users-elastic.js b/app/assets/v2/js/users-elastic.js index ecfd32fc1ae..fff6f41f565 100644 --- a/app/assets/v2/js/users-elastic.js +++ b/app/assets/v2/js/users-elastic.js @@ -312,8 +312,8 @@ Vue.mixin({ user.is_following = false; } - event.target.classList.toggle('btn-outline-green'); - event.target.classList.toggle('btn-gc-blue'); + event.target.classList.toggle('btn-outline-secondary'); + event.target.classList.toggle('btn-primary'); }).fail(function(error) { event.target.disabled = false; }); diff --git a/app/assets/v2/js/users.js b/app/assets/v2/js/users.js index c5fe90897f0..905106a7074 100644 --- a/app/assets/v2/js/users.js +++ b/app/assets/v2/js/users.js @@ -249,8 +249,8 @@ Vue.mixin({ user.is_following = false; } - event.target.classList.toggle('btn-outline-green'); - event.target.classList.toggle('btn-gc-blue'); + event.target.classList.toggle('btn-outline-secondary'); + event.target.classList.toggle('btn-primary'); }).fail(function(error) { event.target.disabled = false; }); diff --git a/app/assets/v2/js/vue-components.js b/app/assets/v2/js/vue-components.js index ad61e775fd9..014cba3bcbb 100644 --- a/app/assets/v2/js/vue-components.js +++ b/app/assets/v2/js/vue-components.js @@ -635,7 +635,7 @@ Vue.component('project-card', { }, template: `
- + grant_tag badge
@@ -650,9 +650,9 @@ Vue.component('project-card', { [[ project.summary | truncate(500) ]]

- View Project - View Bounty - + View Project + View Bounty + @@ -792,8 +792,8 @@ Vue.component('suggested-profile', {

- following - follow + following + follow

diff --git a/app/assets/v2/js/wallet.js b/app/assets/v2/js/wallet.js index 6b90be1b223..1b366f09f1c 100644 --- a/app/assets/v2/js/wallet.js +++ b/app/assets/v2/js/wallet.js @@ -207,7 +207,7 @@ function createImg(source) { if (!imgProvider) { imgProvider = document.createElement('img'); imgProvider.classList.add('image-provider'); - elem.appendChild(imgProvider); + elem.insertBefore(imgProvider, icon); } if (!source) { diff --git a/app/assets/v2/scss/activity_stream.scss b/app/assets/v2/scss/activity_stream.scss index fa7edc0c36a..440055752d9 100644 --- a/app/assets/v2/scss/activity_stream.scss +++ b/app/assets/v2/scss/activity_stream.scss @@ -179,6 +179,10 @@ a .sup { max-height: 100px; } +.activity_stream .content img.logo-metacard { + max-width: 105px; +} + .comment_container li{ text-align: left; list-style: none; @@ -360,14 +364,14 @@ iframe.popout{ display: none; } -.infinite-more-link { - position: absolute; - bottom: 10px; - text-align: center; - width: 50%; - border: 1px solid; - margin-left: 25%; -} +// .infinite-more-link { +// position: absolute; +// bottom: 10px; +// text-align: center; +// width: 50%; +// border: 1px solid; +// margin-left: 25%; +// } .dark-mode .activity_stream .activity_detail .tag { background-color: var(--gc-blue); diff --git a/app/assets/v2/scss/all-variables.scss b/app/assets/v2/scss/all-variables.scss new file mode 100644 index 00000000000..2e3f35ab49f --- /dev/null +++ b/app/assets/v2/scss/all-variables.scss @@ -0,0 +1,5 @@ +@import "./lib/bootstrap/functions"; +@import "./lib/bootstrap/variables"; +@import "./lib/bootstrap/mixins"; +// overwrite variables in this file +@import "./lib/bootstrap-overwrites"; \ No newline at end of file diff --git a/app/assets/v2/scss/base.scss b/app/assets/v2/scss/base.scss index 85f6c25f53d..98bcddc7b6b 100644 --- a/app/assets/v2/scss/base.scss +++ b/app/assets/v2/scss/base.scss @@ -25,9 +25,6 @@ span { word-wrap: break-word; } -a { - color: var(--link-color); -} .cursor-pointer { cursor: pointer !important; @@ -41,32 +38,6 @@ a { background-size: cover; } -.navbar-dark .navbar-nav .nav-link { - border-radius: 2px; - color: white; -} - -.navbar .interior .dropdown-item { - color: black !important; - font-size: 0.9rem; -} - -.navbar .interior .dropdown-item:hover { - color: white !important; -} - -.navbar .interior .dropdown-item:hover img{ - filter: invert(100%); -} -.navbar .interior .dropdown-item:hover i{ - color: white; -} - -#navbarSupportedContent { - padding-top: 2px; - padding-bottom: 2px; -} - .navbar-nav .btn-gc-blue { margin-right: 1rem; font-size: 0.9rem; @@ -81,32 +52,6 @@ a { max-height: 88vh; } -.nav_avatar, -.navbar__cta, -.nav-item.dropdown, -.navbar-nav .nav-link { - margin-top: auto; - margin-bottom: auto; -} - -.nav-link.login i { - font-size: 1.5em; - position: relative; - top: 3px; - margin-right: 10px; -} - -.navbar-nav .nav-link:hover { - background-color: rgba(255, 255, 255, 0.2); -} - -.navbar-nav a.nav-link.selected { - color: #4aeaa7 !important; -} - -.navbar a.slack i { - margin-right: 3px; -} .navbar-network { border: 1px solid #828282; @@ -261,50 +206,50 @@ p a { float:right; } -.btn-warning, -.btn-success, -.btn-info { - padding: 0.4rem 1.4rem; - font-size: 1.25rem; - border: 2px solid #15003e; - transition: none; -} - -.btn-warning:hover, -.btn-success:hover, -.btn-info { - cursor: pointer; -} - -.btn-info:hover { - background-color: #15003e; - border-color: #15003e; - color: #f9006c; -} - -.btn-warning { - color: #15003e; -} - -.btn { - cursor: pointer; -} - -.btn-warning:hover { - background-color: #15003e; - border-color: #15003e; - color: #ffce08; -} - -.btn-success { - color: #15003e; -} - -.btn-success:hover { - background-color: #15003e; - border-color: #15003e; - color: #25e899; -} +// .btn-warning, +// .btn-success, +// .btn-info { +// padding: 0.4rem 1.4rem; +// font-size: 1.25rem; +// border: 2px solid #15003e; +// transition: none; +// } + +// .btn-warning:hover, +// .btn-success:hover, +// .btn-info { +// cursor: pointer; +// } + +// .btn-info:hover { +// background-color: #15003e; +// border-color: #15003e; +// color: #f9006c; +// // } + +// .btn-warning { +// color: #15003e; +// } + +// .btn { +// cursor: pointer; +// } + +// .btn-warning:hover { +// background-color: #15003e; +// border-color: #15003e; +// color: #ffce08; +// } + +// .btn-success { +// color: #15003e; +// } + +// .btn-success:hover { +// background-color: #15003e; +// border-color: #15003e; +// color: #25e899; +// } .link-current { color: currentColor; @@ -709,7 +654,7 @@ input[type=text].loading { } #gitcoin_buttons .btn { - font-weight: bold; + // font-weight: bold; margin: 10px; } @@ -982,7 +927,6 @@ input.is-invalid { color: white; padding: 5px 10px; border-radius: 2px; - margin-bottom: 15px; display: block; text-align: center; } diff --git a/app/assets/v2/scss/buttons.scss b/app/assets/v2/scss/buttons.scss index 04f1d3a420a..e4ecd5caef3 100644 --- a/app/assets/v2/scss/buttons.scss +++ b/app/assets/v2/scss/buttons.scss @@ -285,7 +285,7 @@ button:focus { } .btn-radio.active { - border-color: #3E00FF; + border-color: #6F3FF5; } .btn-radio i { @@ -305,5 +305,6 @@ button:focus { .btn-gc-grey:not(:disabled):not(.disabled).active { color: white; - background-color: #5300ff; + background-color: #6f3ef5; + border-color: #6F3FF5; } diff --git a/app/assets/v2/scss/colors.scss b/app/assets/v2/scss/colors.scss index 0d3f67beb79..cfe838bf456 100644 --- a/app/assets/v2/scss/colors.scss +++ b/app/assets/v2/scss/colors.scss @@ -1,7 +1,7 @@ html { --gc-light-blue: #16a8d5; - --gc-blue: #3E00FF; - --gc-blue-hover: #5b24ff; + --gc-blue: #6F3FF5; + --gc-blue-hover: #5932C4; --gc-purple: #0D0764; --gc-purple-hover: #0b0d9d; --gc-green: #0FCE7C; @@ -36,8 +36,8 @@ html { --main-bg: #eff3f6; --form-input-bg: white; --form-input-color: rgba(0, 0, 0, 0.38); - --button-radio-icon-color: #3e00ff; - --link-color: #3e00ff; + --button-radio-icon-color: #6F3FF5; + --link-color: #6F3FF5; --townsquare-link-color: black; --townsquare-block-header-color: #626365; --active-button-border-color: var(--link-color); @@ -48,8 +48,8 @@ html { /* @media screen and (prefers-color-scheme: dark) { */ html.dark-mode { --gc-light-blue: #16a8d5; - --gc-blue: #3E00FF; - --gc-blue-hover: #5b24ff; + --gc-blue: #6F3FF5; + --gc-blue-hover: #5932C4; --gc-purple: #0D0764; --gc-purple-hover: #0b0d9d; --gc-green: #0FCE7C; diff --git a/app/assets/v2/scss/gc-mixins.scss b/app/assets/v2/scss/gc-mixins.scss new file mode 100644 index 00000000000..b3e717162b7 --- /dev/null +++ b/app/assets/v2/scss/gc-mixins.scss @@ -0,0 +1,8 @@ +// import this variable set into every .scss file which will use variables +@import "./lib/bootstrap/functions"; +@import "./lib/bootstrap/variables"; +@import "./lib/bootstrap/mixins"; +// overwrite bootstrap variables in this file +@import "./lib/bootstrap-overwrites"; +// extra utilities +@import "./gc-utilities"; diff --git a/app/assets/v2/scss/gc-utilities.scss b/app/assets/v2/scss/gc-utilities.scss new file mode 100644 index 00000000000..5dfa12e6045 --- /dev/null +++ b/app/assets/v2/scss/gc-utilities.scss @@ -0,0 +1,3 @@ +.hover-underline:not(:disabled):not(.disabled):not(.active):hover { + text-decoration: underline!important +} diff --git a/app/assets/v2/scss/gc-variables.scss b/app/assets/v2/scss/gc-variables.scss new file mode 100644 index 00000000000..5ac50762a70 --- /dev/null +++ b/app/assets/v2/scss/gc-variables.scss @@ -0,0 +1,76 @@ +// GC colors +$gc-purple: #0D0764; +$gc-grey: #EEEEEE; + +// GC colors and shades +$gc-violet-500: #5932C4; +$gc-violet-400: #6F3FF5; +$gc-violet-300: #8C65F7; +$gc-violet-200: #c9b8ff; +$gc-violet-100: #F0EBFF; + +$gc-teal-500: #11BC92; +$gc-teal-400: #02E2AC; +$gc-teal-300: #5BF1CD; +$gc-teal-200: #b3ffed; +$gc-teal-100: #E6FFF9; + +$gc-pink-500: #D44D6E; +$gc-pink-400: #F3587D; +$gc-pink-300: #F579A6; +$gc-pink-200: #faadbf; +$gc-pink-100: #FDDEE5; + +$gc-yellow-500: #E1B815; +$gc-yellow-400: #FFCC00; +$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; diff --git a/app/assets/v2/scss/gitcoin.scss b/app/assets/v2/scss/gitcoin.scss index 1e1ee7711e4..7bfd46f9c45 100644 --- a/app/assets/v2/scss/gitcoin.scss +++ b/app/assets/v2/scss/gitcoin.scss @@ -1,16 +1,3 @@ -body { - overflow-x: hidden; - width: 100%; - background-color: #fff; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -h4, -.h4 { - padding-top: 40px; -} - #indicate-popup { position: fixed; top: 0.25rem; @@ -24,10 +11,6 @@ h4, z-index: 2; } -.lighter { - font-weight: lighter; -} - .no-gutter { margin-right: 0; margin-left: 0; @@ -64,18 +47,6 @@ h4, color: lightgray !important; } -.header { - background-image: url(static('v2/images/header-bg.png')); - background-color: #0d023b; - background-size: cover; - background-position: 0px 0px; - background-repeat: no-repeat; - position: relative; -} - -.index .header { - overflow: hidden; -} .minihero { overflow: hidden; @@ -88,27 +59,11 @@ h4, color: var(--gc-green); } -.header.dash { - overflow: visible; -} - .header-contributor { background-image: url(static('v2/images/landing/contributor/hero_header_bg.jpg')); background-color: #3f00ff; } -.gitcoin-background { - background: url(static("v2/images/header-bg.png")) #0d023b; - background-attachment: fixed; - background-position: center 0; -} - -.dropdown-toggle::after { - position: relative; - top: 2px; - right: -4px; -} - .text-white { color: #ffffff; } @@ -193,37 +148,6 @@ h4, letter-spacing: 0.5rem; } -div.button-pink { - display: inline-flex; - align-items: center; - justify-content: center; - cursor: pointer; - color: #f9006c; - font-size: 0.95rem; - font-weight: bold; - line-height: 42px; - text-transform: uppercase; - background: none; - width: 130px; - height: 39px; - border-radius: 19px; - border: 3px solid #f9006c; - letter-spacing: 0.1em; -} - -.git-pill { - background-color: #0d023b; - border-radius: 1.2rem; - padding-left: 0.95rem; - padding-right: 0.95rem; - height: 2rem; -} - -.git-pill span { - position: relative; - top: 2px; - left: 2px; -} .header-line { color: #12c971; @@ -243,7 +167,6 @@ div.button-pink { } .subheader-line { - color: #fff; font-size: 1.5em; font-weight: 500; } @@ -399,6 +322,14 @@ div.button-pink { text-decoration: underline; } +.footer__notification { + margin-top: -64px; +} + +.left-0 { + left: 0px; +} + .footer { background-color: #0d023b; padding-top: 4rem; @@ -418,17 +349,6 @@ div.button-pink { top: -10px } -.nav-link:visited { - color: #eff4ee; -} - -.navbar-expand-md .navbar-nav .nav-link { - color: #eff4ee; - text-decoration: none; - padding-right: 1rem; - padding-left: 1rem; - font-size: 0.9rem; -} .footer .nav-link:hover { border-radius: 2px; @@ -591,10 +511,10 @@ div.button-pink { padding: 12px 25px; } -.dropdown-menu .dropdown-item:hover { - background-color: #3E00FF; - color: #FFFFFF !important; -} +// .dropdown-menu .dropdown-item:hover { +// background-color: #3E00FF; +// color: #FFFFFF !important; +// } #why-gitcoin .dropdown-item { padding-left: 15px; @@ -623,6 +543,10 @@ div.button-pink { left: 5rem; } +.navbar { + min-height: 66px; +} + @media (max-width: 389.9px) { .footer__main { @@ -632,10 +556,12 @@ div.button-pink { } @media (max-width: 767.98px) { + .navbar { + padding: 1rem 1rem; + } .navbar-collapse { margin-top: 1.5rem; } - #indicate-popup { display: none; } @@ -655,8 +581,8 @@ div.button-pink { } .navbar-expand-md .navbar-nav .nav-link { - padding-left: 0.7rem; - padding-right: 0.7rem; + padding-left: 0.4rem; + padding-right: 0.4rem; } } @@ -711,7 +637,7 @@ div.button-pink { } #codefund .cf-wrapper { - font-family: 'Muli', sans-serif !important; + font-family: 'Libre Franklin', sans-serif !important; text-align: center !important; } @@ -951,6 +877,10 @@ textarea.status-textarea { vertical-align: top; } +.provider-icon { + width: 1.25em; +} + .wallet-network { margin-top: -14px; position: absolute; diff --git a/app/assets/v2/scss/grants/detail.scss b/app/assets/v2/scss/grants/detail.scss index 6952b7ec5a8..7a4be791f47 100644 --- a/app/assets/v2/scss/grants/detail.scss +++ b/app/assets/v2/scss/grants/detail.scss @@ -32,7 +32,7 @@ } .ql-editor { - font-family: 'Muli', sans-serif; + font-family: 'Libre Franklin', sans-serif; } .ql-editor[contenteditable="false"] { diff --git a/app/assets/v2/scss/grants/grant.scss b/app/assets/v2/scss/grants/grant.scss index a09c39efc8f..e24aa6df68b 100644 --- a/app/assets/v2/scss/grants/grant.scss +++ b/app/assets/v2/scss/grants/grant.scss @@ -464,27 +464,18 @@ .grants_type_nav a.selected { font-weight: bold; border-bottom: none; - padding-bottom: 6px; -} - -.grants_keyword_nav a:hover { - border-bottom: 1.5px solid black; - padding-bottom: 4px; -} - -.grants_keyword_nav a.selected:hover { - border-color: #3E00FF; } .grants_nav a { color: #333333; margin-right: 30px; cursor: pointer; + max-width: 185px; } .grants_nav a:hover { - text-shadow: 0 0 .01px black, 0 0 .01px black, 0 0 .01px black; - text-decoration: none; + text-shadow: 0.1px 0.1px 0 currentColor; + text-decoration: underline; } .grants-search .select2-selection__arrow { @@ -492,8 +483,7 @@ } .grants_nav .selected { - font-weight: 1000; - color: #3f24f9 !important; + text-shadow: 0.2px 0.2px 0 currentColor; } .arrow_box { diff --git a/app/assets/v2/scss/home.scss b/app/assets/v2/scss/home.scss index f1f227811bb..09f9af3ff45 100644 --- a/app/assets/v2/scss/home.scss +++ b/app/assets/v2/scss/home.scss @@ -1,5 +1,5 @@ .navbar { - background-color: #0d023b; + // background-color: #0d023b; } .banner { @@ -121,16 +121,16 @@ font-size: 12px; } -.navbar .interior .dropdown-item:hover span { - color: #fff; -} +// .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; -} +// .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; @@ -138,7 +138,7 @@ } .homepage .banner #fund-issue { - border: 2px solid #3E00FF; + // border: 2px solid #3E00FF; } .optimize_oss p, @@ -478,12 +478,12 @@ figure:hover::before { } } -@media (min-width: 992px) { - .mx-auto .nav-item { - margin-left: 0.75rem; - margin-right: 0.75rem; - } -} +// @media (min-width: 992px) { +// .mx-auto .nav-item { +// margin-left: 0.75rem; +// margin-right: 0.75rem; +// } +// } @media (max-width: 1024px) { diff --git a/app/assets/v2/scss/landing_page.scss b/app/assets/v2/scss/landing_page.scss index 16cf2ec388d..718f43212aa 100644 --- a/app/assets/v2/scss/landing_page.scss +++ b/app/assets/v2/scss/landing_page.scss @@ -54,7 +54,7 @@ body.funder-page { } #landing_page_wrapper { - overflow-y: scroll; + // overflow-y: scroll; background-color: #F9F9F9; } @@ -576,10 +576,10 @@ body.funder-page { } .navbar:not(.following) .btn { - background: transparent; + // background: transparent; } .navbar:not(.following) .btn:hover { - background-color: rgba(255, 255, 255, 0.2); + // background-color: rgba(255, 255, 255, 0.2); } @keyframes rotate-blades { diff --git a/app/assets/v2/scss/landingpage/breakpoints.scss b/app/assets/v2/scss/landingpage/breakpoints.scss index 8163c8fa03d..140118c1ffc 100644 --- a/app/assets/v2/scss/landingpage/breakpoints.scss +++ b/app/assets/v2/scss/landingpage/breakpoints.scss @@ -3,6 +3,7 @@ $laptop: "(max-width: 1312px)"; $tablet: "(max-width: 992px)"; $phone: "(max-width: 748px)"; $small: "(max-width: 600px)"; +$smaller: "(max-width: 330px)"; @media #{$desktop} { @@ -35,5 +36,11 @@ $small: "(max-width: 600px)"; } } +@media #{$smaller} { + :root{ + --device: "smaller"; + } +} + diff --git a/app/assets/v2/scss/landingpage/logo.scss b/app/assets/v2/scss/landingpage/logo.scss index 410b2547783..d1ad8faaca2 100644 --- a/app/assets/v2/scss/landingpage/logo.scss +++ b/app/assets/v2/scss/landingpage/logo.scss @@ -1,25 +1,27 @@ -#logo{ +#logo { position: absolute; margin-left: -1.5em; left: 3em; - img{ + img { width: 8.7rem; } } - - - @media #{$tablet} { - #logo{ + #logo { margin-left: -0.5em; left: 2em; - img{ + img { width: 10rem; min-width: 150px; } - } } + +@media #{$smaller} { + #logo { + margin-top: 1em; + } +} \ No newline at end of file diff --git a/app/assets/v2/scss/leaderboard.scss b/app/assets/v2/scss/leaderboard.scss index 44dcf788561..b273fe1fe80 100644 --- a/app/assets/v2/scss/leaderboard.scss +++ b/app/assets/v2/scss/leaderboard.scss @@ -55,7 +55,7 @@ border-radius: 50%; } -tbody, a { +tbody, td { color: #5C5D5F } diff --git a/app/assets/v2/scss/lib/bootstrap-overwrites.scss b/app/assets/v2/scss/lib/bootstrap-overwrites.scss new file mode 100644 index 00000000000..e1672150f7b --- /dev/null +++ b/app/assets/v2/scss/lib/bootstrap-overwrites.scss @@ -0,0 +1,18 @@ +// 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/lib/bootstrap.scss b/app/assets/v2/scss/lib/bootstrap.scss new file mode 100644 index 00000000000..9927515cac3 --- /dev/null +++ b/app/assets/v2/scss/lib/bootstrap.scss @@ -0,0 +1,37 @@ +// import all variables and mixins used by bootstrap + gitcoin +@import "../gc-mixins"; +// import the rest of the bootstrap +@import "./bootstrap/root"; +@import "./bootstrap/reboot"; +@import "./bootstrap/type"; +@import "./bootstrap/images"; +@import "./bootstrap/code"; +@import "./bootstrap/grid"; +@import "./bootstrap/tables"; +@import "./bootstrap/forms"; +@import "./bootstrap/buttons"; +@import "./bootstrap/transitions"; +@import "./bootstrap/dropdown"; +@import "./bootstrap/button-group"; +@import "./bootstrap/input-group"; +@import "./bootstrap/custom-forms"; +@import "./bootstrap/nav"; +@import "./bootstrap/navbar"; +@import "./bootstrap/card"; +@import "./bootstrap/breadcrumb"; +@import "./bootstrap/pagination"; +@import "./bootstrap/badge"; +@import "./bootstrap/jumbotron"; +@import "./bootstrap/alert"; +@import "./bootstrap/progress"; +@import "./bootstrap/media"; +@import "./bootstrap/list-group"; +@import "./bootstrap/close"; +@import "./bootstrap/toasts"; +@import "./bootstrap/modal"; +@import "./bootstrap/tooltip"; +@import "./bootstrap/popover"; +@import "./bootstrap/carousel"; +@import "./bootstrap/spinners"; +@import "./bootstrap/utilities"; +@import "./bootstrap/print"; diff --git a/app/assets/v2/scss/lib/index.scss b/app/assets/v2/scss/lib/index.scss index 6ce8f0fbf3b..aa68f9eb970 100644 --- a/app/assets/v2/scss/lib/index.scss +++ b/app/assets/v2/scss/lib/index.scss @@ -1,5 +1,9 @@ // bootstrap and bootstrap-vue must be included within the same context -@import './bootstrap/bootstrap.scss'; -@import './bootstrap-vue/index.scss'; +@import 'bootstrap'; + +@import 'bootstrap-vue/index'; + +@import 'vue-select/vue-select'; + +@import 'typography'; -@import './vue-select/vue-select.scss'; diff --git a/app/assets/v2/scss/lib/typography.scss b/app/assets/v2/scss/lib/typography.scss index 6f5820f365d..e395481487e 100644 --- a/app/assets/v2/scss/lib/typography.scss +++ b/app/assets/v2/scss/lib/typography.scss @@ -1,53 +1,147 @@ -/* muli-200 - latin */ +/* libre-franklin-200 - latin-ext_latin */ @font-face { - font-family: 'Muli'; + font-family: 'Libre Franklin'; font-style: normal; font-weight: 200; - src: local('Muli ExtraLight'), local('Muli-ExtraLight'), - url('/static/v2/fonts/muli/muli-v12-latin-200.woff2') format('woff2'), - url('/static/v2/fonts/muli/muli-v12-latin-200.woff') format('woff'), - url('/static/v2/fonts/muli/muli-v12-latin-200.ttf') format('truetype'); + src: url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200.svg#LibreFranklin') format('svg'); /* Legacy iOS */ } -/* muli-regular - latin */ +/* libre-franklin-regular - latin-ext_latin */ @font-face { - font-family: 'Muli'; + font-family: 'Libre Franklin'; font-style: normal; font-weight: 400; - src: local('Muli Regular'), local('Muli-Regular'), - url('/static/v2/fonts/muli/muli-v12-latin-regular.woff2') format('woff2'), - url('/static/v2/fonts/muli/muli-v12-latin-regular.woff') format('woff'), - url('/static/v2/fonts/muli/muli-v12-latin-regular.ttf') format('truetype'); + src: url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-regular.svg#LibreFranklin') format('svg'); /* Legacy iOS */ } -/* muli-600 - latin */ +/* libre-franklin-600 - latin-ext_latin */ @font-face { - font-family: 'Muli'; + font-family: 'Libre Franklin'; font-style: normal; font-weight: 600; - src: local('Muli SemiBold'), local('Muli-SemiBold'), - url('/static/v2/fonts/muli/muli-v12-latin-600.woff2') format('woff2'), - url('/static/v2/fonts/muli/muli-v12-latin-600.woff') format('woff'), - url('/static/v2/fonts/muli/muli-v12-latin-600.ttf') format('truetype'); + src: url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600.svg#LibreFranklin') format('svg'); /* Legacy iOS */ } -/* muli-700 - latin */ +/* libre-franklin-800 - latin-ext_latin */ @font-face { - font-family: 'Muli'; + font-family: 'Libre Franklin'; font-style: normal; - font-weight: 700; - src: local('Muli Bold'), local('Muli-Bold'), - url('/static/v2/fonts/muli/muli-v12-latin-700.woff2') format('woff2'), - url('/static/v2/fonts/muli/muli-v12-latin-700.woff') format('woff'), - url('/static/v2/fonts/muli/muli-v12-latin-700.ttf') format('truetype'); + font-weight: 800; + src: url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800.svg#LibreFranklin') format('svg'); /* Legacy iOS */ } -.g-font-futura { - font-family: 'futura-pt', sans-serif; +/* libre-franklin-200italic - latin-ext_latin */ +@font-face { + font-family: 'Libre Franklin'; + font-style: italic; + font-weight: 200; + src: url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-200italic.svg#LibreFranklin') format('svg'); /* Legacy iOS */ +} + +/* libre-franklin-italic - latin-ext_latin */ +@font-face { + font-family: 'Libre Franklin'; + font-style: italic; + font-weight: 400; + src: url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-italic.svg#LibreFranklin') format('svg'); /* Legacy iOS */ +} + +/* libre-franklin-600italic - latin-ext_latin */ +@font-face { + font-family: 'Libre Franklin'; + font-style: italic; + font-weight: 600; + src: url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-600italic.svg#LibreFranklin') format('svg'); /* Legacy iOS */ +} + +/* libre-franklin-800italic - latin-ext_latin */ +@font-face { + font-family: 'Libre Franklin'; + font-style: italic; + font-weight: 800; + src: url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/libre-franklin/libre-franklin-v7-latin-ext_latin-800italic.svg#LibreFranklin') format('svg'); /* Legacy iOS */ } -.g-font-muli { - font-family: 'Muli', sans-serif; +/* miriam-libre-regular - latin-ext_latin */ +@font-face { + font-family: 'Miriam Libre'; + font-style: normal; + font-weight: 400; + src: url('/static/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), + url('/static/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('/static/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('/static/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ + url('/static/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('/static/v2/fonts/miriam-libre/miriam-libre-v7-latin-ext_latin-regular.svg#MiriamLibre') format('svg'); /* Legacy iOS */ +} + +@supports (font-variation-settings: normal) { + @font-face { + font-family: 'Libre Franklin'; + src: url('/static/v2/fonts/libre-franklin/LibreFranklin-VariableFont_wght.ttf') format('truetype supports variations'), + url('/static/v2/fonts/libre-franklin/LibreFranklin-VariableFont_wght.ttf') format('truetype-variations'); + font-weight: 100 1000; + font-stretch: 25% 151%; + } + + @font-face { + font-family: 'Libre Franklin'; + src: url('/static/v2/fonts/libre-franklin/LibreFranklin-Italic-VariableFont_wght.ttf') format('truetype supports variations'), + url('/static/v2/fonts/libre-franklin/LibreFranklin-Italic-VariableFont_wght.ttf') format('truetype-variations'); + font-variation-settings: 'ital' 1; + font-style: italic; + font-weight: 100 1000; + font-stretch: 25% 151%; + } } /* Font variables @@ -63,5 +157,10 @@ --fs-body: 0.875rem; --fw-light: 300; - --fw-bold: 700; + --fw-bold: 600; +} + + +.gc-font-base { + font-family: $font-family-base; } diff --git a/app/assets/v2/scss/mission.scss b/app/assets/v2/scss/mission.scss index 2f09553fe63..ccacbae6a22 100644 --- a/app/assets/v2/scss/mission.scss +++ b/app/assets/v2/scss/mission.scss @@ -3,7 +3,7 @@ /* Font */ /* The Titles */ .section-title { - font-family: 'Muli', sans-serif; + font-family: 'Libre Franklin', sans-serif; font-style: normal; font-weight: normal; font-size: 30px; @@ -186,7 +186,7 @@ /* We Value Section */ #we-value { - font-family: 'Muli', sans-serif; + font-family: 'Libre Franklin', sans-serif; font-style: normal; font-weight: normal; font-size: 19px; @@ -195,7 +195,7 @@ color: #000000; } #vote-text { - font-family: 'Muli', sans-serif; + font-family: 'Libre Franklin', sans-serif; font-style: normal; font-weight: bold; font-size: 12px; @@ -210,7 +210,7 @@ max-width: 11.5%; } .we-value-text { - font-family: 'Muli', sans-serif; + font-family: 'Libre Franklin', sans-serif; font-style: normal; font-weight: bold; font-size: 21px; @@ -301,7 +301,7 @@ .we-interact-card-text { width: 213px; height: 108px; - font-family: 'Muli', sans-serif; + font-family: 'Libre Franklin', sans-serif; font-style: normal; font-weight: normal; font-size: 16px; diff --git a/app/assets/v2/scss/notifications.scss b/app/assets/v2/scss/notifications.scss index 8afc2d3f0e6..cdb94093d13 100644 --- a/app/assets/v2/scss/notifications.scss +++ b/app/assets/v2/scss/notifications.scss @@ -1,3 +1,6 @@ +// import variables and mixins +@import './gc-mixins'; + html { --color-notification: 37, 232, 153; --badge-bg: #D6FBEB; @@ -15,18 +18,19 @@ html.dark-mode { --badge-blue-text: white; } -.navbar-nav .nav-link.notification__icon { - position: relative; - font-size: 18px; - color: white; -} +// .navbar-nav .nav-link.notification__icon { +// position: relative; +// font-size: 18px; +// color: white; +// } .notification__icon.dropdown-toggle::after { content: none; } .notification__dot { - background: red; + background: rgba(255,255,255,0.8); + color: $navbar-light-hover-color; display: none; min-width: 17px; height: 17px; @@ -34,7 +38,7 @@ html.dark-mode { box-shadow: 0 0 0 rgba(var(--color-notification), .4); position: absolute; top: 0; - left: 2.5em; + left: 1.2rem; font-size: 10px; text-align: center; font-weight: bold; diff --git a/app/assets/v2/scss/onboard.scss b/app/assets/v2/scss/onboard.scss index a938620d610..9fde99784af 100644 --- a/app/assets/v2/scss/onboard.scss +++ b/app/assets/v2/scss/onboard.scss @@ -337,11 +337,11 @@ h3 { border-radius: 3px; } -.completed { - background-color: #0D0764; - color: #FFFFFF; - border-color: #0D0764; -} +// .completed { +// background-color: #0D0764; +// color: #FFFFFF; +// border-color: #0D0764; +// } @keyframes turn { 0% { transform: rotate(0deg); } diff --git a/app/assets/v2/scss/onboarding_v2.scss b/app/assets/v2/scss/onboarding_v2.scss index 4c026285dc7..85d68c83a6e 100644 --- a/app/assets/v2/scss/onboarding_v2.scss +++ b/app/assets/v2/scss/onboarding_v2.scss @@ -39,7 +39,14 @@ } #onboarding_v2 .modal-content { - margin-top: 22rem; + margin-top: 285px; +} + +.modal-backdrop.show { + opacity: 1; + background-image: url(static('v2/images/tribes/promo-decoration.svg')); + background-color: rgba(106, 72, 199, 0.98); + background-size: cover; } .no-bg { diff --git a/app/assets/v2/scss/onepager/main.scss b/app/assets/v2/scss/onepager/main.scss index f8dc6719dc4..9b3be3104b1 100644 --- a/app/assets/v2/scss/onepager/main.scss +++ b/app/assets/v2/scss/onepager/main.scss @@ -536,11 +536,11 @@ body.is-ie #wrapper { height: 100%; } -body #main a:not(.button) { +body #main a:not(.btn) { color: #fc7596; } -body #main a:not(.button):hover { +body #main a:not(.btn):hover { color: #ec5597; } diff --git a/app/assets/v2/scss/products.scss b/app/assets/v2/scss/products.scss index 598356e9e8a..460199cc060 100644 --- a/app/assets/v2/scss/products.scss +++ b/app/assets/v2/scss/products.scss @@ -193,6 +193,16 @@ color: #000; } +.button-Town { + color: #212529; + background-color: #02E2AC; +} + +.button-Discord{ + background-color: #6F3FF5; + color: #fff; +} + .button-hackathons{ background-color: #ffa2de; color: white; diff --git a/app/assets/v2/scss/profile.scss b/app/assets/v2/scss/profile.scss index fb582394591..ce55c0d7fbe 100644 --- a/app/assets/v2/scss/profile.scss +++ b/app/assets/v2/scss/profile.scss @@ -480,7 +480,7 @@ top: 0; color: #ffffff; z-index: 1; - width: 100vw; + width: 100%; cursor: pointer; } diff --git a/app/assets/v2/scss/quests.scss b/app/assets/v2/scss/quests.scss index 5852c0f30a2..3ba162273ab 100644 --- a/app/assets/v2/scss/quests.scss +++ b/app/assets/v2/scss/quests.scss @@ -27,16 +27,16 @@ bottom: -5px; } -.btn:not(.btn-gc-blue) { - width: 100px; - position: relative; - border: none; - padding: 5px; - text-align: center; - display: inline-block; - top: 5px; - font-size: 16px; -} +// .btn:not(.btn-gc-blue) { +// width: 100px; +// position: relative; +// border: none; +// padding: 5px; +// text-align: center; +// display: inline-block; +// top: 5px; +// font-size: 16px; +// } .btn-secondary { background-color: white; diff --git a/app/assets/v2/scss/quickstart.scss b/app/assets/v2/scss/quickstart.scss index 8fa2ab88d08..716eac382dd 100644 --- a/app/assets/v2/scss/quickstart.scss +++ b/app/assets/v2/scss/quickstart.scss @@ -68,10 +68,6 @@ letter-spacing: 0; } -.issuetypes-container p { - line-height: 0.9rem; -} - .bounty-tips { background: #0D0764; } @@ -141,5 +137,5 @@ } .flex-column img { - margin: auto; + // margin: auto; } diff --git a/app/assets/v2/scss/search.scss b/app/assets/v2/scss/search.scss index dd15dbe9f90..f4c0745fa85 100644 --- a/app/assets/v2/scss/search.scss +++ b/app/assets/v2/scss/search.scss @@ -2,11 +2,11 @@ font-size: 12px !important; } -.navbar-nav .nav-link.gc-search__icon { - position: relative; - font-size: 18px; - color: white; -} +// .navbar-nav .nav-link.gc-search__icon { +// position: relative; +// font-size: 18px; +// color: white; +// } .gc-search__icon.dropdown-toggle::after { content: none; diff --git a/app/assets/v2/scss/top-nav.scss b/app/assets/v2/scss/top-nav.scss index ffbc7b63341..ddf574db0aa 100644 --- a/app/assets/v2/scss/top-nav.scss +++ b/app/assets/v2/scss/top-nav.scss @@ -44,6 +44,7 @@ padding: 0; } } + .top-nav a:hover img, .top-nav a.selected img { /* opacity: 1; */ @@ -54,7 +55,11 @@ opacity: 1; } .navbar-toggler[aria-expanded="true"] .navbar-toggler-icon { - background-image: url("data:image/svg+xml,%0A%3Csvg width='30px' height='30px' viewBox='0 0 30 30' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3C!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch --%3E%3Cdesc%3ECreated with Sketch.%3C/desc%3E%3Cdefs%3E%3C/defs%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='Artboard' transform='translate(-146.000000, -156.000000)' fill-rule='nonzero'%3E%3Cg id='download' transform='translate(77.000000, 45.000000)'%3E%3Cpath d='M73,118 L95,134 M73,134 L95,118' id='Shape-Copy-2' stroke-opacity='0.5' stroke='%23FFFFFF' stroke-width='2' stroke-linecap='round'%3E%3C/path%3E%3Crect id='Path' x='69' y='111' width='30' height='30'%3E%3C/rect%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml,%0A%3Csvg width='30px' height='30px' viewBox='0 0 30 30' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3C!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch --%3E%3Cdesc%3ECreated with Sketch.%3C/desc%3E%3Cdefs%3E%3C/defs%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='Artboard' transform='translate(-146.000000, -156.000000)' fill-rule='nonzero'%3E%3Cg id='download' transform='translate(77.000000, 45.000000)'%3E%3Cpath d='M73,118 L95,134 M73,134 L95,118' id='Shape-Copy-2' stroke='rgba%280, 0, 0, 0.5%29' stroke-width='2' stroke-linecap='round'%3E%3C/path%3E%3Crect id='Path' x='69' y='111' width='30' height='30'%3E%3C/rect%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); +} + +.navbar-dark .navbar-toggler[aria-expanded="true"] .navbar-toggler-icon { + filter: invert(1); } .brand-hover .logo-animated { diff --git a/app/assets/v2/scss/town_square.scss b/app/assets/v2/scss/town_square.scss index e42733e043c..9ccf212fa06 100644 --- a/app/assets/v2/scss/town_square.scss +++ b/app/assets/v2/scss/town_square.scss @@ -386,6 +386,22 @@ a.offer_container.animate:hover .prize-gift::after { opacity: 0.4; } +.dark-mode { + .bg-white { + background-color: var(--main-bg)!important; + } + .navbar-light #logo { + color: #fff; + } + .navbar-light .navbar-nav .nav-link { + color: rgba(255, 255, 255, 0.5); + } + .loading { + filter: brightness(100); + opacity: 0.3; + } +} + .empty .prize-gift { color: grey; text-shadow: 0 2px 0px grey; @@ -894,7 +910,7 @@ body.green.offer_view .announce { .townsquare_block-header { font-size: 0.9rem; - font-weight: 700; + font-weight: 600; color: var(--townsquare-block-header-color); text-transform: uppercase; cursor: pointer; @@ -994,6 +1010,21 @@ body.green.offer_view .announce { color: var(--blue); } +.nav-link.nav-line.active { + color: var(--default-text-color); + border-color: var(--active-button-border-color); +} + +.nav-link.nav-line:not(.active):hover { + color: var(--default-text-color); + border-color: var(--active-button-border-color); +} + +.nav-tabs .nav-line { + color: var(--gc-dark-grey); + border-color: var(--gc-dark-grey); +} + .nav-badge { font-size: 9px; color: var(--link-color); diff --git a/app/bounty_requests/templates/bounty_request_form.html b/app/bounty_requests/templates/bounty_request_form.html index 6f02b32ac49..696a384881f 100644 --- a/app/bounty_requests/templates/bounty_request_form.html +++ b/app/bounty_requests/templates/bounty_request_form.html @@ -22,76 +22,76 @@ {% include 'shared/cards.html' %} -
- {% include 'shared/top_nav.html' with class='d-md-flex' %} - {% include 'shared/nav.html' %} -
-
-
-
-
-
-

{% trans "Request a Bounty" %} {% trans "Alpha" %}

-

- {% blocktrans %} - Have an open-source issue that you think would benefit the community? - Suggest it be given a bounty! - {% endblocktrans %} -

-
- - -
-
- {% for field in form %} -
- - {{ field }} -
- {% endfor %} -
- +
+
+ {% include 'shared/top_nav.html' with class='d-md-flex' %} + {% include 'shared/nav.html' %} +
+
+
+
+
+
+

{% trans "Request a Bounty" %} {% trans "Alpha" %}

+

+ {% blocktrans %} + Have an open-source issue that you think would benefit the community? + Suggest it be given a bounty! + {% endblocktrans %} +

+
+ +
- +
+ {% for field in form %} +
+ + {{ field }} +
+ {% endfor %} +
+ +
+
+
-
- +
+ {% include 'shared/newsletter.html' %} +
-
- {% include 'shared/newsletter.html' %} -
+ {% if comments_prefill %} + + {% endif %} + + {% include 'shared/analytics.html' %} + {% include 'shared/footer_scripts.html' with slim=1 %} + {% include 'shared/footer.html' %}
- {% if comments_prefill %} - - {% endif %} - - {% include 'shared/bottom_notification.html' %} - {% include 'shared/analytics.html' %} - {% include 'shared/footer_scripts.html' with slim=1 %} - {% include 'shared/footer.html' %} - diff --git a/app/dashboard/templates/addinterest.html b/app/dashboard/templates/addinterest.html index 77b56397951..0977925583b 100644 --- a/app/dashboard/templates/addinterest.html +++ b/app/dashboard/templates/addinterest.html @@ -93,7 +93,7 @@
{% trans "Submit a Plan" %}
- + {% elif is_registered and bounty.event %}
@@ -169,14 +169,14 @@
{% trans "Submit a Plan" %}

You can modify your project details anytime on the projects page or when you submit work.

- +
{% else %}

This bounty is part of {{bounty.event.name}}.
Please register for the hackathon and read the rules of participation before you continue.

- Register for Hackathon + Register for Hackathon
{% endif %}
@@ -186,7 +186,7 @@
{% trans "Submit a Plan" %}
-
diff --git a/app/dashboard/templates/board/contributor.html b/app/dashboard/templates/board/contributor.html index eee6e84dea5..9d2f21996f4 100644 --- a/app/dashboard/templates/board/contributor.html +++ b/app/dashboard/templates/board/contributor.html @@ -43,7 +43,7 @@
-
+
Bounties matching your skills: [[ skills.join(', ') ]] (Update Skills)
@@ -86,7 +86,7 @@
@@ -97,7 +97,7 @@

Check back regularly for the latest matching bounties or
check out the Issue Explorer for more bounties!

  • - VIEW MORE BOUNTIES + VIEW MORE BOUNTIES
    • @@ -142,8 +142,8 @@

    - Submit Work - + Submit Work +
    @@ -154,7 +154,7 @@

    Find a bounty or check out our Contributors Guide to start doing bounties!

    Have any questions? Chat with us on Slack!

    - Find a Bounty + Find a Bounty @@ -197,7 +197,7 @@

    - +
    @@ -261,7 +261,7 @@

    If you also want to check your finished bounties, you can find them here:

    - Check my bounties in the explorer + Check my bounties in the explorer diff --git a/app/dashboard/templates/board/funder.html b/app/dashboard/templates/board/funder.html index 5ac8e46acdb..f591ed312ec 100644 --- a/app/dashboard/templates/board/funder.html +++ b/app/dashboard/templates/board/funder.html @@ -80,8 +80,8 @@
    - Feature Bounty - Invite Contributors + Feature Bounty + Invite Contributors
    @@ -107,18 +107,18 @@
    - Accept - Reject + Accept + Reject
    - +
    [[ contributor.interest.issue_message]]

  • Couldn’t find the right contributor?

    - EXPLORE USER DIRECTORY + EXPLORE USER DIRECTORY
    • @@ -131,7 +131,7 @@

    Fund an Issue or check out our Funders Guide to start getting contributors for your project!

    Have any questions? Chat with us on Slack!

    - Fund an Issue + Fund an Issue @@ -176,8 +176,8 @@

    - Feature Bounty - Invite Contributors + Feature Bounty + Invite Contributors
    @@ -203,18 +203,18 @@

    - Accept - Reject + Accept + Reject
    - +
    [[ contributor.interest.issue_message]]

  • Couldn’t find the right contributor?

    - EXPLORE USER DIRECTORY + EXPLORE USER DIRECTORY
    • @@ -283,7 +283,7 @@

    - Payout bounty + Payout bounty
    [[ contributor.fulfiller_metadata.data.payload.fulfiller.githubPRLink ]]
    @@ -335,7 +335,7 @@

    - Extend Expiration + Extend Expiration
    @@ -354,7 +354,7 @@

    If you also want to check your finished and cancelled bounties, you can find them here:

    - Check my bounties in the explorer + Check my bounties in the explorer diff --git a/app/dashboard/templates/board/index.html b/app/dashboard/templates/board/index.html index c8e944eff15..504754d7c05 100644 --- a/app/dashboard/templates/board/index.html +++ b/app/dashboard/templates/board/index.html @@ -28,69 +28,69 @@ {% endcompress %} - {% include 'shared/top_nav.html' with class='d-md-flex' %} - {% include 'shared/nav.html' %} -
    +
    + {% include 'shared/top_nav.html' with class='d-md-flex' %} + {% include 'shared/nav.html' %} +
    -
    - +
    + +
    +
    + {% include 'board/funder.html' %} + {% include 'board/contributor.html' %} + {% if is_staff %} + {% include 'board/ptokens.html' %} + {% endif %} +
    -
    - {% include 'board/funder.html' %} - {% include 'board/contributor.html' %} - {% if is_staff %} - {% include 'board/ptokens.html' %} + {% include 'shared/footer.html' %} + {% include 'shared/analytics.html' %} + {% include 'shared/footer_scripts.html' with slim=1 %} + + + {% if keywords %} + + {% endif %} + + - - {% if keywords %} + + + - {% endif %} - - - - - - +
    diff --git a/app/dashboard/templates/board/ptokens.html b/app/dashboard/templates/board/ptokens.html index 0e493afad2a..f1cbfd6336d 100644 --- a/app/dashboard/templates/board/ptokens.html +++ b/app/dashboard/templates/board/ptokens.html @@ -60,7 +60,6 @@
    -
    @@ -72,26 +71,26 @@ Create a time token to get paid today for work tomorrow Learn more
    - @@ -128,9 +127,9 @@
    - - - + + +
    @@ -140,7 +139,7 @@

    [[ error.open || 'You don’t have any open requests' ]]

    Have any questions? Chat with us on Slack!

    - Browse tokens + Browse tokens @@ -176,8 +175,8 @@

    - - + +
    diff --git a/app/dashboard/templates/bounty/cancel.html b/app/dashboard/templates/bounty/cancel.html index 225be50ef5a..3d46d97a93e 100644 --- a/app/dashboard/templates/bounty/cancel.html +++ b/app/dashboard/templates/bounty/cancel.html @@ -37,139 +37,139 @@ - {% include 'shared/tag_manager_2.html' %} - {% include 'shared/top_nav.html' with class='d-md-flex' %} -
    - {% include 'shared/nav.html' %} -
    +
    + {% include 'shared/tag_manager_2.html' %} + {% include 'shared/top_nav.html' with class='d-md-flex' %} +
    + {% include 'shared/nav.html' %} +
    -
    -
    - {% include 'shared/no_issue_error.html' with page='kill_bounty' %} - {% if is_bounties_network %} - {% include 'shared/no_metamask_error.html' %} - {% include 'shared/zero_balance_error.html' %} - {% include 'shared/unlock_metamask.html' %} - {% include 'shared/connect_metamask.html' %} - {% endif %} +
    +
    + {% include 'shared/no_issue_error.html' with page='kill_bounty' %} + {% if is_bounties_network %} + {% include 'shared/no_metamask_error.html' %} + {% include 'shared/zero_balance_error.html' %} + {% include 'shared/unlock_metamask.html' %} + {% include 'shared/connect_metamask.html' %} + {% endif %} +
    -
    -
    -
    -
    -
    - -
    -
    -
    - Helmet front -
    -
    -

    {% trans "Cancel Bounty and Reclaim Funds" %}

    -

    {% trans "(Issue Submitters only)" %}

    -
    +
    +
    +
    +
    + -

    {% trans "Once you cancel, you will receive the funds & you can reuse it for your next bounty." %}

    -
    -
    -

    - - - {% trans "Back to Bounty" %} - -

    - - +
    +
    +
    + Helmet front +
    +
    +

    {% trans "Cancel Bounty and Reclaim Funds" %}

    +

    {% trans "(Issue Submitters only)" %}

    +
    +

    {% trans "Once you cancel, you will receive the funds & you can reuse it for your next bounty." %}

    + +
    +

    + + + {% trans "Back to Bounty" %} + +

    + + +
    -
    -
    {% trans "Reason" %}
    -

    - {% trans "Please let us know why you cancelled the bounty" %} -

    -
    -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - - +
    +
    {% trans "Reason" %}
    +

    + {% trans "Please let us know why you cancelled the bounty" %} +

    +
    +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + + +
    + + + +
    +
    - -
    - - - + {% include 'shared/bounty_actions_hidden_vars.html' %} + +
    +
    + +
    -
    - - {% include 'shared/bounty_actions_hidden_vars.html' %} - -
    -
    - - +
    +
    -
    -
    - -
    - + +
    + + {% include 'shared/analytics.html' %} + {% include 'shared/footer_scripts.html' with slim=1 %} + {% include 'shared/footer.html' %}
    - - {% include 'shared/bottom_notification.html' %} - {% include 'shared/analytics.html' %} - {% include 'shared/footer_scripts.html' with slim=1 %} - {% include 'shared/footer.html' %} - {% if is_bounties_network %} diff --git a/app/dashboard/templates/bounty/change.html b/app/dashboard/templates/bounty/change.html index 77f72147694..1060f2543e4 100644 --- a/app/dashboard/templates/bounty/change.html +++ b/app/dashboard/templates/bounty/change.html @@ -25,90 +25,90 @@ {% endcompress %} - {% include 'shared/tag_manager_2.html' %} -
    - {% include 'shared/top_nav.html' with class='d-md-flex' %} - {% include 'shared/nav.html' %} -
    -
    -
    -
    -
    -
    -
    -
    -

    {% trans "Change Bounty Details" %}

    - -
    - {% include 'shared/issue_details.html' %} -
    +
    + {% include 'shared/tag_manager_2.html' %} +
    + {% include 'shared/top_nav.html' with class='d-md-flex' %} + {% include 'shared/nav.html' %} +
    +
    +
    +
    +
    +
    +
    + +

    {% trans "Change Bounty Details" %}

    -
    - {% include 'shared/bounty_details.html' %} -
    +
    + {% include 'shared/issue_details.html' %} +
    -
    - {% include 'shared/bounty_categories.html' %} -
    +
    + {% include 'shared/bounty_details.html' %} +
    -
    - {% include 'shared/bounty_keywords.html' %} -
    +
    + {% include 'shared/bounty_categories.html' %} +
    -
    - {% include 'shared/reserved.html' %} -
    +
    + {% include 'shared/bounty_keywords.html' %} +
    - {% if is_bounties_network %} -
    - {% include 'shared/featured.html' %} +
    + {% include 'shared/reserved.html' %}
    - {% endif %} - {% if not is_bounties_network %} -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - + {% if is_bounties_network %} +
    + {% include 'shared/featured.html' %} +
    + {% endif %} + + {% if not is_bounties_network %} +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + {% endif %} - +
    +
    - {% endif %} - -
    - -
    - + +
    + {% include 'shared/analytics.html' %} + {% include 'shared/footer.html' %} + {% include 'shared/footer_scripts.html' with slim=1 %} + {% include 'shared/current_profile.html' %}
    - {% include 'shared/bottom_notification.html' %} - {% include 'shared/analytics.html' %} - {% include 'shared/footer.html' %} - {% include 'shared/footer_scripts.html' with slim=1 %} - - {% include 'shared/current_profile.html' %} + - - -

    {% comment %} If checkout not started {% endcomment %}
    -
    @@ -381,13 +381,13 @@

    Pay with zkSync

    {% comment %} End HTML Template for cart-ethereum-zksync.js {% endcomment %}
    - -
    - + Payout
    @@ -90,7 +90,7 @@ Signing Transaction Failed.

    - Try again in some time + Try again in some time

    @@ -108,7 +108,7 @@ here.

    - Payout your next Grant + Payout your next Grant
    diff --git a/app/grants/templates/grants/cart/extension/harmony.html b/app/grants/templates/grants/cart/extension/harmony.html index b40610831e3..87323f6325a 100644 --- a/app/grants/templates/grants/cart/extension/harmony.html +++ b/app/grants/templates/grants/cart/extension/harmony.html @@ -61,7 +61,7 @@
    - + Payout
    @@ -90,7 +90,7 @@ Signing Transaction Failed.

    - Try again in some time + Try again in some time

    @@ -108,7 +108,7 @@ here.

    - Payout your next Grant + Payout your next Grant
    diff --git a/app/grants/templates/grants/cart/extension/kusama.html b/app/grants/templates/grants/cart/extension/kusama.html index 9815f256108..0b461745ce3 100644 --- a/app/grants/templates/grants/cart/extension/kusama.html +++ b/app/grants/templates/grants/cart/extension/kusama.html @@ -61,7 +61,7 @@
    - + Payout
    @@ -91,7 +91,7 @@

    - Try again in some time + Try again in some time

    @@ -102,7 +102,7 @@
    diff --git a/app/grants/templates/grants/cart/extension/polkadot.html b/app/grants/templates/grants/cart/extension/polkadot.html index 1451771cef3..1f66531bc9d 100644 --- a/app/grants/templates/grants/cart/extension/polkadot.html +++ b/app/grants/templates/grants/cart/extension/polkadot.html @@ -61,7 +61,7 @@
    - + Payout
    @@ -91,7 +91,7 @@

    - Try again in some time + Try again in some time

    @@ -102,7 +102,7 @@
    diff --git a/app/grants/templates/grants/cart/qr/celo.html b/app/grants/templates/grants/cart/qr/celo.html index f27cbdf675c..da7c88e3b87 100644 --- a/app/grants/templates/grants/cart/qr/celo.html +++ b/app/grants/templates/grants/cart/qr/celo.html @@ -69,12 +69,12 @@
    - + Payout - + Completed @@ -136,7 +136,7 @@
    - +
    [[grant.error]]
    diff --git a/app/grants/templates/grants/cart/qr/zcash.html b/app/grants/templates/grants/cart/qr/zcash.html index a88cbb7d3f9..9bf5099a950 100644 --- a/app/grants/templates/grants/cart/qr/zcash.html +++ b/app/grants/templates/grants/cart/qr/zcash.html @@ -68,12 +68,12 @@
    - + Payout - + Completed @@ -136,7 +136,7 @@
    - +
    [[grant.error]]
    diff --git a/app/grants/templates/grants/cart/qr/zil.html b/app/grants/templates/grants/cart/qr/zil.html index 347ad819b58..ef9d20f325f 100644 --- a/app/grants/templates/grants/cart/qr/zil.html +++ b/app/grants/templates/grants/cart/qr/zil.html @@ -68,12 +68,12 @@
    - + Payout - + Completed @@ -135,7 +135,7 @@
    - +
    [[grant.error]]
    diff --git a/app/grants/templates/grants/components/card.html b/app/grants/templates/grants/components/card.html index d340a6a5ccc..9825b4a258b 100644 --- a/app/grants/templates/grants/components/card.html +++ b/app/grants/templates/grants/components/card.html @@ -105,11 +105,11 @@

    - + Quick View - -
    diff --git a/app/grants/templates/grants/components/collection.html b/app/grants/templates/grants/components/collection.html index 70ca3e19132..e43d890b67b 100644 --- a/app/grants/templates/grants/components/collection.html +++ b/app/grants/templates/grants/components/collection.html @@ -106,11 +106,11 @@

    {% if activeCollection %} - {% else %} - View diff --git a/app/grants/templates/grants/detail/_index.html b/app/grants/templates/grants/detail/_index.html index 814349fac50..4faed903af5 100644 --- a/app/grants/templates/grants/detail/_index.html +++ b/app/grants/templates/grants/detail/_index.html @@ -38,497 +38,496 @@ - {% include 'shared/tag_manager_2.html' %} -
    - {% include 'shared/top_nav.html' with class='d-md-flex' %} - {% include 'grants/nav.html' %} -
    - {% if is_staff %} -
    - Staff only - {% trans "View Admin" %} +
    + {% include 'shared/tag_manager_2.html' %} +
    + {% include 'shared/top_nav.html' with class='d-md-flex' %} + {% include 'grants/nav.html' %}
    - {% endif %} -
    - - - + +
    + + +
    + Back to [[backLink.title]] +
    +     + +
    + + + +
    + {% if is_team_member %} + {% include 'profiles/status_box.html' with suppress_tags=1 placeholder="Update Grant's Funders" what="grant" whatid=grant.pk max_length=1000 suppress_data_toggle=1 %} + {% else %} + {% include 'profiles/status_box.html' with suppress_tags=1 placeholder="Write on grants wall" what="grant" whatid=grant.pk suppress_data_toggle=1 %} + {% endif %} +
    + {% include 'shared/activity_container.html' with pinned=False %} +
    -
    - {% endif %} -

    {% trans "No Activity for this Grant!" %}

    - - -
    -
    -
    - -
    -

    - {% trans "Contributions" %} ([[transactions?.count]]) -

    -
    -
    -
    - - - - -
    -
    - - - [[transaction.subscription.contributor_profile]] - - - - anonymous - -
    -
    - - (Failed) - - - (Pending) - -
    -
    - - View Etherscan - -
    -
    -
    -

    - [[transaction.subscription.amount_per_period | formatNumberWithDecimal ]] - [[transaction.subscription.token_symbol]] -

    + + + + + + {% if is_team_member %} +
    + {% if is_owner %} + + Export Transactions (OWNER ONLY) + | + {% endif %} + + + All Contributor Addresses for this Grant (TEAM ONLY) + +
    +
    + {% endif %} +

    {% trans "No Activity for this Grant!" %}

    + + +
    +
    +
    + +
    +

    + {% trans "Contributions" %} ([[transactions?.count]]) +

    +
    +
    +
    + + + +
    -
    -
    -
    -

    - ($ [[transaction.subscription.amount_per_period_usdt | formatNumberWithDecimal ]]) -

    +
    + + + [[transaction.subscription.contributor_profile]] + + + + anonymous + +
    +
    + + (Failed) + + + (Pending) + +
    +
    + + View Etherscan + +
    +
    +
    +

    + [[transaction.subscription.amount_per_period | formatNumberWithDecimal ]] + [[transaction.subscription.token_symbol]] +

    +
    +
    +
    +
    +

    + ($ [[transaction.subscription.amount_per_period_usdt | formatNumberWithDecimal ]]) +

    +
    +
    +
    + (includes [[transaction.subscription.amount_per_period_to_gitcoin| formatNumberWithDecimal ]] [[transaction.subscription.token_symbol ]] => Grants Dev Fund)
    -
    -
    - (includes [[transaction.subscription.amount_per_period_to_gitcoin| formatNumberWithDecimal ]] [[transaction.subscription.token_symbol ]] => Grants Dev Fund)
    -
    - - - - -
    - -
    - - -     - - - -

    {% trans "No related grants." %}

    - -
    -
    - -
    - -
    -
    [[relgrant.title]]
    -

    [[relgrant.description | truncate(150)]]

    -
    - -
    - - - -
    - -
    - - - - -

    {% trans "No contributors." %}

    - -
    - - - [[contributor.user]] - -
    - - - -
    - -
    -     - - - {% if is_staff %} - - - - -

    Grant Sybil Profile

    - -
    - - SybilScore ™️: {{ grant.sybil_score }} -
    - - RiskScore ™️: {{ grant.weighted_risk_score }} - 
    -
-                A grant's SybilScore ™️ is calculated off of the total of suspicious activity on each of the following vectors:
-                - Account Metadata
-                - Suspicious Interactions
-                - Grant Flags Reports
-                - BrightID Trust Score (coming soon)
-                - KYC (maybe coming soon)
-                - MACI (maybe coming soon)
-
-                a grant's RiskScore ™️ is equal to its (SybilScore ™️)^2 * sqrt(its matching funds for this round).
-
    -
    - {% for ele in sybil_profiles%} -

    {{ele.0}}: (avg {{ele.1.1|floatformat:2}})

    - - - - - - - - - {% for sp in ele.1.0 %} - - - - - - - - {% endfor %} -
    - Index - - Contributors - - Contributors (pct) - - Contributions/Contributor - - Profiles -
    - {% if '0x' in sp.0 %} - {{sp.0}} - {% else %} - {{sp.0}} - {% endif %} - - {{sp.1}} - - {{sp.5}}% - - {{sp.3|floatformat:2}} - -
    - {% for this_profile in sp.4 %} - - {% if forloop.counter < 20 %} - - {% endif %} - @{{this_profile}} - - {% endfor %} -
    -
    - + + + +
    + +
    + + + +

    {% trans "No contributors." %}

    - {% endfor %} +
    + + + [[contributor.user]] +
    -     - {% endif %} - {% if is_team_member or is_staff %} - - - {% if tab == 'stats' %} -
    -
    - -
    -
    - {% if stats_history|length %} -

    Marketing History Over Time

    - - - - - - - - {% for ele in stats_history %} - - - - - - - {% endfor %} -
    - When - - Impressions - - Added to Cart - - Contributions -
    - {{ele.created_on|date:"Y/m/d"}} - - {{ele.data.impressions}} - - {{ele.data.in_cart}} - - {{ele.data.contributions}} -
    - {% endif %} - -

    Contribution History (in USD)

    -
    -
    -
    -
    -

    {% trans "Contributions" %}

    -

    {% trans "CLR Matching Funds" %}

    + + + +
    + +
    + + + + {% if is_staff %} + + + + +

    Grant Sybil Profile

    + +
    + + SybilScore ™️: {{ grant.sybil_score }} +
    + + RiskScore ™️: {{ grant.weighted_risk_score }} + 
    +
+                  A grant's SybilScore ™️ is calculated off of the total of suspicious activity on each of the following vectors:
+                  - Account Metadata
+                  - Suspicious Interactions
+                  - Grant Flags Reports
+                  - BrightID Trust Score (coming soon)
+                  - KYC (maybe coming soon)
+                  - MACI (maybe coming soon)
+
+                  a grant's RiskScore ™️ is equal to its (SybilScore ™️)^2 * sqrt(its matching funds for this round).
+
    +
    + {% for ele in sybil_profiles%} +

    {{ele.0}}: (avg {{ele.1.1|floatformat:2}})

    + + + + + + + + + {% for sp in ele.1.0 %} + + + + + + + + {% endfor %} +
    + Index + + Contributors + + Contributors (pct) + + Contributions/Contributor + + Profiles +
    + {% if '0x' in sp.0 %} + {{sp.0}} + {% else %} + {{sp.0}} + {% endif %} + + {{sp.1}} + + {{sp.5}}% + + {{sp.3|floatformat:2}} + +
    + {% for this_profile in sp.4 %} + + {% if forloop.counter < 20 %} + + {% endif %} + @{{this_profile}} + + {% endfor %} +
    +
    + + + + {% endfor %} +
    +     + {% endif %} + {% if is_team_member or is_staff %} + + + {% if tab == 'stats' %} +
    +
    + +
    +
    + {% if stats_history|length %} +

    Marketing History Over Time

    + + + + + + + + {% for ele in stats_history %} + + + + + + + {% endfor %} +
    + When + + Impressions + + Added to Cart + + Contributions +
    + {{ele.created_on|date:"Y/m/d"}} + + {{ele.data.impressions}} + + {{ele.data.in_cart}} + + {{ele.data.contributions}} +
    + {% endif %} + +

    Contribution History (in USD)

    +
    +
    +
    +
    +

    {% trans "Contributions" %}

    +

    {% trans "CLR Matching Funds" %}

    +
    -
    +
    -
    + {% endif %} + {% endif %} - - {% endif %} - -
    + +
    -
    +
    - -
    - {% include 'grants/detail/template-grant-details.html' %} - - {% include 'shared/bottom_notification.html' %} - {% include 'shared/footer.html' %} - {% include 'shared/current_profile.html' %} - {% include 'shared/analytics.html' %} - {% include 'grants/shared/shared_scripts.html' %} - {% include 'shared/footer_scripts.html' with slim=1 ignore_inject_web3=1 %} - - - - - {{verification_tweet|json_script:"verification_tweet"}} - {{user_code|json_script:"user_code"}} - - - {% include 'shared/activity_scripts.html' %} - - - - - - {% if is_team_member %} - - {% if tab == 'stats' %} - - - + {% include 'grants/detail/template-grant-details.html' %} + + {% include 'shared/footer.html' %} + {% include 'shared/current_profile.html' %} + {% include 'shared/analytics.html' %} + {% include 'grants/shared/shared_scripts.html' %} + {% include 'shared/footer_scripts.html' with slim=1 ignore_inject_web3=1 %} + + + + + {{verification_tweet|json_script:"verification_tweet"}} + {{user_code|json_script:"user_code"}} + + + {% include 'shared/activity_scripts.html' %} + + + + + + {% if is_team_member %} + + {% if tab == 'stats' %} + + + + {% endif %} {% endif %} - {% endif %} - {% if is_staff %} - - + - {% endif %} - - + {% endif %} +
    diff --git a/app/grants/templates/grants/detail/funding.html b/app/grants/templates/grants/detail/funding.html index 6372fd21d9f..fa529ff8e00 100644 --- a/app/grants/templates/grants/detail/funding.html +++ b/app/grants/templates/grants/detail/funding.html @@ -84,7 +84,7 @@

    {% endif %} {% if not grant.active %} - @@ -105,20 +105,20 @@

    {% if user_non_errored_subscription %} - {% elif grant.link_to_new_grant %} - {% else %}
    {% include 'grants/shared/hidden_inputs.html' %} -
    diff --git a/app/grants/templates/grants/detail/index.html b/app/grants/templates/grants/detail/index.html index e9810cd09c4..6ee80b68d7f 100644 --- a/app/grants/templates/grants/detail/index.html +++ b/app/grants/templates/grants/detail/index.html @@ -37,98 +37,99 @@ - {% include 'shared/tag_manager_2.html' %} -
    - {% include 'shared/top_nav.html' with class='d-md-flex' %} - {% include 'grants/nav.html' %} -
    - - {% include 'grants/shared/waiting_state.html' %} +
    + {% include 'shared/tag_manager_2.html' %} +
    + {% include 'shared/top_nav.html' with class='d-md-flex' %} + {% include 'grants/nav.html' %} +
    - {% if is_staff %} -
    - Staff only - {% trans "View Admin" %} -
    - {% endif %} + {% include 'grants/shared/waiting_state.html' %} -
    -
    -
    -
    - {% include 'grants/detail/info.html' %} + {% if is_staff %} +
    + Staff only + {% trans "View Admin" %} +
    + {% endif %} + +
    +
    +
    +
    + {% include 'grants/detail/info.html' %} +
    +
    + {% include 'grants/detail/funding.html' %} +
    -
    - {% include 'grants/detail/funding.html' %} +
    +
    + {% include 'grants/detail/tabs.html' %} +
    -
    -
    - {% include 'grants/detail/tabs.html' %} -
    +
    - -
    - - - Edit Grant + + Edit Grant
    @@ -297,17 +297,17 @@
    TEAM
    @@ -328,14 +328,14 @@
    TEAM
    Read all the rules here. If you see someone breaking the rules, please use 'Flag Grant' to report them. -
    {% if should_show_claim_match_button %}
    -
    @@ -352,7 +352,7 @@
    REGION
    - [[grant.region.label]] + [[grant.region.label]]
    @@ -360,13 +360,13 @@
    CATEGORY
    - [[item.fields.label]] + [[item.fields.label]]
    @@ -419,9 +419,9 @@
    Verify Grant Ownership with Twitter

    Step 2: Click to send the verification tweet from the grant account ([[grant.twitter_handle_1]])

    - Send Verification Tweet + Send Verification Tweet

    Step 3: Click the "Verify" button below

    - +
    @@ -553,7 +553,7 @@
    Verify Grant Ownership with Twitter
    - +