dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

make userbar area more compact, including removing favicon

Browse source
This commit is contained in:
Emi Matchu 2013-12-26 13:08:51 -05:00
parent 10b3f49249
commit 5f95ef7e56
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/_layout.sass
View file

@ -71,7 +71,7 @@ h3
$container_width: 800px $container_width: 800px
#container #container
margin: 1em auto margin: .25em auto
padding-top: $container-top-padding padding-top: $container-top-padding
position: relative position: relative
width: $container_width width: $container_width
@ -218,7 +218,8 @@ dd
weight: bold weight: bold
left: 0 left: 0
line-height: 1 line-height: 1
padding: .25em padding-left: .25em
padding-right: .25em
position: absolute position: absolute
top: 0 top: 0
&:hover &:hover
@ -227,6 +228,10 @@ dd
span:before span:before
content: "<< " content: "<< "
#home-link, #userbar
padding-top: 6px
padding-bottom: 6px
.pagination .pagination
a, span a, span
margin: 0 .5em margin: 0 .5em

2
app/assets/stylesheets/partials/clean/_constants.sass
View file

@ -27,5 +27,5 @@ $object-width: 100px
$object-padding: 8px $object-padding: 8px
$nc-icon-size: 16px $nc-icon-size: 16px
$container-top-padding: 3em $container-top-padding: 2.5em

4
app/helpers/application_helper.rb
View file

@ -14,10 +14,6 @@ module ApplicationHelper
@body_class << " #{class_name}" @body_class << " #{class_name}"
end end
def auth_server_icon_url
"http://#{Openneo::Auth.config.auth_server}/favicon.png"
end
def body_class def body_class
"#{params[:controller]} #{params[:controller]}-#{params[:action]}".tap do |output| "#{params[:controller]} #{params[:controller]}-#{params[:action]}".tap do |output|
output << @body_class if @body_class output << @body_class if @body_class

1
app/views/layouts/application.html.haml
View file

@ -49,7 +49,6 @@
= link_to t('.userbar.logout'), logout_path_with_return_to = link_to t('.userbar.logout'), logout_path_with_return_to
- else - else
= link_to login_path_with_return_to, :id => 'userbar-log-in' do = link_to login_path_with_return_to, :id => 'userbar-log-in' do
= image_tag auth_server_icon_url
%span= t('.userbar.login') %span= t('.userbar.login')
#footer #footer