From 39c366e2e9ded80d071fc454c6acff708fc93a41 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Mon, 6 Sep 2010 17:22:57 -0700
Subject: [PATCH] group edit button up top.
---
app/views/shared/_group_friends.haml | 1 -
app/views/shared/_group_nav.haml | 6 ++++--
public/stylesheets/application.css | 15 ++++----------
public/stylesheets/sass/application.sass | 26 ++++++++----------------
4 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/app/views/shared/_group_friends.haml b/app/views/shared/_group_friends.haml
index 7ab5b67996..206d588c12 100644
--- a/app/views/shared/_group_friends.haml
+++ b/app/views/shared/_group_friends.haml
@@ -4,7 +4,6 @@
- unless @group == :all
= link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
- = link_to "Edit", (edit_group_path(@group)), :class => "buttion"
.yo{:style => 'display:none'}
#add_request_pane
diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml
index 8708b5132c..70968780ae 100644
--- a/app/views/shared/_group_nav.haml
+++ b/app/views/shared/_group_nav.haml
@@ -6,11 +6,13 @@
%li{:id => group.id, :class => ("selected" if current_group?(group))}
%span.group_name
= link_for_group group
- %span{:class => 'âš™'}
- = link_to "âš™", "#", :class => "edit_group_button"
%li.new_group= link_to("+", "#add_group_pane", :id => "add_group_button")
+ %li
+ %span{:class => 'âš™'}
+ = link_to "âš™", edit_group_path(Group.first), :class => "edit_group_button", :title => "Manage your facets."
+
.yo{ :style => "display:none;"}
#add_group_pane
= render "groups/new_group"
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3cb4beb1e7..1cf49b9026 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -462,21 +462,16 @@ h1.big_text {
margin-right: 0.5em;
padding: 3px 8px;
border: 1px solid #555555; }
- #group_nav ul > li:hover {
- background-color: #444444; }
- #group_nav ul > li:hover a {
- color: #999999; }
#group_nav ul > li a {
color: #999999; }
#group_nav ul > li a:hover {
background: none; }
#group_nav ul > li a.editable:hover {
background: yellow; }
- #group_nav ul .âš™ {
- margin-left: 4px;
- margin-right: -4px; }
- #group_nav ul .âš™ a {
- color: black; }
+ #group_nav ul > li:hover {
+ background-color: #444444; }
+ #group_nav ul > li:hover a {
+ color: #999999; }
#group_nav ul .selected {
font-weight: bold;
background-color: white;
@@ -486,8 +481,6 @@ h1.big_text {
background-color: #eeeeee; }
#group_nav ul .selected a {
color: black; }
- #group_nav ul .selected .âš™ a {
- color: #333333; }
#add_photo_loader {
position: absolute;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index f1050fac2d..1a6a01e1f8 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -577,6 +577,7 @@ h1.big_text
:style none
:font
:size 14px
+
> li
:background
:color #444
@@ -587,12 +588,6 @@ h1.big_text
:border 1px solid #555
- &:hover
- :background
- :color #444
- a
- :color #999
-
a
:color #999
&:hover
@@ -600,12 +595,12 @@ h1.big_text
&.editable:hover
:background yellow
- .âš™
- :margin
- :left 4px
- :right -4px
- a
- :color #000
+ &:hover
+ :background
+ :color #444
+ a
+ :color #999
+
.selected
:font
@@ -621,11 +616,6 @@ h1.big_text
a
:color #000
- .âš™
- a
- :color #333
-
-
#add_photo_loader
:position absolute
:display none
@@ -780,3 +770,5 @@ h1.big_text
:font
:style italic
:color #666
+
+
--
GitLab