This is an automated email from the ASF dual-hosted git repository.
brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new c6766eb 2.11.0-M2-git-02: Fix JSPWIKI-1074
c6766eb is described below
commit c6766ebe0d6e5483c29d0dcccb3608ff5a8cad2e
Author: brushed <dirk.frederi...@gmail.com>
AuthorDate: Sun Feb 3 13:30:17 2019 +0100
2.11.0-M2-git-02: Fix JSPWIKI-1074
JSPWIKI-1074: Fixed buggy header width in Fixed Page Layout
---
ChangeLog | 9 ++++-
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../main/styles/haddock/default/Template.View.less | 36 ++++++++++++++++----
.../src/main/styles/haddock/default/grid.less | 16 ---------
.../src/main/styles/haddock/default/print.less | 5 +--
.../haddock/default/responsive-viewport.less | 39 ++++++++++++++++++----
6 files changed, 72 insertions(+), 35 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2ef205c..e60cad4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2019-02-24 Dirk Frederickx (brushed AT apache DOT org)
+2019-02-03 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.11.0-M2-git-02
+
+ * JSPWIKI-1074: Fixed buggy header width in Fixed Page Layout
+
+
+2019-02-03 Dirk Frederickx (brushed AT apache DOT org)
* 2.11.0-M2-git-01
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index 10844e9..700b6cf 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/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 = "01";
+ public static final String BUILD = "02";
/**
* This is the generic version string you should use when printing out
the version. It is of
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 1f95d7e..e9d14d1 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Template.View.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Template.View.less
@@ -95,13 +95,19 @@ DOM structure:
(end)
*/
-.container-fluid {
- //margin:0 1em;
-
- .header > *:not(.titlebox),
- > .row > ul.nav {
- //padding-right:@padding-base-horizontal;
- }
+// Set the container width, and override it for fixed navbars in media queries
+.container {
+ .container-fixed();
+
+ @media (min-width: @screen-sm) {
+ width: @container-sm;
+ }
+ @media (min-width: @screen-md) {
+ width: @container-md;
+ }
+ @media (min-width: @screen-lg-min) {
+ width: @container-lg;
+ }
}
.titlebox {
@@ -175,6 +181,22 @@ Fixed .header with hide (on scrolldown) and show (on
scrollup) effects.
}
}
+.fixed-header.container > .header {
+
+ //compensate for the 2x15px padding on the .container (bootstrap)
+ @media (min-width: @screen-sm) {
+ //width: unit(unit(@container-sm)-30,px);
+ width: @container-sm - 30px;
+ }
+ @media (min-width: @screen-md) {
+ //width: unit(unit(@container-md)-30,px);
+ width: @container-md - 30px;
+ }
+ @media (min-width: @screen-lg-min) {
+ width: unit(unit(@container-lg)-30,px);
+ width: @container-lg - 30px;
+ }
+}
.header .pagename {
.text-overflow();
diff --git a/jspwiki-war/src/main/styles/haddock/default/grid.less
b/jspwiki-war/src/main/styles/haddock/default/grid.less
index a093695..7153d34 100644
--- a/jspwiki-war/src/main/styles/haddock/default/grid.less
+++ b/jspwiki-war/src/main/styles/haddock/default/grid.less
@@ -20,22 +20,6 @@
*/
// Minimal Grid system for JSPWiki
-
-// Set the container width, and override it for fixed navbars in media queries
-.container {
- .container-fixed();
-
- @media (min-width: @screen-sm) {
- width: @container-sm;
- }
- @media (min-width: @screen-md) {
- width: @container-md;
- }
- @media (min-width: @screen-lg-min) {
- width: @container-lg;
- }
-}
-
.row {
.clearfix();
}
diff --git a/jspwiki-war/src/main/styles/haddock/default/print.less
b/jspwiki-war/src/main/styles/haddock/default/print.less
index 379abf7..8ca7f88 100644
--- a/jspwiki-war/src/main/styles/haddock/default/print.less
+++ b/jspwiki-war/src/main/styles/haddock/default/print.less
@@ -112,10 +112,6 @@ Inherit parts of Bootstrap:print.less ;
background: #fff !important;
}
- // Bootstrap components
- .navbar {
- display: none;
- }
/*
.table {
@@ -181,6 +177,7 @@ body > .container {
}
.header .logo, .userbox, .titlebox, .searchbox, .breadcrumb, .row.sticky,
+.header .navigation,
a.feed[href], .editsection, .hashlink, .filter-input, .slmbx,
.index .header, a[href='#top'] {
display:none;
diff --git
a/jspwiki-war/src/main/styles/haddock/default/responsive-viewport.less
b/jspwiki-war/src/main/styles/haddock/default/responsive-viewport.less
index 9e5ff32..a02215b 100644
--- a/jspwiki-war/src/main/styles/haddock/default/responsive-viewport.less
+++ b/jspwiki-war/src/main/styles/haddock/default/responsive-viewport.less
@@ -32,6 +32,14 @@ Section: Responsive styles for small viewports or screens
*/
+/* support for var(--css-properties) */
+@supports not(--some-test-prop:red) {
+ .form-group.pref-appearance {
+ display:none;
+ }
+}
+
+
/*
very small screen-sizes, phones in portrait mode
*/
@@ -151,6 +159,24 @@ Medium size screens, tablets, phones in landscape mode
// TableX.Sort.less
// TableX.Filter.less
// forms.less
+ .form-control {
+ width:auto;
+ display:inline;
+ //padding: @padding-xs-vertical @padding-xs-horizontal;
+
+ }
+ .form-group select {
+ padding-top: @padding-xs-vertical;
+ padding-bottom:@padding-xs-vertical;
+
+ background-size: @padding-small-horizontal @padding-small-horizontal;
+ background-position:@padding-small-horizontal center;
+
+ }
+ label.form-switch {
+ padding-top: @padding-small-vertical;
+ padding-bottom:@padding-small-vertical;
+ }
// modals.less
// pagination.less
@@ -198,6 +224,9 @@ Medium size screens, tablets, phones in landscape mode
// Template.View.less
+ // Make container 100% fluid
+ .container { padding:0; }
+
.header, .footer {
.btn [class^="icon-"]:before { font-size: 1em; }
}
@@ -269,12 +298,10 @@ Medium size screens, tablets, phones in landscape mode
the sidebar will overlay the main page which remains fit to 100% of
the screen-size
*/
.content {
- .sidebar, &:after { width: @wiki-small-viewport-dialog-width; }
- }
-
- //hide sidebar
- .content {
- .sidebar, &:after { margin-left:-100%; }
+ .sidebar, &:after {
+ width: @wiki-small-viewport-dialog-width;
+ margin-left:-100%;
+ }
}
.sidebar { position:absolute; }
