diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index 4c0997b15..6c3039aef 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -1,9 +1,3 @@
-%h1
- Stream for
- = link_to "all groups", root_path
-
-= render "shared/publisher", :group_ids => :all
-
%ul#stream
- for post in @posts
= render type_partial(post), :post => post unless post.class == Album
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 30d602e0c..64a7a48a5 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,8 +1,3 @@
-%h1
- Stream for
- = link_to @group.name, @group
-
-= render "shared/publisher", :group_id => @group.id
%ul#stream
- for post in @posts
= render type_partial(post), :post => post
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index cd3579319..6adbf7463 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -51,17 +51,25 @@
%li.settings= link_to "settings", edit_user_path(current_user)
%li.logout= link_to "logout", destroy_user_session_path
-
#sub_header
.container
+ .span-19.append-5.last
+ = render "shared/publisher", :group_ids => :all
= render "shared/group_nav"
.container
- .span-5.last
- %h1 Friends
- = render "shared/group_friends"
-
.span-19.last
= yield
+ .span-4.prepend-1.last
+ %h1
+ - if @group == :all
+ = link_to "Everybody", root_path
+ - else
+ = link_to @group.name, @group
+
+ = render "shared/group_friends"
+
+ .span-24.last
= render "posts/debug"
+
diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml
index 88995f9b5..8708b5132 100644
--- a/app/views/shared/_group_nav.haml
+++ b/app/views/shared/_group_nav.haml
@@ -9,7 +9,7 @@
%span{:class => '⚙'}
= link_to "⚙", "#", :class => "edit_group_button"
- %li.new_group= link_to("new", "#add_group_pane", :id => "add_group_button")
+ %li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button")
.yo{ :style => "display:none;"}
#add_group_pane
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 782a1bdad..7d096e52b 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -36,11 +36,8 @@ $(document).ready(function(){
element.toggleClass("editing");
if( element.hasClass("editing") ) {
-
element.attr("contentEditable", true);
element.focus();
-
-
//remove newline action
$(element).keypress(function(e) {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f1b9f7945..dae50fe37 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -74,7 +74,7 @@ header {
margin-bottom: 0;
color: black;
background-color: #333333;
- border-bottom: 2px solid #666666;
+ border-bottom: 1px solid #666666;
padding: 0; }
header #diaspora_text {
position: absolute;
@@ -101,9 +101,10 @@ header {
color: #df0101; }
#sub_header {
+ border-bottom: 1px solid #444444;
margin: 0 -2em;
padding: 0.5em 0;
- background-color: black;
+ background-color: #111111;
margin-bottom: 2em; }
#show_filters {
@@ -317,7 +318,8 @@ label {
font-weight: normal; }
#publisher {
- border-bottom: 2px #999999 solid;
+ padding-top: 20px;
+ padding-bottom: 20px;
color: #999999;
position: relative;
height: 63px;
@@ -459,15 +461,18 @@ h1.big_text {
margin: 0;
margin-bottom: -5px;
padding: 0;
+ padding-left: 65px;
list-style: none;
font-size: 14px; }
#group_nav ul > li {
+ border-radius: 3px 3px 0 0;
+ background-color: #333333;
display: inline;
- margin-right: 1.5em;
+ margin-right: 0.5em;
padding: 0.3em 0.5em;
- padding-right: 0.3em; }
+ border: 1px solid #444444; }
#group_nav ul > li:hover {
- background-color: #333333; }
+ background-color: #444444; }
#group_nav ul > li:hover a {
color: #999999; }
#group_nav ul > li a {
@@ -477,11 +482,14 @@ h1.big_text {
#group_nav ul > li a.editable:hover {
background: yellow; }
#group_nav ul .⚙ {
- margin-left: 4px; }
+ margin-left: 4px;
+ margin-right: -4px; }
#group_nav ul .⚙ a {
color: black; }
#group_nav ul .selected {
+ opacity: 1;
background-color: white;
+ border-bottom: 1px solid white;
color: black; }
#group_nav ul .selected:hover {
background-color: #eeeeee; }
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 552049c8e..2b45fe81c 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -81,7 +81,7 @@ header
:background
:color #333
:border
- :bottom 2px solid #666
+ :bottom 1px solid #666
:padding 0
#diaspora_text
@@ -117,10 +117,12 @@ header
:padding-right 10px
#sub_header
+ :border
+ :bottom 1px solid #444
:margin 0 -2em
:padding 0.5em 0
:background
- :color black
+ :color #111
:margin
:bottom 2em
@@ -391,8 +393,9 @@ label
:weight normal
#publisher
- :border
- :bottom 2px #999 solid
+ :padding
+ :top 20px
+ :bottom 20px
:color #999
:position relative
:height 63px
@@ -581,24 +584,28 @@ h1.big_text
:margin 0
:bottom -5px
:padding 0
+ :left 65px
:list
:style none
:font
:size 14px
> li
+ :border-radius 3px 3px 0 0
+ :background
+ :color #333
:display inline
:margin
- :right 1.5em
+ :right 0.5em
:padding 0.3em 0.5em
- :right 0.3em
+
+ :border 1px solid #444
&:hover
:background
- :color #333
+ :color #444
a
:color #999
-
a
:color #999
&:hover
@@ -609,12 +616,16 @@ h1.big_text
.⚙
:margin
:left 4px
+ :right -4px
a
:color #000
.selected
+ :opacity 1
:background
:color #fff
+ :border
+ :bottom 1px solid #fff
:color #000
&:hover
:background