gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a snap logo to the navbar

Browse source
This commit is contained in:
Michael Ball 2020-01-07 00:08:05 -08:00
parent b49bddafb6
commit 5f1f93d221
4 changed files with 38 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/snapcon_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 48 KiB

5
app/assets/stylesheets/osem-navbar.scss
View file

@ -34,4 +34,9 @@
.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus { .navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus {
color: #FFF; color: #FFF;
} }
.navbar-brand img {
margin-top: -5px;
max-height: 100%;
}
} }

2
app/helpers/application_helper.rb
View file

@ -185,7 +185,7 @@ module ApplicationHelper
'OSEM' 'OSEM'
) )
link_to( link_to(
link_text, image_tag('snapcon_logo.png'),
root_path, root_path,
class: 'navbar-brand', class: 'navbar-brand',
title: 'Open Source Event Manager' title: 'Open Source Event Manager'

56
app/views/layouts/_navigation.html.haml
View file

@ -14,7 +14,7 @@
%span.icon-bar %span.icon-bar
%span.icon-bar %span.icon-bar
%span.icon-bar %span.icon-bar
= nav_root_link_for conference = nav_root_link_for(conference)
.collapse.navbar-collapse#main-nav .collapse.navbar-collapse#main-nav
- if content_for :splash_nav - if content_for :splash_nav
@ -42,33 +42,37 @@
= link_to(new_registration_path('user')) do = link_to(new_registration_path('user')) do
%span.fa.fa-heart %span.fa.fa-heart
Sign Up Sign Up
%li.dropdown.visible-desktop %li{class: ""}
%a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'} = link_to(sign_in_path) do
%span.fa.fa-user %span.fa.fa-user
Sign In Sign In
%span.caret -# %li.dropdown.visible-desktop
.dropdown-menu -# %a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'}
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true' -# %span.fa.fa-user
= form_tag User.ichain_login_url do -# Sign In
= text_field_tag 'username', nil, id: 'user_ichain_email_dd', class: 'form-control', placeholder: 'Username' -# %span.caret
= password_field_tag 'password', nil, id: 'user_ichain_password_dd', class: 'form-control', placeholder: 'Password' -# .dropdown-menu
%button.btn.btn-success.btn-block Sign in -# - if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
- else -# = form_tag User.ichain_login_url do
%div{style: "padding: 6px"} -# = text_field_tag 'username', nil, id: 'user_ichain_email_dd', class: 'form-control', placeholder: 'Username'
= form_tag new_user_session_path, class: 'form-group' do -# = password_field_tag 'password', nil, id: 'user_ichain_password_dd', class: 'form-control', placeholder: 'Password'
= text_field_tag 'user[login]', nil, id: 'user_login_dd', class: 'form-control', placeholder: 'Username / E-Mail' -# %button.btn.btn-success.btn-block Sign in
= password_field_tag 'user[password]', nil, id: 'user_password_dd', class: 'form-control', placeholder: 'Password' -# - else
%p.text-right -# %div{style: "padding: 6px"}
%small -# = form_tag new_user_session_path, class: 'form-group' do
%label{for: 'user_remember_me'} Remember me -# = text_field_tag 'user[login]', nil, id: 'user_login_dd', class: 'form-control', placeholder: 'Username / E-Mail'
= check_box_tag 'user[remember_me]' -# = password_field_tag 'user[password]', nil, id: 'user_password_dd', class: 'form-control', placeholder: 'Password'
%br -# %p.text-right
%button.btn.btn-success.btn-block Sign in -# %small
- unless omniauth_configured.empty? -# %label{for: 'user_remember_me'} Remember me
.divider -# = check_box_tag 'user[remember_me]'
%h6.text-center -# %br
or -# %button.btn.btn-success.btn-block Sign in
= render 'devise/shared/openid_links' -# - unless omniauth_configured.empty?
-# .divider
-# %h6.text-center
-# or
-# = render 'devise/shared/openid_links'
-# %p.text-right -# %p.text-right
-# %br -# %br
-# %a.small.btn.btn-xs.btn-default{"data-toggle" => "collapse", "data-target" => "#navbar-devise-help"} -# %a.small.btn.btn-xs.btn-default{"data-toggle" => "collapse", "data-target" => "#navbar-devise-help"}