diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 9b209a790..c138a31b6 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -22,9 +22,9 @@ def sign_attribute_image attribute, number, main, in_menu=false end #these images have been resized with - # mogrify -resize 42x42 -background white -gravity center -extent 42x42 *.png + # mogrify -negate -alpha copy -negate -resize 42x42 -background transparent -gravity center -extent 42x42 *.png # or - # mogrify -resize 72x72 -background white -gravity center -extent 72x72 *.png + # mogrify -negate -alpha copy -negate -resize 72x72 -background transparent -gravity center -extent 72x72 *.png # Sign Attribute is Selected? diff --git a/app/helpers/static_pages_helper.rb b/app/helpers/static_pages_helper.rb index 6edc68306..18297bc82 100644 --- a/app/helpers/static_pages_helper.rb +++ b/app/helpers/static_pages_helper.rb @@ -63,6 +63,10 @@ def time_listing def signs_from_array(array) array.map{|v| [v[0], Sign.find(:id => v[1])]}.reject{|v| v[1].nil? } end + def link_sign name, id + return link_to name, sign_path(id) if Sign.find(:id => id) + return name + end def classifiers { :sass => [ diff --git a/app/views/static_pages/classifiers.html.haml b/app/views/static_pages/classifiers.html.haml index 8af388604..5e76ead86 100644 --- a/app/views/static_pages/classifiers.html.haml +++ b/app/views/static_pages/classifiers.html.haml @@ -14,17 +14,17 @@ Classifier signs describe and/or represent a noun by depicting its semantic or visual features. For instance, objects that are flat and round (eg, a coin), straight and thin (eg, a picture frame), or spherical (eg, the earth) are represented by handshapes that are - manipulated in space to represent a feature of the object’s appearance, size and location. + manipulated in space to represent a feature of the object’s appearance, size and location. Instrumental or handling classifiers represent how an object is used, with the handshape - reflecting something about the object’s shape or how it is held, and the movement showing + reflecting something about the object’s shape or how it is held, and the movement showing how it is used (eg, unscrewing a lid or turning a knob). Certain classifier handshapes represent closed semantic categories, such as ‘vehicle’, or ‘person’, and these are also used like a pronoun that can be moved to incorporate a verb of motion and location. For example, a flat open handshape with the blade down represents - a vehicle, and can be moved in an upward-sloping, zig-zag motion to express ‘a car driving - up a steep winding road’. These complex classifier constructions that incorporate an entity - and an action are also known as ‘pro-forms’. + a vehicle, and can be moved in an upward-sloping, zig-zag motion to express ‘a car driving + up a steep winding road’. These complex classifier constructions that incorporate an entity + and an action are also known as ‘pro-forms’. Number and quantity is expressed in some classifiers by a change or reduplication of handshape; eg, three upright fingers moving forward, rather than one, can stand for three @@ -34,11 +34,11 @@ representing parts of the same entity, or two different entities that relate to each other in space (eg, a car parked under a roof, a bird on a rock, two people sitting opposite, a train entering a tunnel). - + %p Classifiers are a productive source of new vocabulary creation in signed languages, as they - can be used to represent new nouns (eg, [mobile phone](/signs/5581)), activities (eg, [bungy-jump](/signs/6066)), and + can be used to represent new nouns (eg, #{link_sign 'mobile phone', 5581}, activities (eg, #{link_sign 'bungy-jump', 6066}), and other concepts. Many signs in the established dictionary lexicon that reflect shape or action - originate in classifiers, such as [table](/signs/834), [hammer](/signs/3846), [plate](/signs/5666), [jump](/signs/2974), [meet](/signs/2461), [assertive](/signs/2405). + originate in classifiers, such as #{link_sign 'table', 834}, #{link_sign 'hammer', 3846}, #{link_sign 'plate', 5666}, #{link_sign 'jump', 2974}, #{link_sign 'meet', 2461}, #{link_sign 'assertive', 2405}. Frequently used NZSL classifier handshapes are shown in these pages, according to categories of meaning. @@ -59,7 +59,7 @@ = render :partial => 'static_pages/grid', :locals => {:group => value.last} .typogarphy %h3 Body parts classifiers - %p.note These handshapes describe moveable body parts including: legs, arms, head, feet, eyes, hair, ears, penis, eyebrows, mouth, tongue, buttocks, etc. For animals – paws, tail, whiskers, claws, wings, beak. These can function as proforms incorporating noun and verb. + %p.note These handshapes describe moveable body parts including: legs, arms, head, feet, eyes, hair, ears, penis, eyebrows, mouth, tongue, buttocks, etc. For animals — paws, tail, whiskers, claws, wings, beak. These can function as proforms incorporating noun and verb. = render :partial => 'static_pages/grid', :locals => {:group => classifiers[:body_parts]} .typography %h3 Mass or quantity classifiers diff --git a/app/views/static_pages/contact-us.html.haml b/app/views/static_pages/contact-us.html.haml deleted file mode 100644 index 8b1378917..000000000 --- a/app/views/static_pages/contact-us.html.haml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/views/static_pages/copyright.html.haml b/app/views/static_pages/copyright.html.haml deleted file mode 100644 index 6ea781e3e..000000000 --- a/app/views/static_pages/copyright.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -.typography.rule_after - :markdown - Copyright - ========= - - Printing or electronic copying of vocabulary sheets or individual images is permitted for individual use, or by teachers for use in their own classroom. Wider distribution or re-publication of any images or text from NZSL Online requires prior permission from the Managing Editor: diff --git a/app/views/static_pages/help.html.haml b/app/views/static_pages/help.html.haml index 119a951d1..b82ed1bca 100644 --- a/app/views/static_pages/help.html.haml +++ b/app/views/static_pages/help.html.haml @@ -1,7 +1,8 @@ .typography.rule_after - :markdown + :markdown Help ==== + About the Entries ----------------- @@ -10,19 +11,21 @@ line drawing, as a videoclip, and as used in an example sentence. The sign is translated with equivalent English words - usually a main gloss, and secondary or other possible meanings. Both main and secondary English glosses are included in a sign search. - + All the sentence examples reflect natural NZSL usage, and the structure of the signed sentence is represented in a literal gloss displayed below the videoclip. Notice that each written sign gloss in a sentence can be clicked to link to the entry for that sign within the dictionary. An English translation of example sentences is provided to show the meaning and grammatical context for using the sign. - + Drawings and video clips will be the most important way for learners to see how to make a sign. But some entries also contain a ‘hint’ that helps to remember the way a sign looks, based on a visual aspect of the sign. All signs are indexed to a topic, which allows users to look for signs according to a topic - area: actions, emotions, family, health, politics, time, for example. + area: [actions](/signs/search?tag=5), [emotions](/signs/search?tag=18), + [family](/signs/search?tag=15), [health](/signs/search?tag=23), + [politics](/signs/search?tag=22), [time](/signs/search?tag=39), for example. Entries contain grammatical information about how a sign is formed and used, including the following: its main grammatical role in NZSL (verb, noun, adjective, pronoun, interrogative, @@ -34,15 +37,17 @@ Information about the origin and the users of particular signs is shown in some entries. Where this information is known (not in every case), origin of a sign is noted (for example, within NZSL or adopted from Auslan, BSL or ASL). Certain signs are known to be used more - by one generation than another, in which case the entry will indicate ‘older’ or ‘younger’ use. + by one generation than another, in which case the entry will indicate ‘older’ + or ‘younger’ use. - A small number of signs are marked as ‘archaic’ or ‘rare’, meaning that they are no longer, - or very infrequently, used. Other signs that have been recently coined (sometimes for - specialised or educational purposes) and are not yet in widespread use are marked - as ‘neologisms’. Signs that are regarded by the NZSL community as obscene, or - as ‘informal’ slang, are marked as such. - + A small number of signs are marked as [archaic](/signs/search?usage=1) or + [rare](/signs/search?usage=5), meaning that they are no longer, or very infrequently, used. Other + signs that have been recently coined (sometimes for specialised or educational purposes) and are + not yet in widespread use are marked as [neologisms](/signs/search?usage=2). Signs that are + regarded by the NZSL community as [obscene](signs/search?usage=3), or as + [informal](/signs/search?usage=4) slang, are marked as such. + How to Use - ----------- - + ========== + _Coming soon!_ \ No newline at end of file diff --git a/app/views/static_pages/nzsl.html.haml b/app/views/static_pages/nzsl.html.haml index 5c0385c05..d007ebf91 100644 --- a/app/views/static_pages/nzsl.html.haml +++ b/app/views/static_pages/nzsl.html.haml @@ -24,10 +24,10 @@ Research on natural signed languages and Deaf cultures began to positively impact the NZ Deaf community in the mid 1980s. From this time, the local sign language was researched, documented in dictionaries, and - named as ‘NZSL’. In the decades since, Deaf New Zealanders have assumed a more positive sense of ownership - of their language and asserted a Deaf cultural identity. NZSL was accepted for use in Deaf education from - 1993. In 2006 it was legally recognised in the [NZSL Act](http://www.odi.govt.nz/what-we-do/nzsl/index.html) - as an official language of New Zealand. + named as ‘NZSL’. In the decades since, Deaf New Zealanders have assumed a more positive sense + of ownership of their language and asserted a Deaf cultural identity. NZSL was accepted for use in Deaf + education from 1993. In 2006 it was legally recognised in the + [NZSL Act](http://www.odi.govt.nz/what-we-do/nzsl/index.html) as an official language of New Zealand. Variation in the lexicon ------------------------ @@ -48,9 +48,8 @@ Where can I learn NZSL? ----------------------- - The best way to start is to take an NZSL course with a qualified Deaf teacher. Credit- - bearing courses are offered at Victoria University of Wellington and Auckland University of - Technology. + The best way to start is to take an NZSL course with a qualified Deaf teacher. Credit-bearing courses are + offered at Victoria University of Wellington and Auckland University of Technology. Many non-credit courses are offered by local community education providers. These can be located by visiting the [website of the NZSL Teachers Association](http://www.nzslta.org.nz) or by diff --git a/public/images/handshapes/42/handshape.1.1.1.png b/public/images/handshapes/42/handshape.1.1.1.png index 5dd763cc3..f95093778 100644 Binary files a/public/images/handshapes/42/handshape.1.1.1.png and b/public/images/handshapes/42/handshape.1.1.1.png differ diff --git a/public/images/handshapes/42/handshape.1.1.2.png b/public/images/handshapes/42/handshape.1.1.2.png index f72d7e977..9bbb128ef 100644 Binary files a/public/images/handshapes/42/handshape.1.1.2.png and b/public/images/handshapes/42/handshape.1.1.2.png differ diff --git a/public/images/handshapes/42/handshape.1.1.3.png b/public/images/handshapes/42/handshape.1.1.3.png index 4ca88113a..a844c8632 100644 Binary files a/public/images/handshapes/42/handshape.1.1.3.png and b/public/images/handshapes/42/handshape.1.1.3.png differ diff --git a/public/images/handshapes/42/handshape.1.2.1.png b/public/images/handshapes/42/handshape.1.2.1.png index 577c24e31..9668c1af9 100644 Binary files a/public/images/handshapes/42/handshape.1.2.1.png and b/public/images/handshapes/42/handshape.1.2.1.png differ diff --git a/public/images/handshapes/42/handshape.1.2.2.png b/public/images/handshapes/42/handshape.1.2.2.png index 57361e62b..6d8d9eb47 100644 Binary files a/public/images/handshapes/42/handshape.1.2.2.png and b/public/images/handshapes/42/handshape.1.2.2.png differ diff --git a/public/images/handshapes/42/handshape.1.3.1.png b/public/images/handshapes/42/handshape.1.3.1.png index 56053afc2..1f5ca5085 100644 Binary files a/public/images/handshapes/42/handshape.1.3.1.png and b/public/images/handshapes/42/handshape.1.3.1.png differ diff --git a/public/images/handshapes/42/handshape.1.3.2.png b/public/images/handshapes/42/handshape.1.3.2.png index 6ddff9090..cba8cef03 100644 Binary files a/public/images/handshapes/42/handshape.1.3.2.png and b/public/images/handshapes/42/handshape.1.3.2.png differ diff --git a/public/images/handshapes/42/handshape.1.4.1.png b/public/images/handshapes/42/handshape.1.4.1.png index 48d7f4500..7ef8414bf 100644 Binary files a/public/images/handshapes/42/handshape.1.4.1.png and b/public/images/handshapes/42/handshape.1.4.1.png differ diff --git a/public/images/handshapes/42/handshape.2.1.1.png b/public/images/handshapes/42/handshape.2.1.1.png index 3f888b644..d5f909a5e 100644 Binary files a/public/images/handshapes/42/handshape.2.1.1.png and b/public/images/handshapes/42/handshape.2.1.1.png differ diff --git a/public/images/handshapes/42/handshape.2.1.2.png b/public/images/handshapes/42/handshape.2.1.2.png index cdf68fdd6..c57cc215f 100644 Binary files a/public/images/handshapes/42/handshape.2.1.2.png and b/public/images/handshapes/42/handshape.2.1.2.png differ diff --git a/public/images/handshapes/42/handshape.2.2.1.png b/public/images/handshapes/42/handshape.2.2.1.png index abf882b8d..c5f6266ae 100644 Binary files a/public/images/handshapes/42/handshape.2.2.1.png and b/public/images/handshapes/42/handshape.2.2.1.png differ diff --git a/public/images/handshapes/42/handshape.2.2.2.png b/public/images/handshapes/42/handshape.2.2.2.png index 9b975d7be..bb51c725c 100644 Binary files a/public/images/handshapes/42/handshape.2.2.2.png and b/public/images/handshapes/42/handshape.2.2.2.png differ diff --git a/public/images/handshapes/42/handshape.2.3.1.png b/public/images/handshapes/42/handshape.2.3.1.png index 0da29e7ea..c40ef1d86 100644 Binary files a/public/images/handshapes/42/handshape.2.3.1.png and b/public/images/handshapes/42/handshape.2.3.1.png differ diff --git a/public/images/handshapes/42/handshape.2.3.2.png b/public/images/handshapes/42/handshape.2.3.2.png index f19faeeef..b20c27897 100644 Binary files a/public/images/handshapes/42/handshape.2.3.2.png and b/public/images/handshapes/42/handshape.2.3.2.png differ diff --git a/public/images/handshapes/42/handshape.2.3.3.png b/public/images/handshapes/42/handshape.2.3.3.png index 1a5bfd03f..2aebfd3c3 100644 Binary files a/public/images/handshapes/42/handshape.2.3.3.png and b/public/images/handshapes/42/handshape.2.3.3.png differ diff --git a/public/images/handshapes/42/handshape.3.1.1.png b/public/images/handshapes/42/handshape.3.1.1.png index 7735003a3..f86016c56 100644 Binary files a/public/images/handshapes/42/handshape.3.1.1.png and b/public/images/handshapes/42/handshape.3.1.1.png differ diff --git a/public/images/handshapes/42/handshape.3.2.1.png b/public/images/handshapes/42/handshape.3.2.1.png index 844616984..68e804e9d 100644 Binary files a/public/images/handshapes/42/handshape.3.2.1.png and b/public/images/handshapes/42/handshape.3.2.1.png differ diff --git a/public/images/handshapes/42/handshape.3.3.1.png b/public/images/handshapes/42/handshape.3.3.1.png index 3f72d7d83..ba6aa274f 100644 Binary files a/public/images/handshapes/42/handshape.3.3.1.png and b/public/images/handshapes/42/handshape.3.3.1.png differ diff --git a/public/images/handshapes/42/handshape.3.4.1.png b/public/images/handshapes/42/handshape.3.4.1.png index e972c0e19..2d86999c1 100644 Binary files a/public/images/handshapes/42/handshape.3.4.1.png and b/public/images/handshapes/42/handshape.3.4.1.png differ diff --git a/public/images/handshapes/42/handshape.3.4.2.png b/public/images/handshapes/42/handshape.3.4.2.png index 74738e01a..1f2825dc4 100644 Binary files a/public/images/handshapes/42/handshape.3.4.2.png and b/public/images/handshapes/42/handshape.3.4.2.png differ diff --git a/public/images/handshapes/42/handshape.3.5.1.png b/public/images/handshapes/42/handshape.3.5.1.png index 6a2a84d46..800771d3b 100644 Binary files a/public/images/handshapes/42/handshape.3.5.1.png and b/public/images/handshapes/42/handshape.3.5.1.png differ diff --git a/public/images/handshapes/42/handshape.3.5.2.png b/public/images/handshapes/42/handshape.3.5.2.png index 1b21e945e..b45e85555 100644 Binary files a/public/images/handshapes/42/handshape.3.5.2.png and b/public/images/handshapes/42/handshape.3.5.2.png differ diff --git a/public/images/handshapes/42/handshape.4.1.1.png b/public/images/handshapes/42/handshape.4.1.1.png index caf584d5f..c26ab23dc 100644 Binary files a/public/images/handshapes/42/handshape.4.1.1.png and b/public/images/handshapes/42/handshape.4.1.1.png differ diff --git a/public/images/handshapes/42/handshape.4.1.2.png b/public/images/handshapes/42/handshape.4.1.2.png index b0281be5e..06e22eb96 100644 Binary files a/public/images/handshapes/42/handshape.4.1.2.png and b/public/images/handshapes/42/handshape.4.1.2.png differ diff --git a/public/images/handshapes/42/handshape.4.2.1.png b/public/images/handshapes/42/handshape.4.2.1.png index e054c00fa..a492de405 100644 Binary files a/public/images/handshapes/42/handshape.4.2.1.png and b/public/images/handshapes/42/handshape.4.2.1.png differ diff --git a/public/images/handshapes/42/handshape.4.2.2.png b/public/images/handshapes/42/handshape.4.2.2.png index e8560ff62..a0a61b585 100644 Binary files a/public/images/handshapes/42/handshape.4.2.2.png and b/public/images/handshapes/42/handshape.4.2.2.png differ diff --git a/public/images/handshapes/42/handshape.4.3.1.png b/public/images/handshapes/42/handshape.4.3.1.png index f77ac5b72..ab1390d93 100644 Binary files a/public/images/handshapes/42/handshape.4.3.1.png and b/public/images/handshapes/42/handshape.4.3.1.png differ diff --git a/public/images/handshapes/42/handshape.4.3.2.png b/public/images/handshapes/42/handshape.4.3.2.png index 3fdc2c3a0..7339c60ed 100644 Binary files a/public/images/handshapes/42/handshape.4.3.2.png and b/public/images/handshapes/42/handshape.4.3.2.png differ diff --git a/public/images/handshapes/42/handshape.5.1.1.png b/public/images/handshapes/42/handshape.5.1.1.png index 3e7eecfca..039c01e42 100644 Binary files a/public/images/handshapes/42/handshape.5.1.1.png and b/public/images/handshapes/42/handshape.5.1.1.png differ diff --git a/public/images/handshapes/42/handshape.5.1.2.png b/public/images/handshapes/42/handshape.5.1.2.png index 7ebb9f550..ef7b0135f 100644 Binary files a/public/images/handshapes/42/handshape.5.1.2.png and b/public/images/handshapes/42/handshape.5.1.2.png differ diff --git a/public/images/handshapes/42/handshape.5.2.1.png b/public/images/handshapes/42/handshape.5.2.1.png index 087fa5f3b..6bb3e347f 100644 Binary files a/public/images/handshapes/42/handshape.5.2.1.png and b/public/images/handshapes/42/handshape.5.2.1.png differ diff --git a/public/images/handshapes/42/handshape.5.3.1.png b/public/images/handshapes/42/handshape.5.3.1.png index 67e0e8a69..5b3064501 100644 Binary files a/public/images/handshapes/42/handshape.5.3.1.png and b/public/images/handshapes/42/handshape.5.3.1.png differ diff --git a/public/images/handshapes/42/handshape.5.3.2.png b/public/images/handshapes/42/handshape.5.3.2.png index 2dd1a397f..a053e2adb 100644 Binary files a/public/images/handshapes/42/handshape.5.3.2.png and b/public/images/handshapes/42/handshape.5.3.2.png differ diff --git a/public/images/handshapes/42/handshape.5.4.1.png b/public/images/handshapes/42/handshape.5.4.1.png index c11308619..e05230a3c 100644 Binary files a/public/images/handshapes/42/handshape.5.4.1.png and b/public/images/handshapes/42/handshape.5.4.1.png differ diff --git a/public/images/handshapes/42/handshape.6.1.1.png b/public/images/handshapes/42/handshape.6.1.1.png index 19a47d540..53cf1510f 100644 Binary files a/public/images/handshapes/42/handshape.6.1.1.png and b/public/images/handshapes/42/handshape.6.1.1.png differ diff --git a/public/images/handshapes/42/handshape.6.1.2.png b/public/images/handshapes/42/handshape.6.1.2.png index 21e3ac912..4e2651548 100644 Binary files a/public/images/handshapes/42/handshape.6.1.2.png and b/public/images/handshapes/42/handshape.6.1.2.png differ diff --git a/public/images/handshapes/42/handshape.6.1.3.png b/public/images/handshapes/42/handshape.6.1.3.png index 099de3d59..b6e855129 100644 Binary files a/public/images/handshapes/42/handshape.6.1.3.png and b/public/images/handshapes/42/handshape.6.1.3.png differ diff --git a/public/images/handshapes/42/handshape.6.1.4.png b/public/images/handshapes/42/handshape.6.1.4.png index a28b59cb2..ffc733bc2 100644 Binary files a/public/images/handshapes/42/handshape.6.1.4.png and b/public/images/handshapes/42/handshape.6.1.4.png differ diff --git a/public/images/handshapes/42/handshape.6.2.1.png b/public/images/handshapes/42/handshape.6.2.1.png index 98011211c..80a57c220 100644 Binary files a/public/images/handshapes/42/handshape.6.2.1.png and b/public/images/handshapes/42/handshape.6.2.1.png differ diff --git a/public/images/handshapes/42/handshape.6.2.2.png b/public/images/handshapes/42/handshape.6.2.2.png index 00170538d..764132d34 100644 Binary files a/public/images/handshapes/42/handshape.6.2.2.png and b/public/images/handshapes/42/handshape.6.2.2.png differ diff --git a/public/images/handshapes/42/handshape.6.2.3.png b/public/images/handshapes/42/handshape.6.2.3.png index cb436a02e..83b73aa26 100644 Binary files a/public/images/handshapes/42/handshape.6.2.3.png and b/public/images/handshapes/42/handshape.6.2.3.png differ diff --git a/public/images/handshapes/42/handshape.6.2.4.png b/public/images/handshapes/42/handshape.6.2.4.png index c8bd84656..0678c3c79 100644 Binary files a/public/images/handshapes/42/handshape.6.2.4.png and b/public/images/handshapes/42/handshape.6.2.4.png differ diff --git a/public/images/handshapes/42/handshape.6.3.1.png b/public/images/handshapes/42/handshape.6.3.1.png index a4d2de58d..c8f7f7a04 100644 Binary files a/public/images/handshapes/42/handshape.6.3.1.png and b/public/images/handshapes/42/handshape.6.3.1.png differ diff --git a/public/images/handshapes/42/handshape.6.3.2.png b/public/images/handshapes/42/handshape.6.3.2.png index 72f2da925..80e890e8a 100644 Binary files a/public/images/handshapes/42/handshape.6.3.2.png and b/public/images/handshapes/42/handshape.6.3.2.png differ diff --git a/public/images/handshapes/42/handshape.6.4.1.png b/public/images/handshapes/42/handshape.6.4.1.png index 389305ccb..678399658 100644 Binary files a/public/images/handshapes/42/handshape.6.4.1.png and b/public/images/handshapes/42/handshape.6.4.1.png differ diff --git a/public/images/handshapes/42/handshape.6.4.2.png b/public/images/handshapes/42/handshape.6.4.2.png index 4b7800ae9..30beb4f16 100644 Binary files a/public/images/handshapes/42/handshape.6.4.2.png and b/public/images/handshapes/42/handshape.6.4.2.png differ diff --git a/public/images/handshapes/42/handshape.6.5.1.png b/public/images/handshapes/42/handshape.6.5.1.png index 596aa6bcd..77262a0fa 100644 Binary files a/public/images/handshapes/42/handshape.6.5.1.png and b/public/images/handshapes/42/handshape.6.5.1.png differ diff --git a/public/images/handshapes/42/handshape.6.5.2.png b/public/images/handshapes/42/handshape.6.5.2.png index 87872d0df..dc2a55798 100644 Binary files a/public/images/handshapes/42/handshape.6.5.2.png and b/public/images/handshapes/42/handshape.6.5.2.png differ diff --git a/public/images/handshapes/42/handshape.6.6.1.png b/public/images/handshapes/42/handshape.6.6.1.png index 1a0136864..632bedac9 100644 Binary files a/public/images/handshapes/42/handshape.6.6.1.png and b/public/images/handshapes/42/handshape.6.6.1.png differ diff --git a/public/images/handshapes/42/handshape.6.6.2.png b/public/images/handshapes/42/handshape.6.6.2.png index 66dfc7071..4f8801123 100644 Binary files a/public/images/handshapes/42/handshape.6.6.2.png and b/public/images/handshapes/42/handshape.6.6.2.png differ diff --git a/public/images/handshapes/42/handshape.7.1.1.png b/public/images/handshapes/42/handshape.7.1.1.png index 38850b72b..32c21873b 100644 Binary files a/public/images/handshapes/42/handshape.7.1.1.png and b/public/images/handshapes/42/handshape.7.1.1.png differ diff --git a/public/images/handshapes/42/handshape.7.1.2.png b/public/images/handshapes/42/handshape.7.1.2.png index e0ed08f8f..4ce1b22bb 100644 Binary files a/public/images/handshapes/42/handshape.7.1.2.png and b/public/images/handshapes/42/handshape.7.1.2.png differ diff --git a/public/images/handshapes/42/handshape.7.1.3.png b/public/images/handshapes/42/handshape.7.1.3.png index 1405b17ca..ebad5750c 100644 Binary files a/public/images/handshapes/42/handshape.7.1.3.png and b/public/images/handshapes/42/handshape.7.1.3.png differ diff --git a/public/images/handshapes/42/handshape.7.1.4.png b/public/images/handshapes/42/handshape.7.1.4.png index cdfab8653..3f9cf72ed 100644 Binary files a/public/images/handshapes/42/handshape.7.1.4.png and b/public/images/handshapes/42/handshape.7.1.4.png differ diff --git a/public/images/handshapes/42/handshape.7.2.1.png b/public/images/handshapes/42/handshape.7.2.1.png index f379e4dab..d2c3907b5 100644 Binary files a/public/images/handshapes/42/handshape.7.2.1.png and b/public/images/handshapes/42/handshape.7.2.1.png differ diff --git a/public/images/handshapes/42/handshape.7.3.1.png b/public/images/handshapes/42/handshape.7.3.1.png index 1f3e14040..afe3e04b1 100644 Binary files a/public/images/handshapes/42/handshape.7.3.1.png and b/public/images/handshapes/42/handshape.7.3.1.png differ diff --git a/public/images/handshapes/42/handshape.7.3.2.png b/public/images/handshapes/42/handshape.7.3.2.png index b8ffcbdfe..e94002c66 100644 Binary files a/public/images/handshapes/42/handshape.7.3.2.png and b/public/images/handshapes/42/handshape.7.3.2.png differ diff --git a/public/images/handshapes/42/handshape.7.3.3.png b/public/images/handshapes/42/handshape.7.3.3.png index 1cd0e4fa8..d3efcaf1b 100644 Binary files a/public/images/handshapes/42/handshape.7.3.3.png and b/public/images/handshapes/42/handshape.7.3.3.png differ diff --git a/public/images/handshapes/42/handshape.7.4.1.png b/public/images/handshapes/42/handshape.7.4.1.png index 7a95ef3e7..41a9d0d66 100644 Binary files a/public/images/handshapes/42/handshape.7.4.1.png and b/public/images/handshapes/42/handshape.7.4.1.png differ diff --git a/public/images/handshapes/42/handshape.7.4.2.png b/public/images/handshapes/42/handshape.7.4.2.png index 566285d48..b84281979 100644 Binary files a/public/images/handshapes/42/handshape.7.4.2.png and b/public/images/handshapes/42/handshape.7.4.2.png differ diff --git a/public/images/handshapes/42/handshape.8.1.1.png b/public/images/handshapes/42/handshape.8.1.1.png index 6d1cdb9e5..da21c3975 100644 Binary files a/public/images/handshapes/42/handshape.8.1.1.png and b/public/images/handshapes/42/handshape.8.1.1.png differ diff --git a/public/images/handshapes/42/handshape.8.1.2.png b/public/images/handshapes/42/handshape.8.1.2.png index 7414f6e59..bb506bb00 100644 Binary files a/public/images/handshapes/42/handshape.8.1.2.png and b/public/images/handshapes/42/handshape.8.1.2.png differ diff --git a/public/images/handshapes/42/handshape.8.1.3.png b/public/images/handshapes/42/handshape.8.1.3.png index d98539498..fe5a54898 100644 Binary files a/public/images/handshapes/42/handshape.8.1.3.png and b/public/images/handshapes/42/handshape.8.1.3.png differ diff --git a/public/images/locations/42/location.1.1.in_front_of_body.png b/public/images/locations/42/location.1.1.in_front_of_body.png index cbb21c314..0ca1c8a38 100644 Binary files a/public/images/locations/42/location.1.1.in_front_of_body.png and b/public/images/locations/42/location.1.1.in_front_of_body.png differ diff --git a/public/images/locations/42/location.2.2.in_front_of_face.png b/public/images/locations/42/location.2.2.in_front_of_face.png index 1fe5a1ed5..4465f1a80 100644 Binary files a/public/images/locations/42/location.2.2.in_front_of_face.png and b/public/images/locations/42/location.2.2.in_front_of_face.png differ diff --git a/public/images/locations/42/location.3.3.head.png b/public/images/locations/42/location.3.3.head.png index 59d601c86..1b17c7831 100644 Binary files a/public/images/locations/42/location.3.3.head.png and b/public/images/locations/42/location.3.3.head.png differ diff --git a/public/images/locations/42/location.3.4.top_of_head.png b/public/images/locations/42/location.3.4.top_of_head.png index 74bd14c3f..c92f3decb 100644 Binary files a/public/images/locations/42/location.3.4.top_of_head.png and b/public/images/locations/42/location.3.4.top_of_head.png differ diff --git a/public/images/locations/42/location.3.5.eyes.png b/public/images/locations/42/location.3.5.eyes.png index e29c10f62..7096f59b2 100644 Binary files a/public/images/locations/42/location.3.5.eyes.png and b/public/images/locations/42/location.3.5.eyes.png differ diff --git a/public/images/locations/42/location.3.6.nose.png b/public/images/locations/42/location.3.6.nose.png index 2b2846f0c..2a2f9afe2 100644 Binary files a/public/images/locations/42/location.3.6.nose.png and b/public/images/locations/42/location.3.6.nose.png differ diff --git a/public/images/locations/42/location.3.7.ear.png b/public/images/locations/42/location.3.7.ear.png index b3bb8f4c0..cd3cbf77e 100644 Binary files a/public/images/locations/42/location.3.7.ear.png and b/public/images/locations/42/location.3.7.ear.png differ diff --git a/public/images/locations/42/location.3.8.cheek.png b/public/images/locations/42/location.3.8.cheek.png index 1b72b3dea..a36358785 100644 Binary files a/public/images/locations/42/location.3.8.cheek.png and b/public/images/locations/42/location.3.8.cheek.png differ diff --git a/public/images/locations/42/location.3.9.lower_head.png b/public/images/locations/42/location.3.9.lower_head.png index 596d2b1d6..3da4faa83 100644 Binary files a/public/images/locations/42/location.3.9.lower_head.png and b/public/images/locations/42/location.3.9.lower_head.png differ diff --git a/public/images/locations/42/location.4.0.body.png b/public/images/locations/42/location.4.0.body.png index d00e9dade..68ed16e96 100644 Binary files a/public/images/locations/42/location.4.0.body.png and b/public/images/locations/42/location.4.0.body.png differ diff --git a/public/images/locations/42/location.4.10.neck_throat.png b/public/images/locations/42/location.4.10.neck_throat.png index 01b1814ff..b6cf6e4e7 100644 Binary files a/public/images/locations/42/location.4.10.neck_throat.png and b/public/images/locations/42/location.4.10.neck_throat.png differ diff --git a/public/images/locations/42/location.4.11.shoulders.png b/public/images/locations/42/location.4.11.shoulders.png index 8668c2f13..47fac87df 100644 Binary files a/public/images/locations/42/location.4.11.shoulders.png and b/public/images/locations/42/location.4.11.shoulders.png differ diff --git a/public/images/locations/42/location.4.12.chest.png b/public/images/locations/42/location.4.12.chest.png index f38c62604..9a467903c 100644 Binary files a/public/images/locations/42/location.4.12.chest.png and b/public/images/locations/42/location.4.12.chest.png differ diff --git a/public/images/locations/42/location.4.13.abdomen.png b/public/images/locations/42/location.4.13.abdomen.png index 95294f1f9..19ef48bba 100644 Binary files a/public/images/locations/42/location.4.13.abdomen.png and b/public/images/locations/42/location.4.13.abdomen.png differ diff --git a/public/images/locations/42/location.4.14.hips_pelvis_groin.png b/public/images/locations/42/location.4.14.hips_pelvis_groin.png index f60772959..3f4aacf66 100644 Binary files a/public/images/locations/42/location.4.14.hips_pelvis_groin.png and b/public/images/locations/42/location.4.14.hips_pelvis_groin.png differ diff --git a/public/images/locations/42/location.4.15.upper_leg.png b/public/images/locations/42/location.4.15.upper_leg.png index 88eca43a1..e326e5f13 100644 Binary files a/public/images/locations/42/location.4.15.upper_leg.png and b/public/images/locations/42/location.4.15.upper_leg.png differ diff --git a/public/images/locations/42/location.5.0.arm.png b/public/images/locations/42/location.5.0.arm.png index a16bfe510..6d2111482 100644 Binary files a/public/images/locations/42/location.5.0.arm.png and b/public/images/locations/42/location.5.0.arm.png differ diff --git a/public/images/locations/42/location.5.16.upper_arm.png b/public/images/locations/42/location.5.16.upper_arm.png index bf124d8d6..1277cf635 100644 Binary files a/public/images/locations/42/location.5.16.upper_arm.png and b/public/images/locations/42/location.5.16.upper_arm.png differ diff --git a/public/images/locations/42/location.5.17.elbow.png b/public/images/locations/42/location.5.17.elbow.png index 0c0cadd07..9cf96478c 100644 Binary files a/public/images/locations/42/location.5.17.elbow.png and b/public/images/locations/42/location.5.17.elbow.png differ diff --git a/public/images/locations/42/location.5.18.lower_arm.png b/public/images/locations/42/location.5.18.lower_arm.png index c6f5e35c6..4fc5933e0 100644 Binary files a/public/images/locations/42/location.5.18.lower_arm.png and b/public/images/locations/42/location.5.18.lower_arm.png differ diff --git a/public/images/locations/42/location.6.0.hand.png b/public/images/locations/42/location.6.0.hand.png index 21c63c0c6..97dc2c04f 100644 Binary files a/public/images/locations/42/location.6.0.hand.png and b/public/images/locations/42/location.6.0.hand.png differ diff --git a/public/images/locations/42/location.6.19.wrist.png b/public/images/locations/42/location.6.19.wrist.png index 3ff2df47f..4e993ecde 100644 Binary files a/public/images/locations/42/location.6.19.wrist.png and b/public/images/locations/42/location.6.19.wrist.png differ diff --git a/public/images/locations/42/location.6.20.fingers_thumb.png b/public/images/locations/42/location.6.20.fingers_thumb.png index 289858097..edf0e55ef 100644 Binary files a/public/images/locations/42/location.6.20.fingers_thumb.png and b/public/images/locations/42/location.6.20.fingers_thumb.png differ diff --git a/public/images/locations/42/location.6.21.palm_of_hand.png b/public/images/locations/42/location.6.21.palm_of_hand.png index bf70b0280..5a1302ef1 100644 Binary files a/public/images/locations/42/location.6.21.palm_of_hand.png and b/public/images/locations/42/location.6.21.palm_of_hand.png differ diff --git a/public/images/locations/42/location.6.22.back_of_hand.png b/public/images/locations/42/location.6.22.back_of_hand.png index 972e1a342..7dbdc1521 100644 Binary files a/public/images/locations/42/location.6.22.back_of_hand.png and b/public/images/locations/42/location.6.22.back_of_hand.png differ diff --git a/public/images/locations/42/location.6.23.blades_of_hand.png b/public/images/locations/42/location.6.23.blades_of_hand.png index 122b217b8..b7e0fb9e9 100644 Binary files a/public/images/locations/42/location.6.23.blades_of_hand.png and b/public/images/locations/42/location.6.23.blades_of_hand.png differ diff --git a/public/images/locations/72/location.1.1.in_front_of_body.png b/public/images/locations/72/location.1.1.in_front_of_body.png index 2c237f30a..1441c4114 100644 Binary files a/public/images/locations/72/location.1.1.in_front_of_body.png and b/public/images/locations/72/location.1.1.in_front_of_body.png differ diff --git a/public/images/locations/72/location.2.2.in_front_of_face.png b/public/images/locations/72/location.2.2.in_front_of_face.png index 285b2b89d..57ecad4e7 100644 Binary files a/public/images/locations/72/location.2.2.in_front_of_face.png and b/public/images/locations/72/location.2.2.in_front_of_face.png differ diff --git a/public/images/locations/72/location.3.3.head.png b/public/images/locations/72/location.3.3.head.png index b03622be3..bdb0c5380 100644 Binary files a/public/images/locations/72/location.3.3.head.png and b/public/images/locations/72/location.3.3.head.png differ diff --git a/public/images/locations/72/location.3.4.top_of_head.png b/public/images/locations/72/location.3.4.top_of_head.png index 4d8109a8f..fb395d8d8 100644 Binary files a/public/images/locations/72/location.3.4.top_of_head.png and b/public/images/locations/72/location.3.4.top_of_head.png differ diff --git a/public/images/locations/72/location.3.5.eyes.png b/public/images/locations/72/location.3.5.eyes.png index bfd8f12c9..92fbbc22a 100644 Binary files a/public/images/locations/72/location.3.5.eyes.png and b/public/images/locations/72/location.3.5.eyes.png differ diff --git a/public/images/locations/72/location.3.6.nose.png b/public/images/locations/72/location.3.6.nose.png index 72c05a5cb..a6afa4b54 100644 Binary files a/public/images/locations/72/location.3.6.nose.png and b/public/images/locations/72/location.3.6.nose.png differ diff --git a/public/images/locations/72/location.3.7.ear.png b/public/images/locations/72/location.3.7.ear.png index a3805ef45..82a5717a7 100644 Binary files a/public/images/locations/72/location.3.7.ear.png and b/public/images/locations/72/location.3.7.ear.png differ diff --git a/public/images/locations/72/location.3.8.cheek.png b/public/images/locations/72/location.3.8.cheek.png index 257d21cd1..865787d0a 100644 Binary files a/public/images/locations/72/location.3.8.cheek.png and b/public/images/locations/72/location.3.8.cheek.png differ diff --git a/public/images/locations/72/location.3.9.lower_head.png b/public/images/locations/72/location.3.9.lower_head.png index 49378c14c..7b47ef0ce 100644 Binary files a/public/images/locations/72/location.3.9.lower_head.png and b/public/images/locations/72/location.3.9.lower_head.png differ diff --git a/public/images/locations/72/location.4.0.body.png b/public/images/locations/72/location.4.0.body.png index 332244b60..21d526ba7 100644 Binary files a/public/images/locations/72/location.4.0.body.png and b/public/images/locations/72/location.4.0.body.png differ diff --git a/public/images/locations/72/location.4.10.neck_throat.png b/public/images/locations/72/location.4.10.neck_throat.png index a9c731509..a3d8f170f 100644 Binary files a/public/images/locations/72/location.4.10.neck_throat.png and b/public/images/locations/72/location.4.10.neck_throat.png differ diff --git a/public/images/locations/72/location.4.11.shoulders.png b/public/images/locations/72/location.4.11.shoulders.png index 95116e63b..f932109c8 100644 Binary files a/public/images/locations/72/location.4.11.shoulders.png and b/public/images/locations/72/location.4.11.shoulders.png differ diff --git a/public/images/locations/72/location.4.12.chest.png b/public/images/locations/72/location.4.12.chest.png index ba9ff4d6b..bbc246f86 100644 Binary files a/public/images/locations/72/location.4.12.chest.png and b/public/images/locations/72/location.4.12.chest.png differ diff --git a/public/images/locations/72/location.4.13.abdomen.png b/public/images/locations/72/location.4.13.abdomen.png index 0813a1c08..73f9828d1 100644 Binary files a/public/images/locations/72/location.4.13.abdomen.png and b/public/images/locations/72/location.4.13.abdomen.png differ diff --git a/public/images/locations/72/location.4.14.hips_pelvis_groin.png b/public/images/locations/72/location.4.14.hips_pelvis_groin.png index d7fc2e781..e3c57eb0a 100644 Binary files a/public/images/locations/72/location.4.14.hips_pelvis_groin.png and b/public/images/locations/72/location.4.14.hips_pelvis_groin.png differ diff --git a/public/images/locations/72/location.4.15.upper_leg.png b/public/images/locations/72/location.4.15.upper_leg.png index 39d69796c..9dead8b8a 100644 Binary files a/public/images/locations/72/location.4.15.upper_leg.png and b/public/images/locations/72/location.4.15.upper_leg.png differ diff --git a/public/images/locations/72/location.5.0.arm.png b/public/images/locations/72/location.5.0.arm.png index a65663c77..37030b318 100644 Binary files a/public/images/locations/72/location.5.0.arm.png and b/public/images/locations/72/location.5.0.arm.png differ diff --git a/public/images/locations/72/location.5.16.upper_arm.png b/public/images/locations/72/location.5.16.upper_arm.png index d015afd70..c71cce95f 100644 Binary files a/public/images/locations/72/location.5.16.upper_arm.png and b/public/images/locations/72/location.5.16.upper_arm.png differ diff --git a/public/images/locations/72/location.5.17.elbow.png b/public/images/locations/72/location.5.17.elbow.png index e684e7a68..a7820731d 100644 Binary files a/public/images/locations/72/location.5.17.elbow.png and b/public/images/locations/72/location.5.17.elbow.png differ diff --git a/public/images/locations/72/location.5.18.lower_arm.png b/public/images/locations/72/location.5.18.lower_arm.png index fbdb20204..89724e692 100644 Binary files a/public/images/locations/72/location.5.18.lower_arm.png and b/public/images/locations/72/location.5.18.lower_arm.png differ diff --git a/public/images/locations/72/location.6.0.hand.png b/public/images/locations/72/location.6.0.hand.png index 38d49e703..f325312d2 100644 Binary files a/public/images/locations/72/location.6.0.hand.png and b/public/images/locations/72/location.6.0.hand.png differ diff --git a/public/images/locations/72/location.6.19.wrist.png b/public/images/locations/72/location.6.19.wrist.png index a10764ba1..42d0506a6 100644 Binary files a/public/images/locations/72/location.6.19.wrist.png and b/public/images/locations/72/location.6.19.wrist.png differ diff --git a/public/images/locations/72/location.6.20.fingers_thumb.png b/public/images/locations/72/location.6.20.fingers_thumb.png index d13a90464..706c461db 100644 Binary files a/public/images/locations/72/location.6.20.fingers_thumb.png and b/public/images/locations/72/location.6.20.fingers_thumb.png differ diff --git a/public/images/locations/72/location.6.21.palm_of_hand.png b/public/images/locations/72/location.6.21.palm_of_hand.png index 5b8f332fa..1e0e2ca6c 100644 Binary files a/public/images/locations/72/location.6.21.palm_of_hand.png and b/public/images/locations/72/location.6.21.palm_of_hand.png differ diff --git a/public/images/locations/72/location.6.22.back_of_hand.png b/public/images/locations/72/location.6.22.back_of_hand.png index 28d56118a..8d2b72243 100644 Binary files a/public/images/locations/72/location.6.22.back_of_hand.png and b/public/images/locations/72/location.6.22.back_of_hand.png differ diff --git a/public/images/locations/72/location.6.23.blades_of_hand.png b/public/images/locations/72/location.6.23.blades_of_hand.png index 3a9bd72cf..501fa60fe 100644 Binary files a/public/images/locations/72/location.6.23.blades_of_hand.png and b/public/images/locations/72/location.6.23.blades_of_hand.png differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 29bf94df9..2d2d249fe 100755 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -192,7 +192,7 @@ a.logo {height:71px; width:92px; background:url('/images/ui/logo.png') top left .dropdown .close {position:absolute; top:5px; right:5px; background:url('/images/ui/close_search.png') right center no-repeat; padding-right:20px; height:15px; line-height:15px;} .attribute_options .row {clear:left;} -.attribute_options li {display:block; margin: 0 0 2px 2px; float:left; position:relative; background:white; border:1px solid #bbb;} +.attribute_options li {display:block; margin: 0 0 2px 2px; float:left; position:relative; border:1px solid #bbb;} .attribute_options .group {width:71px; height:71px;} .attribute_options .selected {border-color:#598afb;} @@ -203,11 +203,12 @@ a.logo {height:71px; width:92px; background:url('/images/ui/logo.png') top left .attribute_options .selected .sub:hover, .sub {top:48px; right:0; height:23px; display:block; margin:0; padding:0; float:left; position:absolute; background:white;} +.attribute_options .selected .sub:hover {background:transparent;} .attribute_options .selected .sub:hover .image, .sub .image {width:21px; height:21px; line-height:1;} .sub .image img {height:100%;} -.sub li, -.attribute_options .selected .sub li{border-color:white; margin:0;} +.sub li {border-color:white; margin:0;} +.attribute_options .selected .sub li{border-color:#e2edfc; margin:0;} .sub1, .attribute_options .selected .sub1:hover {width:23px;} .sub2, .attribute_options .selected .sub2:hover {width:46px;} .sub3, .attribute_options .selected .sub3:hover {width:69px;} @@ -217,6 +218,8 @@ a.logo {height:71px; width:92px; background:url('/images/ui/logo.png') top left .sub:hover {height:44px; z-index:10; top:38px;} .sub:hover .image {width:42px; height:42px; line-height:1;} +.attribute_options .selected, .attribute_options .selected ul {background-color:#e2edfc;} + .locations .image {width:72px; height:72px;} .locations .attribute_options li{font-size:8px; text-align:center; line-height:10px;} @@ -400,7 +403,7 @@ a.video_replace {background:#99a0a5; display:block; border:0; float:left;} .rule_after {background:url('/images/ui/hr.png') left bottom no-repeat; padding-bottom:1px; margin-bottom:16px;} .rounded {-webkit-border-radius:4px; -moz-border-radius:4px; -o-border-radius:4px; border-radius:4px;} -.transition {-webkit-transition-duration:0.5s; -webkit-transition-property:width height background; -webkit-transition-time:1s;} +.transition {/*-webkit-transition-duration:0.5s; -webkit-transition-property:width height background; -webkit-transition-time:1s;*/} .vertical_space {padding-bottom:16px;} .shadow {-webkit-box-shadow:0 2px 3px rgba(0,0,0,0.5); -moz-box-shadow:0 2px 3px rgba(0,0,0,0.5);