浏览代码

Merge branch 'master' into master

cy8aer 6 年前
父节点
当前提交
8ed3d3fd25
没有帐户链接到提交者的电子邮件

+ 5
- 5
requirements.txt 查看文件

1
 certifi==2017.11.5
1
 certifi==2017.11.5
2
-flask==0.12.2
2
+flask==1.0.2
3
 flask-babel==0.11.2
3
 flask-babel==0.11.2
4
-lxml==4.1.1
5
-idna==2.5
4
+lxml==4.2.1
5
+idna==2.6
6
 pygments==2.1.3
6
 pygments==2.1.3
7
-pyopenssl==17.4.0
8
-python-dateutil==2.6.1
7
+pyopenssl==18.0.0
8
+python-dateutil==2.7.3
9
 pyyaml==3.12
9
 pyyaml==3.12
10
 requests[socks]==2.18.4
10
 requests[socks]==2.18.4

+ 1
- 1
searx/settings.yml 查看文件

311
     engine : xpath
311
     engine : xpath
312
     paging : True
312
     paging : True
313
     search_url : https://scholar.google.com/scholar?start={pageno}&q={query}&hl=en&as_sdt=0,5&as_vis=1
313
     search_url : https://scholar.google.com/scholar?start={pageno}&q={query}&hl=en&as_sdt=0,5&as_vis=1
314
-    results_xpath : //div[@class="gs_r"]/div[@class="gs_ri"]
314
+    results_xpath : //div[contains(@class, "gs_r")]/div[@class="gs_ri"]
315
     url_xpath : .//h3/a/@href
315
     url_xpath : .//h3/a/@href
316
     title_xpath : .//h3/a
316
     title_xpath : .//h3/a
317
     content_xpath : .//div[@class="gs_rs"]
317
     content_xpath : .//div[@class="gs_rs"]

+ 1
- 1
searx/static/themes/oscar/css/logicodev-dark.min.css
文件差异内容过多而无法显示
查看文件


+ 1
- 1
searx/static/themes/oscar/css/logicodev.min.css
文件差异内容过多而无法显示
查看文件


+ 1
- 1
searx/static/themes/oscar/css/pointhi.min.css
文件差异内容过多而无法显示
查看文件


+ 1
- 0
searx/static/themes/oscar/less/logicodev/search.less 查看文件

18
     padding-bottom: 0.4rem;
18
     padding-bottom: 0.4rem;
19
     padding-top: 0.4rem;
19
     padding-top: 0.4rem;
20
     text-align: center;
20
     text-align: center;
21
+    min-width: 50px;
21
   }
22
   }
22
   label:last-child, .input-group-addon:last-child {
23
   label:last-child, .input-group-addon:last-child {
23
       border-right: @mild-gray 1px solid;
24
       border-right: @mild-gray 1px solid;

+ 1
- 0
searx/static/themes/oscar/less/pointhi/search.less 查看文件

18
         padding-bottom: 0.8rem;
18
         padding-bottom: 0.8rem;
19
         padding-top: 0.8rem;
19
         padding-top: 0.8rem;
20
         text-align: center;
20
         text-align: center;
21
+        min-width: 50px;
21
     }
22
     }
22
 
23
 
23
     label:last-child, .input-group-addon:last-child {
24
     label:last-child, .input-group-addon:last-child {