diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 86d9efde7b7a8c3241ed4cef7408154fc5e8615f..ba5ba735f187b7d34258301a5741078ef802565e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -16,7 +16,7 @@ %body #header .container - %img#diaspora_text{:src => 'images/diaspora.png'} + %img#diaspora_text{:src => '/images/diaspora.png'} #session_action - if user_signed_in? @@ -25,7 +25,8 @@ = link_to "login", new_user_session_path %ul.nav - %li= link_to "users", users_url + %li= link_to "Users", users_url + %li= link_to "Status Messages", status_messages_url .container - if show_title? diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml index f97ed335138277068d6628024e03bd43745b5f78..f0c2e7f87feae3023678ac4336977d17b7e48456 100644 --- a/app/views/users/index.html.haml +++ b/app/views/users/index.html.haml @@ -1,4 +1,4 @@ -- title "Home" +- title "Users" %table %tr diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 2eda0e215077cd6e6d218ee6aa523b4db0cd6d9b..143c558b89bcad086aaa4b5cb4ee833fa981a1a2 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -59,4 +59,5 @@ h4 { margin: 0; display: block; } #header ul.nav li { - display: inline; } + display: inline; + margin-right: 1em; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 8399858be688dff456598ea818ce3f868c04b69c..17d67a425521947a1b74ab4aaf678c4ca4a10c5f 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -70,4 +70,6 @@ h4 li :display inline + :margin + :right 1em