Skip to content
Extraits de code Groupes Projets
Valider 54e5fb4a rédigé par danielvincent's avatar danielvincent
Parcourir les fichiers

add new aspect back on manage page. changed badges

parent 15104cf9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -27,9 +27,8 @@ ...@@ -27,9 +27,8 @@
= render 'shared/invitations', :invites => @invites = render 'shared/invitations', :invites => @invites
- content_for :publish do %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')) = 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 %ul#aspect_list
- for aspect in @aspects - for aspect in @aspects
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
= link_for_aspect aspect = link_for_aspect aspect
%ul{ :style => "position:absolute;right:0;bottom:0.01em;"} %ul{ :style => "position:absolute;right:0;bottom:0.01em;"}
%li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)} %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') = 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')
......
...@@ -47,7 +47,7 @@ $(function() { ...@@ -47,7 +47,7 @@ $(function() {
var dropzone = $(this)[0]; var dropzone = $(this)[0];
if ($(this)[0].id == ui.draggable[0].getAttribute('from_aspect_id')){ if ($(this)[0].id == ui.draggable[0].getAttribute('from_aspect_id')){
ui.draggable.css('background','none'); ui.draggable.css('background-color','#333');
} else { } else {
ui.draggable.css('background-color','orange'); ui.draggable.css('background-color','orange');
$.ajax({ $.ajax({
...@@ -57,7 +57,7 @@ $(function() { ...@@ -57,7 +57,7 @@ $(function() {
"to" : { "to" : dropzone.id }}, "to" : { "to" : dropzone.id }},
success: function(data){ success: function(data){
ui.draggable.attr('from_aspect_id', dropzone.id); ui.draggable.attr('from_aspect_id', dropzone.id);
ui.draggable.css('background','none'); ui.draggable.css('background-color','#333');
}}); }});
} }
......
...@@ -180,30 +180,6 @@ header ...@@ -180,30 +180,6 @@ header
:margin :margin
:left 425px :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 ul#stream
:margin 0 :margin 0
:padding 0 :padding 0
...@@ -925,24 +901,33 @@ h1.big_text ...@@ -925,24 +901,33 @@ h1.big_text
:margin 5px :margin 5px
:z-index 10 :z-index 10
:text :width 110px
:align center
:width 125px :background
:height 120px :color #333
:border-radius 5px
a
:color #ccc
img img
:height 100px :height 40px
:width 100px :width 40px
:display inline-block :display inline
.name
:display inline
:top 0
:margin
:left 5px
&:active &:active
:z-index 20 :z-index 20
:color #666 :color #666
img :-webkit-box-shadow 0 1px 3px #000
:-webkit-box-shadow 0 1px 3px #333 :-moz-box-shadow 0 2px 4px #000
:-moz-box-shadow 0 2px 4px #333 :opacity 0.9
:opacity 0.9
ul#settings_nav ul#settings_nav
:list :list
...@@ -1007,7 +992,6 @@ ul#settings_nav ...@@ -1007,7 +992,6 @@ ul#settings_nav
.empty_message .empty_message
:margin :margin
:top 12px
:bottom 12px :bottom 12px
:text :text
:align center :align center
...@@ -1016,11 +1000,10 @@ ul#settings_nav ...@@ -1016,11 +1000,10 @@ ul#settings_nav
h3 h3
:color #777 :color #777
:margin 0
:padding 2em :padding 2em
:bottom 0.7em :bottom 0.7em
:border 2px dashed #777 :border 2px dashed #FAC421
:border-radius 5px :border-radius 5px
.null_arrow .null_arrow
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter