You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2016/12/13 20:54:09 UTC
jspwiki git commit: JSPWIKI-1037
Repository: jspwiki
Updated Branches:
refs/heads/master 1ebca686d -> 4e7810ca8
JSPWIKI-1037
IE display fixed (flexbox hack)
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/4e7810ca
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/4e7810ca
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/4e7810ca
Branch: refs/heads/master
Commit: 4e7810ca81e2c9ee2b420895c902a9a9e21c6b40
Parents: 1ebca68
Author: brushed <di...@gmail.com>
Authored: Tue Dec 13 21:53:24 2016 +0100
Committer: brushed <di...@gmail.com>
Committed: Tue Dec 13 21:53:24 2016 +0100
----------------------------------------------------------------------
ChangeLog | 9 +++++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
.../src/main/styles/haddock/default/Category.less | 4 ++--
.../src/main/styles/haddock/default/Template.View.less | 11 ++++++++---
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/4e7810ca/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 94ef8f7..1c16582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-12-13 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-svn-18
+
+ * [JSPWIKI-1037] UI will not display with IE 9 or IE10.
+ Issue with Flexbox implementation in IE. (also applies to IE11)
+
+ * Small style update on %%categories dropdown
+
2016-12-11 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-svn-17
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/4e7810ca/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 0b026e5..25f3842 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "17";
+ public static final String BUILD = "18";
/**
* This is the generic version string you should use when printing out the version. It is of
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/4e7810ca/jspwiki-war/src/main/styles/haddock/default/Category.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Category.less b/jspwiki-war/src/main/styles/haddock/default/Category.less
index ffaadbf..2496bfe 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Category.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Category.less
@@ -47,7 +47,7 @@ DOM structure after:
(end)
*/
.category-link {
- border-bottom:2px solid @wiki-category-link-color;
+ border-bottom:3px solid @wiki-category-link-color;
&:hover, &:focus { text-decoration:none; }
}
@@ -119,7 +119,7 @@ Style: Popup
margin-top:3px; //slightly move popup down with 3px under the category-link
//FIXME: remove this from AJAXCategory.jsp
- .categoryTitle { .hide; }
+ .categoryTitle, br { .hide; }
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/4e7810ca/jspwiki-war/src/main/styles/haddock/default/Template.View.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Template.View.less b/jspwiki-war/src/main/styles/haddock/default/Template.View.less
index 89c7f8f..4709eb7 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Template.View.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Template.View.less
@@ -38,8 +38,6 @@ DOM Structure:
(end)
*/
-
-
/*
Section: Title box
The title box is an optional alert box at the top of the page, to put
@@ -79,7 +77,7 @@ DOM structure:
ul.dropdown-menu.pull-right[data-hover-parent="searchbox"]
li.dropdown-header
- button#searchSubmit.btn[type="submit"] For full search, hit enter...
+ button#searchSubmit.btn[type="submit"] For full search, hit enter...
li.findpages ...create & clone buttons
li.findpages ...other search results
li.divider
@@ -222,6 +220,13 @@ even when there\u2019s not enough content to fill the page.
Credits: https://philipwalton.github.io/solved-by-flexbox/demos/sticky-footer/
*/
+body.can-flex {
+ //hack for IE-bug : see https://github.com/philipwalton/flexbugs#3-min-height-on-a-flex-container-wont-apply-to-its-flex-items
+ display: flex;
+ min-height: 100vh;
+ flex-flow: column;
+}
+
body.can-flex > .container-fluid,
body.can-flex > .container {
display: -webkit-box;