diff --git a/app/assets/stylesheets/home.css.scss b/app/assets/stylesheets/home.css.scss deleted file mode 100644 index f0ddc684..00000000 --- a/app/assets/stylesheets/home.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the home controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/osem.css b/app/assets/stylesheets/osem.css index be091d30..275ad382 100644 --- a/app/assets/stylesheets/osem.css +++ b/app/assets/stylesheets/osem.css @@ -28,11 +28,6 @@ margin: 20px 0; } -.nav-collapse .dropdown-menu { - background-color: #e6e6e6; - color: #555555; -} - /* Lastly, apply responsive CSS fixes as necessary */ @media (max-width: 767px) { #footer { diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index d240743d..65759546 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -1,10 +1,11 @@ -%a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"} +%a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse", :id => "mobmenu" } %span.icon-th = link_to "OSEM", root_path, :class => 'brand', :title => "Open Source Event Manager" - if @conference && !@conference.short_title.nil? %span.brand = @conference.short_title .nav-collapse.collapse + / The Admin Menu for Conferences / - if user_signed_in? - if has_role?(current_user, "admin") || has_role?(current_user, "organizer") - if controller.class.name.split("::").first=="Admin" @@ -50,14 +51,16 @@ %li = link_to(admin_conference_schedule_path(@conference.short_title), :target => "_blank") do Schedule - %ul.nav.pull-right %li.dropdown - %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"} - = image_tag(current_user.person.gravatar_url(:size => "20"), :title => "Yo #{current_user.person.public_name}!", :class=>"visible-desktop") - + %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", :class=>"visible-desktop"} + = image_tag(current_user.person.gravatar_url(:size => "22"), :title => "Yo #{current_user.person.public_name}!") + %b.caret + %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", :class=>"hidden-desktop"} + = current_user.person.public_name if current_user.person + %b.caret %ul.dropdown-menu{:style => "padding: 15px;"} - %li + %li.visible-desktop = link_to("#") do %i.icon-home = current_user.person.public_name if current_user.person @@ -117,6 +120,4 @@ %br = link_to "Forgot your password?", new_password_path('user') %li.hidden-desktop - = link_to('Sign In', new_user_session_path) - - + = link_to('Sign In', new_user_session_path) \ No newline at end of file