From 508a421c45421924c47585d68a5013f9d003c02b Mon Sep 17 00:00:00 2001 From: Severyn Kozak Date: Tue, 17 Jun 2014 16:57:25 -0400 Subject: [PATCH] Change advanced-search button, mod error messages. Add: templates/index.html, static/sass/index.sass, static/img/index/search_bar_magnifying_glass.png -Replace the magnifying-glass advanced-search icon with a simple textual button. static/(js/index.js, sass/index.sass) -Slightly modify the appearance of error messages; add message for no results. --- static/img/index/search_bar_magnifying_glass.png | Bin 2533 -> 0 bytes static/js/index.js | 10 ++++- static/sass/index.sass | 45 +++++++++++------------ templates/index.html | 7 +++- 4 files changed, 35 insertions(+), 27 deletions(-) delete mode 100644 static/img/index/search_bar_magnifying_glass.png diff --git a/static/img/index/search_bar_magnifying_glass.png b/static/img/index/search_bar_magnifying_glass.png deleted file mode 100644 index d1c613463892ffd07ed12e852325073de888cd88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2533 zcmcIli$9dv8$ahY%te}a%p{TK)rDF@xeaYIZ&BDLYKzojbVYXwrJ8wN+J4^^oLv1dzgsgEXmm$oac7LDG?=SehpU?Yw&hxy_d(L^j=RDu<>2;oN zdMqOr06@>f-St}lAR0oz&_TxUQ0^{dbhfQ=b43=Mm;2>~AnlSN z3epdItX)NK(Z(@8-SQXG1*IMGa9y$S$XiwO@^8~?3{Hh+rCmJ3@F7$Ru6PEsV?^f> zYxY6zvBiSHji+ZQbjkt4^))S$X>E}>x5v9}R3|dGHeBzCd%s(xyfw+`27aPW^WjxK zd-d8^c69R8xz)d{mx%V<^nF%PSZI+qb+*J56jvXyGg|P*YkcBl%x0{&s7OO5)rK|i zb&za)L8IcH9_3wZ0#08OgXD6V#W(bJt17uvMHG_tDo zzBnvk1DEpWN1J09ew_9bfD9pamI877=v5?$Nl@q$Ka(nJ`}sgQGip!IbW(j!Sld-zaIM8;X!87HGoZAVmez+>&? zksS|Gi<G;XuklQk5QC_(-xMk@X339OqmdBeZ%6xqD>EmhCQq+`2pC8 z|48kORQ8XTVZ5@>c_HN?2O86sVPDpY1$M@)+}eV4UC47_#av>Nv8I9NBi`&_WKzu% zwMSrMz&wO){m|HL<)+UYwBB2Ql2j}k)iYE4Cr@tb%kL~ z(Rq1!t@+rYuFlTRO5^AVg#}o6byN(fWdP6s1zuQ(`?qe$??f1=qW4 zQUP!SfRp2e0Wkm!#0W%xmENR~^d<~-FRI!GL6sq32C{!bU2&TqR`llh z&0F2xmUS6@5dSzKaux{G`!TTXV>1UZj!&6W5l?dWp3%ce`gR`L$1OvRTw=#1Z`kq! zvF_?@GJR-p4DZ)+Kl0Sa_{8gQuYW4&b@6X3^?^>}ALBthw3$i=&c1$*qt&}d(R^b+ zAG1}M0E%?;z=AInSZS?=-C}`N>PH8`P@S-1I~JU3b$?Mc4@830fx-5tvaZ`MneUo4 zC3-a+qA2rvvNWVfA_l1^f9D~vmgz8acUl;8py6wdZwKv#>DkBIcCpA`jT6@>o-Hnv zj{oU){omGQ63`+2d2)Mud;NTh=cw&Q#XC7WkMEfAVv`zm_mNkhZXOe`GSAIvy2=)V zG~ML~WipLv$v`^j1&n}WTr%PC*sV+tQXLt!KjPd{xA5@u8~R`G9-ivx=rD%CEPeMl zRm3sJ4A1&+3ybC{z~SKx7_aq#Av}eqz{JoDhTFsW?()mCC(nC3hH}VtOo9FnCAaqt zPlvQSY$EzlcAkUd^hgl>bahF6VZ^@1XEa>>EZC?zs8J+P_y0ASud#}NN?W~08BK__ zJc!t|aBpM8GIQO_12Uww#oKg6oUHHi3igno%8Pco;aWntIZ&F%#+D`Dq7f5YSG6r| z_zdD?39XBt)*HTSZI!u?9UYw-Imo33N^7Dj?u%9FiDB0sP^poTjUNkGJ>CEB<}C{3r~ck_4eU?j#gWS@!MhQ!5dp%Z$B}Ps+F>M+Syw zP5$OseFdR(;M9K)uXhBMQE6P@I?GjR`_5Nw-|}6G*evI{CaHPJ)`|d$P@_E^vo(+^ zTa)_h9~S#rwO%c2sP|BMm?PuQnKN~v zC+Gv>_LKZRBxFdy%q?)r2BP&IX=6C?Mcq)4jzERzRR3`)L*-~hAWmiQ2`X4w`Z@N0 zInmW9iO59(##iXC7#69H&iwy`sEZFJjl=mq0Me#u&^@_?0NDa*xaEYmxBqMtlM}z` z5EP}9BY`Xd48m8v>5C@O190+#Qsm?`mOZ2pp{k+<6P?f4I5}uNd`CqO5Fk0ilh)Tf z@I!3T(xFA;Q3F~lwA*5rlk1Qw;u}E~yZn6UqRSjError: "); + var error = $( + [ + "
Error ", + "»
" + ].join("")); error.append(msg); resultsDiv.appendChild(error[0]); } diff --git a/static/sass/index.sass b/static/sass/index.sass index 08bfa26..4472a56 100644 --- a/static/sass/index.sass +++ b/static/sass/index.sass @@ -115,40 +115,29 @@ div#search-field margin-bottom: 0px padding: 6px - input[type="text"] - width: 85% + input[type="text"]#query + width: 100% &:hover border-color: $baseColor1 button#advanced-search background-color: white - border: 1px solid white - width: 15% - height: 10% - padding: 0px - float: right + border: none + color: $baseColor2 + font-size: 1.1em + font-style: italic &:hover - img - background-color: black - cursor: pointer + color: $baseColor1 + cursor: pointer &.clicked - img - background-color: $baseColor1 + color: $baseColor1 &:focus outline: 0 - img - @extend .t3 - - background-color: $baseColor2 - margin-top: 5px - width: 26px - height: 26px - &.partly-visible margin-top: 0% position: absolute @@ -168,10 +157,14 @@ div#search-field margin-right: auto width: 60% - input:hover + input @extend .t3 - border: 1px solid $baseColor1 + &#query + width: 80% + + &:hover + border: 1px solid $baseColor1 div#advanced-search background-color: white @@ -338,9 +331,15 @@ div#results text-align: center span - color: $baseColor1 + margin-right: 10px font-size: 150% + &#s1 + color: $baseColor1 + + &#s2 + color: $baseColor2 + &.disable-hover pointer-events: none diff --git a/templates/index.html b/templates/index.html index 28b1345..c64ac94 100644 --- a/templates/index.html +++ b/templates/index.html @@ -28,9 +28,10 @@