gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mobile navigation

Browse source
This commit is contained in:
Henne Vogelsang 2013-06-27 21:58:17 +02:00 • committed by Henne Vogelsang
parent 252e1fe544
commit 8c743bdb3a
3 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/home.css.scss
View file

@ -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/

5
app/assets/stylesheets/osem.css
View file

@ -28,11 +28,6 @@
margin: 20px 0; margin: 20px 0;
} }
.nav-collapse .dropdown-menu {
background-color: #e6e6e6;
color: #555555;
}
/* Lastly, apply responsive CSS fixes as necessary */ /* Lastly, apply responsive CSS fixes as necessary */
@media (max-width: 767px) { @media (max-width: 767px) {
#footer { #footer {

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

@ -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 %span.icon-th
= link_to "OSEM", root_path, :class => 'brand', :title => "Open Source Event Manager" = link_to "OSEM", root_path, :class => 'brand', :title => "Open Source Event Manager"
- if @conference && !@conference.short_title.nil? - if @conference && !@conference.short_title.nil?
%span.brand %span.brand
= @conference.short_title = @conference.short_title
.nav-collapse.collapse .nav-collapse.collapse
/ The Admin Menu for Conferences /
- if user_signed_in? - if user_signed_in?
- if has_role?(current_user, "admin") || has_role?(current_user, "organizer") - if has_role?(current_user, "admin") || has_role?(current_user, "organizer")
- if controller.class.name.split("::").first=="Admin" - if controller.class.name.split("::").first=="Admin"
@ -50,14 +51,16 @@
%li %li
= link_to(admin_conference_schedule_path(@conference.short_title), :target => "_blank") do = link_to(admin_conference_schedule_path(@conference.short_title), :target => "_blank") do
Schedule Schedule
%ul.nav.pull-right %ul.nav.pull-right
%li.dropdown %li.dropdown
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"} %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", :class=>"visible-desktop"}
= image_tag(current_user.person.gravatar_url(:size => "20"), :title => "Yo #{current_user.person.public_name}!", :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;"} %ul.dropdown-menu{:style => "padding: 15px;"}
%li %li.visible-desktop
= link_to("#") do = link_to("#") do
%i.icon-home %i.icon-home
= current_user.person.public_name if current_user.person = current_user.person.public_name if current_user.person
@ -117,6 +120,4 @@
%br %br
= link_to "Forgot your password?", new_password_path('user') = link_to "Forgot your password?", new_password_path('user')
%li.hidden-desktop %li.hidden-desktop
= link_to('Sign In', new_user_session_path) = link_to('Sign In', new_user_session_path)