Merge remote-tracking branch 'nypl/master' into main

ThePalaceProject · May 5, 2021 · d3bdb5a · d3bdb5a
2 parents c14a491 + cd4cfa0
commit d3bdb5a
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 ## Changelog
 
+### v0.4.40
+
+#### Fixed
+
+- Fixed another footer placement bug.
+
+### v0.4.39
+
+#### Updated
+
+- Upgraded to v1.3.18 of the reusable components package.
+
 ### v0.4.38
 
 #### Fixed

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simplified-circulation-web",
-  "version": "0.4.38",
+  "version": "0.4.40",
   "description": "Web Front-end for Library Simplified Circulation Manager Admin Interface",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "draft-js": "0.11.2",
     "font-awesome": "^4.6.3",
     "isomorphic-fetch": "^2.2.1",
-    "library-simplified-reusable-components": "1.3.16",
+    "library-simplified-reusable-components": "1.3.18",
     "numeral": "^2.0.6",
     "opds-feed-parser": "0.0.17",
     "opds-web-client": "^0.4.2",

diff --git a/src/stylesheets/config_tab_container.scss b/src/stylesheets/config_tab_container.scss
@@ -82,4 +82,5 @@ $dangercolor: #D9534F;
       }
     }
   }
+
 }
diff --git a/src/stylesheets/footer.scss b/src/stylesheets/footer.scss
@@ -8,7 +8,7 @@ footer {
   z-index: 1;
   position: absolute;
   bottom: 0;
-  height: 56px; 
+  height: 56px;
   p {
     margin: 2px 0;
     a, a:visited, a:link {
@@ -20,3 +20,7 @@ footer {
     }
   }
 }
+
+.config footer {
+  position: relative;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,4 +82,5 @@ $dangercolor: #D9534F; @@
           }
         }
       }
     }