From 9f841c7e396617e19800501db773003a195d97e5 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sat, 29 Jun 2013 17:06:49 +0200 Subject: [PATCH] responsive now ! --- app/assets/stylesheets/admin.css.less | 2 +- .../admin/framework/bootstrap.less | 2 + app/views/layouts/admin.html.haml | 42 +++++++++++-------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/admin.css.less b/app/assets/stylesheets/admin.css.less index cd3f186..77dd68f 100644 --- a/app/assets/stylesheets/admin.css.less +++ b/app/assets/stylesheets/admin.css.less @@ -21,7 +21,7 @@ body.admin{ - padding-top:60px; +padding:0px; #upload_details{ display:none; diff --git a/app/assets/stylesheets/admin/framework/bootstrap.less b/app/assets/stylesheets/admin/framework/bootstrap.less index dc5d99e..9f446aa 100755 --- a/app/assets/stylesheets/admin/framework/bootstrap.less +++ b/app/assets/stylesheets/admin/framework/bootstrap.less @@ -65,3 +65,5 @@ @import "slider.less"; + +@import "responsive.less"; diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 523b999..3a82d9c 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -19,26 +19,20 @@ %body.admin - .navbar.navbar-fixed-top.navbar-inverse - .navbar-inner - .container-fluid - %ul.nav.pull-right - - %li.dropdown - %a{:href => "#", :class => "dropdown-toggle", :data => {:toggle => "dropdown"}} - =image_tag (current_admin.file? ? current_admin.file.square.url : ""), :class => "img img-rounded", :style => "height:15px;" - =current_admin.firstname - =current_admin.name - %b.caret - %ul.dropdown-menu - %li.divider - %li=link_to "Se déconnecter", destroy_admin_session_path, :class => "logout_link",:method => :delete - - + .navbar.navbar-inverse + .navbar-inner{:style => "border-radius:0px;"} + .container + %a.btn.btn-navbar{:data => {:toggle => "collapse", :target => ".nav-collapse"}} + %span.icon-bar + %span.icon-bar + %span.icon-bar + + + %a.brand{:href => "/admin"} Administration - .container.nav-collapse + .collapse.nav-collapse %ul.nav %li=link_to i(:home), "/admin" %li=link_to "Admins", admin_admins_path @@ -59,7 +53,19 @@ %li=link_to "notes", topics_path %li=link_to "urls courtes", tiny_urls_path - + %ul.nav.pull-right + + %li.dropdown + %a{:href => "#", :class => "dropdown-toggle", :data => {:toggle => "dropdown"}} + =image_tag (current_admin.file? ? current_admin.file.square.url : ""), :class => "img img-rounded", :style => "height:15px;" + =current_admin.firstname + =current_admin.name + %b.caret + %ul.dropdown-menu + %li.divider + %li=link_to "Se déconnecter", destroy_admin_session_path, :class => "logout_link",:method => :delete + + .container-fluid