From 54e5fb4abba816392728d82c530826ddb1c3e4ea Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sun, 17 Oct 2010 23:36:23 -0700
Subject: [PATCH] add new aspect back on manage page. changed badges
---
app/views/aspects/manage.html.haml | 5 +-
app/views/shared/_aspect_nav.haml | 1 -
public/javascripts/aspect-edit.js | 4 +-
public/stylesheets/sass/application.sass | 59 +++++++++---------------
4 files changed, 25 insertions(+), 44 deletions(-)
diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index 73b2bac29c..dba34ad248 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -27,9 +27,8 @@
= render 'shared/invitations', :invites => @invites
-- content_for :publish do
- = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
-
+%h2 Manage aspects
+= link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
%ul#aspect_list
- for aspect in @aspects
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index 799479a13d..d4e4e404fc 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -11,7 +11,6 @@
= link_for_aspect aspect
%ul{ :style => "position:absolute;right:0;bottom:0.01em;"}
-
%li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)}
= link_to ( (@request_count == 0)? t('.manage') : "#{t('.manage')} (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => t('.manage_your_aspects')
diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index 2d6564e6ba..77d9907939 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -47,7 +47,7 @@ $(function() {
var dropzone = $(this)[0];
if ($(this)[0].id == ui.draggable[0].getAttribute('from_aspect_id')){
- ui.draggable.css('background','none');
+ ui.draggable.css('background-color','#333');
} else {
ui.draggable.css('background-color','orange');
$.ajax({
@@ -57,7 +57,7 @@ $(function() {
"to" : { "to" : dropzone.id }},
success: function(data){
ui.draggable.attr('from_aspect_id', dropzone.id);
- ui.draggable.css('background','none');
+ ui.draggable.css('background-color','#333');
}});
}
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 9b448edee9..e046d95dea 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -180,30 +180,6 @@ header
:margin
:left 425px
- #aspect_header
- :-webkit-box-shadow 0px -4px 6px -2px #777
-
- :background
- :color #fff
- :border
- :top 1px solid #fff
- :padding 20px 0
-
- h1
- :text-shadow 0 1px 0 #fff
-
- a
- :color #444
- &:hover
- :background none
- :color #999
-
- .page_title
- :text
- :transform uppercase
- :shadow 0 1px 0 #fff
-
-
ul#stream
:margin 0
:padding 0
@@ -925,24 +901,33 @@ h1.big_text
:margin 5px
:z-index 10
- :text
- :align center
+ :width 110px
- :width 125px
- :height 120px
+ :background
+ :color #333
+
+ :border-radius 5px
+
+ a
+ :color #ccc
img
- :height 100px
- :width 100px
- :display inline-block
+ :height 40px
+ :width 40px
+ :display inline
+
+ .name
+ :display inline
+ :top 0
+ :margin
+ :left 5px
&:active
:z-index 20
:color #666
- img
- :-webkit-box-shadow 0 1px 3px #333
- :-moz-box-shadow 0 2px 4px #333
- :opacity 0.9
+ :-webkit-box-shadow 0 1px 3px #000
+ :-moz-box-shadow 0 2px 4px #000
+ :opacity 0.9
ul#settings_nav
:list
@@ -1007,7 +992,6 @@ ul#settings_nav
.empty_message
:margin
- :top 12px
:bottom 12px
:text
:align center
@@ -1016,11 +1000,10 @@ ul#settings_nav
h3
:color #777
- :margin 0
:padding 2em
:bottom 0.7em
- :border 2px dashed #777
+ :border 2px dashed #FAC421
:border-radius 5px
.null_arrow
--
GitLab