From 1ec3dc5bc6c2ed690540738d6e707267b5a294f7 Mon Sep 17 00:00:00 2001 From: niuage Date: Fri, 24 Jan 2025 21:35:13 +0000 Subject: [PATCH 1/6] new nav --- .../reimagine2/mobile_global_nav.coffee | 9 ++ .../reimagine2/devpost/_global_nav_bar.sass | 90 +++++++++++++++---- .../foundation/extensions/_flex.sass | 6 ++ .../devpost/_global_nav_desktop.html.erb | 4 - .../_host_a_hackathon_nav_entry.html.erb | 59 ++++++++++++ .../_join_a_hackathon_nav_entry.html.erb | 48 ++++++++++ .../global_nav/_resources_nav_entry.html.erb | 57 ++++++++++++ .../global_nav/_world_menu_entries.html.erb | 56 ++---------- .../devpost/global_nav/mobile/_world.html.erb | 4 +- .../mobile/_world_menu_entries.html.erb | 52 +++-------- 10 files changed, 268 insertions(+), 117 deletions(-) create mode 100644 app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb create mode 100644 app/views/reimagine2/devpost/global_nav/_join_a_hackathon_nav_entry.html.erb create mode 100644 app/views/reimagine2/devpost/global_nav/_resources_nav_entry.html.erb diff --git a/app/assets/javascripts/reimagine2/mobile_global_nav.coffee b/app/assets/javascripts/reimagine2/mobile_global_nav.coffee index 812a3e1b..93c5ace2 100644 --- a/app/assets/javascripts/reimagine2/mobile_global_nav.coffee +++ b/app/assets/javascripts/reimagine2/mobile_global_nav.coffee @@ -28,3 +28,12 @@ if !$mobileSearchContainer.hasClass("hide") $mobileSearchContainer.find("#search").focus() + + $("[data-accordion-tab]").on "click", (e) => + e.preventDefault() + + targetId = $(this).attr('href').substring(1) + $targetSection = $(`[data-accordion-section="${targetId}"]`) + + $targetSection.slideToggle() + $('[data-accordion-section').not($targetSection).slideUp(); diff --git a/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass b/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass index 9755d253..af8a6f74 100644 --- a/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass +++ b/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass @@ -1,5 +1,7 @@ @import "./global_nav_active_states" +$dropdown-links-line-height: 28px + #global-nav background: white box-shadow: rgba(0, 0, 0, 0.3) 0px 1px 3px 0px @@ -7,6 +9,14 @@ position: relative .top-bar-section + .dropdown.main-menu-dropdown + li a + padding: 0 + line-height: $dropdown-links-line-height + + &:hover + background: none + .has-dropdown > a:after border-top-color: transparent border-left-color: $grey-3 @@ -102,13 +112,18 @@ display: flex flex-direction: column padding-top: 3px - padding-left: 53px + + &.with-icon-offset + padding-left: 50px a padding: 6px 6px line-height: 16px color: $primary-1 + .resource-title + font-weight: bold + .name float: left @@ -157,9 +172,6 @@ strong display: inline - @media only screen and (max-width: 1076px) - padding: 0 1.18em - .alpha display: none letter-spacing: 1px @@ -351,7 +363,6 @@ .dropdown &.float-left position: absolute - left: -12.125em z-index: 1001 .panel-product-content @@ -362,42 +373,83 @@ margin-bottom: 0 line-height: 16px -#floating-menu-wrapper +.floating-menu-wrapper .floating-menu - display: flex - height: 226px - width: 768px + padding: 32px .panel-container flex: 1 - padding: 20px 30px 40px + margin-right: 32px font-size: 14px + &:last-child, &.mr-0 + margin-right: 0 + + &.mb-4 + margin-bottom: 16px + + &.bordered + border: 1px solid #DDE3E6 + border-radius: 8px + + &.bordered-hover:hover + border-color: $anchor-font-color-hover + .panel-product display: flex grid-column-gap: 12px align-items: flex-start - padding: 10px border-radius: 3px font-size: 14px white-space: normal - max-height: initial + max-height: initial !important - .title - padding-top: 4px - padding-bottom: 4px + .title + margin: 4px 0 8px - .subtitle - color: $blue-grey-4 + .subtitle + color: $blue-grey-6 .panel-content display: flex flex-direction: column - padding-top: 10px - padding-left: 53px + + &.with-icon-offset + padding-top: 10px + padding-left: 50px a padding: 6px 6px border-radius: 3px line-height: 16px color: $primary-1 + + .panel-section + padding: 16px + + &.pt-0 + padding-top: 0 + + .fa-arrow-right + float: right + line-height: $dropdown-links-line-height + color: $blue-grey-4 + + a:hover + .fa-arrow-right + color: $anchor-font-color-hover + + p + margin-bottom: 0 + + +#join-a-hackathon-dropdown + left: -194px + width: 820px + +#host-a-hackathon-dropdown + min-width: 1000px + left: -384px + +#resources-dropdown + left: -100px diff --git a/app/assets/stylesheets/reimagine2/foundation/extensions/_flex.sass b/app/assets/stylesheets/reimagine2/foundation/extensions/_flex.sass index 7e1381cf..0fa4acba 100644 --- a/app/assets/stylesheets/reimagine2/foundation/extensions/_flex.sass +++ b/app/assets/stylesheets/reimagine2/foundation/extensions/_flex.sass @@ -28,6 +28,9 @@ @media #{$small} +align-stretch +.align-start + align-items: flex-start + .flex-column -ms-flex-direction: column -webkit-flex-direction: column @@ -67,3 +70,6 @@ .flex-columns +flex(1) + +.is-flex-grow-1 + flex-grow: 1 diff --git a/app/views/reimagine2/devpost/_global_nav_desktop.html.erb b/app/views/reimagine2/devpost/_global_nav_desktop.html.erb index e375d229..665334ce 100644 --- a/app/views/reimagine2/devpost/_global_nav_desktop.html.erb +++ b/app/views/reimagine2/devpost/_global_nav_desktop.html.erb @@ -11,10 +11,6 @@
From 1a81edfc40e3f31aa18c0482df23b28d27e37cd9 Mon Sep 17 00:00:00 2001 From: niuage Date: Fri, 24 Jan 2025 21:57:12 +0000 Subject: [PATCH 2/6] adds the accordion. Now just need to put stuff in partials and move them to the mobile menu acocrdion sections and should be very close to done --- .../javascripts/reimagine2/mobile_global_nav.coffee | 4 ++-- .../reimagine2/devpost/_global_nav_bar.sass | 12 +++++++++++- .../devpost/global_nav/mobile/_world.html.erb | 4 +++- .../global_nav/mobile/_world_menu_entries.html.erb | 6 +++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/reimagine2/mobile_global_nav.coffee b/app/assets/javascripts/reimagine2/mobile_global_nav.coffee index 93c5ace2..add71991 100644 --- a/app/assets/javascripts/reimagine2/mobile_global_nav.coffee +++ b/app/assets/javascripts/reimagine2/mobile_global_nav.coffee @@ -32,8 +32,8 @@ $("[data-accordion-tab]").on "click", (e) => e.preventDefault() - targetId = $(this).attr('href').substring(1) - $targetSection = $(`[data-accordion-section="${targetId}"]`) + targetId = $(e.currentTarget).attr('href').substring(1) + $targetSection = $("[data-accordion-section='#{targetId}']") $targetSection.slideToggle() $('[data-accordion-section').not($targetSection).slideUp(); diff --git a/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass b/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass index af8a6f74..d029f683 100644 --- a/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass +++ b/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass @@ -357,6 +357,17 @@ $dropdown-links-line-height: 28px color: $grey-3 font-size: 1.1rem + .accordion-tab + color: $dark + display: block + padding: 24px 16px !important + max-height: none + line-height: $dropdown-links-line-height !important + border-bottom: 1px solid $grey-2 + + .accordion-section + display: none + .ui-autocomplete max-width: 300px @@ -442,7 +453,6 @@ $dropdown-links-line-height: 28px p margin-bottom: 0 - #join-a-hackathon-dropdown left: -194px width: 820px diff --git a/app/views/reimagine2/devpost/global_nav/mobile/_world.html.erb b/app/views/reimagine2/devpost/global_nav/mobile/_world.html.erb index 289872ec..b6181a5d 100644 --- a/app/views/reimagine2/devpost/global_nav/mobile/_world.html.erb +++ b/app/views/reimagine2/devpost/global_nav/mobile/_world.html.erb @@ -1 +1,3 @@ -<%= render "reimagine2/devpost/global_nav/mobile/world_menu_entries" %> + diff --git a/app/views/reimagine2/devpost/global_nav/mobile/_world_menu_entries.html.erb b/app/views/reimagine2/devpost/global_nav/mobile/_world_menu_entries.html.erb index 1e9f4ec3..753fbf60 100644 --- a/app/views/reimagine2/devpost/global_nav/mobile/_world_menu_entries.html.erb +++ b/app/views/reimagine2/devpost/global_nav/mobile/_world_menu_entries.html.erb @@ -1,15 +1,15 @@
- + Join a hackathon

kiou1

- + Host a hackathon -
+

kiou1

From aa521854972a5e55a07000b1d400897b2e27e548 Mon Sep 17 00:00:00 2001 From: niuage Date: Mon, 27 Jan 2025 21:25:21 +0000 Subject: [PATCH 3/6] Everything looks good now --- .../reimagine2/devpost/_global_nav_bar.sass | 86 +++++++++++-------- ...t_a_hackathon_by_use_case_section.html.erb | 23 +++++ ..._host_a_hackathon_devpost_section.html.erb | 9 ++ .../_host_a_hackathon_dft_section.html.erb | 9 ++ .../_host_a_hackathon_nav_entry.html.erb | 42 +-------- ..._join_a_hackathon_devpost_section.html.erb | 19 ++++ .../_join_a_hackathon_dft_section.html.erb | 16 ++++ .../_join_a_hackathon_nav_entry.html.erb | 33 +------ .../global_nav/_resources_nav_entry.html.erb | 46 +--------- .../global_nav/_resources_section.html.erb | 44 ++++++++++ .../mobile/_world_menu_entries.html.erb | 35 +++++++- 11 files changed, 206 insertions(+), 156 deletions(-) create mode 100644 app/views/reimagine2/devpost/global_nav/_host_a_hackathon_by_use_case_section.html.erb create mode 100644 app/views/reimagine2/devpost/global_nav/_host_a_hackathon_devpost_section.html.erb create mode 100644 app/views/reimagine2/devpost/global_nav/_host_a_hackathon_dft_section.html.erb create mode 100644 app/views/reimagine2/devpost/global_nav/_join_a_hackathon_devpost_section.html.erb create mode 100644 app/views/reimagine2/devpost/global_nav/_join_a_hackathon_dft_section.html.erb create mode 100644 app/views/reimagine2/devpost/global_nav/_resources_section.html.erb diff --git a/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass b/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass index d029f683..51d55e15 100644 --- a/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass +++ b/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass @@ -367,6 +367,10 @@ $dropdown-links-line-height: 28px .accordion-section display: none + background: $grey-1 + + .panel-section + border-bottom: 1px solid #DDE3E6 .ui-autocomplete max-width: 300px @@ -385,55 +389,61 @@ $dropdown-links-line-height: 28px line-height: 16px .floating-menu-wrapper - .floating-menu - padding: 32px + padding: 32px - .panel-container - flex: 1 - margin-right: 32px - font-size: 14px + .mobile & + padding: 0 - &:last-child, &.mr-0 - margin-right: 0 + .panel-container + flex: 1 + margin-right: 32px + font-size: 14px - &.mb-4 - margin-bottom: 16px + &:last-child, &.mr-0 + margin-right: 0 - &.bordered - border: 1px solid #DDE3E6 - border-radius: 8px + &.mb-4 + margin-bottom: 16px - &.bordered-hover:hover - border-color: $anchor-font-color-hover + &.bordered + border: 1px solid #DDE3E6 + border-radius: 8px - .panel-product - display: flex - grid-column-gap: 12px - align-items: flex-start - border-radius: 3px - font-size: 14px + &.bordered-hover:hover + border-color: $anchor-font-color-hover + + .panel-product + display: flex + grid-column-gap: 12px + align-items: flex-start + border-radius: 3px + font-size: 14px + white-space: normal + max-height: initial !important + padding: 0 !important + + > * white-space: normal - max-height: initial !important - .title - margin: 4px 0 8px + .title + margin: 4px 0 6px - .subtitle - color: $blue-grey-6 + .subtitle + color: $blue-grey-6 - .panel-content - display: flex - flex-direction: column + .panel-content + display: flex + flex-direction: column - &.with-icon-offset - padding-top: 10px - padding-left: 50px + &.with-icon-offset + padding-top: 10px + padding-left: 50px - a - padding: 6px 6px - border-radius: 3px - line-height: 16px - color: $primary-1 + a + line-height: $dropdown-links-line-height !important + padding: 0 !important + border-radius: 3px + color: $primary-1 .panel-section padding: 16px @@ -450,7 +460,7 @@ $dropdown-links-line-height: 28px .fa-arrow-right color: $anchor-font-color-hover - p + p:not(.title) margin-bottom: 0 #join-a-hackathon-dropdown diff --git a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_by_use_case_section.html.erb b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_by_use_case_section.html.erb new file mode 100644 index 00000000..398af37e --- /dev/null +++ b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_by_use_case_section.html.erb @@ -0,0 +1,23 @@ +<% arrow_icon = ''.html_safe %> + +<%= content_tag :div, class: ["panel-section", local_assigns[:panel_classes]] do %> +
+

By use case

+ + <% + entries = [ + ['AI hackathons', 'https://info.devpost.com/product/ai-hackathons'], + ['Customer hackathons', 'https://info.devpost.com/product/customer-hackathons'], + ['Employee hackathons', 'https://info.devpost.com/product/devpost-for-teams'], + ['Public hackathons', 'https://info.devpost.com/product/public-hackathons'], + ] + %> + + <% entries.each do |entry| %> + <% link_copy, link_url = entry %> + <%= link_to link_url do %> + <%= link_copy %> <%= arrow_icon %> + <% end %> + <% end %> +
+<% end %> diff --git a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_devpost_section.html.erb b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_devpost_section.html.erb new file mode 100644 index 00000000..91ffc854 --- /dev/null +++ b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_devpost_section.html.erb @@ -0,0 +1,9 @@ +
+ + <%= image_tag 'reimagine2/devpost-logo-mobile.svg', alt: 'Devpost' %> +
+

Devpost

+

Grow your developer ecosystem and promote your platform.

+
+ +
diff --git a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_dft_section.html.erb b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_dft_section.html.erb new file mode 100644 index 00000000..5dc40769 --- /dev/null +++ b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_dft_section.html.erb @@ -0,0 +1,9 @@ +
+ + <%= image_tag 'reimagine2/dft-logo-mobile.svg', alt: 'Devpost for Teams' %> +
+

Devpost for Teams

+

Drive innovation, collaboration, and retention within your org.

+
+ +
diff --git a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb index 7f3e6e4c..e267c8a8 100644 --- a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb +++ b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb @@ -7,51 +7,15 @@
  • -
    - - <%= image_tag 'reimagine2/devpost-logo-mobile.svg', alt: 'Devpost' %> -
    -

    Devpost

    -

    Grow your developer ecosystem and promote your platform.

    -
    -     -
    + <%= render "reimagine2/devpost/global_nav/host_a_hackathon_devpost_section" %>
    -
    - - <%= image_tag 'reimagine2/dft-logo-mobile.svg', alt: 'Devpost for Teams' %> -
    -

    Devpost for Teams

    -

    Drive innovation, collaboration, and retention within your org.

    -
    -     -
    + <%= render "reimagine2/devpost/global_nav/host_a_hackathon_dft_section" %>
    -
    -
    -

    By use case

    - - <% - entries = [ - ['AI hackathons', 'https://info.devpost.com/product/ai-hackathons'], - ['Customer hackathons', 'https://info.devpost.com/product/customer-hackathons'], - ['Employee hackathons', 'https://info.devpost.com/product/devpost-for-teams'], - ['Public hackathons', 'https://info.devpost.com/product/public-hackathons'], - ] - %> - - <% entries.each do |entry| %> - <% link_copy, link_url = entry %> - <%= link_to link_url do %> - <%= link_copy %> <%= arrow_icon %> - <% end %> - <% end %> -
    -
    + <%= render "reimagine2/devpost/global_nav/host_a_hackathon_by_use_case_section", panel_classes: "pt-0" %>
    • diff --git a/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_devpost_section.html.erb b/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_devpost_section.html.erb new file mode 100644 index 00000000..4cd59f66 --- /dev/null +++ b/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_devpost_section.html.erb @@ -0,0 +1,19 @@ +<% arrow_icon = ''.html_safe %> + +
    + + <%= image_tag 'reimagine2/devpost-logo-mobile.svg', alt: 'Devpost' %> +
    +

    Devpost

    +

    Participate in our public hackathons

    +
    +     +
    + <%= link_to reimagine_root_url(path: '/hackathons') do %> + Hackathons <%= arrow_icon %> + <% end %> + <%= link_to reimagine_root_url(path: '/software') do %> + Projects <%= arrow_icon %> + <% end %> +
    +
    diff --git a/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_dft_section.html.erb b/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_dft_section.html.erb new file mode 100644 index 00000000..9c646821 --- /dev/null +++ b/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_dft_section.html.erb @@ -0,0 +1,16 @@ +<% arrow_icon = ''.html_safe %> + +
    + + <%= image_tag 'reimagine2/dft-logo-mobile.svg', alt: 'Devpost for Teams' %> +
    +

    Devpost for Teams

    +

    Access your company's private hackathons

    +
    +     +
    + + Login <%= arrow_icon %> + +
    +
    diff --git a/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_nav_entry.html.erb b/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_nav_entry.html.erb index 0470aef2..e032bb02 100644 --- a/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_nav_entry.html.erb +++ b/app/views/reimagine2/devpost/global_nav/_join_a_hackathon_nav_entry.html.erb @@ -7,40 +7,11 @@
  • -
    - - <%= image_tag 'reimagine2/devpost-logo-mobile.svg', alt: 'Devpost' %> -
    -

    Devpost

    -

    Participate in our public hackathons

    -
    -     -
    - <%= link_to reimagine_root_url(path: '/hackathons') do %> - Hackathons <%= arrow_icon %> - <% end %> - <%= link_to reimagine_root_url(path: '/software') do %> - Projects <%= arrow_icon %> - <% end %> -
    -
    + <%= render "reimagine2/devpost/global_nav/join_a_hackathon_devpost_section" %>
    -
    - - <%= image_tag 'reimagine2/dft-logo-mobile.svg', alt: 'Devpost for Teams' %> -
    -

    Devpost for Teams

    -

    Access your company's private hackathons

    -
    -     -
    - - Login <%= arrow_icon %> - -
    -
    + <%= render "reimagine2/devpost/global_nav/join_a_hackathon_dft_section" %>
    • diff --git a/app/views/reimagine2/devpost/global_nav/_resources_nav_entry.html.erb b/app/views/reimagine2/devpost/global_nav/_resources_nav_entry.html.erb index b382eeb1..f40a3fdd 100644 --- a/app/views/reimagine2/devpost/global_nav/_resources_nav_entry.html.erb +++ b/app/views/reimagine2/devpost/global_nav/_resources_nav_entry.html.erb @@ -6,51 +6,7 @@ diff --git a/app/views/reimagine2/devpost/global_nav/_resources_section.html.erb b/app/views/reimagine2/devpost/global_nav/_resources_section.html.erb new file mode 100644 index 00000000..b68d1e26 --- /dev/null +++ b/app/views/reimagine2/devpost/global_nav/_resources_section.html.erb @@ -0,0 +1,44 @@ +<% + entries = [ + { + title: "Blog", + subtitle: "Insights into hackathon planning and participation", + url: "https://info.devpost.com/blog" + }, + { + title: "Customer stories", + subtitle: "Inspiration from peers and other industry leaders", + url: "https://info.devpost.com/customer-stories" + }, + { + title: "Planning guides", + subtitle: "Best practices for planning online and in-person hackathons", + url: "https://info.devpost.com/guides" + }, + { + title: "Webinars & events", + subtitle: "Upcoming events and on-demand recordings", + url: "https://info.devpost.com/webinar-events" + }, + { + title: "Help desk", + subtitle: "How to use Devpost and Devpost for Teams", + url: "https://help.devpost.com/" + } + ] +%> + +<% entries.each do |entry| %> +
    +
    + <%= link_to entry[:url] do %> +

    + <%= entry[:title] %> +

    +

    + <%= entry[:subtitle] %> +

    + <% end %> +
    +
    +<% end %> diff --git a/app/views/reimagine2/devpost/global_nav/mobile/_world_menu_entries.html.erb b/app/views/reimagine2/devpost/global_nav/mobile/_world_menu_entries.html.erb index 753fbf60..53546365 100644 --- a/app/views/reimagine2/devpost/global_nav/mobile/_world_menu_entries.html.erb +++ b/app/views/reimagine2/devpost/global_nav/mobile/_world_menu_entries.html.erb @@ -1,15 +1,44 @@ -
    +
    Join a hackathon
    -

    kiou1

    +
    + <%= render "reimagine2/devpost/global_nav/join_a_hackathon_devpost_section" %> +
    + +
    + <%= render "reimagine2/devpost/global_nav/join_a_hackathon_dft_section" %> +
    Host a hackathon
    -

    kiou1

    +
    + <%= render "reimagine2/devpost/global_nav/host_a_hackathon_devpost_section" %> +
    + +
    + <%= render "reimagine2/devpost/global_nav/host_a_hackathon_dft_section" %> +
    + +
    + <%= render "reimagine2/devpost/global_nav/host_a_hackathon_by_use_case_section" %> +
    +
    + + + Resources + +
    +
    +
    +
    + <%= render "reimagine2/devpost/global_nav/resources_section" %> +
    +
    +
    From 70fb2699dd7be010f62cae8d7ddb74c40292a95d Mon Sep 17 00:00:00 2001 From: niuage Date: Mon, 27 Jan 2025 21:51:00 +0000 Subject: [PATCH 4/6] wasnt done actually, forgot to replace the carets --- .../reimagine2/devpost/_global_nav_bar.sass | 15 ++++++++++++++- ..._host_a_hackathon_by_use_case_section.html.erb | 2 +- .../_host_a_hackathon_nav_entry.html.erb | 6 ++++-- .../_join_a_hackathon_devpost_section.html.erb | 2 +- .../_join_a_hackathon_dft_section.html.erb | 2 +- .../_join_a_hackathon_nav_entry.html.erb | 6 ++++-- .../global_nav/_resources_nav_entry.html.erb | 6 ++++-- .../mobile/_world_menu_entries.html.erb | 6 +++--- 8 files changed, 32 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass b/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass index 51d55e15..5449c8a9 100644 --- a/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass +++ b/app/assets/stylesheets/reimagine2/devpost/_global_nav_bar.sass @@ -172,6 +172,14 @@ $dropdown-links-line-height: 28px strong display: inline + &:after + border: 0 !important + + i + margin-left: 4px + position: relative + top: 1px + .alpha display: none letter-spacing: 1px @@ -359,11 +367,16 @@ $dropdown-links-line-height: 28px .accordion-tab color: $dark + font-weight: 500 display: block padding: 24px 16px !important max-height: none line-height: $dropdown-links-line-height !important border-bottom: 1px solid $grey-2 + font-size: 16px !important + display: flex + align-items: center + justify-content: space-between .accordion-section display: none @@ -469,7 +482,7 @@ $dropdown-links-line-height: 28px #host-a-hackathon-dropdown min-width: 1000px - left: -384px + left: -402px #resources-dropdown left: -100px diff --git a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_by_use_case_section.html.erb b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_by_use_case_section.html.erb index 398af37e..d6541d9e 100644 --- a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_by_use_case_section.html.erb +++ b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_by_use_case_section.html.erb @@ -1,4 +1,4 @@ -<% arrow_icon = ''.html_safe %> +<% arrow_icon = ''.html_safe %> <%= content_tag :div, class: ["panel-section", local_assigns[:panel_classes]] do %>
    diff --git a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb index e267c8a8..d9042642 100644 --- a/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb +++ b/app/views/reimagine2/devpost/global_nav/_host_a_hackathon_nav_entry.html.erb @@ -1,7 +1,9 @@ -<% arrow_icon = ''.html_safe %> +<% arrow_icon = ''.html_safe %>
  • - <%= link_to 'Host a hackathon', '#', class: 'main-link' %> + <%= link_to '#', class: 'main-link' do %> + Host a hackathon + <% end %>