Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration

Resolved conflict searx/settings.yml

2 files changed, 41 insertions, 6 deletions

diff --git a/searx/static/themes/oscar/less/logicodev/results.less b/searx/static/themes/oscar/less/logicodev/results.less
index 37a5a76d5..9e57da788 100644
--- a/searx/static/themes/oscar/less/logicodev/results.less
+++ b/searx/static/themes/oscar/less/logicodev/results.less
@@ -6,7 +6,7 @@
     .favicon {
         margin-bottom:-3px;
     }
-    
+
     a {
         color: @black;
         text-decoration: none;
@@ -18,7 +18,7 @@
         &:visited{
             color: @violet;
         }
-        
+
         .highlight {
             background-color: @dim-gray;
             // Chrome hack: bold is different size than normal
@@ -64,10 +64,9 @@
     float: left !important;
     width: 24%;
     margin: .5%;
-    a{
+    a {
         display: block;
         width: 100%;
-        height: 170px;
         background-size: cover;
     }
 }
@@ -148,3 +147,21 @@
     color: @gray;
     background: transparent;
 }
+
+.result .text-muted small {
+    word-wrap: break-word;
+}
+
+.modal-wrapper {
+    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+}
+
+.modal-wrapper {
+    background-clip: padding-box;
+    background-color: #fff;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    border-radius: 6px;
+    box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+    outline: 0 none;
+    position: relative;
+}
diff --git a/searx/static/themes/oscar/less/pointhi/results.less b/searx/static/themes/oscar/less/pointhi/results.less
index b3d87001c..beea353d0 100644
--- a/searx/static/themes/oscar/less/pointhi/results.less
+++ b/searx/static/themes/oscar/less/pointhi/results.less
@@ -6,10 +6,10 @@
     .favicon {
         margin-bottom:-3px;
     }
-    
+
     a {
         vertical-align: bottom;
-        
+
         .highlight {
             font-weight:bold;
         }
@@ -81,3 +81,21 @@
     color: #AAA;
     background: #FFF;
 }
+
+.result .text-muted small {
+    word-wrap: break-word;
+}
+
+.modal-wrapper {
+    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+}
+
+.modal-wrapper {
+    background-clip: padding-box;
+    background-color: #fff;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    border-radius: 6px;
+    box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+    outline: 0 none;
+    position: relative;
+}