user menu is a button. fixed remove aspect button on aspect#show
This commit is contained in:
parent
16141bf1ff
commit
a9a91c436a
4 changed files with 42 additions and 17 deletions
|
|
@ -20,6 +20,8 @@
|
||||||
= text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5
|
= text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5
|
||||||
|
|
||||||
%ul#user_menu
|
%ul#user_menu
|
||||||
|
.right
|
||||||
|
▼
|
||||||
.avatar
|
.avatar
|
||||||
= owner_image_tag
|
= owner_image_tag
|
||||||
= link_to current_user.real_name, '#'
|
= link_to current_user.real_name, '#'
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,8 @@
|
||||||
= render 'shared/add_contact', :aspect => aspect
|
= render 'shared/add_contact', :aspect => aspect
|
||||||
|
|
||||||
%h3 Aspect settings
|
%h3 Aspect settings
|
||||||
!= remove_link(aspect)
|
.big_buttons
|
||||||
|
= button_to "Remove Aspect", aspect, :method => "delete", :confirm => "Remove aspect?"
|
||||||
|
|
||||||
.contact_pictures
|
.contact_pictures
|
||||||
- for contact in contacts
|
- for contact in contacts
|
||||||
|
|
|
||||||
|
|
@ -61,9 +61,6 @@
|
||||||
#question_mark_pane
|
#question_mark_pane
|
||||||
= render 'shared/public_explain'
|
= render 'shared/public_explain'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#publisher_photo_upload
|
#publisher_photo_upload
|
||||||
= render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id)
|
= render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -140,41 +140,58 @@ header
|
||||||
:text-overflow ellipsis
|
:text-overflow ellipsis
|
||||||
:text-shadow 0 1px 0 #000
|
:text-shadow 0 1px 0 #000
|
||||||
|
|
||||||
:width auto
|
:width 120px
|
||||||
|
|
||||||
|
:cursor pointer
|
||||||
|
|
||||||
:z-index 10
|
:z-index 10
|
||||||
:padding 5px 10px
|
:padding 5px 0
|
||||||
:left 40px
|
:left 30px
|
||||||
|
:right 5px
|
||||||
:margin 0
|
:margin 0
|
||||||
:top -2px
|
:top -2px
|
||||||
:right -5px
|
:right -5px
|
||||||
|
|
||||||
|
:background
|
||||||
|
:color #000
|
||||||
|
|
||||||
|
:border
|
||||||
|
:radius 5px
|
||||||
|
|
||||||
:position absolute
|
:position absolute
|
||||||
:display inline
|
:display inline
|
||||||
|
|
||||||
:top 0
|
:top 5px
|
||||||
:right 0
|
:right 0
|
||||||
|
|
||||||
:list
|
:list
|
||||||
:style none
|
:style none
|
||||||
|
|
||||||
|
.right
|
||||||
|
:right 5px
|
||||||
|
|
||||||
|
&:hover
|
||||||
|
:background
|
||||||
|
:color #222
|
||||||
|
|
||||||
li
|
li
|
||||||
:display none
|
:display none
|
||||||
:padding 4px
|
|
||||||
|
|
||||||
a
|
a
|
||||||
:display block
|
:display block
|
||||||
|
:padding 4px
|
||||||
|
:height 100%
|
||||||
&:hover
|
&:hover
|
||||||
:background
|
:background
|
||||||
:color #009
|
:color #107FC9
|
||||||
|
:color #fff
|
||||||
|
|
||||||
&.active
|
&.active
|
||||||
:margin
|
:margin
|
||||||
:top -3px
|
:top -3px
|
||||||
:right -6px
|
:right -6px
|
||||||
:background
|
:background
|
||||||
:color #333
|
:color #000
|
||||||
:border 1px solid #999
|
:border 1px solid #999
|
||||||
|
|
||||||
:box-shadow 0 1px 2px #333
|
:box-shadow 0 1px 2px #333
|
||||||
|
|
@ -188,7 +205,8 @@ header
|
||||||
:height 20px
|
:height 20px
|
||||||
:width 20px
|
:width 20px
|
||||||
:position absolute
|
:position absolute
|
||||||
:left 5px
|
:left 2px
|
||||||
|
:top 2px
|
||||||
:display block
|
:display block
|
||||||
|
|
||||||
.stream
|
.stream
|
||||||
|
|
@ -712,11 +730,14 @@ form p
|
||||||
|
|
||||||
form p.checkbox_select
|
form p.checkbox_select
|
||||||
label
|
label
|
||||||
:left 20px
|
:position relative
|
||||||
:top 0
|
:left 0
|
||||||
|
:top 3px
|
||||||
|
:margin
|
||||||
|
:right 6px
|
||||||
img
|
img
|
||||||
:position relative
|
:position relative
|
||||||
:left 90px
|
:top 7px
|
||||||
|
|
||||||
label
|
label
|
||||||
:font
|
:font
|
||||||
|
|
@ -1874,3 +1895,7 @@ h3,h4
|
||||||
:box-shadow 0 4px 8px #333
|
:box-shadow 0 4px 8px #333
|
||||||
|
|
||||||
:display none
|
:display none
|
||||||
|
|
||||||
|
.big_buttons
|
||||||
|
input
|
||||||
|
:width 100%
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue