conflict

<<<<<<< HEAD
            %nav.navbar.navbar-default
              <!-- Brand and toggle get grouped for better mobile display -->
              %div.navbar-header
                %button{ :type => 'button', :class => 'navbar-toggle collapsed', "data-toggle" => "collapse", "data-target" => "#bs-example-navbar-collapse-1", "aria-expanded" => "false"}
                  %span.fa.fa-circle
                  %span.fa.fa-circle
                  %span.fa.fa-circle
                = link_to root_path, :class => "navbar-brand bye-header-logo headline", :onclick => "javascript: dataLayer.push(['_trackEvent', 'Click logo']);" do
                  = image_tag 'byebuy-logo.svg', width: 85, alt: ""
                %ul.navbar-brand.navbar-big-screens.pull-right
                  %li.hide-768.nav-catalogue
                    %ul
                      %li.nav-margin
                        %a{"href" => "#{listing_path}"}
                          = Spree.t(:catalogue)
                      %li.nav-margin.didi.dropdown
                        %a.dropdown-toggle.hidden-md.hidden-lg{"href" => "/ourcategories", "data-animations"=>"fadeIn", "data-hover" => "dropdown",  }
                          = Spree.t(:explore)
                        %a.dropdown-toggle.hidden-xs.hidden-sm{ "href" => "/ourcategories", "aria-haspopup" => "true", "data-animations"=>"fadeIn", "data-hover" => "dropdown",  }
                          = Spree.t(:explore)
                        %ul.dropdown-menu.nav-cat-li
                          = render partial: 'spree/home/list_taxons_menu'
                      %li.search-input-list.nav-margin
                        %a.pull-right{:href => "javascript:void(0)"}
                        = form_tag spree.products_path, :method => :get do
                          = text_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search)
                  %li.nav-sign-in
                    %ul
                      %li.dropdown.menu-ddl.pull-right.nav-margin.nav-signin-field
                        %a{:href => "/sign-up", class: "button1 header-login #{'hidden' if spree_current_user}"}
                          = Spree.t(:sign_in_new)
                      %li.dropdown.menu-ddl.pull-right.nav-margin.nav-signin-field
                        %a{ :id => 'dropdownMenu2', "aria-expanded" => "true", "data-toggle" => "dropdown", :href => "#", class: "button4 header-logout #{'hidden' if !spree_current_user}"}
                          = image_tag 'byebuy-emoji.svg', width: 96, alt: "", :class => "bb-emoji"
                          = image_tag 'byebuy-emoji-wink.svg', width: 96, alt: "", :class => "bb-emoji-wink hide"
                        %ul.dropdown-menu{"aria-labelledby" => "dropdownMenu2", :role => "menu"}
                          %li.user-wrapper.emoji-dropdown
                            %span.emoji-hello
                              - if spree_current_user && spree_current_user.bill_address && spree_current_user.bill_address.firstname
                                = "Hello #{spree_current_user.bill_address.firstname}!"
                              - else
                                = 'Hello'
                            = link_to :controller => 'users', :action => 'dashboard' do
                              = Spree.t(:dashboard)
                            = link_to destroy_spree_user_session_path do
                              = Spree.t(:sign_out)
                      %li.pull-right.nav-margin
                        %a.magic-icon#checkout-button{:href => "javascript:void(0)"}
                          %span#line-items-count
                            = notifaction_number
                      = render partial: 'spree/shared/shop_header'
                %div#slider
              <!-- Brand and toggle get grouped for better mobile display -->
              %div{ :id => 'bs-example-navbar-collapse-1', :class => 'collapse navbar-collapse' }
                %ul{:class => 'nav navbar-nav' }
                  %li.navbar-input.hidden-md.hidden-lg
                    %a.pull-right{:href => "javascript:void(0)"}
                    = form_tag spree.products_path, :method => :get do
                      = text_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search)
                  %li.nav-margin.hidden-lg.hidden-md
                    %a{"href" => "#{listing_path}"}
                      = Spree.t(:catalogue)
                  %li.dropdown.hidden-md.hidden-lg
                    %a.dropdown-toggle.hidden-md.hidden-lg{"href" => "#", "data-toggle" => "dropdown", "data-delay" => "500", "data-close-others" => "false"}
                      = Spree.t(:explore)
                    %ul.dropdown-menu
                      = render partial: 'spree/home/list_taxons_menu'
=======
            - if session[:bb_pays_confirm].present?
              %nav.navbar.navbar-default
                %div.navbar-header
                  %div.byebuy-pays-header
                    = image_tag "mediamarkt_logo.png"
            - else
              %nav.navbar.navbar-default
                <!-- Brand and toggle get grouped for better mobile display -->
                %div.navbar-header
                  %button{ :type => 'button', :class => 'navbar-toggle collapsed', "data-toggle" => "collapse", "data-target" => "#bs-example-navbar-collapse-1", "aria-expanded" => "false"}
                    %span.fa.fa-circle
                    %span.fa.fa-circle
                    %span.fa.fa-circle
                  = link_to root_path, :class => "navbar-brand bye-header-logo headline", :onclick => "javascript: dataLayer.push(['_trackEvent', 'Click logo']);" do
                    = image_tag 'byebuy-logo.svg', width: 85, alt: ""
                  %ul.navbar-brand.navbar-big-screens.pull-right
                    %li.hide-768.nav-catalogue
                      %ul
                        %li.nav-margin
                          %a.dropdown-toggle.hidden-md.hidden-lg{"href" => "/ourcategories", "data-animations"=>"fadeIn", "data-hover" => "dropdown",  }
                            = Spree.t(:catalogue)
                          %a.dropdown-toggle.hidden-xs.hidden-sm{ "href" => "/ourcategories", "aria-haspopup" => "true", "data-animations"=>"fadeIn", "data-hover" => "dropdown",  }
                            = Spree.t(:catalogue)
                          %ul.dropdown-menu.nav-cat-li
                            = render partial: 'spree/home/list_taxons_menu'
                        %li.nav-margin.didi.dropdown
                          %a{"href" => "/best-offers"}
                            = Spree.t(:available_products)
                        %li.search-input-list.nav-margin
                          %a.pull-right{:href => "javascript:void(0)"}
                          = form_tag spree.products_path, :method => :get do
                            = text_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search)
                    %li.nav-sign-in
                      %ul
                        %li.dropdown.menu-ddl.pull-right.nav-margin.nav-signin-field
                          %a{ :id => 'dropdownMenu1', "aria-expanded" => "true", "data-toggle" => "dropdown", :href => "#", class: "button1 header-login #{'hidden' if spree_current_user}"}
                            = Spree.t(:sign_in_new)
                          %ul.dropdown-menu{"aria-labelledby" => "dropdownMenu1", :role => "menu"}
                            %li.sign-up-in-wrapper
                              .sign_up
                                = render partial: 'spree/shared/cart/sign_up_form'
                              .sign_in.hidden
                                = render partial: 'spree/shared/cart/sign_in_form'
                        %li.dropdown.menu-ddl.pull-right.nav-margin.nav-signin-field
                          %a{ :id => 'dropdownMenu2', "aria-expanded" => "true", "data-toggle" => "dropdown", :href => "#", class: "button4 header-logout #{'hidden' if !spree_current_user}"}
                            = image_tag 'byebuy-emoji.svg', width: 96, alt: "", :class => "bb-emoji"
                            = image_tag 'byebuy-emoji-wink.svg', width: 96, alt: "", :class => "bb-emoji-wink hide"
                          %ul.dropdown-menu{"aria-labelledby" => "dropdownMenu2", :role => "menu"}
                            %li.user-wrapper.emoji-dropdown
                              %span.emoji-hello
                                - if spree_current_user && spree_current_user.bill_address && spree_current_user.bill_address.firstname
                                  = "Hello #{spree_current_user.bill_address.firstname}!"
                                - else
                                  = 'Hello'
                              = link_to :controller => 'users', :action => 'dashboard' do
                                = Spree.t(:dashboard)
                              = link_to destroy_spree_user_session_path do
                                = Spree.t(:sign_out)
                        %li.pull-right.nav-margin
                          %a.magic-icon{:href => "javascript:void(0)"}
                            %span#line-items-count
                              = notifaction_number
                        = render partial: 'spree/shared/shop_header'
                        %li.nav-avail.pull-right
                          %a{"href" => "/best-offers"}
                            = Spree.t(:available_products)
                <!-- Brand and toggle get grouped for better mobile display -->
                %div{ :id => 'bs-example-navbar-collapse-1', :class => 'collapse navbar-collapse' }
                  %ul{:class => 'nav navbar-nav' }
                    %li.navbar-input.hidden-md.hidden-lg
                      %a.pull-right{:href => "javascript:void(0)"}
                      = form_tag spree.products_path, :method => :get do
                        = text_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search)
                    %li.nav-margin.hidden-lg.hidden-md
                      %a{"href" => "/best-offers"}
                        = Spree.t(:available_products)
                    %li.dropdown.hidden-md.hidden-lg
                      %a.dropdown-toggle.hidden-md.hidden-lg{"href" => "#", "data-toggle" => "dropdown", "data-delay" => "500", "data-close-others" => "false"}
                        = Spree.t(:catalogue)
                      %ul.dropdown-menu
                        = render partial: 'spree/home/list_taxons_menu'
>>>>>>> staging