5d9d04a · searx · git.iko.soy

git.iko.soy/searx

[enh] better highlighting

commit5d9d04a16e0becad65b55351503b8a015551847b authorAdam Tauber <asciimoo@gmail.com> dateFri 9 May 2014, 02:04 (12 years ago) parent58de280

4 files changed+14−3

compare with master

unifiedsplit

searx/static/css/style.css+2 searx/static/less/definitions.less+2−1 searx/static/less/style.less+8 searx/utils.py+2−2

searx/static/css/style.css+2

@@ -48,6 +48,8 @@ a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}

4848.right{float:right}

4949.invisible{display:none}

5050.left{float:left}

51+.highlight{color:#094089}

52+.content .highlight{color:#000}

5153.image_result{float:left;margin:10px 10px;position:relative;height:160px}.image_result img{border:0;height:160px}

5254.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff}

5355.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em}

searx/static/less/definitions.less+2−1

@@ -9,7 +9,8 @@

99@color-base: #3498DB;

1010@color-base-dark: #2980B9;

1111@color-base-light: #ECF0F1;

12−

12+@color-highlight: #094089;

13+@color-black: #000000;

1314

1415/// General

1516

searx/static/less/style.less+8

@@ -273,6 +273,14 @@ a {

273273 float: left;

274274}

275275

276+.highlight {

277+ color: @color-highlight;

278+}

279+

280+.content .highlight {

281+ color: @color-black;

282+}

283+

276284.image_result {

277285 float: left;

278286 margin: 10px 10px;

searx/utils.py+2−2

@@ -28,7 +28,7 @@ def highlight_content(content, query):

2828 query = query.decode('utf-8')

2929 if content.lower().find(query.lower()) > -1:

3030 query_regex = u'({0})'.format(re.escape(query))

31− content = re.sub(query_regex, '\\1', content, flags=re.I | re.U)

31+ content = re.sub(query_regex, '\\1', content, flags=re.I | re.U)

3232 else:

3333 regex_parts = []

3434 for chunk in query.split():

@@ -37,7 +37,7 @@ def highlight_content(content, query):

3737 else:

3838 regex_parts.append(u'{0}'.format(re.escape(chunk)))

3939 query_regex = u'({0})'.format('|'.join(regex_parts))

40− content = re.sub(query_regex, '\\1', content, flags=re.I | re.U)

40+ content = re.sub(query_regex, '\\1', content, flags=re.I | re.U)

4141

4242 return content

4343