Merge branch 'master' into statsbox

fossasia · Aug 7, 2017 · a0b041a · a0b041a
2 parents 7423b94 + 561e6ef
commit a0b041a
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 254 deletions.
diff --git a/src/app/app.component.css b/src/app/app.component.css
@@ -0,0 +1 @@
+
diff --git a/src/app/auto-correct/auto-correct.component.css b/src/app/auto-correct/auto-correct.component.css
@@ -2,7 +2,7 @@
   font-size: medium;
   font-weight: 500;
   color: navy;
-  padding-top: 3%;
+  padding-top: 13px;
 }
 
 .mean {

diff --git a/src/app/auto-correct/auto-correct.component.ts b/src/app/auto-correct/auto-correct.component.ts
@@ -27,7 +27,7 @@ export class AutoCorrectComponent implements OnInit {
     this.resultscomponentchange$ = store.select(fromRoot.getItems);
     this.resultscomponentchange$.subscribe(resp => {
       this.query$.subscribe(query => {
-        if (query) {
+        if (query && !query.includes('/date')) {
           this.sugflag = false;
 
           this.isQues = false;

diff --git a/src/app/infobox/infobox.component.css b/src/app/infobox/infobox.component.css
@@ -46,12 +46,12 @@ a {
     width: 368px;
   }
 }
-@media screen and (max-width: 1180px) {
+@media screen and (max-width: 1200px) {
   .card{
     width: 268px;
   }
 }
-  @media screen and (max-width: 998px) {
+  @media screen and (max-width: 1034px) {
   .card {
     display: none;
   }

diff --git a/src/app/intelligence/intelligence.component.css b/src/app/intelligence/intelligence.component.css
@@ -7,3 +7,9 @@
   transition: 0.3s;
   width: 434px;
 }
+
+@media screen and (max-width: 450px) {
+  div.card{
+    width: 92vw;
+  }
+}
diff --git a/src/app/navbar/navbar.component.css b/src/app/navbar/navbar.component.css
@@ -13,7 +13,7 @@
 #navbar-search{
   display: inline;
   float:left;
-  margin-left: -2%;
+  margin-left: -25px;
 }
 
 #navbar-dropdown-box{
@@ -25,11 +25,8 @@
   border-bottom: none;
 }
 
-
 .top-nav{
   margin-bottom: 0px;
-  margin-top: -5%;
-  padding-top: 0.4%;
 }
 
 #navcontainer {
@@ -49,18 +46,7 @@
       width: 160px;
       height: auto;
   }
-  .top-nav {
-    margin-top: -5%;
-  }
-}
-
-@media screen and (max-width:1219px) {
-  #navbar-search {
-    margin-left: -4%;
-  }
-}
 
-@media screen and (min-width:1920px) {
   #navbar-search{
     top:6px;
   }
@@ -71,32 +57,17 @@
       margin-top: 2px;
       width: 120px;
   }
-  .top-nav{
-    margin-top: -6%;
-  }
-}
-
-@media screen and (max-width:850px) {
-  .top-nav{
-    margin-top: -7%;
+  #navbar-search{
+    margin-left: -44px;
   }
 }
 
-@media screen and (max-width:819px) {
-  #navbar-search {
-    margin-left: -5%;
-  }
-
-}
 @media screen and (max-width:800px) {
   #navbar-dropdown-box {
     margin-top: -36px;
   }
 }
 @media screen and (max-width:767px) {
-  .top-nav{
-    margin-top: -8%;
-  }
   .navbar-brand{
       margin-left: 38%;
       height: auto;
@@ -131,18 +102,8 @@
   .align-navsearch-btn {
     margin-right: 2% !important;
   }
-  .top-nav{
-    margin-top: -9%;
-  }
 }
 
-@media screen and (max-width:539px) {
-  .top-nav{
-    margin-top: -11%;
-  }
-}
-
-
 @media screen and (max-width:479px) {
   .navbar-brand{
       margin-left: 33%;
@@ -153,16 +114,10 @@
   .align-navsearch-btn {
     margin-right: 3% !important;
   }
-  .top-nav{
-    margin-top: -13%;
-  }
 }
 
 @media screen and (max-width:379px) {
   .navbar-brand{
     margin-left: 30%;
   }
-  .top-nav{
-    margin-top: -16%;
-  }
 }
diff --git a/src/app/related-search/related-search.component.css b/src/app/related-search/related-search.component.css
@@ -1,12 +1,10 @@
 .card{
-  padding-left: 50px;
   padding-top: 10px;
   max-width: 850px;
 }
 
 .container {
   margin-right: 0px;
-  margin-left: -7px;
   padding-left: 0px;
   padding-right: 0px;
 }