More visual cleanup; top nav; edit aspects
This commit is contained in:
danielgrippi
parent
41773cb29e
commit
f90dc0996a
14 changed files with 338 additions and 105 deletions
|
|
@ -33,7 +33,7 @@ class AspectsController < ApplicationController
|
||||||
all_selected_contacts = Contact.joins(:aspect_memberships).
|
all_selected_contacts = Contact.joins(:aspect_memberships).
|
||||||
where(:aspect_memberships => {:aspect_id => aspect_ids})
|
where(:aspect_memberships => {:aspect_id => aspect_ids})
|
||||||
@selected_contacts_count = all_selected_contacts.count
|
@selected_contacts_count = all_selected_contacts.count
|
||||||
@selected_contacts = all_selected_contacts.limit(24)
|
@selected_contacts = all_selected_contacts.limit(20)
|
||||||
end
|
end
|
||||||
|
|
||||||
@aspect_ids = @aspects.map { |a| a.id }
|
@aspect_ids = @aspects.map { |a| a.id }
|
||||||
|
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
||||||
-# licensed under the Affero General Public License version 3 or later. See
|
|
||||||
-# the COPYRIGHT file.
|
|
||||||
|
|
||||||
- content_for :head do
|
|
||||||
= include_javascripts :aspects
|
|
||||||
|
|
||||||
#edit_aspect_pane
|
|
||||||
- if @contacts.count > 0
|
|
||||||
%h4= t('aspects.edit.add_existing')
|
|
||||||
= render 'shared/contact_list', :aspect_id => aspect.id, :contacts => contacts, :manage => defined?(manage)
|
|
||||||
|
|
||||||
= render 'shared/add_contact', :aspect_id => aspect.id
|
|
||||||
|
|
||||||
%hr
|
|
||||||
= form_for aspect do |asp|
|
|
||||||
= asp.text_field :name, :value => aspect.name
|
|
||||||
= t('aspects.contacts_visible')
|
|
||||||
= aspect.check_box :contacts_visible, :default => true
|
|
||||||
%br
|
|
||||||
= t('aspects.contacts_not_visible')
|
|
||||||
-#contacts_visible should be editable here
|
|
||||||
= asp.submit t('aspects.edit.rename_aspect')
|
|
||||||
|
|
||||||
%hr
|
|
||||||
.big_buttons
|
|
||||||
= button_to t('aspects.edit.remove_aspect'), aspect, :method => "delete", :confirm => t('aspects.edit.confirm_remove_aspect')
|
|
||||||
|
|
||||||
|
|
@ -32,7 +32,8 @@
|
||||||
= render 'shared/contact_list', :aspect => @aspect, :contacts => @contacts
|
= render 'shared/contact_list', :aspect => @aspect, :contacts => @contacts
|
||||||
|
|
||||||
%br
|
%br
|
||||||
%div{:style => "text-align:right;"}
|
.bottom_submit_section
|
||||||
= link_to t('.done'), '#', :class => 'button', :rel => 'close'
|
.left
|
||||||
= link_to t('delete'), @aspect, :method => "delete", :confirm => t('.confirm_remove_aspect'), :class => 'button'
|
= button_to t('delete'), @aspect, :method => "delete", :confirm => t('.confirm_remove_aspect'), :class => 'button delete'
|
||||||
|
= submit_tag t('.done'), :class => 'button creation', :rel => 'close'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,11 +18,13 @@
|
||||||
|
|
||||||
.span-18.last
|
.span-18.last
|
||||||
#people_stream.stream.contacts
|
#people_stream.stream.contacts
|
||||||
- if @contacts.size > 0
|
#aspect_controls
|
||||||
#aspect_controls
|
= link_to "Edit #{@aspect_.name}", edit_aspect_path(@aspect_), :rel => "facebox"
|
||||||
- if @aspect_
|
|
||||||
= link_to "start a conversation", new_conversation_path(:aspect_id => @aspect_.id, :name => @aspect_.name), :class => "button conversation_button", :rel => "facebox"
|
|
||||||
|
|
||||||
|
- if @aspect_
|
||||||
|
= link_to "start a conversation", new_conversation_path(:aspect_id => @aspect_.id, :name => @aspect_.name), :class => "button conversation_button", :rel => "facebox"
|
||||||
|
|
||||||
|
- if @contacts.size > 0
|
||||||
- for contact in @contacts
|
- for contact in @contacts
|
||||||
.stream_element{:id => contact.person.id}
|
.stream_element{:id => contact.person.id}
|
||||||
.right
|
.right
|
||||||
|
|
|
||||||
|
|
@ -22,16 +22,26 @@
|
||||||
= text_field_tag 'q', nil, :placeholder => t('find_people'), :type => 'search', :results => 5
|
= text_field_tag 'q', nil, :placeholder => t('find_people'), :type => 'search', :results => 5
|
||||||
|
|
||||||
- if @notification_count
|
- if @notification_count
|
||||||
#notification_badge
|
#nav_badges
|
||||||
= link_to "", notifications_path, :title => new_notification_text(@notification_count)
|
#home_badge.badge
|
||||||
= image_tag 'icons/monotone_flag.png', :height => 20, :width => 20, :id => "notification-flag"
|
= link_to aspects_path, :title => t('_home') do
|
||||||
.badge_count{:class => ("hidden" if @notification_count == 0)}
|
= image_tag 'icons/home_grey.svg', :height => 16
|
||||||
= @notification_count
|
|
||||||
#message_inbox_badge
|
#contacts_badge.badge
|
||||||
= link_to "", conversations_path , :title => new_message_text(@unread_message_count)
|
= link_to contacts_path, :title => t('_contacts') do
|
||||||
= image_tag 'icons/mail_grey.png', :height => 16, :width => 16
|
= image_tag 'icons/contacts_grey.svg', :height => 16
|
||||||
.badge_count{:class => ("hidden" if @unread_message_count == 0)}
|
|
||||||
= @unread_message_count
|
#notification_badge.badge
|
||||||
|
= link_to notifications_path, :title => new_notification_text(@notification_count) do
|
||||||
|
= image_tag 'icons/notifications_grey.svg', :height => 16, :id => "notification-flag"
|
||||||
|
.badge_count{:class => ("hidden" if @notification_count == 0)}
|
||||||
|
= @notification_count
|
||||||
|
|
||||||
|
#message_inbox_badge.badge
|
||||||
|
= link_to conversations_path , :title => new_message_text(@unread_message_count) do
|
||||||
|
= image_tag 'icons/mail_grey.svg', :width => 18
|
||||||
|
.badge_count{:class => ("hidden" if @unread_message_count == 0)}
|
||||||
|
= @unread_message_count
|
||||||
|
|
||||||
%ul#user_menu.dropdown
|
%ul#user_menu.dropdown
|
||||||
%li
|
%li
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@ en:
|
||||||
_comments: "Comments"
|
_comments: "Comments"
|
||||||
all_aspects: "All Aspects"
|
all_aspects: "All Aspects"
|
||||||
no_results: "No Results Found"
|
no_results: "No Results Found"
|
||||||
|
_contacts: "Contacts"
|
||||||
|
|
||||||
|
|
||||||
#for reference translation, the real activerecord english transations are actually
|
#for reference translation, the real activerecord english transations are actually
|
||||||
|
|
@ -211,7 +212,7 @@ en:
|
||||||
send: "Send"
|
send: "Send"
|
||||||
helper:
|
helper:
|
||||||
new_messages:
|
new_messages:
|
||||||
zero: "no new messages"
|
zero: "No new messages"
|
||||||
one: "1 new messages"
|
one: "1 new messages"
|
||||||
few: "%{count} new messages"
|
few: "%{count} new messages"
|
||||||
many: "%{count} new messages"
|
many: "%{count} new messages"
|
||||||
|
|
@ -366,7 +367,7 @@ en:
|
||||||
and: 'and'
|
and: 'and'
|
||||||
helper:
|
helper:
|
||||||
new_notifications:
|
new_notifications:
|
||||||
zero: "no new notifications"
|
zero: "No new notifications"
|
||||||
one: "1 new notifications"
|
one: "1 new notifications"
|
||||||
few: "%{count} new notifications"
|
few: "%{count} new notifications"
|
||||||
many: "%{count} new notifications"
|
many: "%{count} new notifications"
|
||||||
|
|
|
||||||
88
public/images/icons/contacts_grey.svg
Normal file
88
public/images/icons/contacts_grey.svg
Normal file
|
|
@ -0,0 +1,88 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
version="1.0"
|
||||||
|
id="Layer_1"
|
||||||
|
x="0px"
|
||||||
|
y="0px"
|
||||||
|
width="100px"
|
||||||
|
height="85.416px"
|
||||||
|
viewBox="0 0 100 85.416"
|
||||||
|
enable-background="new 0 0 100 85.416"
|
||||||
|
xml:space="preserve"
|
||||||
|
inkscape:version="0.48.1 r9760"
|
||||||
|
sodipodi:docname="noun_project_288.svg"><metadata
|
||||||
|
id="metadata25"><rdf:RDF><cc:Work
|
||||||
|
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
||||||
|
id="defs23" /><sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="1367"
|
||||||
|
inkscape:window-height="734"
|
||||||
|
id="namedview21"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.5744161"
|
||||||
|
inkscape:cx="42.321557"
|
||||||
|
inkscape:cy="30.400614"
|
||||||
|
inkscape:window-x="1892"
|
||||||
|
inkscape:window-y="281"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="Layer_1" />
|
||||||
|
<g
|
||||||
|
id="g3"
|
||||||
|
style="fill:#939393;fill-opacity:1">
|
||||||
|
<path
|
||||||
|
d="M60.082,20.987H39.918c-3.231,0-5.851,2.618-5.851,5.85v27.44c0,3.231,2.62,5.852,5.851,5.852h0.033v19.436 c0,3.231,2.546,5.852,5.689,5.852h8.722c3.14,0,5.688-2.62,5.688-5.852V60.129h0.032c3.231,0,5.851-2.62,5.851-5.852v-27.44 C65.932,23.605,63.313,20.987,60.082,20.987z"
|
||||||
|
id="path5"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
<circle
|
||||||
|
cx="50"
|
||||||
|
cy="9.55"
|
||||||
|
r="9.55"
|
||||||
|
id="circle7"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="g9"
|
||||||
|
style="fill:#939393;fill-opacity:1">
|
||||||
|
<path
|
||||||
|
d="M94.986,23.268H77.708c-2.771,0-5.014,2.245-5.014,5.014v23.514c0,2.771,2.243,5.016,5.014,5.016h0.028v16.654 c0,2.77,2.182,5.014,4.873,5.014h7.475c2.691,0,4.874-2.244,4.874-5.014V56.811h0.027c2.771,0,5.015-2.245,5.015-5.016V28.281 C100,25.513,97.756,23.268,94.986,23.268z"
|
||||||
|
id="path11"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
<circle
|
||||||
|
cx="86.347"
|
||||||
|
cy="13.469"
|
||||||
|
r="8.184"
|
||||||
|
id="circle13"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="g15"
|
||||||
|
style="fill:#939393;fill-opacity:1">
|
||||||
|
<path
|
||||||
|
d="M22.292,23.268H5.014C2.245,23.268,0,25.513,0,28.281v23.514c0,2.771,2.245,5.016,5.014,5.016h0.028v16.654 c0,2.77,2.184,5.014,4.874,5.014h7.474c2.692,0,4.874-2.244,4.874-5.014V56.811h0.028c2.769,0,5.014-2.245,5.014-5.016V28.281 C27.305,25.513,25.06,23.268,22.292,23.268z"
|
||||||
|
id="path17"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
<circle
|
||||||
|
cx="13.653"
|
||||||
|
cy="13.469"
|
||||||
|
r="8.183"
|
||||||
|
id="circle19"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 3 KiB |
50
public/images/icons/home_grey.svg
Normal file
50
public/images/icons/home_grey.svg
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
version="1.0"
|
||||||
|
id="Layer_1"
|
||||||
|
x="0px"
|
||||||
|
y="0px"
|
||||||
|
width="100px"
|
||||||
|
height="83.84px"
|
||||||
|
viewBox="0 0 100 83.84"
|
||||||
|
enable-background="new 0 0 100 83.84"
|
||||||
|
xml:space="preserve"
|
||||||
|
inkscape:version="0.48.1 r9760"
|
||||||
|
sodipodi:docname="noun_project_293_6.svg"><metadata
|
||||||
|
id="metadata9"><rdf:RDF><cc:Work
|
||||||
|
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
||||||
|
id="defs7" /><sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="915"
|
||||||
|
inkscape:window-height="535"
|
||||||
|
id="namedview5"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="3.1250001"
|
||||||
|
inkscape:cx="50"
|
||||||
|
inkscape:cy="41.919998"
|
||||||
|
inkscape:window-x="2298"
|
||||||
|
inkscape:window-y="283"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="Layer_1" />
|
||||||
|
<path
|
||||||
|
d="M99.585,49.144c-6.011-6.031-12.021-12.061-18.032-18.092c-0.306-0.307-0.52-0.484-0.665-0.578 c0.021-0.076,0.035-0.181,0.035-0.335c0-2.175,0-4.351,0-6.526c0-4.371,0-8.741,0-13.112c0-0.794-0.663-1.457-1.457-1.457 c-3.158,0-6.315,0-9.474,0c-0.794,0-1.457,0.663-1.457,1.457c0,2.497,0,4.993,0,7.49C62.7,12.136,56.865,6.281,51.03,0.426 c-0.304-0.304-0.645-0.424-0.975-0.424C50.037,0,50.019,0.001,50,0c-0.019,0.001-0.037,0-0.056,0.002 c-0.33,0-0.671,0.12-0.975,0.424C32.785,16.665,16.6,32.904,0.415,49.144c-0.897,0.899-0.243,2.486,1.03,2.486 c3.322,0,6.646,0,9.969,0c0,10.251,0,20.502,0,30.753c0,0.794,0.663,1.457,1.457,1.457c10.353,0,19.735,0,30.089,0 c0.793,0,1.456-0.663,1.456-1.457c0-7.171,0-14.342,0-21.514c3.075,0,8.093,0,11.168,0c0,7.172,0,14.343,0,21.514 c0,0.794,0.663,1.457,1.456,1.457c10.354,0,19.736,0,30.09,0c0.793,0,1.456-0.663,1.456-1.457c0-10.251,0-20.502,0-30.753 c3.323,0,6.646,0,9.969,0C99.827,51.63,100.482,50.043,99.585,49.144z"
|
||||||
|
id="path3"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.5 KiB |
54
public/images/icons/mail_grey.svg
Normal file
54
public/images/icons/mail_grey.svg
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
version="1.0"
|
||||||
|
id="Layer_1"
|
||||||
|
x="0px"
|
||||||
|
y="0px"
|
||||||
|
width="100px"
|
||||||
|
height="63.145px"
|
||||||
|
viewBox="0 0 100 63.145"
|
||||||
|
enable-background="new 0 0 100 63.145"
|
||||||
|
xml:space="preserve"
|
||||||
|
inkscape:version="0.48.1 r9760"
|
||||||
|
sodipodi:docname="noun_project_426_1 2.svg"><metadata
|
||||||
|
id="metadata11"><rdf:RDF><cc:Work
|
||||||
|
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
||||||
|
id="defs9" /><sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="1717"
|
||||||
|
inkscape:window-height="1062"
|
||||||
|
id="namedview7"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.1491804"
|
||||||
|
inkscape:cx="7.340973"
|
||||||
|
inkscape:cy="31.5725"
|
||||||
|
inkscape:window-x="1680"
|
||||||
|
inkscape:window-y="0"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="Layer_1" />
|
||||||
|
<path
|
||||||
|
d="M98.706,9.805C82.471,21.644,66.235,33.482,50.001,45.321L50,45.32l-0.001,0.001C33.765,33.482,17.529,21.644,1.294,9.805 C0.751,9.409,0,9.946,0,10.548c0,17.246,0,34.491,0,51.737c0,0.468,0.392,0.859,0.86,0.859c16.379,0,32.759,0,49.14,0 c16.38,0,32.761,0,49.14,0c0.469,0,0.86-0.392,0.86-0.859c0-17.246,0-34.492,0-51.737C100,9.946,99.249,9.409,98.706,9.805z"
|
||||||
|
id="path3"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
<path
|
||||||
|
d="M0.426,1.603c16.38,11.943,32.76,23.887,49.141,35.831c0.111,0.082,0.272,0.122,0.434,0.122s0.322-0.04,0.434-0.122 C66.814,25.489,83.194,13.546,99.574,1.603C100.231,1.123,100.058,0,99.14,0C82.76,0,66.379,0,50,0S17.24,0,0.86,0 C-0.058,0-0.231,1.123,0.426,1.603z"
|
||||||
|
id="path5"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.3 KiB |
62
public/images/icons/notifications_grey.svg
Normal file
62
public/images/icons/notifications_grey.svg
Normal file
|
|
@ -0,0 +1,62 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
version="1.0"
|
||||||
|
id="Layer_1"
|
||||||
|
x="0px"
|
||||||
|
y="0px"
|
||||||
|
width="100px"
|
||||||
|
height="100px"
|
||||||
|
viewBox="0 0 100 100"
|
||||||
|
enable-background="new 0 0 100 99.999"
|
||||||
|
xml:space="preserve"
|
||||||
|
inkscape:version="0.48.1 r9760"
|
||||||
|
sodipodi:docname="notifications_grey.svg"><metadata
|
||||||
|
id="metadata15"><rdf:RDF><cc:Work
|
||||||
|
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
||||||
|
id="defs13" /><sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="765"
|
||||||
|
inkscape:window-height="540"
|
||||||
|
id="namedview11"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="1"
|
||||||
|
inkscape:cx="50"
|
||||||
|
inkscape:cy="-26.335615"
|
||||||
|
inkscape:window-x="1680"
|
||||||
|
inkscape:window-y="0"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="Layer_1" />
|
||||||
|
<g
|
||||||
|
id="g3"
|
||||||
|
style="fill:#939393;fill-opacity:1">
|
||||||
|
<path
|
||||||
|
d="M28.793,71.207c-5.062-5.065-7.6-11.705-7.62-18.356l-6.515-0.002c0.021,8.32,3.193,16.635,9.526,22.967 c6.335,6.331,14.647,9.504,22.967,9.526l-0.001-6.515C40.5,78.806,33.856,76.268,28.793,71.207z"
|
||||||
|
id="path5"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
<path
|
||||||
|
d="M18.423,81.575C10.501,73.654,6.535,63.251,6.514,52.85L0,52.846c0.02,12.074,4.623,24.145,13.815,33.34 c9.193,9.188,21.261,13.796,33.337,13.812v-6.515C36.745,93.467,26.346,89.495,18.423,81.575z"
|
||||||
|
id="path7"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
d="M76.157,43.675l-2.863-0.341c3.781-4.642,3.509-11.487-0.819-15.811c-4.321-4.327-11.166-4.599-15.811-0.818l-0.339-2.862 L32.482,0L11.531,20.949l23.842,23.843l2.864,0.341c-3.779,4.643-3.506,11.485,0.819,15.811c4.325,4.325,11.167,4.596,15.81,0.819 l0.339,2.862L79.05,88.466L100,67.519L76.157,43.675z M38.384,38.586L20.749,20.949L32.482,9.218l17.637,17.636l0.669,5.64 l-6.762,6.761L38.384,38.586z M79.05,79.249L61.412,61.613l-0.668-5.64l6.761-6.761l5.642,0.668L90.78,67.519L79.05,79.249z"
|
||||||
|
id="path9"
|
||||||
|
style="fill:#939393;fill-opacity:1" />
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.6 KiB |
|
|
@ -16,7 +16,7 @@ var AspectFilters = {
|
||||||
var button = $(this),
|
var button = $(this),
|
||||||
guid = button.attr('data-guid');
|
guid = button.attr('data-guid');
|
||||||
|
|
||||||
if(guid && location.href.search("a_ids..="+guid+"(&|$)") != -1){
|
if(guid && location.href.search("a_ids..="+guid+"(#|&|$)") != -1){
|
||||||
button.parent().addClass('active');
|
button.parent().addClass('active');
|
||||||
AspectFilters.selectedGUIDS.push(guid);
|
AspectFilters.selectedGUIDS.push(guid);
|
||||||
$("#aspect_nav li.all_aspects").removeClass('active');
|
$("#aspect_nav li.all_aspects").removeClass('active');
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
$blue: #3f8fba;
|
$blue: #3f8fba;
|
||||||
$red: red;
|
$red: #a80000;
|
||||||
$background: #fff;
|
$background: #fff;
|
||||||
$creation-blue: #0097ff;
|
$creation-blue: #0097ff;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -129,10 +129,8 @@ header
|
||||||
@include linear-gradient(rgba(35,30,30,0.95),rgba(35,30,30,1))
|
@include linear-gradient(rgba(35,30,30,0.95),rgba(35,30,30,1))
|
||||||
|
|
||||||
:z-index 50
|
:z-index 50
|
||||||
:padding 0
|
:padding 6px 0
|
||||||
:top 2px
|
|
||||||
:color #CCC
|
:color #CCC
|
||||||
:height 35px
|
|
||||||
|
|
||||||
:position fixed
|
:position fixed
|
||||||
|
|
||||||
|
|
@ -182,7 +180,7 @@ header
|
||||||
:position absolute
|
:position absolute
|
||||||
:display inline
|
:display inline
|
||||||
|
|
||||||
:top 5px
|
:top 0
|
||||||
:right 0
|
:right 0
|
||||||
|
|
||||||
&:hover
|
&:hover
|
||||||
|
|
@ -1617,37 +1615,41 @@ h3 span.current_gs_step
|
||||||
:background
|
:background
|
||||||
:color #22AAE0
|
:color #22AAE0
|
||||||
|
|
||||||
#notification_badge,
|
#nav_badges
|
||||||
#message_inbox_badge
|
|
||||||
:position relative
|
:position relative
|
||||||
:top 5px
|
:display inline-block
|
||||||
:display inline
|
:top 3px
|
||||||
:margin 0 10px
|
|
||||||
:right -5px
|
|
||||||
:font
|
|
||||||
:weight bold
|
|
||||||
:size smaller
|
|
||||||
:width 28px
|
|
||||||
|
|
||||||
&:active
|
a:hover
|
||||||
:top 6px
|
:text
|
||||||
|
:decoration none
|
||||||
|
|
||||||
a
|
.badge
|
||||||
:z-index 5
|
:position relative
|
||||||
:position absolute
|
:display inline
|
||||||
:top -9px
|
:margin 0 15px
|
||||||
:width 20px
|
:right -5px
|
||||||
:height 20px
|
:font
|
||||||
|
:weight bold
|
||||||
|
:size smaller
|
||||||
|
:width 28px
|
||||||
|
|
||||||
&:hover
|
&:active
|
||||||
.badge_count
|
:top 1px
|
||||||
:background
|
|
||||||
:color lighten(#A40802, 5%)
|
&:hover
|
||||||
|
.badge_count
|
||||||
|
:background
|
||||||
|
:color lighten(#A40802, 5%)
|
||||||
|
|
||||||
|
#message_inbox_badge
|
||||||
|
img
|
||||||
|
:position relative
|
||||||
|
:top -2px
|
||||||
|
|
||||||
#notification_badge
|
#notification_badge
|
||||||
img
|
img
|
||||||
:position relative
|
:position relative
|
||||||
:top 2px
|
|
||||||
|
|
||||||
.badge_count
|
.badge_count
|
||||||
@include border-radius(2px)
|
@include border-radius(2px)
|
||||||
|
|
@ -2034,11 +2036,6 @@ h3,h4
|
||||||
:padding
|
:padding
|
||||||
:bottom 5px
|
:bottom 5px
|
||||||
|
|
||||||
#edit_aspect_pane
|
|
||||||
@include box-shadow(0,4px,8px,#333)
|
|
||||||
|
|
||||||
:display none
|
|
||||||
|
|
||||||
.big_buttons
|
.big_buttons
|
||||||
input
|
input
|
||||||
:width 100%
|
:width 100%
|
||||||
|
|
@ -2252,7 +2249,6 @@ ul.show_comments
|
||||||
:bottom -4px
|
:bottom -4px
|
||||||
:padding 4px
|
:padding 4px
|
||||||
|
|
||||||
|
|
||||||
ul.show_comments,
|
ul.show_comments,
|
||||||
.likes_container
|
.likes_container
|
||||||
*
|
*
|
||||||
|
|
@ -2260,6 +2256,10 @@ ul.show_comments,
|
||||||
:weight bold
|
:weight bold
|
||||||
:color #999
|
:color #999
|
||||||
|
|
||||||
|
li
|
||||||
|
:border
|
||||||
|
:bottom 1px solid #ccc
|
||||||
|
|
||||||
img
|
img
|
||||||
:position relative
|
:position relative
|
||||||
:top 3px
|
:top 3px
|
||||||
|
|
@ -2349,25 +2349,6 @@ ul.show_comments,
|
||||||
:padding
|
:padding
|
||||||
:left 60px
|
:left 60px
|
||||||
|
|
||||||
#new_notifications,
|
|
||||||
#new_requests
|
|
||||||
:position relative
|
|
||||||
|
|
||||||
:margin
|
|
||||||
:bottom 10px
|
|
||||||
:top -8px
|
|
||||||
|
|
||||||
h4
|
|
||||||
:display inline
|
|
||||||
img
|
|
||||||
:position relative
|
|
||||||
:display inline
|
|
||||||
:margin
|
|
||||||
:right 4px
|
|
||||||
:top 5px
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#email_invitation
|
#email_invitation
|
||||||
input
|
input
|
||||||
:width 100%
|
:width 100%
|
||||||
|
|
@ -2882,7 +2863,7 @@ ul.left_nav
|
||||||
:padding 3px 7px
|
:padding 3px 7px
|
||||||
|
|
||||||
&:hover
|
&:hover
|
||||||
@include border-radius(4px)
|
@include border-radius(2px)
|
||||||
|
|
||||||
:background
|
:background
|
||||||
:color lighten($blue,45%)
|
:color lighten($blue,45%)
|
||||||
|
|
@ -3018,8 +2999,8 @@ ul.left_nav
|
||||||
|
|
||||||
#selected_aspect_contacts
|
#selected_aspect_contacts
|
||||||
.avatar
|
.avatar
|
||||||
:height 26px
|
:height 32px
|
||||||
:width 26px
|
:width 32px
|
||||||
:margin
|
:margin
|
||||||
:bottom -2px
|
:bottom -2px
|
||||||
|
|
||||||
|
|
@ -3031,7 +3012,16 @@ ul.left_nav
|
||||||
:border 1px dotted #ccc
|
:border 1px dotted #ccc
|
||||||
|
|
||||||
.bottom_submit_section
|
.bottom_submit_section
|
||||||
|
:display block
|
||||||
|
:position relative
|
||||||
|
|
||||||
|
form
|
||||||
|
:display inline-block
|
||||||
:text-align right
|
:text-align right
|
||||||
|
|
||||||
#no_posts
|
#no_posts
|
||||||
:padding 20px
|
:padding 20px
|
||||||
|
|
||||||
|
.left
|
||||||
|
:position absolute
|
||||||
|
:left 0
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,9 @@
|
||||||
:border
|
:border
|
||||||
:top 1px solid #aaa
|
:top 1px solid #aaa
|
||||||
|
|
||||||
|
.button.delete
|
||||||
|
:color desaturate($red,10%)
|
||||||
|
|
||||||
.button.in_aspects
|
.button.in_aspects
|
||||||
@include linear-gradient(lighten(#76C000,8%),#76C000)
|
@include linear-gradient(lighten(#76C000,8%),#76C000)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue