From b980cb97be29cc754c1181893bf89e02b2977bf7 Mon Sep 17 00:00:00 2001 From: Robert Milner Date: Wed, 21 Mar 2012 22:16:56 -0500 Subject: [PATCH] Much happier with the CSS. Lots of refactoring to do. Write Excuse button needs work. Favorite and the footer as well. --- app/assets/images/_black.svg | 32 +++ app/assets/images/account.png | Bin 0 -> 1458 bytes app/assets/images/account.svg | 15 + app/assets/images/account_black.svg | 18 ++ app/assets/images/arror_left_black.svg | 22 ++ app/assets/images/arrow_down.svg | 17 ++ app/assets/images/arrow_down2.svg | 15 + app/assets/images/arrow_down2_black.svg | 19 ++ app/assets/images/arrow_down_black.svg | 22 ++ app/assets/images/arrow_left.svg | 17 ++ app/assets/images/arrow_left2.svg | 15 + app/assets/images/arrow_left2_black.svg | 19 ++ app/assets/images/arrow_left_black.png | Bin 0 -> 1543 bytes app/assets/images/arrow_left_black.svg | 22 ++ app/assets/images/arrow_right.svg | 17 ++ app/assets/images/arrow_right.svgz | Bin 0 -> 4882 bytes app/assets/images/arrow_right2.svg | 15 + app/assets/images/arrow_right2_black.svg | 18 ++ app/assets/images/arrow_right_black.png | Bin 0 -> 1532 bytes app/assets/images/arrow_right_black.svg | 22 ++ app/assets/images/arrow_up.svg | 17 ++ app/assets/images/arrow_up2.svg | 15 + app/assets/images/arrow_up2_black.svg | 18 ++ app/assets/images/arrow_up_black.svg | 22 ++ app/assets/images/bookmark.svg | 15 + app/assets/images/bookmark_black.svg | 18 ++ app/assets/images/calendar.svg | 14 + app/assets/images/calendar_black.svg | 16 ++ app/assets/images/comment.svg | 15 + app/assets/images/comment_black.svg | 18 ++ app/assets/images/cycle.svg | 19 ++ app/assets/images/cycle_black.svg | 26 ++ app/assets/images/email.svg | 15 + app/assets/images/email_black.svg | 18 ++ app/assets/images/facebook.png | Bin 0 -> 754 bytes app/assets/images/facebook.svg | 14 + app/assets/images/facebook_black.svg | 17 ++ app/assets/images/heart.png | Bin 0 -> 1371 bytes app/assets/images/heart.svg | 16 ++ app/assets/images/heart_black.svg | 20 ++ app/assets/images/home.png | Bin 0 -> 972 bytes app/assets/images/home.svg | 15 + app/assets/images/home_black.svg | 18 ++ app/assets/images/location.png | Bin 0 -> 1773 bytes app/assets/images/location.svg | 15 + app/assets/images/location_black.svg | 18 ++ app/assets/images/refresh.svg | 22 ++ app/assets/images/refresh_black.svg | 32 +++ app/assets/images/search.png | Bin 0 -> 1861 bytes app/assets/images/search.svg | 16 ++ app/assets/images/search_black.svg | 20 ++ app/assets/images/star.svg | 18 ++ app/assets/images/star_black.svg | 24 ++ app/assets/images/tag.png | Bin 0 -> 1117 bytes app/assets/images/tag.svg | 15 + app/assets/images/tag_black.svg | 18 ++ app/assets/images/time.svg | 15 + app/assets/images/time_black.svg | 18 ++ app/assets/images/twitter.png | Bin 0 -> 1046 bytes app/assets/images/twitter.svg | 15 + app/assets/images/twitter_black.svg | 18 ++ app/assets/images/write.png | Bin 0 -> 898 bytes app/assets/images/write.svg | 16 ++ app/assets/images/write_black.svg | 20 ++ app/assets/javascripts/application.js | 9 +- app/assets/stylesheets/application.css | 1 + app/assets/stylesheets/global/_variables.scss | 2 + app/assets/stylesheets/global/footer.css.scss | 14 +- app/assets/stylesheets/global/forms.css.scss | 145 ++++++++++ app/assets/stylesheets/global/header.css.scss | 27 +- .../stylesheets/global/section.css.scss | 133 ++++----- app/views/pages/_carousel.html.haml | 46 +++ app/views/pages/_footer.html.haml | 10 +- app/views/pages/_header.html.haml | 2 +- app/views/pages/_nav_def_list.html.haml | 15 - app/views/pages/_search_box.html.haml | 5 +- app/views/pages/excuse.html.haml | 46 +-- app/views/pages/location.html.haml | 23 +- app/views/pages/search.html.haml | 21 +- app/views/pages/tag.html.haml | 24 +- .../assets/javascripts/bootstrap-tooltip.js | 270 ++++++++++++++++++ 81 files changed, 1560 insertions(+), 184 deletions(-) create mode 100644 app/assets/images/_black.svg create mode 100644 app/assets/images/account.png create mode 100644 app/assets/images/account.svg create mode 100644 app/assets/images/account_black.svg create mode 100644 app/assets/images/arror_left_black.svg create mode 100644 app/assets/images/arrow_down.svg create mode 100644 app/assets/images/arrow_down2.svg create mode 100644 app/assets/images/arrow_down2_black.svg create mode 100644 app/assets/images/arrow_down_black.svg create mode 100644 app/assets/images/arrow_left.svg create mode 100644 app/assets/images/arrow_left2.svg create mode 100644 app/assets/images/arrow_left2_black.svg create mode 100644 app/assets/images/arrow_left_black.png create mode 100644 app/assets/images/arrow_left_black.svg create mode 100644 app/assets/images/arrow_right.svg create mode 100644 app/assets/images/arrow_right.svgz create mode 100644 app/assets/images/arrow_right2.svg create mode 100644 app/assets/images/arrow_right2_black.svg create mode 100644 app/assets/images/arrow_right_black.png create mode 100644 app/assets/images/arrow_right_black.svg create mode 100644 app/assets/images/arrow_up.svg create mode 100644 app/assets/images/arrow_up2.svg create mode 100644 app/assets/images/arrow_up2_black.svg create mode 100644 app/assets/images/arrow_up_black.svg create mode 100644 app/assets/images/bookmark.svg create mode 100644 app/assets/images/bookmark_black.svg create mode 100644 app/assets/images/calendar.svg create mode 100644 app/assets/images/calendar_black.svg create mode 100644 app/assets/images/comment.svg create mode 100644 app/assets/images/comment_black.svg create mode 100644 app/assets/images/cycle.svg create mode 100644 app/assets/images/cycle_black.svg create mode 100644 app/assets/images/email.svg create mode 100644 app/assets/images/email_black.svg create mode 100644 app/assets/images/facebook.png create mode 100644 app/assets/images/facebook.svg create mode 100644 app/assets/images/facebook_black.svg create mode 100644 app/assets/images/heart.png create mode 100644 app/assets/images/heart.svg create mode 100644 app/assets/images/heart_black.svg create mode 100644 app/assets/images/home.png create mode 100644 app/assets/images/home.svg create mode 100644 app/assets/images/home_black.svg create mode 100644 app/assets/images/location.png create mode 100644 app/assets/images/location.svg create mode 100644 app/assets/images/location_black.svg create mode 100644 app/assets/images/refresh.svg create mode 100644 app/assets/images/refresh_black.svg create mode 100644 app/assets/images/search.png create mode 100644 app/assets/images/search.svg create mode 100644 app/assets/images/search_black.svg create mode 100644 app/assets/images/star.svg create mode 100644 app/assets/images/star_black.svg create mode 100644 app/assets/images/tag.png create mode 100644 app/assets/images/tag.svg create mode 100644 app/assets/images/tag_black.svg create mode 100644 app/assets/images/time.svg create mode 100644 app/assets/images/time_black.svg create mode 100644 app/assets/images/twitter.png create mode 100644 app/assets/images/twitter.svg create mode 100644 app/assets/images/twitter_black.svg create mode 100644 app/assets/images/write.png create mode 100644 app/assets/images/write.svg create mode 100644 app/assets/images/write_black.svg create mode 100644 app/assets/stylesheets/global/forms.css.scss create mode 100644 app/views/pages/_carousel.html.haml delete mode 100644 app/views/pages/_nav_def_list.html.haml create mode 100644 vendor/assets/javascripts/bootstrap-tooltip.js diff --git a/app/assets/images/_black.svg b/app/assets/images/_black.svg new file mode 100644 index 0000000..b9b9b13 --- /dev/null +++ b/app/assets/images/_black.svg @@ -0,0 +1,32 @@ + + + +]> + + + + + + diff --git a/app/assets/images/account.png b/app/assets/images/account.png new file mode 100644 index 0000000000000000000000000000000000000000..f664a943e131e7ac6f557ce4b23b4201d0188cd1 GIT binary patch literal 1458 zcmV;j1x@;iP)i$d{AGV*Qa+oq_GjeO^b z9*!iE`1au2u4tZ}{Hy^zZ%>rmw?)w%;b-TJgpG(YEA%iU;^>uS+EVJNlB%Z6l61{@ z7Bbt>OqgAbnOSu!%eB&|@>#TDM%7^ovdWYZY*&_9VV@Z_OiQx(kLyU>pZl6-f-uMu zwKUW$)HHEL7@1itBLAD1_((HHn0nS(*1nxYF3hWM7uwfpEC>^18M-uh_QG6f{tx!F z*DVRj5*TW)XEMdIq>_qEr6$c0<~~7LoczxBM3{2XCHEgc6JJTV^igI-ggJ~G2P*qO zU4)U^WrHt&IMY_k^!Upn%2gh3dD(Lvuk^NKJCLxe#Xgh3dDK^TOwEes2HAERdBPSc}-EnevF z8%@GI%?2vAXj1T+O-X?je(3HKZNfa^hweV%Ae(MD$aVm8 zJki@19L8sMWIMu02Q6{MEj8Xk#f3t8QF)<|<~#0Uy!HFw+C}T_;9QERaAxGV6tQwG z^O#_CdDMKlGZ#DSLjA?g7K9l}0nF9$q@;sVQ`ie~mq2v6<9(3zMjBp!LrP+*?To!( zi&yv|OA_gcmxMx6HO-U}>_!@kFFLBlV9$m90cv4DbNByzlo5;I#7DM+-`@a7T|!pL)(@N)0##H0V*w&sV_}U+Ke_?i?W3DbITYv!VfRaT@=Dd3R*b3i)>a{`8IAkMP)6> z5-tN`_gXuI?W31XN|QAx%TOWblFhonk<0Nsz#Y( zBFrtanB?S`D057N*^rLx)-pcAoV6BV zbQd%^O9F&Byqc!F;+-i`^g_2quP~>3qodTA^6(Lwd-y0{JfV-HVN&*{s!FE@WCQVx z{x&a5=@R3ZV + + +]> + + + + + diff --git a/app/assets/images/account_black.svg b/app/assets/images/account_black.svg new file mode 100644 index 0000000..a026423 --- /dev/null +++ b/app/assets/images/account_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/arror_left_black.svg b/app/assets/images/arror_left_black.svg new file mode 100644 index 0000000..3e3baec --- /dev/null +++ b/app/assets/images/arror_left_black.svg @@ -0,0 +1,22 @@ + + + +]> + + + + + + diff --git a/app/assets/images/arrow_down.svg b/app/assets/images/arrow_down.svg new file mode 100644 index 0000000..84915f2 --- /dev/null +++ b/app/assets/images/arrow_down.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + diff --git a/app/assets/images/arrow_down2.svg b/app/assets/images/arrow_down2.svg new file mode 100644 index 0000000..54f033c --- /dev/null +++ b/app/assets/images/arrow_down2.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/arrow_down2_black.svg b/app/assets/images/arrow_down2_black.svg new file mode 100644 index 0000000..b65cb3d --- /dev/null +++ b/app/assets/images/arrow_down2_black.svg @@ -0,0 +1,19 @@ + + + +]> + + + + + + diff --git a/app/assets/images/arrow_down_black.svg b/app/assets/images/arrow_down_black.svg new file mode 100644 index 0000000..4b8b9a2 --- /dev/null +++ b/app/assets/images/arrow_down_black.svg @@ -0,0 +1,22 @@ + + + +]> + + + + + + diff --git a/app/assets/images/arrow_left.svg b/app/assets/images/arrow_left.svg new file mode 100644 index 0000000..3243f42 --- /dev/null +++ b/app/assets/images/arrow_left.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + diff --git a/app/assets/images/arrow_left2.svg b/app/assets/images/arrow_left2.svg new file mode 100644 index 0000000..d9c3e43 --- /dev/null +++ b/app/assets/images/arrow_left2.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/arrow_left2_black.svg b/app/assets/images/arrow_left2_black.svg new file mode 100644 index 0000000..f4b5ef2 --- /dev/null +++ b/app/assets/images/arrow_left2_black.svg @@ -0,0 +1,19 @@ + + + +]> + + + + + + diff --git a/app/assets/images/arrow_left_black.png b/app/assets/images/arrow_left_black.png new file mode 100644 index 0000000000000000000000000000000000000000..f234d82029f04b90566a0ea3aa86e2f296c9e773 GIT binary patch literal 1543 zcmV+i2Kf1jP)NxCCtNYA@&V|1)RIbr}bc429SJZTYC*q zM6K)-+A#*@qjmP0R&Z}vP@2JdL7;rJ-d-cX0Vn_`RgKaq0_C$*g&JpK*V8Hn<+HXN zUDX$A0LYit0FU=kWd|rGjpL|~Hnp;%HbhZeYlUS40K9FZtzAY63X`J5x8J4mb~#4- zT}p-p^-7$&rUWc7wb0aXXfmrML>4$Qt(8baF!AXLumBpTaTc`BG+OT9<1{h$C1Hk@ z&KzA!9hi;efh4ANB-v>Mw9g9K?M1-wr($k{sm4uq=O)1J%up$53s}fEBHIvO6k>06 zqoi)RGyk^1?mwv$#_hP&*Wi}cS559pT*LCn)x@W`VQ@WJJ6OpJws)S9voy5V`?R@W zSqq0{PEAIAky!HdDS0$ERJTVNnkb{drwU!b!n?+6Qbv~^u&{r)`czS-0W8iBnA#{K zF}kD}q25Y~GOi=NwXhN0aS-m(4xPu;1K|GPKvtM2RqKBWImUs>s4Y zh0C~%3ouuJMXau3P>3`nGbK6AF-?syYebe=;xL;Z)WYh{9l-iB@R58w+e?(+5pI=O$pQtUhR3-!5qs)dPu92*=YbpH~LQeQ1j` z)!d86fkL{VnJpYy=C8sCs$Zr~4g6u6iz(DJhrw9a2RqM`n1h|C z&Q||sJ~xs(J#iSG2P{6(PpX<6yu@NK1ewgKzN)KY1xB z+AI7<{Sx$4rHnL`cN#?XDPBV?tF2D*vhzk5FnG~g7rS|CZ zHp+B>=Hxx1I;GO(7*<#d1ttVE)Yrmfdo5!t92%c?xF8NoYci@349weHznU0TIMjB< z9EUFg6~I50%(slQ&ihXa+Y7_v?Yp;gi`_+_AL1Lnp>!HSKcD+0p-ykeef~dmT#wdA zh6*r;!EWFevbr%7moKE&MnMtG%{Cz&yodk|>KS2mON^BCR+m)6pE4b+FIZ@dFcK#y zIi0}3F3JNMz~TiBoS4?w*N-)vn9OP^1sKv3(h#5lENP(W;N+kSp~R1QX?c~ehVySQ zji7P3pIZloy2hM@3+yV%|KmY~;Fc5%&r0cH$0{{*jU|#BZ + + +]> + + + + + + diff --git a/app/assets/images/arrow_right.svg b/app/assets/images/arrow_right.svg new file mode 100644 index 0000000..e0066c5 --- /dev/null +++ b/app/assets/images/arrow_right.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + diff --git a/app/assets/images/arrow_right.svgz b/app/assets/images/arrow_right.svgz new file mode 100644 index 0000000000000000000000000000000000000000..1b80134963c056030a54d0e215d0352223f0d1d5 GIT binary patch literal 4882 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 E0O|Q$+yDRo literal 0 HcmV?d00001 diff --git a/app/assets/images/arrow_right2.svg b/app/assets/images/arrow_right2.svg new file mode 100644 index 0000000..0ce6fd6 --- /dev/null +++ b/app/assets/images/arrow_right2.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/arrow_right2_black.svg b/app/assets/images/arrow_right2_black.svg new file mode 100644 index 0000000..633d25e --- /dev/null +++ b/app/assets/images/arrow_right2_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/arrow_right_black.png b/app/assets/images/arrow_right_black.png new file mode 100644 index 0000000000000000000000000000000000000000..7b3fd9738e3047191caa3e4f3d158b09bfe01549 GIT binary patch literal 1532 zcmVIU@~E`CMJ@4|8T532e^nP%I zAQWTu3e%&9=mCEu--B#hYg&5|VvWD1g5i+`$zBj7@7W%B=F_^hT?UZ6XFGonD56&W z7kbPXlppQr?`g&Gh6SZ=?W_otAMNb#5pVzna8l(cM?;`o3RUDdJ*%F^FesPGa;mC# zR0GJnR)fd)US$syz4|!jz0Jm0QX3*E-dKg@4gf~mowahA5ELdvsV~1vWt%2OD^kY@ec@aeh@w@IBDqnXgXwPSgIf0S9V0-M6#?t9tuhYy0%UU=r zQxb6Pi@cJDU&-CvP}Q1dXrgq1uO+$`Vzg#x>XhE)Z0I3qh31^f%SiSvtB606Jzhqa zciAPl_q}y5vm7yBB(?qjn4rD>+l9to&RV(1%Q_{mbEy(OWKEvt7|X+~9eaBhB&sx*SAfwXa+=}JVlXh3(Z{0 zK+{j7#$NMlXvk?sR!U1}Q&K$5CruC4!l8x|JWZWbY5lYFVP1@Qn}g3Oo@NY9XMxXU zK}eDro;pzPb9q<*BLkX8fB~AJVG&?}CTpz#1`W-v07iJlL`VXb-k}g+fTg!?b9qoS z?r7W%Vq-Zp=>eAD+6sIwqn?N6*=i~CNK#*M$ZWMh&(gvAr=}|D04z~qX#`hChcUoB z1B*#mMvr|(&JqQd9Ci*=V{Wbh7L%|{I?#ZPZ1!N8)DvQ>tSwlsZk4@OR%f%YhXgm6 zCXIQ8XEEbhf}KVREOuZCGJnXCWp-e>deldsse!*Uioai6fOj(+%UObtbx!>lj$IYv zojKT9KP*q%ZHlS^0v76IYt zTk#4%Ug0-LUj_e4N<7ObeU1IVcnvWxJ0GOlVB?M#oh$V+HL%F?E;)Fa0$AjDmv0}W z)QTz8@&?VY9Ni4_ZfmD^O^jw(UfhhYWo(2)Gp774mBZ4w8C7Hwt5-d}O05`_AUWP5 zPy+l%Ci5lTjP~JzN4a%*y*+oVzD!Ma7lAHhtoujl)csICPW_Tlz!Xl#;%jtSPac-j z)GzuF@Phs|;?{H2@2x#Zys$e1Nn>ty7jl3X5uhQTQI@w@?gCq~S-QDn)p?jRgEs5L zVs>60XnJQ0R~23XQSL&+VsbXMQ<(!My!(!ohgBUo(r z=Tw zKD++A9FSpf03{MQTVCvfq!cH9RibRQ7F4D&#Rhv>$=EejX|(<>Cte?EIKPHx_pVjzSN iLI@#*5Sm5*2`~U3ox_rH6qnfm0000 + + +]> + + + + + + diff --git a/app/assets/images/arrow_up.svg b/app/assets/images/arrow_up.svg new file mode 100644 index 0000000..fa4f8e2 --- /dev/null +++ b/app/assets/images/arrow_up.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + diff --git a/app/assets/images/arrow_up2.svg b/app/assets/images/arrow_up2.svg new file mode 100644 index 0000000..2b9360a --- /dev/null +++ b/app/assets/images/arrow_up2.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/arrow_up2_black.svg b/app/assets/images/arrow_up2_black.svg new file mode 100644 index 0000000..d3464f2 --- /dev/null +++ b/app/assets/images/arrow_up2_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/arrow_up_black.svg b/app/assets/images/arrow_up_black.svg new file mode 100644 index 0000000..894c225 --- /dev/null +++ b/app/assets/images/arrow_up_black.svg @@ -0,0 +1,22 @@ + + + +]> + + + + + + diff --git a/app/assets/images/bookmark.svg b/app/assets/images/bookmark.svg new file mode 100644 index 0000000..49bcfb6 --- /dev/null +++ b/app/assets/images/bookmark.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/bookmark_black.svg b/app/assets/images/bookmark_black.svg new file mode 100644 index 0000000..69b6e1b --- /dev/null +++ b/app/assets/images/bookmark_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/calendar.svg b/app/assets/images/calendar.svg new file mode 100644 index 0000000..fcd8ff4 --- /dev/null +++ b/app/assets/images/calendar.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + diff --git a/app/assets/images/calendar_black.svg b/app/assets/images/calendar_black.svg new file mode 100644 index 0000000..b07d63f --- /dev/null +++ b/app/assets/images/calendar_black.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + + diff --git a/app/assets/images/comment.svg b/app/assets/images/comment.svg new file mode 100644 index 0000000..0f1641a --- /dev/null +++ b/app/assets/images/comment.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/comment_black.svg b/app/assets/images/comment_black.svg new file mode 100644 index 0000000..85977b6 --- /dev/null +++ b/app/assets/images/comment_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/cycle.svg b/app/assets/images/cycle.svg new file mode 100644 index 0000000..720ff13 --- /dev/null +++ b/app/assets/images/cycle.svg @@ -0,0 +1,19 @@ + + + +]> + + + + + diff --git a/app/assets/images/cycle_black.svg b/app/assets/images/cycle_black.svg new file mode 100644 index 0000000..bee3332 --- /dev/null +++ b/app/assets/images/cycle_black.svg @@ -0,0 +1,26 @@ + + + +]> + + + + + + diff --git a/app/assets/images/email.svg b/app/assets/images/email.svg new file mode 100644 index 0000000..c63d9d7 --- /dev/null +++ b/app/assets/images/email.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/email_black.svg b/app/assets/images/email_black.svg new file mode 100644 index 0000000..b243f02 --- /dev/null +++ b/app/assets/images/email_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..c134f41d528364fb69da8ef1efd19ac047717ee7 GIT binary patch literal 754 zcmeAS@N?(olHy`uVBq!ia0vp^Js`}%1|-)VaI^zbk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n5KBTIEGZ*dULloQ`%6X;bHJehIcGqIli%-<(PTktlC?S zn+h`(wC}K$nSEgU%68qqV8Wzj`{vJKo;HuYWuXcC)xB3e+iv(WGcX)jZSqaOEcUx{ zT$$m%+1nOvF`O6V)!)q`yl~CqruF1@_NKkZkx zRnyOKzQ>Bk9tVhoNz}Qj*!wmov^|;n#4O2j2G{JkjT~tok57njTlIJP$IqGR)t%h& zzyJJ9{qx;6!g!6r;_rGN=f8NpR4=bp(?5IfhL>|69epc)=4kkgic3%WRqvKFd(Ab; zzvDaI{zpY_YvP*Hv;Tk0YPQU}zwy`M zMv}6`vL9*^YYco@^Y7HA>^BPcx%>Xvsr@lmrOW4wpI)W;V|E4W<3bgQgB-^=Jq^Mn zma8mZqU7h{=jrFsy>sOQwKDH@He2g$H;aM;r8z->2NFEkSq{*^Yfb>N+WdpxmfKzX zXQ>|sau+Zh89@Py%0e@3o!*RVUqV*T6+Sb$a`m + + +]> + + + + + diff --git a/app/assets/images/facebook_black.svg b/app/assets/images/facebook_black.svg new file mode 100644 index 0000000..94d82db --- /dev/null +++ b/app/assets/images/facebook_black.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + + diff --git a/app/assets/images/heart.png b/app/assets/images/heart.png new file mode 100644 index 0000000000000000000000000000000000000000..87082ae5b4e4d8df11f03626e5cc078670749e80 GIT binary patch literal 1371 zcmV-h1*H0kP)M936f3#nSgGPWCGX#Hh>LWsVF@@DIc;eTOaSBIP(Q}14OP2WtuU{zu~qG;+J|}lp6B^7hG0wUudAR9 zReM%#Q@Ueg-g8KQ(~zW4ZR$8^*Md1U|IPF_LQ#IIb}0MjU_QH`zj4T-t>2aY(Z?{Q zzu}59Q0=V@4}DAn`Ws$WIh5gYaQWXSt-r2ic`oDOng05n*sja?ST~s-Ea`8D!k9_aLqa#BAFfRd zrS;e8kYp~?mRXw2RH|M{?ypl}%#EN;c3Ndk5k0PtR1o(P``g8kv`jd7nd#e7aDUxp zn8Z`_f2q16jEMf)4o$hGEQLwU10ezYOwp41JF>adwjGk@f`a!cinRXDon#o3U3Q6& z<#3t+f4`MwY%UZKNj`yaQ)tXo0Cyv*~!l=}=Wmpn7 z9BtcV7|k!@D2AKonlIzSCvLusZ{C0`BOtrj><`0+LZI1aE;kf1Z}dc5ljX^FqvyK2 zXzHD?$HX@&^fM$Uw!h4_t4wse+jiBw@q#!f!=jEXwS_U#tkjPeVjVp%b$0=;JtTb@ zp4M4f`|nHQx02SULj4~vh*$t(!?!`7h#Mv)Y7!4aZO8%!mz^K4ks(m z(FlVyamwOV7^I0$7VpATq@kAPHv7y`O-mcR@6$^yjTKI7TB6P{l}tlf#AR6~T`eX? zD-692#_WUS)vjqVQHd~B|2e@G%3~6c&TZT zCQK?T+}>B7MF^9KG*QYDtuT>G6Rj*!3saFMrdpbP7C=o)8=`)0b!4?P!PK;f%`lZr z6M9)haAgXjg$Z1mWMoN7n2I!^)zXYoktO;$%$Ye&Xtgx6lw?U3T^3RLXUdsC8e~aa znz;vA=0rYjX_h_8!cJRAgDgmcEMO_kx&v9(L^fSv3e`3aW!aboP(T`F0e8|Mi%@BH z4P@CNi(F}jsvT;`axe>=AXu7# + + +]> + + + + + diff --git a/app/assets/images/heart_black.svg b/app/assets/images/heart_black.svg new file mode 100644 index 0000000..e4f1c54 --- /dev/null +++ b/app/assets/images/heart_black.svg @@ -0,0 +1,20 @@ + + + +]> + + + + + + diff --git a/app/assets/images/home.png b/app/assets/images/home.png new file mode 100644 index 0000000000000000000000000000000000000000..6eb1f955bd1b24473c3fe4b06e54b9b39a93b3d7 GIT binary patch literal 972 zcmeAS@N?(olHy`uVBq!ia0vp^Js`}%1|-)VaI^zbk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nDabc978H@y}A3>SK5%l;p2}hj7Cno9cL`)2~cA&TQJ#x z=_N}Ea{|*Q$D0i~1zT0W&tIf+=jrR5|MOB<6+4>VpR5z?$~R*MTF3B!x%U43BOkBS ztJJZz&v)jvWpY;J!Usu|t|K z+EFKm^`n5($wX;+xyKrBnbths!KG+3-Qs=hN}$j@t|_V0;y(wkbd=!|Rz3RIS!S!t z6Rp16J8rF6W8ltld(WyXU;2_KhR;rFvJg=?WwTz(UMv5{{mQM8!prty{gH=$7M>`p>01D_=G1c-MT^7s$;kD=}SpB#AJ^= z^jXAl+o^enb+gW)Z4VUq)J0rxgb5sZ=(369wpY^*>qemPA_YEokg&v&yAx9cw@qa$ zwAi3=Xxk?RKK3cDH_QZ%+-(F3_p%h;2o_1a9U)L&eL^Wmn&**$6OdaV(B23%>sa#+ zX@zcJsO%1(@gpVv^QuLmulOHrxwWTPOzrfitkBG??p-(3&aTt-T)$ za#tMOe((0XwHtC-b3~<@|^V;ytva_|`PlJr`=U4mqDZH07Sb>7bO8;)yfE zoue(96RUq2e_gh+ur+d;n)g0|*OS6$PHL_Ec#G4x#QW1N(=&C|IgYZQ z-{qPnws{0U`Sa^K!>mj+*I{!p$TM(X2(UqYh9V}Rac1+&%xTXJ5B)L9KfCGUt$f?M zz3+ct|FL1lqxdH;ek|VD6U~p|!x7K3?ewY^XXbxYyt&P2`qjznKDzFE z_V~W)QuPzwSJn!wGb^~<8&-ab36wj2%-_$%!w_4`pr6ZTyc#6p>FVdQ&MBb@0P1J5 ASO5S3 literal 0 HcmV?d00001 diff --git a/app/assets/images/home.svg b/app/assets/images/home.svg new file mode 100644 index 0000000..e829acf --- /dev/null +++ b/app/assets/images/home.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/home_black.svg b/app/assets/images/home_black.svg new file mode 100644 index 0000000..d3a1132 --- /dev/null +++ b/app/assets/images/home_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/location.png b/app/assets/images/location.png new file mode 100644 index 0000000000000000000000000000000000000000..c785079cb6d84f9c6b1d5d613e651773b8a9bbec GIT binary patch literal 1773 zcmVT03ARousR^S@neo5TmpgjZ}4#4CE$T0ql2#$v7 zG#x?o5&>Gmha9>{Jf`t@+sNyU&fTCVY(p}L$G`DdZR}`8Z5p75?0`}$y2+`oQ=`Xp z9c8-lrzspq9+pqW9pxCu`GlU7DP|X&e6&Du%{^q`_ zsx^Q)BLxvGr4)%hLDN}n;FV!m+W0ds2$n$CI;U#~FekwB7=NY(muypt0aDTtuq060 z042?0dKv>5z~UB~D?_k60+xenEv2W*2rO;kHOny?N2i$;4-5^R=iuQe-DwZGD`i;f z__HW%=zNaSJk5>fPljONWDPZ+JylAupl)$m&u9U&fV-Tn zWd!CX`;>%KPdQ?Uel8Z})O!eeQmattE@`e}CN_e2KiAzaif1kjg3y!xO6bl@BcoaY7M0Nh-R*PX5mj1A z;@Z8#>@2TQ1T5qxVvG z|6gt$hJqzk>`p8$=0k0oNEN>nbGIpJBowI5!t0B_89jAEryF?&=2j?3<6vJ>ZM^ji zOd}AWnf33H$z@U-C0wv^35?(}77xLXMB2(3drpU`1!D8!!Cm%T=0)ICHGny+ufd6qKzI0lBh?VU$p*lpe8Mpe{i zq@)9S6=?s+Vaz4k{OS=HiMfWq9RefK=H4SP633HA1Ij zjX8HplCt6L$e{F(@!8WetHV&kr8+Qmh^bxYsV!4MSeD$ioWx9TC)h_n?q&PdGvX-ddq#izMe4)67rWJ&xRf0t;#(a03 z@=DpcFYLV0a8qt*R#-ZoO;S@AqVL0eF~Ds~8LLZePC;`_t%2(ji)|(7Fm;fd#5-y3 zBK*AlO}{sHVs-nQt;C+CN$;1G?n;j@Jy}*-ROvp)lw>6>5t3xQs)0(W+tKGEUt^&0*j& zKHWvlVc;@8-9^=5;4=Q)Mb%;8GXC5}-C=fICVlW$gNI*g9giDrVAPlUpa5X@_xE}* zvH7W$Xb65*>rt$qzq)dm9ZkT6{n(fRhE^PyfsLOu6I=o6#QZ5Fy_9cD-40GW(|Nnq%c&!>W6d9t=_iRqNIQvjDZ1H29fW^}!!q-_CQVrm*& z-u%?`O5imAP*Q4ovNY%7DkT+|noOr67YFFYz-TSgeyWnI+Sh4|zpy`6mNxg}e=R_!iQRJeAaa06nQRHS1 z%nme~Gr{ZNbSAf$8fLGa>8S|T=&+uO+&)0=oMxm@w_q;?=g_o*u(XJH9?(1r!19Pl zW4K-H@ELlChGSpGIU<`cFlqa}#RXwmSlCn@@&OHCDGZu(cDY>vmhzxUduhM@0W5FX z?GX*JK?7I-&5zB>7f04CH6jLW!D;_z*geM#E(Adk1VIo4K@fCU-vt-|e!)DD+)dK2 P00000NkvXXu0mjf(Jn?O literal 0 HcmV?d00001 diff --git a/app/assets/images/location.svg b/app/assets/images/location.svg new file mode 100644 index 0000000..42b29a4 --- /dev/null +++ b/app/assets/images/location.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/location_black.svg b/app/assets/images/location_black.svg new file mode 100644 index 0000000..2aa8d01 --- /dev/null +++ b/app/assets/images/location_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/refresh.svg b/app/assets/images/refresh.svg new file mode 100644 index 0000000..22ac735 --- /dev/null +++ b/app/assets/images/refresh.svg @@ -0,0 +1,22 @@ + + + +]> + + + + + diff --git a/app/assets/images/refresh_black.svg b/app/assets/images/refresh_black.svg new file mode 100644 index 0000000..b9b9b13 --- /dev/null +++ b/app/assets/images/refresh_black.svg @@ -0,0 +1,32 @@ + + + +]> + + + + + + diff --git a/app/assets/images/search.png b/app/assets/images/search.png new file mode 100644 index 0000000000000000000000000000000000000000..e1c0fa427b33b0df93f76763579436b237042e02 GIT binary patch literal 1861 zcmV-L2fFx)P){X5ClOG1VIo4y(xNb{L9PBAbpI|HBQ$lf8YLF9j(%};m_xERrEc^xB(gk0FwY2 zG8`BDIn4A^Yli26J`+G|pyC7=hU79`UmIACu0_)$Ed4G*Cbub7kgTA+Xk>O zHmu1cUEeqsu`G&nZqs!KtD^u)x@IqaHDlOeVFYG5-Lx)$fA`iH%OF78fS90J0T{s23usO7-*=7P$Y7wcxSqkA>l>^CM!GR)O%Dhbebg76!AS_JObq z>)aX`UcnvVp10PB$Ff|P#P3P&aj!eomE||xu>~xMTY4DJv~fxIfF)ZzW7cXPWnm1v zB6=#Tbo~i$dyYQ3DHL~o4zFnl7Qr{^n&J_#SaU_&Eg;pg3t+qsLf~j_WpO*zJ~X)3 zh7zww8TvOel#qVy9Tv*&f9gYqzLA{_Pp)?(C=Vc|JB}6lJm%k4dq6x}7cKqL+-b-= zF*P3+GghX_w0fe{MoIzrp&9(qZ*xwrR$lJJ3NW$m6Q(dTGMSmClu2l2##GnBTmqK= ztj*tK?mcTfxfb(GY*(pkVV1({6XuhO6q3cL(9yYh3&R1IBrH=88ED)_$(UwjA^5H1 zk|a&xji($}ZtIQUPpZ46gDy$X9j)0FxmpV62?33f#M7_tmQD=0qp8RDCfsHz*QD;2 z4!NYUP&;VvaTT13+b-ow$CiP)5NgNI;9pXGxUdY21kFX%h~qv;SQ%9d6AuJ)PXcW? z_q;j%-Iz(O&3w{|_x4#BiC}kC3M_18s4o)zQA_eVQ8svnM3$xZRVQw8k0;y&e$VN6<>=K`L@60M8Wy=e?gCGh)S3j{`@PnA~Z zkObbnJL+c=I5%i5(1vdXSr>`EtTlIt9$JTyFntr(h5z2H3-w`AvOB5+%!5!n{wct^ zNcG`Cvy-vLQ}Za)mM>oSS95hwspD(TG07;C6h*YZ=JJ1cWWOjP>sGj3rcYW`Izji= zLf=u?`FL1F$0CixCky?rWnp+_QJV0-#Re_KG~AYDkk6>Q4c?@DIK`~zhg0}W`NZ)z zD)M`3FAmsJ)5J40IKr>T(BP2JVD^yEU7Bi_*6+(P#G7}3dpL&JBsB5Z|Cpdzgt9aL z0ZqriSaVH)#>&Fop2fT=?wgus8i8=Dt+EN4d5}Al0Wtth?Bb6oyv>G`+*4P;AfD+7 zG@Vp$;CM#*q*X}4J;g5nm_kw!By4Fqtq-Gc(kdiuX=08)$_<|3-j!!*Vy@OIWu`%y zp@}(L3uwxNCgyG}Pq_&itkV<#P4=RQH09>)5qG$6{sZAC*=kOUn88K)wKP$>#q6Re zmu8In=MNh3I=$?oXjS+s;D8Eu?kQ@voUP6G@LIVEZpwkBQ9Wybt<81%>OCl)_r=nf zIGloNo}`OjDV(M2XYlb7bHi<=0)^yWr+tCOoOq`pmC{%m-0tz=_FaYYAL3hBq62t_ z>4T=@np;4&TUq9ZDnL1Yk9Nfwl)i!40S`^bFZgqq>8A*aD!djTteTbya|#W)*z-eu zjlr>ambKl4cFNxe4J^@i?-G4JGbF1n>fkzsrs5?JND1gkY4J?NZOspjGfT6#G#bu) z%)exC=WNP7+E?TNzyO+Ex&$zQrim^P!yu+<3V4Ktfu(6J00U?~vV;Qw18CZ}8@CQI z4PqEr8pJSwMpPAm0W?kY0AK)36U}iqoCU&~8HI>pU}>7@7Iy%armhwkbwE>BPbC~U z56MAuiIE001 zWxKg=m#Xl(+&{N|fII|25ClOG1VNB5{VTu#k#{BBLuO+z00000NkvXXu0mjf`xI`B literal 0 HcmV?d00001 diff --git a/app/assets/images/search.svg b/app/assets/images/search.svg new file mode 100644 index 0000000..289d3bd --- /dev/null +++ b/app/assets/images/search.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/app/assets/images/search_black.svg b/app/assets/images/search_black.svg new file mode 100644 index 0000000..4aab1d1 --- /dev/null +++ b/app/assets/images/search_black.svg @@ -0,0 +1,20 @@ + + + +]> + + + + + + diff --git a/app/assets/images/star.svg b/app/assets/images/star.svg new file mode 100644 index 0000000..5ee309d --- /dev/null +++ b/app/assets/images/star.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + diff --git a/app/assets/images/star_black.svg b/app/assets/images/star_black.svg new file mode 100644 index 0000000..ea00869 --- /dev/null +++ b/app/assets/images/star_black.svg @@ -0,0 +1,24 @@ + + + +]> + + + + + + diff --git a/app/assets/images/tag.png b/app/assets/images/tag.png new file mode 100644 index 0000000000000000000000000000000000000000..939330f0eaa2faaf3a9f5d3f78f5ffbc003fcb45 GIT binary patch literal 1117 zcmV-j1fu(iP)nhjtB`m7u+RU7abgZ@08$tI-j8pg8>l{ z5fKp){i$IJ-rMbVGkLg^F){FT*4=oOv22>=4KVqjjO5`-#*N{p`7Gmyz*z$3JS+jp zi;SU@ryRh1I|oh!7B^T9`z~m{00u05?{lUCXWQqb7A$TH^RVjXgDVVJq6<5y+t@2j z3l{f{x_Mzq0!#ezBy%)pNdimXrl+>tEm-KFuWpwlup~8+d7HRflAK@(yPCz|{r#f- z4ktX{v5eUn&;41JrO&Rm&N4PT+daq_9+`t-cT8#{7fX_pE6crH0q&2zZW8`3921UB zU7E~;ae`$b5EiiqcgHRgzRuY6J&dD!mQQ`(`{|ahpFQVhEnnx>aGO~sRRQSz<>oXU;zwRNCOzK00u080Sgrb0~Wx51u$Tt zf?&V`7_a~aEL0E-SO5bS$`1xCfB_5T2Ll$sfQ9md0SjQjLixdf1u$Tt{9wRBEm$Z! z7_d+@7_iV`%?T_cd02tPA&kV|-tYt#iUQO9x~m(eh+?lWcT5jO-@}AYSz>y)he_I2 z69I+*LuJ7%nI5+-Q@}hjZ*F_+y-VtLO5s&rUW@V7hoAQta}N_f@OsM}x@p_}%+qdq zMcSJ@OhMxY%e4EM50aLogQbagtbJfvpE@x5vj#u|mR?{$1D4)kK;s)r5*X0<#gYsL zG(NGM1qL+!u$&DBG`_H80RtL8Sh9fujSnnY!GOj-mh50aV;jpwz<|asmWzP_jZG{U z1p^v;SS}6*G`6r@1q^8HV7VF?(AdCoRWP8@kLBuMK%*N=5ip?9i=`MC(CEZc6bxwe zVJQvT`42?M~W(#O!YP)= jh=_=Yh=}OlehDxDu?^r#iaIeP00000NkvXXu0mjfLVwyh literal 0 HcmV?d00001 diff --git a/app/assets/images/tag.svg b/app/assets/images/tag.svg new file mode 100644 index 0000000..3919ee4 --- /dev/null +++ b/app/assets/images/tag.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/tag_black.svg b/app/assets/images/tag_black.svg new file mode 100644 index 0000000..69722b5 --- /dev/null +++ b/app/assets/images/tag_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/time.svg b/app/assets/images/time.svg new file mode 100644 index 0000000..a78a7fe --- /dev/null +++ b/app/assets/images/time.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/app/assets/images/time_black.svg b/app/assets/images/time_black.svg new file mode 100644 index 0000000..dd52f92 --- /dev/null +++ b/app/assets/images/time_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..cbaed2b68eb09a6368f0de4972cfc074dc72d89a GIT binary patch literal 1046 zcmeAS@N?(olHy`uVBq!ia0vp^Js`}%1|-)VaI^zbk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n0I)(IEGZ*dUN+>=>&_XI>$_foB%To>45oJD+5&?@Nvv}dtW{BgS+0NH~rt|^>1Fk3TP(-!~d1H z|2@pwD%CoD_l0$((P3wts#mvk3$ODBZoAg!+KFyB3e%kc;r4vQ+M;)aNudVSu8MwHG-dQ`SsN0 zxRBbz%rBaKp@)}59A0yJqwK30_HFwYWPY_fq*8X%;Uc#w&~adwUWjH}I`7B6%b&z9 ze|xQU_;+E~UcO?Vpgr=(TX)xWT;?$LjFd1vQ^=kerTWi%Cr9zDFIRs5E_9jkkH_WG z_s0UyO!f${#YPCRxjM|aT;L{A^6=D_TRN_Z*)^*#2zmm)H6FH?gShkMHM(t~l}amT&ndA1ndtzllQo_i858&yc%t;?tZH z>09l6{3VVp5^BjjtHGG5bL{;>lk>LgGT-oD4i;N@_t^bzpVhvrw-?FX%9dF2Th4X% zlJD&&Z4d34Kl2aI+vEGTySx#MbqjqIeSEsgndriKPQOKeJ$c!YdE&69QDWHN-4nL0 zxOZoh + + +]> + + + + + diff --git a/app/assets/images/twitter_black.svg b/app/assets/images/twitter_black.svg new file mode 100644 index 0000000..408cd55 --- /dev/null +++ b/app/assets/images/twitter_black.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + + diff --git a/app/assets/images/write.png b/app/assets/images/write.png new file mode 100644 index 0000000000000000000000000000000000000000..7a2fc759ef070d4631b925aee24c342d571277f6 GIT binary patch literal 898 zcmeAS@N?(olHy`uVBq!ia0vp^Js`}%1|-)VaI^zbk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{mMo978H@y}9!+_p*aT!$XT#46=&KExfZh8+dPdGEG*I zW)R*YJwb36U(>Y6_*KRm3ivJ0OWuI)KV#dFdsy`?2D_`{v1 zCt0%h>K$Y1?b_(mw`_L8g6}_*XZN#THrthay>z|vh9~{Ux&OUgzL9y4G-K*y`)}er zA)k|9R-duoJ&WnAfX@6+AGI@A@i9MtSg^L3cc1E0;cwgLrE?!zqJ28}!6~DcZ&zx| zr0kFXIkUgFGEQe&;PW`~e}9y9LK7_CXYyT4u$%Q~ut8)YBil43lLH5YenqVPwee5+odXAgO!5*EG^Naevc1w05nac4d30PK zv$0Lvq4sau&FNvSynmM6d2|26=0j&%Qcr4g8*E@;_P#TZRU)FHQT1IW2bgAq2)~Ih zXlw+^bRF9Zv}i*iGjn&ekWL}cG_iz)PHCVWAiX=lY94_s0=mQ;XgyHzjs}p%hQ_CE z5OF3R9do01raGq&eY%(PIPUN!3!Tl|+E{_+FoFyN>X@}LgdfaQTcfLUV9J)$$2r9k z^tAkM-R8+ybu8%bvhSxdRvo`|B>C&q3nqhr*i`5P~ z7;ifIPj=bsU2|VXzlm`^JNk9)y6GMU_A&QYRq58A&d{8ZTrYHe=d68g?-K9bPkfzvy!6Wc z9ls>@y*#V_@_preZ*%WmmO9OKAK7hHpH8lg|63XT?c&z>Yx9==PnG}d^(XHQN08TF y>&L&oAGMv)KfA3+>+SKektT)>km>HtO9-c5_wp|L$R1BW3elF{r5}E*C)riFa literal 0 HcmV?d00001 diff --git a/app/assets/images/write.svg b/app/assets/images/write.svg new file mode 100644 index 0000000..b9a2c0b --- /dev/null +++ b/app/assets/images/write.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/app/assets/images/write_black.svg b/app/assets/images/write_black.svg new file mode 100644 index 0000000..d859252 --- /dev/null +++ b/app/assets/images/write_black.svg @@ -0,0 +1,20 @@ + + + +]> + + + + + + diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index dca4339..1e859ce 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,6 +13,7 @@ //= require jquery //= require jquery_ujs //= require bootstrap-transition +//= require bootstrap-tooltip //= require bootstrap-carousel //= require_tree . @@ -21,11 +22,13 @@ // favorite_btn $(document).ready(function($) { - $('.carousel').carousel() - $('.previous-button').click(function() { + $('.carousel').carousel({ + interval: 10000 + }); + $('.carousel-previous-button').click(function() { $('.carousel').carousel('prev'); }); - $('.forward-button').click(function() { + $('.carousel-forward-button').click(function() { $('.carousel').carousel('next'); }); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 07e9b86..1b05751 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,6 +11,7 @@ *= require global/reset *= require global/fontface *= require global/global + *= require global/forms *= require global/header *= require carousel *= require global/section diff --git a/app/assets/stylesheets/global/_variables.scss b/app/assets/stylesheets/global/_variables.scss index 3116c1a..8d500c0 100644 --- a/app/assets/stylesheets/global/_variables.scss +++ b/app/assets/stylesheets/global/_variables.scss @@ -6,3 +6,5 @@ $red: #bd3b36; $red_shade: #a53430; $yellow: #fff235; $yellow_shade: #dfd32e; +$green: #C5E95B; +$green_shade: #ACCB4F; \ No newline at end of file diff --git a/app/assets/stylesheets/global/footer.css.scss b/app/assets/stylesheets/global/footer.css.scss index 1cde7a2..a66cb47 100644 --- a/app/assets/stylesheets/global/footer.css.scss +++ b/app/assets/stylesheets/global/footer.css.scss @@ -1,13 +1,8 @@ @import 'variables'; @import 'mixins'; -/* variables */ - footer { - - display: none; - position: fixed; right: 0; bottom: 0; @@ -30,15 +25,18 @@ footer { background-color: #222; a { color: #fff; - font-size: 36px; - line-height: 48px; display: block; text-align: center; @include font_face; @include text_shadow(0, 3px, 0, $black); + img { + width: 40%; + height: auto; + padding: 5px; + } } span.nav_label { - // display: none; + display: none; } } } diff --git a/app/assets/stylesheets/global/forms.css.scss b/app/assets/stylesheets/global/forms.css.scss new file mode 100644 index 0000000..aecf497 --- /dev/null +++ b/app/assets/stylesheets/global/forms.css.scss @@ -0,0 +1,145 @@ +button, +input, +select, +textarea { + margin: 0; + font-size: 100%; + vertical-align: middle; +} +button, +input { + *overflow: visible; + line-height: normal; +} +button::-moz-focus-inner, +input::-moz-focus-inner { + padding: 0; + border: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + -webkit-appearance: button; +} +.search { + max-width: 620px; + width: 100%; + margin-left: auto; + margin-right: auto; + padding: 3px 0; + + .form-search { + padding-left: 14px; + padding-right: 14px; + .search-query { + + width: 100%; + + margin-bottom: 0; + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + } + } +} + +/*button, +input, +select, +textarea { + margin: 0; + font-size: 100%; + vertical-align: middle; +} +button, +input { + *overflow: visible; + line-height: normal; +} +button::-moz-focus-inner, +input::-moz-focus-inner { + padding: 0; + border: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + -webkit-appearance: button; +} +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-decoration, +input[type="search"]::-webkit-search-cancel-button { + -webkit-appearance: none; +} +.search-query { + padding-left: 14px; + padding-right: 14px; + margin-bottom: 0; + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; +} +.form-search input, +.form-inline input, +.form-horizontal input, +.form-search textarea, +.form-inline textarea, +.form-horizontal textarea, +.form-search select, +.form-inline select, +.form-horizontal select, +.form-search .help-inline, +.form-inline .help-inline, +.form-horizontal .help-inline, +.form-search .uneditable-input, +.form-inline .uneditable-input, +.form-horizontal .uneditable-input, +.form-search .input-prepend, +.form-inline .input-prepend, +.form-horizontal .input-prepend, +.form-search .input-append, +.form-inline .input-append, +.form-horizontal .input-append { + display: inline-block; + margin-bottom: 0; +} +.form-search .hide, +.form-inline .hide, +.form-horizontal .hide { + display: none; +} +.form-search label, +.form-inline label { + display: inline-block; +} +.form-search .input-append, +.form-inline .input-append, +.form-search .input-prepend, +.form-inline .input-prepend { + margin-bottom: 0; +} +.form-search .radio, +.form-search .checkbox, +.form-inline .radio, +.form-inline .checkbox { + padding-left: 0; + margin-bottom: 0; + vertical-align: middle; +} +.form-search .radio input[type="radio"], +.form-search .checkbox input[type="checkbox"], +.form-inline .radio input[type="radio"], +.form-inline .checkbox input[type="checkbox"] { + float: left; + margin-left: 0; + margin-right: 3px; +}*/ \ No newline at end of file diff --git a/app/assets/stylesheets/global/header.css.scss b/app/assets/stylesheets/global/header.css.scss index f86b9aa..2d05d12 100644 --- a/app/assets/stylesheets/global/header.css.scss +++ b/app/assets/stylesheets/global/header.css.scss @@ -10,48 +10,45 @@ * */ -/* imports */ @import 'variables'; @import 'mixins'; -/* page */ header { position: fixed; top: 0; - right: 0; left: 0; + right: 0; border-bottom: 2px solid $red_shade; z-index: 1000; - - @include box_shadow_inset(0px, 0px, 0px, 0px, rgba(0, 0, 0, 0.1)); background-color: $red; - - a, a:link, a:hover, a:visited { + @include box_shadow_inset(0px, 0px, 0px, 0px, rgba(0, 0, 0, 0.1)); + a { color: #fff; } h1 { font: bold 24px/32px "Helvetica Neue", Helvetica, Arial, sans-serif; text-align: center; - padding: 10px 0; - letter-spacing: -3px; + padding: 5px 0; + letter-spacing: -2px; @include text_shadow(0, 3px, 0, $red_shade); } ul { position: absolute; top: 0; right: 0; - margin: 14px 0; + margin: 0; li { - @include font_face; - font-size: 22px; float: left; + a { + img { + height: auto; + width: 40%; + } + } } } } .btn-create { - width: 64px; - height: 64px; - overflow: hidden; background-color: $red_shade; } \ No newline at end of file diff --git a/app/assets/stylesheets/global/section.css.scss b/app/assets/stylesheets/global/section.css.scss index f147871..bb56108 100644 --- a/app/assets/stylesheets/global/section.css.scss +++ b/app/assets/stylesheets/global/section.css.scss @@ -1,25 +1,18 @@ -/* imports */ @import 'variables'; @import 'mixins'; + section { height: 100%; #carousel-excuses { height: 100%; - .previous-button, .forward-button { + .carousel-previous-button, .carousel-forward-button { background-color: rgba(0, 0, 0, 0.05); float: left; height: 100%; width: 10%; z-index: 2; - - } - .previous-button { - background-image: url('/assets/upload.svg'); - background-image: none, url('/assets/upload.svg'), url('/assets/upload.svg'); - background-size: 60% auto; - background-repeat: no-repeat; - background-position: center center; + cursor: pointer; opacity: 0.4; transition: opacity 200ms; -moz-transition: opacity 200ms; @@ -33,24 +26,19 @@ section { -o-transition: opacity 200ms; } } - .forward-button { - background-image: url('/assets/upload.svg'); - background-image: none, url('/assets/upload.svg'), url('/assets/upload.svg'); + .carousel-previous-button { + background-image: url('/assets/arrow_left_black.png'); + background-image: none, url('/assets/arrow_left_black.svg'), url('/assets/arrow_left_black.png'); + background-size: 60% auto; + background-repeat: no-repeat; + background-position: center center; + } + .carousel-forward-button { + background-image: url('/assets/arrow_right_black.png'); + background-image: none, url('/assets/arrow_right_black.svg'), url('/assets/arrow_right_black.png'); background-size: 60% auto; background-repeat: no-repeat; background-position: center center; - opacity: 0.4; - transition: opacity 200ms; - -moz-transition: opacity 200ms; - -webkit-transition: opacity 200ms; - -o-transition: opacity 200ms; - &:hover { - opacity: 0.6; - transition: opacity 200ms; - -moz-transition: opacity 200ms; - -webkit-transition: opacity 200ms; - -o-transition: opacity 200ms; - } } .carousel-inner { float: left; @@ -60,61 +48,74 @@ section { .item { padding: 5%; min-height: 200px; + h2 { + font-size: 42px; + line-height: 56px; + margin-bottom: 40px; + @include text_shadow(1px, 3px, 0, #fff); + } } } } } .details { - margin: 20px 0; + color: #fff; + font-size: 12px; + line-height: 18px; + letter-spacing: 1px; + margin: 10px 0; + text-transform: uppercase; h3 { - float: left; - font-size: 12px; - letter-spacing: 2px; - line-height: 32px; - margin-right: 10px; - text-transform: uppercase; + color: #000; + margin-bottom: 10px; } - ul { + a { + color: #fff; + } + div { + border-left: 1px solid #ccc; + border-right: 1px solid #fff; + padding-right: 20px; float: left; + padding: 5px 20px; + } + .favorite { + border-left: 0; + } + .location { li { - background-color: $blue; - color: #fff; - float: left; - font-size: 12px; - letter-spacing: 1px; - line-height: 18px; - margin: 2px 5px; + background-color: $green; + display: inline-block; + margin: 0 0 10px 0; padding: 5px 10px; - text-transform: uppercase; + @include border_radius(25px); + @include box_shadow_inset(0, 0, 2px, 2px, rgba(0, 0, 0, 0.03)); + @include box_shadow(0, 2px, 0, 0, #fff); a { - color: #fff; + @include text_shadow(1px, 1px, 0, $green_shade); } - } + &:hover { + background-color: $green_shade; + } + } } -} - -.favorites { - -} -.tags { - li.tag { - background-color: $blue; - color: #fff; - float: left; - font-size: 12px; - letter-spacing: 1px; - line-height: 18px; - margin: 2px 5px; - padding: 5px 10px; - text-transform: uppercase; - @include border_radius(25px); - @include box_shadow_inset(0, 0, 2px, 2px, rgba(0, 0, 0, 0.03)); - a { - color: #fff; - } - &:hover { - background-color: $blue_shade; + .tags { + border-right: 0; + li { + background-color: $blue; + display: inline-block; + margin: 0 10px 10px 0; + padding: 5px 10px; + @include border_radius(25px); + @include box_shadow_inset(0, 0, 2px, 2px, rgba(0, 0, 0, 0.03)); + @include box_shadow(0, 2px, 0, 0, #fff); + a { + @include text_shadow(1px, 1px, 0, $blue_shade); + } + &:hover { + background-color: $blue_shade; + } } } } \ No newline at end of file diff --git a/app/views/pages/_carousel.html.haml b/app/views/pages/_carousel.html.haml new file mode 100644 index 0000000..04dcf55 --- /dev/null +++ b/app/views/pages/_carousel.html.haml @@ -0,0 +1,46 @@ +- if @excuses.count > 0 + - @excuses.each_with_index do |excuse, index| + - if index == 0 + .item.active + %h2 + = excuse.text + .details + - if @current_user.present? + .favorite + %h3 Favorite + = form_tag favorites_path do + = hidden_field_tag :excuse, excuse.id + = submit_tag "Favorite", :name => nil + .location + %h3 Location + %ul + %li= link_to excuse.location.name, "search/#{excuse.location.name.parameterize}" + .tags + %h3 Tags + %ul + - excuse.tags.each do |tag| + %li.tag= link_to tag.name, "tag/#{tag.name}", :rel => "tag" + + - else + .item + %h2 + = excuse.text + .details + - if @current_user.present? + .favorite + %h3 Favorite + = form_tag favorites_path do + = hidden_field_tag :excuse, excuse.id + = submit_tag "Favorite", :name => nil + .location + %h3 Location + %ul + %li= link_to excuse.location.name, "search/#{excuse.location.name.parameterize}" + .tags + %h3 Tags + %ul + - excuse.tags.each do |tag| + %li.tag= link_to tag.name, "tag/#{tag.name}", :rel => "tag" + +- else + .item.active There's no excuse for no excuses! There's only an excuse for Oh, Excuses... Why don't you create one? diff --git a/app/views/pages/_footer.html.haml b/app/views/pages/_footer.html.haml index 617b5d8..198ac75 100644 --- a/app/views/pages/_footer.html.haml +++ b/app/views/pages/_footer.html.haml @@ -2,21 +2,21 @@ %ul %li - = link_to "H", app_excuse_url, :class => "icon" + = link_to (image_tag "/assets/home.svg"), app_excuse_url, :class => "icon", :rel => "tooltip", :title => "Home" %span.nav_label Home %li - = link_to "S", app_search_url, :class => "icon" + = link_to (image_tag "/assets/search.svg"), app_search_url, :class => "icon", :rel => "tooltip", :title => "Search by words" %span.nav_label Search %li - = link_to "L", app_location_url, :class => "icon" + = link_to (image_tag "/assets/location.svg"), app_location_url, :class => "icon", :rel => "tooltip", :title => "Search by location" %span.nav_label Location %li - = link_to "T", app_tag_url, :class => "icon" + = link_to (image_tag "/assets/tag.svg"), app_tag_url, :class => "icon", :rel => "tooltip", :title => "Search by tags" %span.nav_label Tag %li - = link_to "A", app_user_url, :class => "icon" + = link_to (image_tag "/assets/account.svg"), app_user_url, :class => "icon", :rel => "tooltip", :title => "View your account" %span.nav_label Account \ No newline at end of file diff --git a/app/views/pages/_header.html.haml b/app/views/pages/_header.html.haml index b773e5f..77e31b4 100644 --- a/app/views/pages/_header.html.haml +++ b/app/views/pages/_header.html.haml @@ -3,7 +3,7 @@ - if session[:user_id] %ul - %li= link_to "N", new_excuse_path, :class => "btn btn-create icon" + %li= link_to (image_tag "/assets/write.svg"), new_excuse_path, :class => "btn btn-create icon" - else %ul %li= link_to "Sign Up", new_user_path diff --git a/app/views/pages/_nav_def_list.html.haml b/app/views/pages/_nav_def_list.html.haml deleted file mode 100644 index ddd6a91..0000000 --- a/app/views/pages/_nav_def_list.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -%dl - %dd= link_to "H", app_excuse_url, :class => "icon" - %dt Home - - %dd= link_to "S", app_search_url, :class => "icon" - %dt Search - - %dd= link_to "L", app_location_url, :class => "icon" - %dt Location - - %dd= link_to "T", app_tag_url, :class => "icon" - %dt Tag - - %dd= link_to "A", app_user_url, :class => "icon" - %dt Account \ No newline at end of file diff --git a/app/views/pages/_search_box.html.haml b/app/views/pages/_search_box.html.haml index 9ad363b..92be5d9 100644 --- a/app/views/pages/_search_box.html.haml +++ b/app/views/pages/_search_box.html.haml @@ -1,2 +1,3 @@ -= form_tag form_link, method: 'get' do - = search_field_tag :search, params[:search], placeholder: placeholder \ No newline at end of file +.search + = form_tag form_link, method: 'get', :class => "form-search" do + = search_field_tag :search, params[:search], placeholder: placeholder, :class => "search-query" \ No newline at end of file diff --git a/app/views/pages/excuse.html.haml b/app/views/pages/excuse.html.haml index debb910..c4af835 100644 --- a/app/views/pages/excuse.html.haml +++ b/app/views/pages/excuse.html.haml @@ -6,47 +6,11 @@ %section #carousel-excuses.carousel.slide - .previous-button - .previous-icon + .carousel-previous-button + .carousel-previous-icon .carousel-inner - - if @excuses.count > 0 - - @excuses.each_with_index do |excuse, index| - - if index == 0 - .item.active - .text - %h2 - = excuse.text - - if @current_user.present? - .details.favorites - %h3 Favorites - = form_tag favorites_path do - = hidden_field_tag :excuse, excuse.id - = submit_tag "Favorite", :name => nil - .details.tags - %h3 Tags - %ul - - excuse.tags.each do |tag| - %li.tag{ :class => "tag-blue" }= link_to tag.name, "tag/#{tag.name}", :rel => "tag" + = render 'carousel', :excuses => @excuses - - else - .item - .text - %h2 - = excuse.text - - if @current_user.present? - .details.favorites - %h3 Favorites - = form_tag favorites_path do - = hidden_field_tag :excuse, excuse.id - = submit_tag "Favorite", :name => nil - .details.tags - %h3 Tags - %ul - - excuse.tags.each do |tag| - %li.tag{ :class => "tag-blue" }= link_to tag.name, "tag/#{tag.name}", :rel => "tag" - - else - .item.active There's no excuse for no excuses! There's only an excuse for Oh, Excuses... Why don't you create one? - - .forward-button - .forward-icon + .carousel-forward-button + .carousel-forward-icon diff --git a/app/views/pages/location.html.haml b/app/views/pages/location.html.haml index b5c90af..6a7b89f 100644 --- a/app/views/pages/location.html.haml +++ b/app/views/pages/location.html.haml @@ -3,12 +3,17 @@ - if notice = render 'layouts/notice', :notice => notice, :type => "info" -= render 'search_box', form_link: app_location_path, placeholder: 'Search by locations' - -- if @excuses.count > 0 - %ul - - @excuses.each do |excuse| - %li= excuse.text -- else - %ul - %li Can you believe it? There are no excuses from this location... Yet. Why don't you create one? \ No newline at end of file +%section + #carousel-excuses.carousel.slide + + .carousel-previous-button + .carousel-previous-icon + + .carousel-inner + = render 'search_box', form_link: app_location_path, placeholder: 'Search by locations' + = render 'carousel', :excuses => @excuses + + .carousel-forward-button + .carousel-forward-icon + +%span Can you believe it? There are no excuses from this location... Yet. Why don't you create one? \ No newline at end of file diff --git a/app/views/pages/search.html.haml b/app/views/pages/search.html.haml index efec70d..0e33667 100644 --- a/app/views/pages/search.html.haml +++ b/app/views/pages/search.html.haml @@ -3,12 +3,15 @@ - if notice = render 'layouts/notice', :notice => notice, :type => "info" -= render 'search_box', form_link: app_search_path, placeholder: 'Search by words' - -- if @excuses.count > 0 - %ul - - @excuses.each do |excuse| - %li= excuse.text -- else - %ul - %li There's no excuse for no excuses! There's only an excuse for Oh, Excuses... Why don't you create one? \ No newline at end of file +%section + #carousel-excuses.carousel.slide + + .carousel-previous-button + .carousel-previous-icon + + .carousel-inner + = render 'search_box', form_link: app_search_path, placeholder: 'Search by words' + = render 'carousel', :excuses => @excuses + + .carousel-forward-button + .carousel-forward-icon diff --git a/app/views/pages/tag.html.haml b/app/views/pages/tag.html.haml index 89dbeea..21986f1 100644 --- a/app/views/pages/tag.html.haml +++ b/app/views/pages/tag.html.haml @@ -3,13 +3,17 @@ - if notice = render 'layouts/notice', :notice => notice, :type => "info" -= render 'search_box', form_link: app_tag_path, placeholder: 'Search by tags' - -- if @excuses.count > 0 - %ul - - @excuses.each do |excuse| - %li= excuse.text - %li= excuse.tag_names -- else - %ul - %li Can you believe it? There are no excuses with this tag... Yet. Why don't you create one? \ No newline at end of file +%section + #carousel-excuses.carousel.slide + + .carousel-previous-button + .carousel-previous-icon + + .carousel-inner + = render 'search_box', form_link: app_tag_path, placeholder: 'Search by tags' + = render 'carousel', :excuses => @excuses + + .carousel-forward-button + .carousel-forward-icon + +%span Can you believe it? There are no excuses with this tag... Yet. Why don't you create one? \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-tooltip.js b/vendor/assets/javascripts/bootstrap-tooltip.js new file mode 100644 index 0000000..49b5f72 --- /dev/null +++ b/vendor/assets/javascripts/bootstrap-tooltip.js @@ -0,0 +1,270 @@ +/* =========================================================== + * bootstrap-tooltip.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#tooltips + * Inspired by the original jQuery.tipsy by Jason Frame + * =========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +!function( $ ) { + + "use strict" + + /* TOOLTIP PUBLIC CLASS DEFINITION + * =============================== */ + + var Tooltip = function ( element, options ) { + this.init('tooltip', element, options) + } + + Tooltip.prototype = { + + constructor: Tooltip + + , init: function ( type, element, options ) { + var eventIn + , eventOut + + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + this.enabled = true + + if (this.options.trigger != 'manual') { + eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' + eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' + this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + , getOptions: function ( options ) { + options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + + return options + } + + , enter: function ( e ) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + + if (!self.options.delay || !self.options.delay.show) { + self.show() + } else { + self.hoverState = 'in' + setTimeout(function() { + if (self.hoverState == 'in') { + self.show() + } + }, self.options.delay.show) + } + } + + , leave: function ( e ) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + + if (!self.options.delay || !self.options.delay.hide) { + self.hide() + } else { + self.hoverState = 'out' + setTimeout(function() { + if (self.hoverState == 'out') { + self.hide() + } + }, self.options.delay.hide) + } + } + + , show: function () { + var $tip + , inside + , pos + , actualWidth + , actualHeight + , placement + , tp + + if (this.hasContent() && this.enabled) { + $tip = this.tip() + this.setContent() + + if (this.options.animation) { + $tip.addClass('fade') + } + + placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + inside = /in/.test(placement) + + $tip + .remove() + .css({ top: 0, left: 0, display: 'block' }) + .appendTo(inside ? this.$element : document.body) + + pos = this.getPosition(inside) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + + switch (inside ? placement.split(' ')[1] : placement) { + case 'bottom': + tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'top': + tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'left': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} + break + case 'right': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} + break + } + + $tip + .css(tp) + .addClass(placement) + .addClass('in') + } + } + + , setContent: function () { + var $tip = this.tip() + $tip.find('.tooltip-inner').html(this.getTitle()) + $tip.removeClass('fade in top bottom left right') + } + + , hide: function () { + var that = this + , $tip = this.tip() + + $tip.removeClass('in') + + function removeWithAnimation() { + var timeout = setTimeout(function () { + $tip.off($.support.transition.end).remove() + }, 500) + + $tip.one($.support.transition.end, function () { + clearTimeout(timeout) + $tip.remove() + }) + } + + $.support.transition && this.$tip.hasClass('fade') ? + removeWithAnimation() : + $tip.remove() + } + + , fixTitle: function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') + } + } + + , hasContent: function () { + return this.getTitle() + } + + , getPosition: function (inside) { + return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { + width: this.$element[0].offsetWidth + , height: this.$element[0].offsetHeight + }) + } + + , getTitle: function () { + var title + , $e = this.$element + , o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + title = (title || '').toString().replace(/(^\s*|\s*$)/, "") + + return title + } + + , tip: function () { + return this.$tip = this.$tip || $(this.options.template) + } + + , validate: function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + , enable: function () { + this.enabled = true + } + + , disable: function () { + this.enabled = false + } + + , toggleEnabled: function () { + this.enabled = !this.enabled + } + + , toggle: function () { + this[this.tip().hasClass('in') ? 'hide' : 'show']() + } + + } + + + /* TOOLTIP PLUGIN DEFINITION + * ========================= */ + + $.fn.tooltip = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tooltip') + , options = typeof option == 'object' && option + if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + $.fn.tooltip.defaults = { + animation: true + , delay: 0 + , selector: false + , placement: 'top' + , trigger: 'hover' + , title: '' + , template: '
' + } + +}( window.jQuery ); \ No newline at end of file