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 2015/06/22 22:11:44 UTC
svn commit: r1686927 [9/11] - in /jspwiki/trunk: ./
jspwiki-war/src/main/config/wro/ jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/resources/templates/
jspwiki-war/src/main/scripts/behaviors/
jspwiki-war/src/main/scripts/dialog/ jspwi...
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,68 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Style: FindContent.jsp, AJAXSearch.jsp
+
+DOM Structure:
+(start code)
+....
+ div.graphBars
+ div.zebra-table
+ table.wikitable
+ tr
+ th align=left Page
+ th align=left Score
+
+ tr
+ td
+ a.wikipage[href="..."] result1
+ td
+ span.gBar nn
+
+ tr
+ td[colspan=2]
+ div.fragment
+ ... span.searchmatch ".." ...
+
+(end)
+*/
+
+form#searchform2 + div {
+
+ table { .table-condensed; }
+
+ .fragment {
+ //inherit from bootstrap/code.less
+ font-family: @font-family-monospace;
+ font-size: 80%;
+ color: @pre-color;
+ //white-space: pre;
+ //word-break: break-all;
+ //word-wrap: break-word;
+ border-radius: @border-radius-base;
+ overflow: scroll;
+ }
+
+ //.fragment_ellipsis { font-weight:bold; } CHECKME ? not used anymore
+ //.nosearchresult { .warning; display:table-cell; }
+
+ }
+.searchmatch { .highlight; }
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,109 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Section: SearchBox
+ See SearchBox.jsp, UserBox.jsp
+
+DOM structure:
+(start code)
+ form#searchform.searchbox.col6.offset6.pull-right.form-inline
+
+ input#query.form-control[type="text"][placeholder="Quick Navigation"]
+ div.btn
+ span.icon-search
+ span.caret
+
+ ul.dropdown-menu.pull-right //quick navigation dropdown
+(end)
+*/
+
+.searchbox {
+ position:relative; //container for the dropdown-menu
+ width:33%;
+
+ > input {
+ .opacity(0);
+ width: 100%;
+ font-family: @wiki-logo-font-family;
+
+ padding-right: 2em;
+ .transition( all 0.5s ease );
+
+ + .btn {
+ position: absolute;
+ top: 0;
+ right: 0;
+ border: none;
+ background: transparent;
+ }
+
+ }
+ &:hover > input,
+ &:focus > input {
+ .opacity(1);
+
+ + .btn { color: @btn-default-color; }
+ }
+
+ .dropdown-header .btn-block {
+ padding: @padding-base-vertical @padding-base-horizontal;
+ }
+}
+
+
+/*
+Section: Quick Navigation DropDown
+ The quick navigation section contains a drop-down menu,
+ with auto-completion search results, and a list of recently searched commands.
+
+ Uses bootstrap/dropdown.less
+
+DOM Structure:
+(start code)
+ ul.dropdown-menu.pull-right
+
+ li.dropdown-header
+ button.btn.btn-xs.btn-primary.btn-block Full Search...
+
+ li.findpages
+ a[title="Create <page>"]
+ span.createpage <page-name>
+ div.btn.btn-danger.btn-xs.pull-right
+ input[type=checkbox][name=cloney]
+ span Clone this page
+
+ li.findpages
+ a[href]
+ span <page>
+ span.badge.pull-right <score>
+
+ li.divider
+
+ li.dropdown-header Recent Searches
+ li.recents
+ a[href]
+ li.recents.clear
+ a [Clear recent searches]
+(end)
+*/
+
+.findpages .pull-right { margin-left: 1em; } //minimal space text and badge/buttons
+.findpages a[href*="&clone="] .createpage { font-weight:bold; }
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Sidebar.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Sidebar.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Sidebar.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Sidebar.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,69 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+//
+// Support Left and Right Orientation : fav-left, fav-right, fav-slide??
+//
+// (default) left orientation
+/*
+.page { float:right; }
+.sidebar { float:left; }
+* html .page { margin-left:-3px; } //ie6 hack -- Three Pixel Text Jog
+* html .sidebar { margin-right:-3px; }
+
+.fav-right .page { float:left; }
+.fav-right .sidebar { float:right; };
+* html .fav-right .page { margin-right:-3px; } //ie6 hack -- Three Pixel Text Jog
+* html .fav-right .sidebar { margin-left:-3px; }
+
+*/
+
+
+/*
+Section: sidebar
+ See Favorites.jsp
+
+DOM Structure:
+(start code)
+ div.sidebar
+ div.leftmenu
+ div.leftmenufooter
+ div.wikiversion JSPWiki version-number
+ a.feed
+
+(end)
+*/
+
+//keep top-level lists close top the left margin
+.sidebar {
+ position:relative;
+
+ > .close {
+ position:absolute;
+ right:@padding-base-horizontal/2;
+ margin-top:-@padding-base-horizontal;
+ }
+}
+
+//TODO: move this to the pagination bar, in search???
+.cursor {
+ background-color:@gray-lighter;
+}
+
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.UserBox.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,58 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Section: UserBox
+ See UserBox.jsp
+
+DOM structure:
+(start code)
+span.cage.pull-right.user-<loginstatus>
+
+ div.btn
+ span.icon-user
+ span.caret
+
+ ul.dropdown-menu.pull-right[data-hover-parent=".cage"]
+
+ li.dropdown-header
+ span.icon-user
+ label.username User greeting
+
+ li.dropdown-header
+ div.btn-group.btn-group-justified
+ a.login Login | Logout
+ a.pref User Preferences
+
+(end)
+*/
+
+.userbox {
+
+ &:hover > .btn { color: inherit; }
+
+ li { font-family: @wiki-logo-font-family; }
+
+}
+
+
+.user-anonymous li .icon-user { .text-danger; }
+.user-asserted li .icon-user { .text-warning; }
+.user-authenticated li .icon-user { .text-success; }
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,235 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Section: Top level HTML structure
+
+DOM Structure:
+(start code)
+ div[.container|.container-fluid][.fav-left|.fav-right|.fav-hidden]
+ div.titlebox.alert
+ div.header
+ div.row =>Template.Navs.less
+ ul.nav.nav-pills.pull-left
+ ul.nav.nav-pills.pull-right
+ div.content[.active] =>Template.Content.less
+ div.page
+ div.page-content
+ div.page-footer
+ div.sidebar =>Template.Sidebar.less
+ div.footer
+(end)
+*/
+
+
+
+/*
+Section: Title box
+ The title box is an optional alert box at the top of the page, to put
+ web-site messages, alerts, new-flashes etc.
+ It contains the content of the [TitleBox] JSPWiki page.
+ Keep the styling minimal, as the TitleBox page itself can add any style it wants.
+*/
+//.titlebox { }
+
+
+/*
+Section: Header & Footer
+ See Header.jsp, SearchBox.jsp, UserBox.jsp, Footer.jsp
+
+DOM structure:
+(start code)
+ div.header
+ div.topline
+ div.application-logo
+ a.logo.href jspÏiki //link to the home page of this wiki
+
+ div.userbox
+ div.btn
+ span.icon-user
+ span.caret
+
+ ul.dropdown-menu[data-hover-parent="userbox"]
+ li
+ label.username.anonymous|asserted|authenticated
+ li
+ a.btn.btn-link.login|logout Log-in
+ a.btn.btn-link.prefs Prefs
+
+ form#searchform.searchbox.pull-right.form-inline
+ input#query.form-control[type="text"][placeholder="Quick Navigation"]
+
+ button#searchSubmit.btn[type="submit"]
+
+ ul.dropdown-menu.pull-right[data-hover-parent="searchbox"]
+ li
+ li.findpages ...
+ li.divider
+ li.recents ...
+ li.recents.clear ...
+
+
+ div.pagename
+ div.breadcrumbs
+
+ ...
+
+ div.footer
+ div.application-logo
+ div.copyright
+ div.wikiversion JSPWiki version-number
+ a.feed
+(end)
+*/
+
+.container-fluid {
+ //margin:0 1em;
+
+ .header > * {
+ padding-right:@padding-base-horizontal;
+ }
+
+ > .row > ul.nav {
+ padding-right: @padding-base-horizontal;
+ }
+
+ .page-content { margin:0 @padding-base-horizontal; }
+
+}
+
+.header, .footer {
+ .clearfix();
+ position: relative;
+ font-family: @wiki-header-font-family;
+ font-weight: 200;
+ letter-spacing: 1px;
+ color: @wiki-header-color;
+ a { color:inherit; }
+
+ background-color:@wiki-header-bg;
+ #gradient .radial(@wiki-header-bg; darken(@wiki-header-bg,20%));
+
+ //background-image:url(images/background.jpg); //todo: read it from a cookie or so
+ background-size:cover; //or contain;
+ //background-position:50% 0;
+ //background-repeat:no-repeat;
+ background-attachment:fixed; //default=scroll
+
+ > * {
+ padding: @padding-base-horizontal/4 0 @padding-base-horizontal/4 @padding-base-horizontal;
+ }
+}
+
+.topline {
+ .clearfix();
+ border-bottom: 1px solid rgba(255,255,255,0.1);
+ .btn [class^="icon-"]:before { font-size: 1.3em; }
+}
+
+a.logo {
+ position: relative;
+ display:block;
+ font-family: @wiki-logo-font-family;
+ font-size:75%; //@font-size-base* .75
+ font-weight: 200;
+ letter-spacing: 3px;
+ text-decoration: none;
+ padding:1px 1px @font-size-base 3px;
+ //border:1px solid @white;
+ //border-radius:.5em;
+ color:inherit;
+
+ b {
+ position: absolute;
+ font-size: 150%; //@font-size-base
+ font-weight: 200;
+ line-height: 50%;
+ letter-spacing: 1px;
+ left: 0; top: 1em;
+ padding:0 3px;
+ }
+}
+
+
+.header .pagename,
+.header .breadcrumb {
+ .text-overflow();
+
+}
+
+.pagename {
+ font-family: @wiki-logo-font-family;
+ font-size: 3em;
+ text-align: center;
+ a { text-decoration:none; }
+}
+
+//JSPWiki-s breadcrumb - do not inherit bootstraps breadcrumbs
+.breadcrumb {
+ .small;
+ .transition(all .5s ease);
+ color:transparent;
+
+ .divider:before {
+ content:"\2022"; //•
+ padding:0 .25em;
+ }
+}
+.header:hover .breadcrumb {
+ color:inherit;
+ //background:rgba(255,255,255,0.05);
+}
+
+.footer {
+ //background: @wiki-footer-bg;
+ padding:@padding-base-vertical @padding-base-horizontal;
+ text-align: center;
+
+}
+
+.copyright, .wiki-version { .small; }
+
+
+.feed {
+
+ //.@{fa-css-prefix};
+ display:inline-block;
+ font-family:FontJspwiki;
+ font-style: normal;
+ font-weight: normal;
+ line-height: 1;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ text-decoration:none;
+
+ &:before { content: "\e610"; } //fixme -- re-use .icon-search
+ &:hover { text-decoration:none; }
+
+ overflow:hidden;
+ vertical-align:middle;
+}
+
+
+// CHECKME
+// *** ConflictContent.jsp ***
+// #conflict
+// #conflictother
+// #conflictown
+
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tips.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tips.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tips.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Tips.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,54 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Style: Tips
+
+Wiki-markup:
+> %%tip ... /%
+> %%tip-TipCaption ... /%
+
+DOM structure:
+ (start code)
+ span.tip.anchor "Tip Caption"
+
+ div style="...show/hide..." //FIXME
+ div.tip-top
+ div.tip
+ div.tip-title "Tip Caption"
+ div.tip-text " ...tip-body... "
+ div.tip-bottom
+ (end)
+
+Bootstrap
+(start code)
+ div.tooltip.(top|left|right|bottom)
+ div.tooltip-inner
+ div.tooltip-arrow
+(end)
+*/
+
+.tip-link {
+ .category-link;
+ > [class^=tip] { .hidden; }
+}
+
+@tooltip-bg: rgba(0,0,0,.7);
+@tooltip-arrow-color: rgba(0,0,0,.7);
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Carousel.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Carousel.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Carousel.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Carousel.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,75 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Dynamic Style: Viewer.Carousel
+
+DOM Structure:
+ (start code)
+ div.carousel
+ div.carousel-progress
+ ol.carousel-indicators
+ li.active
+ li
+ div.carousel-inner(.spin) //img, object or iframe element is inserted here
+ div.item.active
+ <img..>
+ div.carousel-caption
+ div.item
+ a.controls.next
+ a.controls.prev
+ (end)
+*/
+
+//reuse bootstrap/carousel.less
+.carousel {
+
+ .viewport;
+ width:auto;
+ //overflow:hidden;
+
+ //reveal indicators even on white backgrounds.
+ &:hover .carousel-indicators li { .box-shadow(@carousel-text-shadow); }
+
+ //only show the caption when hovering the mouse
+ .carousel-caption { .opacity(0); .transition(.6s ease); }
+ &:hover .carousel-caption { .opacity(1); }
+
+ // reuse slimbox .controls, iso .carousel-controls , with simplified styling
+ .controls {
+ &.prev { left: .5em; }
+ &.next { right: .5em; }
+ }
+ &:hover .controls { .opacity(@slimbox-control-opacity); }
+
+}
+
+.carousel-progress {
+ position:absolute;
+ bottom:0;
+ background:fade(@red,50%);
+ height:3px;
+ z-index:1;
+ width:0%;
+}
+.sliding > .carousel-progress {
+ .transition(width 10s linear);
+ width:100%;
+}
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,233 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Plugin: Viewer.Slimbox
+ SLIMBOX is a modal viewer for images, video, wikipages and external sites (iframe)
+
+Credit:
+ Inspired by Slimbox by Christophe Bleys (see http://www.digitalia.be/software/slimbox)
+ and the mediaboxAdvanced by John Einselen. (see http://iaian7.com/webcode/mediaboxAdvanced)
+ Adapted for JSPWIKI.
+
+DOM Structure:
+ DOM structure of the Slimbox viewer.
+ (start code)
+ div#slmbx
+ div.modal //shaded background for viewport
+ div.viewport(.spin) //img, object or iframe element is inserted here
+ a.controls.caption
+ a.controls.next
+ a.controls.prev
+ a.controls.close
+ (end)
+
+*/
+
+/*
+//slimbox button icon (right pointing triangle), added next to a slimbox activated link
+.slimbox-link:after { content:" "; }
+.slimbox-link:after,
+.slimbox-btn {
+
+ .caret();
+ border-left: @slimbox-btn-size solid @link-color;
+ border-top: @slimbox-btn-size/2 solid transparent;
+ border-bottom: @slimbox-btn-size/2 solid transparent;
+ border-right:0;
+ margin-left: @slimbox-btn-size/2;
+ &:hover { border-left-color: @link-hover-color; }
+
+ //overwrite button defaults
+ padding: 0;
+ background: transparent;
+ -webkit-appearance: none;
+
+}
+*/
+//slimbox button icon-slimbox
+.slimbox-btn {
+ //overwrite button defaults
+ padding: 0;
+ background: transparent;
+ -webkit-appearance: none;
+ border:0;
+}
+.slimbox-link:after,
+.slimbox-btn:before {
+ // copied from font/jspwiki/core.less
+ // fixme: better use .icon-slimbox ?
+ font-family: 'FontJspwiki';
+ font-style: normal;
+ font-weight: normal;
+
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+
+ color:@link-color;
+ margin-left:.25em;
+
+ content: "\e617";
+ &:hover { text-decoration:none; }
+ overflow:hidden;
+
+ position:relative;
+ top:.1em;
+}
+
+
+.slmbx {
+
+ display:none;
+ .transition(all 2s ease);
+
+ &.active { display:block; z-index:10; }
+
+ //modal transparent screen overlag -- TODO: reuse bootstrap/modal.less
+ .slmodal {
+ position:fixed;
+ _position:absolute; // check ie6
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ .opacity(0);
+
+ cursor:pointer;
+ background-color: @modal-backdrop-bg;
+ // Fade for backdrop
+ //&.fade { .opacity(0); }
+ //&.in { .opacity(.5); }
+ }
+ &.active .slmodal { .opacity(.5); }
+
+ //modal viewport..
+ .viewport {
+ position:fixed;
+ _position:absolute; // ie
+ z-index:10;
+
+ margin:0;padding:0;border:none; //reset some viewer .viewport styles
+
+ // centered viewport, slimbox.js will set width, height, and negative margins
+ top:50%;
+ left:50%;
+ min-height:200px;
+ min-width:200px;
+
+ // transitions to support smooth background-image replacement and height/width resizing
+ .transition(all .4s ease);
+
+ // default background setting, the actual background-image is set by slimbox.js
+ background:transparent no-repeat center center;
+
+ .box-shadow (@slimbox-viewport-corona);
+
+ &:hover .controls { .opacity(@slimbox-control-opacity); }
+
+ &.loading .caption {
+ #gradient > .striped(@gray-lighter);
+ background-size: 40px 40px;
+ .animation(progress-bar-stripes 2s linear infinite);
+ }
+ }
+}
+
+.controls {
+
+ position:absolute;
+ .opacity(0); //only visible on hover
+ .transition(all 1s ease); //smooth appearance on mouse hover
+
+ font-family: @slimbox-font-family;
+ color: @slimbox-text-color;
+ background: @slimbox-control-bg;
+ .box-shadow (@slimbox-viewport-corona);
+ cursor:pointer;
+
+ text-align: center;
+ text-shadow: @slimbox-text-shadow;
+ text-decoration: none;
+
+ &:hover, &:focus {
+ //.opacity(1);
+ opacity:1 !important;
+ outline: none;
+ color: @slimbox-text-color;
+ text-decoration: none;
+ .opacity(.9);
+ }
+
+ &.next, &.prev, &.close {
+ font-family: @slimbox-control-font-family;
+ line-height: @slimbox-control-line-height;
+ font-size: @slimbox-font-size;
+ font-weight: 200; //overwrite bold style of bootstrap/close.less
+ min-width: @slimbox-font-size;
+ height: @slimbox-font-size;
+
+ border-radius: @slimbox-font-size;
+ left: -@slimbox-font-size/2;
+ }
+ &.next, &.prev { top:50%; margin-top:-@slimbox-font-size/2; }
+ &.next { left:auto; right:-@slimbox-font-size/2; }
+ &.close { top:-@slimbox-font-size/2; }
+
+ &.caption {
+ top:100%;
+ width:100%;
+ padding:.25em;
+ margin:2px 0 0 0;
+ }
+
+}
+
+
+
+/*
+.slmbx iframe {
+ width:100%;
+ height:100%;
+ overflow:hidden; // make sure to hide overflow during resize transition
+ background:@white;
+ //scrolling:overflow;
+ -webkit-overflow-scrolling: touch; //bounce effect on ios devices
+}
+iframe::-webkit-scrollbar { width: .5em; height: .5em; }
+iframe::-webkit-scrollbar-button { display:none; }
+iframe::-webkit-scrollbar-track {
+ background:#eee;
+ //-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+}
+//iframe::-webkit-scrollbar-track-piece { }
+iframe::-webkit-scrollbar-thumb {
+ -webkit-border-radius: .5em;
+ -moz-border-radius: .5em;
+ border-radius: .5em;
+ background:#ccc;
+ -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.5);
+ -moz-box-shadow: inset 0 0 6px rgba(0,0,0,.5);
+ box-shadow: inset 0 0 6px rgba(0,0,0,.5);
+}
+//iframe::-webkit-scrollbar-thumb { }
+//iframe::-webkit-scrollbar-thumb { }
+//iframe::-webkit-scrollbar-corner { }
+//iframe::-webkit-resizer { }
+*/
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,61 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Plugin: Viewer
+ This plugin allows inline viewing of images, video, wikipages and external sites (iframe)
+
+Example:
+ - %%viewer [link to youtube...] /%
+ - [description | url to youtube... | class='viewer']
+
+DOM Structure:
+ (start code)
+ div.viewer
+ a.href
+ (end)
+
+ (start code)
+ div.viewer
+ iframe.viewport or object.viewport or img.viewport
+ (end)
+*/
+
+.viewport {
+ margin: 0 0 (@line-height-computed / 2); //inherit from p (bootstrap/style.less)
+
+ .box-shadow(0 3px 10px rgba(0, 0, 0, 0.175));
+
+ min-height:200px;
+ min-width: 200px;
+ max-width: 100%; //shrink images to 100% width of the parent element, if needed
+
+}
+
+//During loading, iframes are temporarily added to the body -- but not displayed
+//After loading, the iframes are put into the viewport by js.
+body > iframe { .hidden; }
+
+//avoid that the default background of an iframe is transparent, and contents becomes unreadible
+//(eg needed for View Page Source
+.viewport iframe {
+ background-color:fade(@white,92%);
+ padding:.5em;
+}
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,89 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Style: WeblogPlugins
+ Styling of weblogs and weblogarchive plugins
+
+DOM structure:
+(start code)
+(end)
+*/
+.weblog {
+ margin:0 2em;
+ clear:both;
+}
+.weblogentry {
+ margin:0.5em 0;
+}
+.weblogentryheading {
+ padding:0.25em 0.5em;
+ font-size:90%;
+ background:#e0e0e0;
+ float:right;
+}
+.weblogentrytitle {
+ padding:0.25em 0.5em;
+ font-size:120%;
+ line-height:1.2;
+ font-weight:bold;
+ background:#e0e0e0;
+}
+.weblogentrybody {
+ margin-left:0.5em;
+ clear:both;
+}
+.weblogentryfooter {
+ font-size:90%;
+ padding:0.25em 0.5em;
+ border-bottom:3px solid #e0e0e0;
+ clear:both;
+}
+/*.weblogarchive {
+}
+.weblogarchive ul {
+}*/
+.weblogarchive li {
+ margin-left:1em;
+ display:block;
+ list-style-type:none;
+}
+.archiveyear {
+ font-weight:bold;
+ text-decoration:none;
+ margin-left:0 !important;
+}
+.archiveyear:after {
+ content:" AD"
+}
+
+.weblogcommentstitle {
+ background:#e0e0e0;
+ margin:1em 0.5em 0 0.5em;
+ padding:0.5em;
+ font-weight:bold;
+ font-size:120%;
+ line-height:1.1;
+}
+.weblogcomments {
+ background:#f9f9f9/*#COMMENT#*/;
+ margin:0 0.5em 1em 0.5em;
+ padding:1em;
+}
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,166 @@
+/*!
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Stylesheet: JSPWiki
+ This is the JSPWiki stylesheet of the HADDOCK template.
+ Where possible, it extends from bootstrap 3.0.0.
+
+ Skins : TODO
+
+ Bootstrap .less files are imported unchanged, so future upgrades are easy.
+ ( ./bootstrap/<file>.less )
+ In some cases, JSPWiki variants of the .less file overwrite the bootstrap styles.
+ Specific JSPWikis styles are covered by dedicated .less files
+ such as JSPWiki Templates, JSPWiki Plugins, JSPWiki Dynamic Styles etc.
+*/
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */
+
+// Core variables and mixins
+@import "../bootstrap/variables.less";
+@import "../bootstrap/mixins.less";
+
+// Reset
+@import "../bootstrap/normalize.less";
+//@import "../bootstrap/print.less";
+
+// Core CSS
+@import "../bootstrap/scaffolding.less";
+@import "../bootstrap/type.less";
+@import "../bootstrap/code.less";
+//@import "../bootstrap/grid.less";
+
+@import "../bootstrap/tables.less";
+@import "../bootstrap/forms.less";
+@import "../bootstrap/buttons.less";
+
+// Components: common
+//@import "../bootstrap/glyphicons.less";
+//@import "../fontawesome/font-awesome.less";
+
+//@import "../bootstrap/component-animations.less";
+@import "../bootstrap/input-groups.less";
+@import "../bootstrap/dropdowns.less";
+@import "../bootstrap/list-group.less";
+@import "../bootstrap/panels.less";
+//@import "../bootstrap/wells.less";
+@import "../bootstrap/close.less";
+
+// Components: Nav
+@import "../bootstrap/navs.less";
+//@import "../bootstrap/navbar.less";
+@import "../bootstrap/button-groups.less";
+//@import "../bootstrap/breadcrumbs.less";
+//@import "../bootstrap/pagination.less";
+//@import "../bootstrap/pager.less";
+
+// Components: Popovers
+@import "../bootstrap/modals.less";
+@import "../bootstrap/tooltip.less";
+@import "../bootstrap/popovers.less";
+
+// Components: Misc
+@import "../bootstrap/alerts.less";
+//@import "../bootstrap/thumbnails.less";
+//@import "../bootstrap/media.less";
+@import "../bootstrap/labels.less";
+@import "../bootstrap/badges.less";
+@import "../bootstrap/progress-bars.less";
+//@import "../bootstrap/accordion.less";
+@import "../bootstrap/carousel.less";
+//@import "../bootstrap/jumbotron.less";
+
+//JSPWiki updates
+
+//JSPWiki Core variables and mixins
+@import "variables.less";
+//JSPWiki Reset
+@import "print.less";
+//JSPWiki Core CSS
+@import "type.less";
+@import "grid.less";
+@import "tables.less";
+@import "TableX.Sort.less";
+@import "TableX.Filter.less";
+@import "forms.less";
+//JSPWiki Components: common
+@import "../fontjspwiki/font-jspwiki.less";
+//@import "dropdown.less";
+//JSPWiki Components: Nav
+@import "pagination.less";
+//JSPWiki Components: Popovers
+@import "Tips.less";
+//JSPWiki Components: Misc
+@import "Viewer.less";
+@import "Viewer.Slimbox.less";
+@import "Viewer.Carousel.less";
+
+
+// JSPWiki: Template specific styles
+@import "Template.View.less";
+@import "Template.UserBox.less";
+@import "Template.SearchBox.less";
+@import "Template.Nav.less";
+@import "Template.Content.less";
+@import "Template.Sidebar.less";
+@import "Template.Attach.less";
+@import "Template.Diff.less";
+@import "Template.Search.less";
+
+// TODO:move to separate jspwiki-edit.less ?
+@import "Template.Edit.less";
+@import "Dialog.less";
+
+@import "Template.Preview.less";
+
+// JSPWiki: Plugins
+@import "ImagePlugin.less";
+@import "IndexPlugin.less";
+@import "TOCPlugin.less";
+@import "WeblogPlugin.less";
+@import "RecentChangesPlugin.less";
+
+// JSPWiki: Taglib
+@import "Calendar.less";
+
+// JSPWiki: Dynamic Styles
+@import "CommentBox.less";
+@import "GraphBar.less";
+@import "Tabs.less";
+@import "Accordion.less";
+@import "Columns.less";
+@import "Collapsible.less";
+@import "Category.less";
+
+@import "Flip.less";
+
+@import "prettify.less";
+
+// Utility classes
+@import "../bootstrap/utilities.less"; // Has to be last to override when necessary
+@import "../bootstrap/responsive-utilities.less";
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/build.less
------------------------------------------------------------------------------
svn:executable = *
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/forms.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/forms.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/forms.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/forms.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,83 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Forms:
+ Including Labels, form-values and form-help.
+
+ Also the general formatting of fieldset, legends is defined here.
+*/
+// Based on bootstrap/forms.less
+
+
+.form-frame {
+ border: 1px solid @legend-border-color;
+ border-radius: @border-radius-base;
+ padding: (@grid-gutter-width / 2) (@grid-gutter-width / 2) 0 ;
+ margin-bottom: @line-height-computed;
+}
+
+// Additional classes -- simplified stuff, borrowing from grid.less
+.form-col-small, .form-col-wide {
+ //see bootstrap/mixins .make-grid()
+ position: relative;
+ // Prevent columns from collapsing when empty
+ min-height: 1px;
+ // Inner gutter via padding
+ padding-left: (@grid-gutter-width / 2);
+ padding-right: (@grid-gutter-width / 2);
+
+ float:left;
+
+ &[type="file"] { padding:0; }
+}
+.form-col-20 { width: 20%; display:inline-block; }
+.form-col-25 { width: 25%; display:inline-block; }
+.form-col-50 { width: 50%; display:inline-block; }
+.form-col-75 { width: 75%; display:inline-block; }
+.form-col-80 { width: 80%; display:inline-block; }
+.form-col-offset-20 { margin-left: 20%; }
+
+
+// hacking some improved dropdown select style
+.form-group select {
+
+ -webkit-appearance: none; //remove default safari and chrome style
+ -moz-appearance: none; //remove default firefox style
+
+ background: url('@{imagePath}/form-select-arrow.png') no-repeat; //replace arrow
+ background-position: @padding-base-horizontal center;
+ text-indent: 0.01px; //remove default arrow from firefox
+ text-overflow: ''; //remove default arrow from firefox
+
+ //inherit styles from .btn
+ cursor: pointer;
+ border: 1px solid transparent;
+ padding: @padding-base-vertical @padding-base-horizontal @padding-base-vertical @padding-base-horizontal+16;
+ border-radius: @border-radius-base;
+
+ //inherit styles from .btn-default
+ color: @btn-default-color;
+ border-color: @btn-default-border;
+ background-color: @btn-default-bg;
+
+}
+/* CHECKME IEfix ?? .from-group select::-ms-expand { display: none; } */
+
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/grid.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/grid.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/grid.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/grid.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,44 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+// 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();
+}
+.col-50 {
+ width:50%; float:left;
+}
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/pagination.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/pagination.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/pagination.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/pagination.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,58 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Style: JSPWiki Pagination
+ Used by InfoContent.jsp, AttachementTab.jsp
+
+DOM Structure
+(start code)
+ div.pagination "Pagination"
+ span.cursor 1
+ a[onclick...] 2
+ ...
+ (Total items: nn)
+(end)
+BOOTSTRAP structure (not used)
+(start code)
+ ul.pagination
+ li.disabled a «
+ li.active
+ a 1
+ span.sr-only (current)
+ ...
+(end)
+*/
+.pagination {
+ margin: @line-height-computed 0;
+ padding: @padding-base-vertical @padding-base-horizontal;
+ background-color: @pagination-bg;
+ border: 1px solid @pagination-border;
+ border-radius: @border-radius-base;
+
+ a, .cursor {
+ padding:0.5em;
+ border:1px solid transparent;
+ }
+ .cursor, a:hover {
+ background-color:@pagination-border;
+ border: 1px solid @pagination-border;
+ }
+}
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/prettify.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/prettify.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/prettify.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/prettify.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,81 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Style: Prettify
+ Pretty printing styles for the code-coloring PRE blocks.
+ Used with prettify.js. (version 3 mar 2013)
+
+Credit:
+ http://code.google.com/p/google-code-prettify/
+
+DOM structure:
+> <pre class="prettyprint"> ... </pre>
+
+*/
+
+// SPAN elements with the classes below are added by prettyprint.
+.pln { color: #000; } /* plain text */
+
+@media screen {
+ .str { color: #489a1b; /*080*/ } /* string content */
+ .kwd { color: #1b609a; /*008*/ } /* a keyword */
+ .com { color: #888; /*800*/ } /* a comment */
+ .typ { color: #606; } /* a type name */
+ .lit { color: #066; } /* a literal value */
+ /* punctuation, lisp open bracket, lisp close bracket */
+ .pun, .opn, .clo { color: #660; }
+ .tag { color: #008; } /* a markup tag name */
+ .atn { color: #606; } /* a markup attribute name */
+ .atv { color: #080; } /* a markup attribute value */
+ .dec, .var { color: #606; } /* a declaration; a variable name */
+ .fun { color: red; } /* a function name */
+}
+
+// Use higher contrast and text-weight for printable form.
+@media print, projection {
+ .str { color: #060; }
+ .kwd { color: #006; font-weight: bold; }
+ .com { color: #600; font-style: italic; }
+ .typ { color: #404; font-weight: bold; }
+ .lit { color: #044; }
+ .pun, .opn, .clo { color: #440; }
+ .tag { color: #006; font-weight: bold; }
+ .atn { color: #404; }
+ .atv { color: #060; }
+}
+
+// linenumbers - added for jspwiki
+pre.prettylines {
+ float: left;
+ overflow-x: hidden;
+ margin: 0;
+ color: @gray-light;
+ text-align: right;
+ background: none;
+ border-color: transparent;
+ .user-select(none);
+}
+
+//pre & code blocks have clear:both;
+.prettyprint {
+ clear: right; //allow left floating of .prettylines
+ overflow-x: scroll;//make sure a line does not wrap, to keep pagenumbers well aligned
+ white-space: pre; //overwrite default 'pre-wrap'
+ word-wrap: normal; //overwrite default 'break-word'
+}
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,190 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+/*
+Section: Print-media
+ Styles to improve the page rendering during printing.
+ Printing displays the page-titel and page-content; other blocks
+ like the favorites, login-sections, search box, menu dropdowns etc. are hidden.
+
+ Tabbed sections are printed one after the other.
+ Accordion sections are printed one after the other.
+*/
+
+@media print {
+
+/*
+Inherit parts of Bootstrap:print.less ;
+*/
+//
+// Basic print styles
+// --------------------------------------------------
+// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
+
+ * {
+ text-shadow: none !important;
+ //color: #000 !important; // Black prints faster: h5bp.com/s
+ //background: transparent !important;
+ box-shadow: none !important;
+ }
+
+ a,
+ a:visited {
+ text-decoration: underline;
+ }
+
+ a[href]:after {
+ content: " (" attr(href) ")";
+ font-size:85%;
+ color:grey;
+ font-family:"Courier New", Courier, mono; font-size:8pt;
+ }
+
+ // Dont show links for images, or javascript/internal links
+ a[href^="javascript:"]:after,
+ a[href^="#"]:after {
+ content: "";
+ }
+
+ pre,
+ blockquote {
+ //border: 1px solid #999;
+ page-break-inside: avoid;
+ }
+
+ thead {
+ display: table-header-group; // h5bp.com/t
+ }
+
+ tr,
+ img {
+ page-break-inside: avoid;
+ }
+
+ img {
+ max-width: 100% !important;
+ }
+
+ @page {
+ margin: 2cm .5cm;
+ }
+
+ p,
+ h2,
+ h3 {
+ orphans: 3;
+ widows: 3;
+ }
+
+ h2,
+ h3 {
+ page-break-after: avoid;
+ }
+
+ // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
+ // Once fixed, we can just straight up remove this.
+ select {
+ background: #fff !important;
+ }
+
+ // Bootstrap components
+ .navbar {
+ display: none;
+ }
+
+/*
+ .table {
+ td,
+ th {
+ background-color: #fff !important;
+ }
+ }
+ .btn,
+ .dropup > .btn {
+ > .caret {
+ border-top-color: #000 !important;
+ }
+ }
+ .label {
+ border: 1px solid #000;
+ }
+*/
+
+ table, tt,pre {
+ overflow:visible;
+ page-break-before: avoid;
+ page-break-inside: avoid;
+ }
+
+ .table {
+ border-collapse: collapse !important;
+ }
+ .table-bordered {
+ th,
+ td {
+ border: 1px solid #ddd !important;
+ }
+ }
+
+
+/*
+JSPWiki print-specific styles
+*/
+.watermark, .logo, .titlebox, .searchbox, .breadcrumb, .nav, a.feed[href],
+.edit-section, .hashlink, .filter-input, .slmbx,
+a[href='#top'] {
+ display:none;
+}
+.header , .footer {
+ background:transparent !important;
+ color:#000 !important;
+}
+.header { border-bottom:1px solid #555; }
+.footer { border-top:1px solid #555; }
+
+
+/* hidden tabs are made visible during print
+ * when printing a page, also the attachment tab gets printed
+ */
+.tabmenu {
+ display:block;
+ visibility:visible;
+}
+.hidetab {
+ display:block;
+ margin:1em 0;
+}
+.tabs { border:none; }
+//todo : open all accordion sections
+
+
+//CHECK -- ff bug : avoid floats during printing
+//.commentbox { float:none; }
+
+//FIXME: Page-break: force a new page with the explicit %%page-break style.
+.page-break {
+ //height:0;
+ page-break-before:always;
+ //border:none;
+ margin:0;
+}
+
+
+} /* end of @media print */
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/tables.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,80 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+// Tables
+// Inherit from bootstrap/tables.less, with some minor tweaks
+
+// JSPWiki generates by default <table border="1">
+// BETTER: remove the border="1" from wikitables, and leave styling upto the css boys
+table[border="1"],
+table[border="1"] th,
+table[border="1"] td { border:0; }
+
+.wikitable {
+
+ .table(); //inherit from bootstrap
+
+ // JSPWiki does not generate thead or tbody elements.
+ // Remove the top border from thead by default
+ // and add 2px to the bottom border for header rows
+ tr:first-child {
+ th, td {
+ border-top: 0;
+ }
+ th {
+ border-bottom: 2px solid @table-border-color;
+ }
+ }
+
+
+ &.table-fit { width:auto; }
+
+}
+
+.table-condensed .wikitable {
+
+ th, td { padding: @table-condensed-cell-padding; }
+
+}
+
+.table-bordered {
+ border:none;
+
+ .wikitable {
+ border: 1px solid @table-border-color;
+
+ tr:first-child {
+ th, td { border-top: 1px solid @table-border-color; }
+ }
+ }
+}
+
+.table-fit .wikitable { width:auto; }
+
+.table-striped .wikitable {
+ > tbody > tr:nth-child(odd) {
+ > td,
+ > th {
+ background-color: @table-bg-accent;
+ }
+ }
+}
+//zebra-table default striping ; adopt default color of bootstrap
+[class*=zebra] .odd { background-color: @table-bg-accent; }
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,420 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+
+//bootstrap
+p, .p {
+ margin: 0 0 (@line-height-computed / 2);
+}
+
+/*
+Headings:
+ The headings h2, h3 and h4 get a {{clear:left}} so they can appear
+ side by side with .commentboxes.
+
+ The {{.editsection}} and {{.hashlink}} define the styling of the
+ [[Edit] and # hash-hover link on each heading.
+
+DOM structure:
+(start code)
+ h2[id="section-..."] Header-Title
+ a.hashlink #
+ a.edit-section[href="...§ion=0"] [Edit]
+(end)
+*/
+
+.hashlink { margin-left: 1em; }
+.edit-section, .hashlink {
+
+ .btn; .btn-default; .btn-xs;
+ margin-right: .25em;
+ .transition(all 1s ease);
+ &:hover { .opacity(1); border-color:transparent; }
+
+}
+h2,h3,h4 {
+
+ .edit-section, .hashlink { .opacity(0); }
+ &:hover {
+ .edit-section, .hashlink { .opacity(.5); }
+ }
+
+}
+
+.sidebar .hashlink, .sidebar .editsection, .panel-title .hashlink { .hidden; }
+
+
+
+b, i {
+ color:inherit;
+}
+
+//used by HighlightQuery, TableX.Filter, ...
+mark,
+.highlight {
+ background-color: @highlight !important;
+}
+
+
+//CHECKME
+br { clear: both; }
+
+
+//CHECKME
+.tree, .tree ul {
+ list-style: none;
+}
+.tree ul li {
+ position: relative;
+}
+/* Inspired by: VM UI Framework */
+/* horizontal connecting lines */
+.tree ul li::before {
+ background: #222;
+ content: '';
+ height: 0.2em;
+ left: -1.5em;
+ position: absolute;
+ top: 0.9em;
+ width: 1em;
+}
+/* vertical connecting lines */
+.tree ul li::after {
+ background: #222;
+ content: '';
+ height: 100%;
+ left: -1.5em;
+ position: absolute;
+ top: 0;
+ width: 0.2em;
+}
+/* closing vertical connecting corner */
+.tree ul li:last-child::after {
+ height: 1em;
+}
+
+//dl { .dl-horizontal; }
+dl dd { margin-left:2em; } //reset flat style of bootstrap/type
+
+
+.hr {
+ display: block;
+ margin-top: 10px 0;
+ border: 0;
+ border-top: 1px solid #eeeeee;
+}
+
+
+/*
+PRE and xflow:
+ Pre-formatted text and code blocks.
+
+ pre - preformatted block
+ .pre - preformatted inline block
+ tt - teletype, monospace inline block
+
+ The ''.xflow'' class ensures a browser compatible overflow of wide content.
+ By default the page height depends on the content, the width should not
+ go beyond the width of the display. So, if needed, add a horizontal scroll bar.
+ Does have some IE specific hacks.
+
+ Applicable to preformatted blocks (pre, tt, code), and the main page content
+ elements such as #pagecontent, #findcontent, #info, #attach, ...
+
+*/
+
+
+//inline code: jspwiki uses <tt> ; styles copied from bootstrap/code.less
+tt {
+ padding: 2px 4px;
+ font-size: 90%;
+ color: @code-color;
+ background-color: @code-bg;
+ white-space: nowrap;
+ border-radius: @border-radius-base;
+}
+// => reuse styling of pre
+
+//list-unstyled : bootstrap
+//list-hover
+.list-hover {
+ li:hover {
+ background-color:@dropdown-link-hover-bg;
+ a { text-decoration:none; }
+ }
+}
+.list-nostyle { list-style: none; }
+
+
+
+/*
+Links:
+ The reusable {{.hover}} class provides generic support for
+ mouse-hover styling on any DOM element. (IE only supports :hover on <a>)
+
+> a:link { ... }
+> a:hover { ... }
+> a:focus { ... }
+> a:visited { ... }
+> a:active { ... }
+
+> a.wikipage
+> a.external
+> a.interwiki
+> a.createpage
+*/
+
+
+//generic behavior -- why not part of bootstrap ??
+a:hover { cursor:pointer; }
+
+//mimic :hover, for old ie cases which may not yet support :hover
+.hover { background-color:@wiki-hover; }
+
+.createpage {
+ color: @wiki-link-createpage;
+ border-bottom: 1px dashed @wiki-link-createpage;
+ &:hover {
+ color:darken(@wiki-link-createpage,10%);
+ text-decoration:none;
+ }
+}
+
+.infolink {
+ display:inline-block;
+ width:16px; height:16px;
+ vertical-align:text-bottom;
+}
+
+//TODO: Overrule standard small red arrow; replace by ... FIXME
+img.outlink { display:none; }
+a.external:after {
+ content: "\279A";
+ //content: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVklEQVR4Xn3PgQkAMQhDUXfqTu7kTtkpd5RA8AInfArtQ2iRXFWT2QedAfttj2FsPIOE1eCOlEuoWWjgzYaB/IkeGOrxXhqB+uA9Bfcm0lAZuh+YIeAD+cAqSz4kCMUAAAAASUVORK5CYII=");
+ //content:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAMAAADXEh96AAAAB3RJTUUH0wMUEC8DV5a0ngAAAAlwSFlzAAAK8AAACvABQqw0mAAAAwBQTFRFAAAAgAAAAIAAgIAAAACAgACAAICAwMDAwNzApsrw/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////vwoKCkgICA/wAAAP8A//8AAAD//wD/AP//////9ptMMgAAAAt0Uk5T/////////////wBKTwHyAAAAG0lEQVR42mPg4voJBAxcYJoBxgMSXGAKKA6lALPeEyZVnxeBAAAAAElFTkSuQmCC);
+}
+
+
+/*
+Interwiki link
+ Reader : show pages without sidebar,minimal header/footer
+ <a class="interwiki" href="Wiki.jsp?page=XXX&skin=reader">XXX</a>
+*/
+a.interwiki[href$="skin=reader"]:hover {
+ border-bottom: 1px dashed @link-hover-color;
+}
+a.interwiki[href$="skin=raw"]:hover {
+ border-bottom: 1px dotted @link-hover-color;
+}
+
+
+/*
+Footnotes
+*/
+.footnote, .footnoteref {
+ .small;
+ vertical-align:super;
+}
+.footnoteref { padding:0 .3em; }
+
+/*
+Images
+*/
+img {
+ border:0;
+ &.inline { .img-responsive; /*max-width:100%;*/ }
+}
+//img.inline
+//img.outlink
+//img.attlink
+
+// Utility class to support un-scaled, scrollable images,
+.scroll, .xflow {
+ overflow:scroll;
+
+ pre, img.inline { width:auto; max-width:none; }
+
+ pre { white-space: nowrap; }
+}
+
+
+
+/*
+Section: Reusable Styles
+ Various reusable css classes for small text, sub- and super-text,
+ strike-through formatting, centered text, quotes, ....
+
+ The standard error, warning and information boxes are defined here as well.
+*/
+
+//.sub { .small; vertical-align:sub; }
+//.sup { .small; vertical-align:super; }
+// Prevent impact on line-height See http://css-tricks.com/snippets/css/prevent-superscripts-and-subscripts-from-affecting-line-height/
+.sup, .sub {
+ .small;
+ //vertical-align: baseline; //standard.
+ position: relative;
+ top: -0.4em;
+}
+.sub { top: 0.4em; }
+
+
+.strike { text-decoration:line-through; }
+
+//see also bootstrap .text-center
+.center {
+ text-align:center;
+ table { text-align:left; }
+}
+
+// %%dropcaps .. /%
+// CSS3: div.dropcap:first-child:first-letter. See http://css-tricks.com/snippets/css/drop-caps/
+div.dropcaps {
+ .p;
+ > span.dropcaps {
+ float:left;
+ color:@dropcaps-color;
+ padding:0 @table-cell-padding;
+ font-family:@dropcaps-font-family;
+ font-size:@dropcaps-font-size;
+ font-weight:@dropcaps-font-weight;
+ line-height:80%;
+ text-shadow:2px 2px 1px rgba(0,0,0,.25);
+ }
+}
+
+
+//%%quote .. /%
+//.quote is replaced by <blockquote>, to reuse bootstraps styling
+
+.page-break {
+ display:block;
+ height:2px;
+ /*background:url(page-break.jpg) 0 center repeat-x; */
+ border-top:2px dashed @table-border-color;
+ margin:1em 0;
+
+ &:hover:after {
+ content:"page break";
+ text-align:center;
+ display:block;
+ color:@table-border-color;
+ .small;
+ }
+
+}
+
+//checkme - should be defined in bootstrap
+.bg-success { background-color: @state-success-bg; }
+.bg-info { background-color: @state-info-bg; }
+.bg-warning { background-color: @state-warning-bg; }
+.bg-danger { background-color: @state-danger-bg; }
+
+
+.ltr { direction:ltr; }
+.rtl { direction:rtl; }
+
+//use bootstraps general .show, .hidden, .invisible
+//Classes used by the TASKS plugin (.hide, .invisible)
+//ok in bootstrap
+
+//checkme: still used?
+.accesskey { text-decoration:underline; }
+
+.changenote { font-style: italic; }
+
+// used by info and attachment tables to display file sizes
+.nowrap-number { white-space:nowrap; }
+.text-right { text-align:right; }
+
+[class^=tangle-] { background: @yellow; }
+
+//TODO: why not use .panel iso .alert as base for these communication boxes
+.default, .success, .information, .info, .warning, .error, .danger {
+ .alert;
+ clear:both;
+ display:block;
+}
+//support inline information blocks
+span.default, span.success, span.information, span.info, span.warning, span.error, span.danger {
+ display:inline;
+ padding: .05em .25em;
+}
+
+.default {
+ .alert-variant(@btn-default-bg; @btn-default-border;@btn-default-color);
+}
+.success { .alert-success; }
+.info, .information { .alert-info; }
+.warning { .alert-warning; }
+.error, .danger { .alert-danger; }
+
+//CHECKME: make sure to fill the table cell with the background color
+td .success, td .information, td .warning, td .error { margin:0; }
+//BETTER: td > .alert { margin:0; }
+
+
+/*
+Style: CAPTCHA tables and images
+*/
+.asirraCaptcha img { width: @wiki-captcha-width; }
+.asirraCaptcha td {
+ background:@wiki-captcha-bg;
+ border:1px solid @table-border-color;
+ padding:1em;
+}
+
+
+/*
+Style: spin; loading animation
+ Reusable class to indicate background processing or loading of ajax content.
+
+ A background image is positioned at the right-hand side of the enclosing element.
+ Alternative: use CSS loading animation
+
+Example:
+> span.spin (type ahead)
+
+*/
+.spin {
+ background:url("@{imagePath}/loading-bar.gif") no-repeat center center !important;
+ //width:16px;
+ //height:16px;
+ //margin:0 0.5em;*/
+}
+
+
+//utility class
+.under-construction {
+ display:block;
+ width:100%;
+ text-align:center;
+ .progress;
+ .progress-bar-variant(@yellow);
+ .progress-striped .progress-bar;
+ .progress.active .progress-bar;
+
+ &:after {
+ content:"UNDER CONSTRUCTION";
+ letter-spacing:1ex;
+ font-weight:bold;
+ }
+}
+
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less?rev=1686927&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less Mon Jun 22 20:11:42 2015
@@ -0,0 +1,145 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); fyou may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+// JSPWiki color scheme an typography
+
+// Better base colors. See - https://github.com/mrmrs/colors/blob/master/less/_variables.less
+@aqua: #7FDBFF;
+@blue: #0074D9;
+@navy: #001F3F;
+@teal: #39CCCC;
+@green: #2ECC40;
+@olive: #3D9970;
+@lime: #01FF70;
+
+// Warm
+@yellow: #FFDC00;
+@orange: #FF851B;
+@red: #FF4136;
+@fuchsia: #F012BE;
+@purple: #B10DC9;
+@maroon: #85144B;
+
+// Gray Scale
+@white: #fff;
+@silver: #ddd;
+@gray: #aaa;
+@black: #111;
+
+
+//JSPWiki paths
+@imagePath: "./images";
+@icon-font-path: "./fonts/";
+
+// Might as well use the nicest Helvetica you can... http://css-tricks.com/snippets/css/better-helvetica/
+@font-family-sans-serif: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+
+//softer gray-tones
+@pre-bg: #f2f2f2;
+@pre-border-color: #e5e5e5;
+@panel-default-border: @pre-border-color;
+@panel-default-heading-bg: @pre-bg;
+
+// JPSWiki variables
+// Main color scheme
+@wiki-header-bg: @brand-primary; //#1976D2;
+@wiki-header-color: @white;
+@wiki-page-bg: @white;
+@wiki-sidebar-bg: #e5e8ed; ;
+@wiki-header-font-family: @font-family-sans-serif;
+
+
+//Layout ratios
+//ref. http://alistapart.com/article/content-out-layout
+// "The most famous irrational ratio in design is, of course, the golden ratio (...),
+// which is derived from patterns in nature and the human form. "
+//
+@golden-ratio: 1.618; //phi
+@golden-square: @golden-ratio * @golden-ratio;
+
+//blurb layout : 1 | (1*phi*phi)
+//three section layout: 1 | (1*phi*phi) | 1
+@wiki-sidebar-width: percentage( 1 / (1 + @golden-square + 1) ); //21.6447%
+
+//wider layout : 1 | (1*phi) => commentbox
+@wiki-commentbox-ratio: percentage( 1 / (1 + @golden-square) ); //27.6373%
+@wiki-commentbox-width: @wiki-commentbox-ratio * 100% / (100% - @wiki-sidebar-width);
+
+
+//Nav bar
+@wiki-logo-font-family: 'HelveticaNeue-UltraLight', 'Helvetica Neue UltraLight', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+@wiki-logo-font-size:20px;
+@wiki-logo-padding:5px;
+@breadcrumb-color: @white;
+
+//TODO: Stacking...
+//@slimbox-index:100;
+//@dialog-index:110;
+
+// Forms
+@wikiFormFontColor: #007; //font color for input, textarea form element
+
+// Highlight
+@wiki-hover: @dropdown-link-hover-bg;
+@highlight: rgba(255, 255, 0, 0.05); //highlight in item lists, search filter, ...
+@wiki-mark: @orange; //mark search results, searchbars (amber), default graphbar
+
+// Misc.
+@wiki-recentchanges-date-bg: @wiki-sidebar-bg;
+@wiki-link-createpage: @red;
+@wiki-diff-add: #9f9; //diff inserted lines
+@wiki-diff-delete: #f93; //diff deleted lines
+@wiki-captcha-bg: @gray-lighter;
+@wiki-captcha-width: 125px;
+
+@pre-scrollable-max-height: 240px; //bootstrap default is 340px
+
+@dropcaps-color: @black;
+@dropcaps-font-size: 500%;
+@dropcaps-font-weight: thin;
+@dropcaps-font-family: @wiki-logo-font-family; //Georgia
+
+// Viewer
+@viewer-box-border-color: @table-border-color;
+
+// Viewer.Slimbox
+@slimbox-viewport-corona: 7px 7px 70px rgba(255,255,255,.5);
+
+@slimbox-font-family: @wiki-header-font-family;
+@slimbox-font-size: 40px; //@carousel-control-font-size; //20px;
+@slimbox-text-shadow: 1px 1px 0 rgba(0,0,0,.1);
+@slimbox-text-color: @black;
+@slimbox-control-bg: @white;
+@slimbox-control-opacity: .7;
+@slimbox-control-font-family: @wiki-logo-font-family;
+@slimbox-control-line-height: 0.85; //heuristic, centering text in a circle
+@slimbox-btn-size: 10px;
+
+// Viewer.Carousel
+@carousel-progress-color: @red;
+@carousel-progress-size: 2px;
+
+// Category
+@wiki-category-link-color: #545454;
+
+//Editor
+@wiki-editor-bg : @white;
+@wiki-preview-bg : transparent; //@white;
+@wiki-resizer: @btn-primary-bg;
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less Mon Jun 22 20:11:42 2015
@@ -1,23 +1,3 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
// Base Class Definition
// -------------------------
@@ -34,7 +14,7 @@
//adopted .fa-fw (fixed width) style
width: (18em / 14);
text-align: center;
-
+
}
*/
@@ -45,11 +25,14 @@
font-weight: normal;
font-variant: normal;
text-transform: none;
- line-height: 1;
+ line-height: @line-height-base;
+
+ position:relative;
+ top:.1em;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-
+
&:hover { text-decoration:none; }
}
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less Mon Jun 22 20:11:42 2015
@@ -1,32 +1,12 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
/*!
* Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
-@import "../fontawesome/variables";
-@import "../fontawesome/mixins";
-@import "path";
-@import "core";
+//@import "../fontawesome/variables";
+//@import "../fontawesome/mixins";
+@import "path.less";
+@import "core.less";
//@import "../fontawesome/larger";
//@import "../fontawesome/fixed-width";
//@import "../fontawesome/list";
@@ -34,4 +14,4 @@
//@import "../fontawesome/spinning";
//@import "../fontawesome/rotated-flipped";
//@import "../fontawesome/stacked";
-@import "icons";
+@import "icons.less";
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.eot
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.eot?rev=1686927&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.eot
------------------------------------------------------------------------------
svn:mime-type = application/vnd.ms-fontobject
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.svg
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.svg?rev=1686927&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.svg
------------------------------------------------------------------------------
svn:mime-type = image/svg+xml
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.ttf
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.ttf?rev=1686927&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.ttf
------------------------------------------------------------------------------
svn:mime-type = application/x-font-ttf
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.woff
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.woff?rev=1686927&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/fonts/FontJspwiki.woff
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less Mon Jun 22 20:11:42 2015
@@ -1,23 +1,3 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less Mon Jun 22 20:11:42 2015
@@ -1,23 +1,3 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
/* FONT PATH */
/*
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<?xml version="1.0" encoding="UTF-8"?>
@@ -30,7 +30,7 @@
<fmt:setBundle basename="CoreResources"/>
<%!
- Logger log = Logger.getLogger("JSPWiki");
+ Logger log = Logger.getLogger("JSPWiki");
%>
<%
@@ -59,7 +59,7 @@ if( request.getParameter("submit") != nu
if ( password != null )
{
Object[] args = { Installer.ADMIN_ID, password, Installer.ADMIN_GROUP };
- wikiSession.addMessage( Installer.INSTALL_INFO,
+ wikiSession.addMessage( Installer.INSTALL_INFO,
MessageFormat.format( rb.getString( "install.jsp.install.msg.rnd.pwd" ), args ) );
}
}
@@ -76,7 +76,7 @@ if ( !installer.adminExists() )
response.setHeader("Cache-Control", "no-cache" );
response.setContentType("text/html; charset=UTF-8");
%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -103,7 +103,7 @@ if ( !installer.adminExists() )
<wiki:Messages div="warning" topic="<%=Installer.INSTALL_WARNING%>" prefix='<%= rb.getString( "install.jsp.install.warning" )%>'/>
<wiki:Messages div="error" topic="<%=Installer.INSTALL_ERROR%>" prefix='<%= rb.getString( "install.jsp.install.error" )%>'/>
</div>
-
+
<div class="formcontainer">
<form action="Install.jsp" method="post">
@@ -111,31 +111,31 @@ if ( !installer.adminExists() )
<!-- Page and log directories -->
<h3><fmt:message key="install.jsp.basics.title" /></h3>
<div class="block">
-
+
<label><fmt:message key="install.jsp.basics.appname.label" /></label>
<input type="text" name="<%=Installer.APP_NAME%>" size="20" value="<%=installer.getProperty( Installer.APP_NAME )%>"/>
<div class="description">
<fmt:message key="install.jsp.basics.appname.desc"/>
- </div>
-
+ </div>
+
<br/> <label><fmt:message key="install.jsp.basics.baseurl.label" /></label>
<input type="text" name="<%=Installer.BASE_URL%>" size="40" value="<%=installer.getProperty( Installer.BASE_URL )%>"/>
<div class="description">
<fmt:message key="install.jsp.basics.baseurl.desc" />
- </div>
-
+ </div>
+
<br/><label><fmt:message key="install.jsp.basics.page.storage.label" /></label>
<input type="text" name="<%=Installer.PAGE_DIR%>" size="40" value="<%=installer.getProperty( Installer.PAGE_DIR )%>"/>
<div class="description">
<fmt:message key="install.jsp.basics.page.storage.desc" />
</div>
-
+
</div>
-
+
<h3><fmt:message key="install.jsp.security.title" /></h3>
<div class="block">
-
- <%
+
+ <%
if( validated )
{
if ( password != null )
@@ -161,7 +161,7 @@ if ( !installer.adminExists() )
}
%>
</div>
-
+
<h3><fmt:message key="install.jsp.adv.settings.title" /></h3>
<div class="block">
<label><fmt:message key="install.jsp.adv.settings.logfile.label" /></label>
@@ -176,7 +176,7 @@ if ( !installer.adminExists() )
<fmt:message key="install.jsp.adv.settings.workdir.desc" />
</div>
</div>
-
+
<br/>
<div class="block">
<div class="instructions">
@@ -186,13 +186,13 @@ if ( !installer.adminExists() )
</div>
<input type="submit" name="submit" value="<fmt:message key="install.jsp.instr.submit" />" />
</div>
-
+
</form>
</div>
<hr />
- <%
+ <%
if( validated )
{
%>