Merge pull request #78 from isubit/development

Development
isubit · Aug 30, 2018 · 401042e · 401042e
2 parents 6378c9d + ee3b981
commit 401042e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/css/theme.css b/css/theme.css
@@ -137,7 +137,9 @@ body,
     text-align: left;
   }
   .isu-region_header-second {
-    padding: 0;
+    display: flex;
+    flex-direction: column;
+    padding-top: 0.5rem;
   }
   .isu-col-header-second {
     padding: 0 15px; /* Back to Bootstrap 4 default */
@@ -213,17 +215,6 @@ body,
   border-radius: 0 0.25rem 0.25rem 0;
 }
 
-/* Large */
-@media screen and (min-width: 992px) {
-  .isu-search {
-    margin-top: 0;
-  }
-  .isu-region_header-second .isu-search__search-field.form-control {
-    /* .form-control via Bootstrap 4 */
-    width: 400px;
-  }
-}
-
 /* Specific to Site Navbar search */
 
 .isu-search {
@@ -233,9 +224,13 @@ body,
 /* Large */
 @media screen and (min-width: 992px) {
   .isu-search {
-    margin-top: 1rem;
+    margin-top: 0;
     padding: 0;
   }
+  .isu-region_header-second .isu-search__search-field.form-control {
+    /* .form-control via Bootstrap 4 */
+    width: 400px;
+  }
 }
 
 .isu-search_toggler {
@@ -562,7 +557,7 @@ body,
  * The most basic unit of content which appears all over.
  */
 
-article:not(.isu-user) {
+article:not(.isu-user):not(.isu-search_collapse) {
   margin-bottom: 2rem;
 }
 .isu-node-title {
@@ -671,6 +666,12 @@ article:not(.isu-user) {
   margin-top: 1rem;
 }
 
+
+.isu-field-tags {
+  padding-top: 1rem;
+  clear: both;
+}
+
 /* -------------------------------------- */
 /* ## COMPONENTS
 /* -------------------------------------- */

diff --git a/iastate_theme.libraries.yml b/iastate_theme.libraries.yml
@@ -7,7 +7,6 @@ global-css:
       css/isu-navbar.css: {}
       css/isu-responsivetables.css: { media: screen }
       css/base.css: {}
-      css/layout.css: {}
       css/theme.css: {}
       css/isu-social.css: {}
       css/utility.css: {}
@@ -42,4 +41,4 @@ font-awesome:
     gpl-compatible: true
   css:
     theme:
-      'https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css': { type: external, minified: true }
+      'https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css': { type: external, minified: true }