[isis] branch master updated: ISIS-2158: css fixes for bootstrap (Navbar)

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e6d549  ISIS-2158: css fixes for bootstrap (Navbar)
3e6d549 is described below

commit 3e6d549bcf1efcbeb84b885defd6ed99fb6f6377
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 19 17:28:54 2019 +0100

    ISIS-2158: css fixes for bootstrap (Navbar)
    
    - prevents the top navbar from overlapping any #body content
    - no spacing hack required, which was broken anyway
    - keeps the previous bootstrap-overrides.css as reference (renamed to
    bootstrap-overrides-all-v1.css)
---
 .../BootstrapOverridesCssResourceReference.java    |  2 +-
 ...verrides.css => bootstrap-overrides-all-v1.css} |  0
 ...verrides.css => bootstrap-overrides-all-v2.css} | 24 +++++++++++++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
index f06f2e2..de53f01 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/BootstrapOverridesCssResourceReference.java
@@ -30,6 +30,6 @@ public class BootstrapOverridesCssResourceReference extends CssResourceReference
     private static final long serialVersionUID = 1L;
 
     public BootstrapOverridesCssResourceReference() {
-        super(BootstrapOverridesCssResourceReference.class, "bootstrap-overrides.css");
+        super(BootstrapOverridesCssResourceReference.class, "bootstrap-overrides-all-v2.css");
     }
 }
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v1.css
similarity index 100%
copy from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
copy to core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v1.css
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
similarity index 98%
rename from core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
rename to core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
index 5c6fcf3..e3a5d80 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
@@ -18,8 +18,25 @@
  *  under the License.
  */
 
+
+#container {
+	padding-left: 0px;
+	padding-right: 0px;
+}
+
+#body {
+    padding-top: 0px; 
+}
+
 body {
-    padding-top: 60px;
+    padding-top: 0px; 
+    margin-bottom: 0px;
+}
+
+.navbar-fixed-top {
+    position: initial;
+    right: initial;
+    left: initial;
 }
 
 .table .form-control:disabled {
@@ -42,6 +59,7 @@ body {
 
 .navbar {
     border-radius: 0;
+    margin-bottom: 0px;
 }
 
 #veil {
@@ -720,10 +738,6 @@ div.referencePanel.scalarNameAndValueComponentType {
     padding-bottom: 5px; /* different from entityCollectionsPanel because of display-inline ? of additionalLinks */
 }
 
-#body {
-    padding-top: 20px;
-}
-
 .additionalLinks.pull-right {
     /*margin-right: 5px;*/
 }