Merge pull request #33 from bcd04001/master

Fixed Search when Homepage is a Blog
weblab · Nov 17, 2014 · ec71765 · ec71765
2 parents c83678e + 5f5b136
commit ec71765
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 11 deletions.
diff --git a/style.css b/style.css
@@ -8216,6 +8216,48 @@ body {
   margin: 0;
 }
 
+body.blog .col-md-3 .form-inline .form-control, body.blog .col-md-3 .navbar-form .form-control {
+  width: 80%;
+}
+@media (max-width: 1200px) {
+  body.blog .col-md-3 .form-inline .form-control, body.blog .col-md-3 .navbar-form .form-control {
+    width: 74%;
+  }
+}
+@media (max-width: 991px) {
+  body.blog .col-md-3 .form-inline .form-control, body.blog .col-md-3 .navbar-form .form-control {
+    width: 60%;
+  }
+}
+@media (max-width: 767px) {
+  body.blog .col-md-3 .form-inline .form-control, body.blog .col-md-3 .navbar-form .form-control {
+    float: left;
+  }
+}
+body.blog .col-md-3 .navbar-form .form-control {
+  width: 80%;
+}
+@media (max-width: 1200px) {
+  body.blog .col-md-3 .navbar-form .form-control {
+    width: 74%;
+  }
+}
+@media (max-width: 991px) {
+  body.blog .col-md-3 .navbar-form .form-control {
+    width: 60%;
+  }
+}
+@media (max-width: 767px) {
+  body.blog .col-md-3 .navbar-form .form-control {
+    float: left;
+  }
+}
+@media (max-width: 767px) {
+  body.blog .col-md-3 .btn {
+    float: left;
+  }
+}
+
 #page-page .col-sm-3 .form-inline .form-control, #page-page .col-sm-3 .navbar-form .form-control, #page-blog .col-sm-3 .form-inline .form-control, #page-blog .col-sm-3 .navbar-form .form-control {
   width: 80%;
 }
@@ -8374,7 +8416,7 @@ body {
   border-top: none;
 }
 
-#mega-footer .col-sm-2 .widget_search widget {
+#mega-footer .col-sm-2 .widget_search {
   padding-left: 0px;
   padding-right: 0px;
 }
@@ -8407,26 +8449,26 @@ body {
     width: 58%;
   }
 }
-#mega-footer .col-sm-3 #search-2 {
+#mega-footer .col-sm-3 .widget_search {
   padding-left: 0px;
   padding-right: 0px;
 }
-#mega-footer .col-sm-3 #search-2 form {
+#mega-footer .col-sm-3 form {
   margin: 1em 0;
 }
-#mega-footer .col-sm-3 #search-2 .form-inline .form-control, #mega-footer .col-sm-3 #search-2 .navbar-form .form-control {
+#mega-footer .col-sm-3 .form-inline .form-control, #mega-footer .col-sm-3 .navbar-form .form-control {
   width: 81%;
 }
 @media (max-width: 991px) {
-  #mega-footer .col-sm-3 #search-2 .form-inline .form-control, #mega-footer .col-sm-3 #search-2 .navbar-form .form-control {
+  #mega-footer .col-sm-3 .form-inline .form-control, #mega-footer .col-sm-3 .navbar-form .form-control {
     width: 75%;
   }
 }
-#mega-footer .col-sm-3 #search-2 .navbar-form .form-control {
+#mega-footer .col-sm-3 .navbar-form .form-control {
   width: 76%;
 }
 @media (max-width: 991px) {
-  #mega-footer .col-sm-3 #search-2 .navbar-form .form-control {
+  #mega-footer .col-sm-3 .navbar-form .form-control {
     width: 75%;
   }
 }
@@ -8440,6 +8482,9 @@ body {
     float: left;
   }
 }
+#mega-footer .table > thead > tr > th, #mega-footer .table > thead > tr > td, #mega-footer .table > tbody > tr > th, #mega-footer .table > tbody > tr > td, #mega-footer .table > tfoot > tr > th, #mega-footer .table > tfoot > tr > td {
+  border-top: 1px solid rgba(255, 255, 255, 0.2);
+}
 
 #mega-footer .widget .widget-head h2 {
   color: #999999;

diff --git a/style.scss b/style.scss
@@ -305,6 +305,40 @@ body {
 	}
 }
 
+body.blog .col-md-3 {
+	.form-inline .form-control {
+		width:80%;
+
+		@media (max-width: 1200px) {
+			width:74%;
+		}
+		@media (max-width: 991px) {
+			width:60%;
+		}
+		@media (max-width: 767px) {
+			float:left;
+		}
+	} 
+	.navbar-form .form-control {
+		width:80%;
+
+		@media (max-width: 1200px) {
+			width:74%;
+		}
+		@media (max-width: 991px) {
+			width:60%;
+		}
+		@media (max-width: 767px) {
+			float:left;
+		}
+	}
+	.btn {
+		@media (max-width: 767px) {
+			float:left;
+		}
+	}
+}
+
 #page-page .col-sm-3, #page-blog .col-sm-3 {
 	.form-inline .form-control {
 		width:80%;
@@ -339,6 +373,8 @@ body {
 	}
 }
 
+
+
 	.form-control {
 		border-right:none;
 		box-shadow: none;
@@ -459,7 +495,7 @@ body {
 
 #mega-footer {
 	.col-sm-2 {
-		.widget_search widget {
+		.widget_search {
 			padding-left:0px;
 			padding-right:0px;
 		}
@@ -490,10 +526,10 @@ body {
 	}
 	.col-sm-3 {
 
-		#search-2 {
+		.widget_search {
 			padding-left:0px;
 			padding-right:0px;
-
+			}
 			form {
 				margin:1em 0;
 			}
@@ -511,7 +547,7 @@ body {
 						width:75%;			
 					}
 				}
-		}
+
 	}
 	.btn {
 		@media (max-width: 767px) {
@@ -523,6 +559,9 @@ body {
 			float:left;
 		}
 	}
+	.table > thead > tr > th, .table > thead > tr > td, .table > tbody > tr > th, .table > tbody > tr > td, .table > tfoot > tr > th, .table > tfoot > tr > td {
+		border-top:1px solid rgba(255, 255, 255, 0.2);
+	}
 }
 
 #mega-footer .widget .widget-head h2 {