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

Merge 9c41817813 into 10ef898a0d

Browse source
This commit is contained in:
Rishabh Saxena 2016-03-26 07:21:28 +00:00
commit b94d34b6aa
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_admin_sidebar.html.haml
View file

@ -1,4 +1,4 @@
%ul.nav.nav-stacked.nav-pills.mySidebar
%ul.nav.nav-stacked.nav-pills.mySidebar.collapse.navbar-collapse
.btn-group
%button{type:'button', class:'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'}
%span.fa.fa-cog

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

@ -8,6 +8,10 @@
%span.icon-bar
%span.icon-bar
= link_to CONFIG['name'], root_path, class: 'navbar-brand', title: 'Open Source Event Manager'
%button.pull-left{"data-target"=>".mySidebar", "data-toggle"=>"collapse", :class=>"navbar-toggle", :type=>"button"}
%span.sr-only
Toggle navigation
%span.fa.fa-sun-o
.collapse.navbar-collapse
- if content_for :splash_nav
%ul.nav.navbar-nav#splash-nav