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 2014/02/14 18:24:35 UTC
svn commit: r1568367 [10/13] - in /jspwiki/trunk: ./ jspwiki-war/
jspwiki-war/src/main/config/wro/ jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/scripts/dynamic-styles/
jspwiki-war/src/main/scripts/lib/ jspwiki-war/src/main/scripts/mo...
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tables.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tables.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tables.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,231 @@
+//
+// Tables
+// --------------------------------------------------
+
+
+table {
+ max-width: 100%;
+ background-color: @table-bg;
+}
+th {
+ text-align: left;
+}
+
+
+// Baseline styles
+
+.table {
+ width: 100%;
+ margin-bottom: @line-height-computed;
+ // Cells
+ > thead,
+ > tbody,
+ > tfoot {
+ > tr {
+ > th,
+ > td {
+ padding: @table-cell-padding;
+ line-height: @line-height-base;
+ vertical-align: top;
+ border-top: 1px solid @table-border-color;
+ }
+ }
+ }
+ // Bottom align for column headings
+ > thead > tr > th {
+ vertical-align: bottom;
+ border-bottom: 2px solid @table-border-color;
+ }
+ // Remove top border from thead by default
+ > caption + thead,
+ > colgroup + thead,
+ > thead:first-child {
+ > tr:first-child {
+ > th,
+ > td {
+ border-top: 0;
+ }
+ }
+ }
+ // Account for multiple tbody instances
+ > tbody + tbody {
+ border-top: 2px solid @table-border-color;
+ }
+
+ // Nesting
+ .table {
+ background-color: @body-bg;
+ }
+}
+
+
+// Condensed table w/ half padding
+
+.table-condensed {
+ > thead,
+ > tbody,
+ > tfoot {
+ > tr {
+ > th,
+ > td {
+ padding: @table-condensed-cell-padding;
+ }
+ }
+ }
+}
+
+
+// Bordered version
+//
+// Add borders all around the table and between all the columns.
+
+.table-bordered {
+ border: 1px solid @table-border-color;
+ > thead,
+ > tbody,
+ > tfoot {
+ > tr {
+ > th,
+ > td {
+ border: 1px solid @table-border-color;
+ }
+ }
+ }
+ > thead > tr {
+ > th,
+ > td {
+ border-bottom-width: 2px;
+ }
+ }
+}
+
+
+// Zebra-striping
+//
+// Default zebra-stripe styles (alternating gray and transparent backgrounds)
+
+.table-striped {
+ > tbody > tr:nth-child(odd) {
+ > td,
+ > th {
+ background-color: @table-bg-accent;
+ }
+ }
+}
+
+
+// Hover effect
+//
+// Placed here since it has to come after the potential zebra striping
+
+.table-hover {
+ > tbody > tr:hover {
+ > td,
+ > th {
+ background-color: @table-bg-hover;
+ }
+ }
+}
+
+
+// Table cell sizing
+//
+// Reset default table behavior
+
+table col[class*="col-"] {
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
+ float: none;
+ display: table-column;
+}
+table {
+ td,
+ th {
+ &[class*="col-"] {
+ float: none;
+ display: table-cell;
+ }
+ }
+}
+
+
+// Table backgrounds
+//
+// Exact selectors below required to override `.table-striped` and prevent
+// inheritance to nested tables.
+
+// Generate the contextual variants
+.table-row-variant(active; @table-bg-active);
+.table-row-variant(success; @state-success-bg);
+.table-row-variant(danger; @state-danger-bg);
+.table-row-variant(warning; @state-warning-bg);
+
+
+// Responsive tables
+//
+// Wrap your tables in `.table-responsive` and we'll make them mobile friendly
+// by enabling horizontal scrolling. Only applies <768px. Everything above that
+// will display normally.
+
+@media (max-width: @screen-xs-max) {
+ .table-responsive {
+ width: 100%;
+ margin-bottom: (@line-height-computed * 0.75);
+ overflow-y: hidden;
+ overflow-x: scroll;
+ -ms-overflow-style: -ms-autohiding-scrollbar;
+ border: 1px solid @table-border-color;
+ -webkit-overflow-scrolling: touch;
+
+ // Tighten up spacing
+ > .table {
+ margin-bottom: 0;
+
+ // Ensure the content doesn't wrap
+ > thead,
+ > tbody,
+ > tfoot {
+ > tr {
+ > th,
+ > td {
+ white-space: nowrap;
+ }
+ }
+ }
+ }
+
+ // Special overrides for the bordered tables
+ > .table-bordered {
+ border: 0;
+
+ // Nuke the appropriate borders so that the parent can handle them
+ > thead,
+ > tbody,
+ > tfoot {
+ > tr {
+ > th:first-child,
+ > td:first-child {
+ border-left: 0;
+ }
+ > th:last-child,
+ > td:last-child {
+ border-right: 0;
+ }
+ }
+ }
+
+ // Only nuke the last row's bottom-border in `tbody` and `tfoot` since
+ // chances are there will be only one `tr` in a `thead` and that would
+ // remove the border altogether.
+ > tbody,
+ > tfoot {
+ > tr:last-child {
+ > th,
+ > td {
+ border-bottom: 0;
+ }
+ }
+ }
+
+ }
+ }
+}
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tables.less
------------------------------------------------------------------------------
svn:executable = *
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/theme.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/theme.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/theme.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/theme.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,247 @@
+
+//
+// Load core variables and mixins
+// --------------------------------------------------
+
+@import "variables.less";
+@import "mixins.less";
+
+
+
+//
+// Buttons
+// --------------------------------------------------
+
+// Common styles
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+ text-shadow: 0 -1px 0 rgba(0,0,0,.2);
+ @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
+ .box-shadow(@shadow);
+
+ // Reset the shadow
+ &:active,
+ &.active {
+ .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+ }
+}
+
+// Mixin for generating new styles
+.btn-styles(@btn-color: #555) {
+ #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%));
+ .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
+ background-repeat: repeat-x;
+ border-color: darken(@btn-color, 14%);
+
+ &:hover,
+ &:focus {
+ background-color: darken(@btn-color, 12%);
+ background-position: 0 -15px;
+ }
+
+ &:active,
+ &.active {
+ background-color: darken(@btn-color, 12%);
+ border-color: darken(@btn-color, 14%);
+ }
+}
+
+// Common styles
+.btn {
+ // Remove the gradient for the pressed/active state
+ &:active,
+ &.active {
+ background-image: none;
+ }
+}
+
+// Apply the mixin to the buttons
+.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
+.btn-primary { .btn-styles(@btn-primary-bg); }
+.btn-success { .btn-styles(@btn-success-bg); }
+.btn-warning { .btn-styles(@btn-warning-bg); }
+.btn-danger { .btn-styles(@btn-danger-bg); }
+.btn-info { .btn-styles(@btn-info-bg); }
+
+
+
+//
+// Images
+// --------------------------------------------------
+
+.thumbnail,
+.img-thumbnail {
+ .box-shadow(0 1px 2px rgba(0,0,0,.075));
+}
+
+
+
+//
+// Dropdowns
+// --------------------------------------------------
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+ #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
+ background-color: darken(@dropdown-link-hover-bg, 5%);
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+ #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
+ background-color: darken(@dropdown-link-active-bg, 5%);
+}
+
+
+
+//
+// Navbar
+// --------------------------------------------------
+
+// Default navbar
+.navbar-default {
+ #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);
+ .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
+ border-radius: @navbar-border-radius;
+ @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
+ .box-shadow(@shadow);
+
+ .navbar-nav > .active > a {
+ #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));
+ .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
+ }
+}
+.navbar-brand,
+.navbar-nav > li > a {
+ text-shadow: 0 1px 0 rgba(255,255,255,.25);
+}
+
+// Inverted navbar
+.navbar-inverse {
+ #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);
+ .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
+
+ .navbar-nav > .active > a {
+ #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));
+ .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
+ }
+
+ .navbar-brand,
+ .navbar-nav > li > a {
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+ }
+}
+
+// Undo rounded corners in static and fixed navbars
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+ border-radius: 0;
+}
+
+
+
+//
+// Alerts
+// --------------------------------------------------
+
+// Common styles
+.alert {
+ text-shadow: 0 1px 0 rgba(255,255,255,.2);
+ @shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);
+ .box-shadow(@shadow);
+}
+
+// Mixin for generating new styles
+.alert-styles(@color) {
+ #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 7.5%));
+ border-color: darken(@color, 15%);
+}
+
+// Apply the mixin to the alerts
+.alert-success { .alert-styles(@alert-success-bg); }
+.alert-info { .alert-styles(@alert-info-bg); }
+.alert-warning { .alert-styles(@alert-warning-bg); }
+.alert-danger { .alert-styles(@alert-danger-bg); }
+
+
+
+//
+// Progress bars
+// --------------------------------------------------
+
+// Give the progress background some depth
+.progress {
+ #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg)
+}
+
+// Mixin for generating new styles
+.progress-bar-styles(@color) {
+ #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 10%));
+}
+
+// Apply the mixin to the progress bars
+.progress-bar { .progress-bar-styles(@progress-bar-bg); }
+.progress-bar-success { .progress-bar-styles(@progress-bar-success-bg); }
+.progress-bar-info { .progress-bar-styles(@progress-bar-info-bg); }
+.progress-bar-warning { .progress-bar-styles(@progress-bar-warning-bg); }
+.progress-bar-danger { .progress-bar-styles(@progress-bar-danger-bg); }
+
+
+
+//
+// List groups
+// --------------------------------------------------
+
+.list-group {
+ border-radius: @border-radius-base;
+ .box-shadow(0 1px 2px rgba(0,0,0,.075));
+}
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+ text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);
+ #gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));
+ border-color: darken(@list-group-active-border, 7.5%);
+}
+
+
+
+//
+// Panels
+// --------------------------------------------------
+
+// Common styles
+.panel {
+ .box-shadow(0 1px 2px rgba(0,0,0,.05));
+}
+
+// Mixin for generating new styles
+.panel-heading-styles(@color) {
+ #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 5%));
+}
+
+// Apply the mixin to the panel headings only
+.panel-default > .panel-heading { .panel-heading-styles(@panel-default-heading-bg); }
+.panel-primary > .panel-heading { .panel-heading-styles(@panel-primary-heading-bg); }
+.panel-success > .panel-heading { .panel-heading-styles(@panel-success-heading-bg); }
+.panel-info > .panel-heading { .panel-heading-styles(@panel-info-heading-bg); }
+.panel-warning > .panel-heading { .panel-heading-styles(@panel-warning-heading-bg); }
+.panel-danger > .panel-heading { .panel-heading-styles(@panel-danger-heading-bg); }
+
+
+
+//
+// Wells
+// --------------------------------------------------
+
+.well {
+ #gradient > .vertical(@start-color: darken(@well-bg, 5%); @end-color: @well-bg);
+ border-color: darken(@well-bg, 10%);
+ @shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1);
+ .box-shadow(@shadow);
+}
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/theme.less
------------------------------------------------------------------------------
svn:executable = *
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tooltip.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tooltip.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tooltip.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tooltip.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,95 @@
+//
+// Tooltips
+// --------------------------------------------------
+
+
+// Base class
+.tooltip {
+ position: absolute;
+ z-index: @zindex-tooltip;
+ display: block;
+ visibility: visible;
+ font-size: @font-size-small;
+ line-height: 1.4;
+ .opacity(0);
+
+ &.in { .opacity(.9); }
+ &.top { margin-top: -3px; padding: @tooltip-arrow-width 0; }
+ &.right { margin-left: 3px; padding: 0 @tooltip-arrow-width; }
+ &.bottom { margin-top: 3px; padding: @tooltip-arrow-width 0; }
+ &.left { margin-left: -3px; padding: 0 @tooltip-arrow-width; }
+}
+
+// Wrapper for the tooltip content
+.tooltip-inner {
+ max-width: @tooltip-max-width;
+ padding: 3px 8px;
+ color: @tooltip-color;
+ text-align: center;
+ text-decoration: none;
+ background-color: @tooltip-bg;
+ border-radius: @border-radius-base;
+}
+
+// Arrows
+.tooltip-arrow {
+ position: absolute;
+ width: 0;
+ height: 0;
+ border-color: transparent;
+ border-style: solid;
+}
+.tooltip {
+ &.top .tooltip-arrow {
+ bottom: 0;
+ left: 50%;
+ margin-left: -@tooltip-arrow-width;
+ border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
+ border-top-color: @tooltip-arrow-color;
+ }
+ &.top-left .tooltip-arrow {
+ bottom: 0;
+ left: @tooltip-arrow-width;
+ border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
+ border-top-color: @tooltip-arrow-color;
+ }
+ &.top-right .tooltip-arrow {
+ bottom: 0;
+ right: @tooltip-arrow-width;
+ border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
+ border-top-color: @tooltip-arrow-color;
+ }
+ &.right .tooltip-arrow {
+ top: 50%;
+ left: 0;
+ margin-top: -@tooltip-arrow-width;
+ border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;
+ border-right-color: @tooltip-arrow-color;
+ }
+ &.left .tooltip-arrow {
+ top: 50%;
+ right: 0;
+ margin-top: -@tooltip-arrow-width;
+ border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;
+ border-left-color: @tooltip-arrow-color;
+ }
+ &.bottom .tooltip-arrow {
+ top: 0;
+ left: 50%;
+ margin-left: -@tooltip-arrow-width;
+ border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
+ border-bottom-color: @tooltip-arrow-color;
+ }
+ &.bottom-left .tooltip-arrow {
+ top: 0;
+ left: @tooltip-arrow-width;
+ border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
+ border-bottom-color: @tooltip-arrow-color;
+ }
+ &.bottom-right .tooltip-arrow {
+ top: 0;
+ right: @tooltip-arrow-width;
+ border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
+ border-bottom-color: @tooltip-arrow-color;
+ }
+}
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/tooltip.less
------------------------------------------------------------------------------
svn:executable = *
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/type.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/type.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/type.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/type.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,281 @@
+//
+// Typography
+// --------------------------------------------------
+
+
+// Headings
+// -------------------------
+
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+ font-family: @headings-font-family;
+ font-weight: @headings-font-weight;
+ line-height: @headings-line-height;
+ color: @headings-color;
+
+ small,
+ .small {
+ font-weight: normal;
+ line-height: 1;
+ color: @headings-small-color;
+ }
+}
+
+h1,
+h2,
+h3 {
+ margin-top: @line-height-computed;
+ margin-bottom: (@line-height-computed / 2);
+
+ small,
+ .small {
+ font-size: 65%;
+ }
+}
+h4,
+h5,
+h6 {
+ margin-top: (@line-height-computed / 2);
+ margin-bottom: (@line-height-computed / 2);
+
+ small,
+ .small {
+ font-size: 75%;
+ }
+}
+
+h1, .h1 { font-size: @font-size-h1; }
+h2, .h2 { font-size: @font-size-h2; }
+h3, .h3 { font-size: @font-size-h3; }
+h4, .h4 { font-size: @font-size-h4; }
+h5, .h5 { font-size: @font-size-h5; }
+h6, .h6 { font-size: @font-size-h6; }
+
+
+// Body text
+// -------------------------
+
+p {
+ margin: 0 0 (@line-height-computed / 2);
+}
+
+.lead {
+ margin-bottom: @line-height-computed;
+ font-size: floor(@font-size-base * 1.15);
+ font-weight: 200;
+ line-height: 1.4;
+
+ @media (min-width: @screen-sm-min) {
+ font-size: (@font-size-base * 1.5);
+ }
+}
+
+
+// Emphasis & misc
+// -------------------------
+
+// Ex: 14px base font * 85% = about 12px
+small,
+.small { font-size: 85%; }
+
+// Undo browser default styling
+cite { font-style: normal; }
+
+// Contextual emphasis
+.text-muted {
+ color: @text-muted;
+}
+.text-primary {
+ color: @brand-primary;
+ &:hover {
+ color: darken(@brand-primary, 10%);
+ }
+}
+.text-warning {
+ color: @state-warning-text;
+ &:hover {
+ color: darken(@state-warning-text, 10%);
+ }
+}
+.text-danger {
+ color: @state-danger-text;
+ &:hover {
+ color: darken(@state-danger-text, 10%);
+ }
+}
+.text-success {
+ color: @state-success-text;
+ &:hover {
+ color: darken(@state-success-text, 10%);
+ }
+}
+.text-info {
+ color: @state-info-text;
+ &:hover {
+ color: darken(@state-info-text, 10%);
+ }
+}
+
+// Alignment
+.text-left { text-align: left; }
+.text-right { text-align: right; }
+.text-center { text-align: center; }
+
+
+// Page header
+// -------------------------
+
+.page-header {
+ padding-bottom: ((@line-height-computed / 2) - 1);
+ margin: (@line-height-computed * 2) 0 @line-height-computed;
+ border-bottom: 1px solid @page-header-border-color;
+}
+
+
+// Lists
+// --------------------------------------------------
+
+// Unordered and Ordered lists
+ul,
+ol {
+ margin-top: 0;
+ margin-bottom: (@line-height-computed / 2);
+ ul,
+ ol {
+ margin-bottom: 0;
+ }
+}
+
+// List options
+
+// Unstyled keeps list items block level, just removes default browser padding and list-style
+.list-unstyled {
+ padding-left: 0;
+ list-style: none;
+}
+
+// Inline turns list items into inline-block
+.list-inline {
+ .list-unstyled();
+
+ > li {
+ display: inline-block;
+ padding-left: 5px;
+ padding-right: 5px;
+
+ &:first-child {
+ padding-left: 0;
+ }
+ }
+}
+
+// Description Lists
+dl {
+ margin-top: 0; // Remove browser default
+ margin-bottom: @line-height-computed;
+}
+dt,
+dd {
+ line-height: @line-height-base;
+}
+dt {
+ font-weight: bold;
+}
+dd {
+ margin-left: 0; // Undo browser default
+}
+
+// Horizontal description lists
+//
+// Defaults to being stacked without any of the below styles applied, until the
+// grid breakpoint is reached (default of ~768px).
+
+@media (min-width: @grid-float-breakpoint) {
+ .dl-horizontal {
+ dt {
+ float: left;
+ width: (@component-offset-horizontal - 20);
+ clear: left;
+ text-align: right;
+ .text-overflow();
+ }
+ dd {
+ margin-left: @component-offset-horizontal;
+ .clearfix(); // Clear the floated `dt` if an empty `dd` is present
+ }
+ }
+}
+
+// MISC
+// ----
+
+// Abbreviations and acronyms
+abbr[title],
+// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
+abbr[data-original-title] {
+ cursor: help;
+ border-bottom: 1px dotted @abbr-border-color;
+}
+.initialism {
+ font-size: 90%;
+ text-transform: uppercase;
+}
+
+// Blockquotes
+blockquote {
+ padding: (@line-height-computed / 2) @line-height-computed;
+ margin: 0 0 @line-height-computed;
+ border-left: 5px solid @blockquote-border-color;
+ p {
+ font-size: (@font-size-base * 1.25);
+ font-weight: 300;
+ line-height: 1.25;
+ }
+ p:last-child {
+ margin-bottom: 0;
+ }
+ small,
+ .small {
+ display: block;
+ line-height: @line-height-base;
+ color: @blockquote-small-color;
+ &:before {
+ content: '\2014 \00A0'; // EM DASH, NBSP
+ }
+ }
+
+ // Float right with text-align: right
+ &.pull-right {
+ padding-right: 15px;
+ padding-left: 0;
+ border-right: 5px solid @blockquote-border-color;
+ border-left: 0;
+ p,
+ small,
+ .small {
+ text-align: right;
+ }
+ small,
+ .small {
+ &:before {
+ content: '';
+ }
+ &:after {
+ content: '\00A0 \2014'; // NBSP, EM DASH
+ }
+ }
+ }
+}
+
+// Quotes
+blockquote:before,
+blockquote:after {
+ content: "";
+}
+
+// Addresses
+address {
+ margin-bottom: @line-height-computed;
+ font-style: normal;
+ line-height: @line-height-base;
+}
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/type.less
------------------------------------------------------------------------------
svn:executable = *
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/utilities.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/utilities.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/utilities.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/utilities.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,56 @@
+//
+// Utility classes
+// --------------------------------------------------
+
+
+// Floats
+// -------------------------
+
+.clearfix {
+ .clearfix();
+}
+.center-block {
+ .center-block();
+}
+.pull-right {
+ float: right !important;
+}
+.pull-left {
+ float: left !important;
+}
+
+
+// Toggling content
+// -------------------------
+
+// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1
+.hide {
+ display: none !important;
+}
+.show {
+ display: block !important;
+}
+.invisible {
+ visibility: hidden;
+}
+.text-hide {
+ .text-hide();
+}
+
+
+// Hide from screenreaders and browsers
+//
+// Credit: HTML5 Boilerplate
+
+.hidden {
+ display: none !important;
+ visibility: hidden !important;
+}
+
+
+// For Affix plugin
+// -------------------------
+
+.affix {
+ position: fixed;
+}
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/utilities.less
------------------------------------------------------------------------------
svn:executable = *
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,642 @@
+//
+// Variables
+// --------------------------------------------------
+
+
+// Global values
+// --------------------------------------------------
+
+// Grays
+// -------------------------
+
+@gray-darker: lighten(#000, 13.5%); // #222
+@gray-dark: lighten(#000, 20%); // #333
+@gray: lighten(#000, 33.5%); // #555
+@gray-light: lighten(#000, 60%); // #999
+@gray-lighter: lighten(#000, 93.5%); // #eee
+
+// Brand colors
+// -------------------------
+
+@brand-primary: #428bca;
+@brand-success: #5cb85c;
+@brand-warning: #f0ad4e;
+@brand-danger: #d9534f;
+@brand-info: #5bc0de;
+
+// Scaffolding
+// -------------------------
+
+@body-bg: #fff;
+@text-color: @gray-dark;
+
+// Links
+// -------------------------
+
+@link-color: @brand-primary;
+@link-hover-color: darken(@link-color, 15%);
+
+// Typography
+// -------------------------
+
+@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-serif: Georgia, "Times New Roman", Times, serif;
+@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base: @font-family-sans-serif;
+
+@font-size-base: 14px;
+@font-size-large: ceil(@font-size-base * 1.25); // ~18px
+@font-size-small: ceil(@font-size-base * 0.85); // ~12px
+
+@font-size-h1: floor(@font-size-base * 2.6); // ~36px
+@font-size-h2: floor(@font-size-base * 2.15); // ~30px
+@font-size-h3: ceil(@font-size-base * 1.7); // ~24px
+@font-size-h4: ceil(@font-size-base * 1.25); // ~18px
+@font-size-h5: @font-size-base;
+@font-size-h6: ceil(@font-size-base * 0.85); // ~12px
+
+@line-height-base: 1.428571429; // 20/14
+@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
+
+@headings-font-family: @font-family-base;
+@headings-font-weight: 500;
+@headings-line-height: 1.1;
+@headings-color: inherit;
+
+
+// Iconography
+// -------------------------
+
+@icon-font-path: "../fonts/";
+@icon-font-name: "glyphicons-halflings-regular";
+
+
+// Components
+// -------------------------
+// Based on 14px font-size and 1.428 line-height (~20px to start)
+
+@padding-base-vertical: 6px;
+@padding-base-horizontal: 12px;
+
+@padding-large-vertical: 10px;
+@padding-large-horizontal: 16px;
+
+@padding-small-vertical: 5px;
+@padding-small-horizontal: 10px;
+
+@padding-xs-vertical: 1px;
+@padding-xs-horizontal: 5px;
+
+@line-height-large: 1.33;
+@line-height-small: 1.5;
+
+@border-radius-base: 4px;
+@border-radius-large: 6px;
+@border-radius-small: 3px;
+
+@component-active-color: #fff;
+@component-active-bg: @brand-primary;
+
+@caret-width-base: 4px;
+@caret-width-large: 5px;
+
+// Tables
+// -------------------------
+
+@table-cell-padding: 8px;
+@table-condensed-cell-padding: 5px;
+
+@table-bg: transparent; // overall background-color
+@table-bg-accent: #f9f9f9; // for striping
+@table-bg-hover: #f5f5f5;
+@table-bg-active: @table-bg-hover;
+
+@table-border-color: #ddd; // table and cell border
+
+
+// Buttons
+// -------------------------
+
+@btn-font-weight: normal;
+
+@btn-default-color: #333;
+@btn-default-bg: #fff;
+@btn-default-border: #ccc;
+
+@btn-primary-color: #fff;
+@btn-primary-bg: @brand-primary;
+@btn-primary-border: darken(@btn-primary-bg, 5%);
+
+@btn-success-color: #fff;
+@btn-success-bg: @brand-success;
+@btn-success-border: darken(@btn-success-bg, 5%);
+
+@btn-warning-color: #fff;
+@btn-warning-bg: @brand-warning;
+@btn-warning-border: darken(@btn-warning-bg, 5%);
+
+@btn-danger-color: #fff;
+@btn-danger-bg: @brand-danger;
+@btn-danger-border: darken(@btn-danger-bg, 5%);
+
+@btn-info-color: #fff;
+@btn-info-bg: @brand-info;
+@btn-info-border: darken(@btn-info-bg, 5%);
+
+@btn-link-disabled-color: @gray-light;
+
+
+// Forms
+// -------------------------
+
+@input-bg: #fff;
+@input-bg-disabled: @gray-lighter;
+
+@input-color: @gray;
+@input-border: #ccc;
+@input-border-radius: @border-radius-base;
+@input-border-focus: #66afe9;
+
+@input-color-placeholder: @gray-light;
+
+@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
+@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+
+@legend-color: @gray-dark;
+@legend-border-color: #e5e5e5;
+
+@input-group-addon-bg: @gray-lighter;
+@input-group-addon-border-color: @input-border;
+
+
+// Dropdowns
+// -------------------------
+
+@dropdown-bg: #fff;
+@dropdown-border: rgba(0,0,0,.15);
+@dropdown-fallback-border: #ccc;
+@dropdown-divider-bg: #e5e5e5;
+
+@dropdown-link-color: @gray-dark;
+@dropdown-link-hover-color: darken(@gray-dark, 5%);
+@dropdown-link-hover-bg: #f5f5f5;
+
+@dropdown-link-active-color: @component-active-color;
+@dropdown-link-active-bg: @component-active-bg;
+
+@dropdown-link-disabled-color: @gray-light;
+
+@dropdown-header-color: @gray-light;
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+
+@zindex-navbar: 1000;
+@zindex-dropdown: 1000;
+@zindex-popover: 1010;
+@zindex-tooltip: 1030;
+@zindex-navbar-fixed: 1030;
+@zindex-modal-background: 1040;
+@zindex-modal: 1050;
+
+// Media queries breakpoints
+// --------------------------------------------------
+
+// Extra small screen / phone
+// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
+@screen-xs: 480px;
+@screen-xs-min: @screen-xs;
+@screen-phone: @screen-xs-min;
+
+// Small screen / tablet
+// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
+@screen-sm: 768px;
+@screen-sm-min: @screen-sm;
+@screen-tablet: @screen-sm-min;
+
+// Medium screen / desktop
+// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
+@screen-md: 992px;
+@screen-md-min: @screen-md;
+@screen-desktop: @screen-md-min;
+
+// Large screen / wide desktop
+// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
+@screen-lg: 1200px;
+@screen-lg-min: @screen-lg;
+@screen-lg-desktop: @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max: (@screen-sm-min - 1);
+@screen-sm-max: (@screen-md-min - 1);
+@screen-md-max: (@screen-lg-min - 1);
+
+
+// Grid system
+// --------------------------------------------------
+
+// Number of columns in the grid system
+@grid-columns: 12;
+// Padding, to be divided by two and applied to the left and right of all columns
+@grid-gutter-width: 30px;
+
+// Navbar collapse
+
+// Point at which the navbar becomes uncollapsed
+@grid-float-breakpoint: @screen-sm-min;
+// Point at which the navbar begins collapsing
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+// Navbar
+// -------------------------
+
+// Basics of a navbar
+@navbar-height: 50px;
+@navbar-margin-bottom: @line-height-computed;
+@navbar-border-radius: @border-radius-base;
+@navbar-padding-horizontal: floor(@grid-gutter-width / 2);
+@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
+
+@navbar-default-color: #777;
+@navbar-default-bg: #f8f8f8;
+@navbar-default-border: darken(@navbar-default-bg, 6.5%);
+
+// Navbar links
+@navbar-default-link-color: #777;
+@navbar-default-link-hover-color: #333;
+@navbar-default-link-hover-bg: transparent;
+@navbar-default-link-active-color: #555;
+@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);
+@navbar-default-link-disabled-color: #ccc;
+@navbar-default-link-disabled-bg: transparent;
+
+// Navbar brand label
+@navbar-default-brand-color: @navbar-default-link-color;
+@navbar-default-brand-hover-color: darken(@navbar-default-brand-color, 10%);
+@navbar-default-brand-hover-bg: transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg: #ddd;
+@navbar-default-toggle-icon-bar-bg: #ccc;
+@navbar-default-toggle-border-color: #ddd;
+
+
+// Inverted navbar
+//
+// Reset inverted navbar basics
+@navbar-inverse-color: @gray-light;
+@navbar-inverse-bg: #222;
+@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
+
+// Inverted navbar links
+@navbar-inverse-link-color: @gray-light;
+@navbar-inverse-link-hover-color: #fff;
+@navbar-inverse-link-hover-bg: transparent;
+@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
+@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%);
+@navbar-inverse-link-disabled-color: #444;
+@navbar-inverse-link-disabled-bg: transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color: @navbar-inverse-link-color;
+@navbar-inverse-brand-hover-color: #fff;
+@navbar-inverse-brand-hover-bg: transparent;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg: #333;
+@navbar-inverse-toggle-icon-bar-bg: #fff;
+@navbar-inverse-toggle-border-color: #333;
+
+
+// Navs
+// -------------------------
+
+@nav-link-padding: 10px 15px;
+@nav-link-hover-bg: @gray-lighter;
+
+@nav-disabled-link-color: @gray-light;
+@nav-disabled-link-hover-color: @gray-light;
+
+@nav-open-link-hover-color: #fff;
+
+// Tabs
+@nav-tabs-border-color: #ddd;
+
+@nav-tabs-link-hover-border-color: @gray-lighter;
+
+@nav-tabs-active-link-hover-bg: @body-bg;
+@nav-tabs-active-link-hover-color: @gray;
+@nav-tabs-active-link-hover-border-color: #ddd;
+
+@nav-tabs-justified-link-border-color: #ddd;
+@nav-tabs-justified-active-link-border-color: @body-bg;
+
+// Pills
+@nav-pills-border-radius: @border-radius-base;
+@nav-pills-active-link-hover-bg: @component-active-bg;
+@nav-pills-active-link-hover-color: @component-active-color;
+
+
+// Pagination
+// -------------------------
+
+@pagination-bg: #fff;
+@pagination-border: #ddd;
+
+@pagination-hover-bg: @gray-lighter;
+
+@pagination-active-bg: @brand-primary;
+@pagination-active-color: #fff;
+
+@pagination-disabled-color: @gray-light;
+
+
+// Pager
+// -------------------------
+
+@pager-border-radius: 15px;
+@pager-disabled-color: @gray-light;
+
+
+// Jumbotron
+// -------------------------
+
+@jumbotron-padding: 30px;
+@jumbotron-color: inherit;
+@jumbotron-bg: @gray-lighter;
+@jumbotron-heading-color: inherit;
+@jumbotron-font-size: ceil(@font-size-base * 1.5);
+
+
+// Form states and alerts
+// -------------------------
+
+@state-success-text: #3c763d;
+@state-success-bg: #dff0d8;
+@state-success-border: darken(spin(@state-success-bg, -10), 5%);
+
+@state-info-text: #31708f;
+@state-info-bg: #d9edf7;
+@state-info-border: darken(spin(@state-info-bg, -10), 7%);
+
+@state-warning-text: #8a6d3b;
+@state-warning-bg: #fcf8e3;
+@state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
+
+@state-danger-text: #a94442;
+@state-danger-bg: #f2dede;
+@state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
+
+
+// Tooltips
+// -------------------------
+@tooltip-max-width: 200px;
+@tooltip-color: #fff;
+@tooltip-bg: #000;
+
+@tooltip-arrow-width: 5px;
+@tooltip-arrow-color: @tooltip-bg;
+
+
+// Popovers
+// -------------------------
+@popover-bg: #fff;
+@popover-max-width: 276px;
+@popover-border-color: rgba(0,0,0,.2);
+@popover-fallback-border-color: #ccc;
+
+@popover-title-bg: darken(@popover-bg, 3%);
+
+@popover-arrow-width: 10px;
+@popover-arrow-color: #fff;
+
+@popover-arrow-outer-width: (@popover-arrow-width + 1);
+@popover-arrow-outer-color: rgba(0,0,0,.25);
+@popover-arrow-outer-fallback-color: #999;
+
+
+// Labels
+// -------------------------
+
+@label-default-bg: @gray-light;
+@label-primary-bg: @brand-primary;
+@label-success-bg: @brand-success;
+@label-info-bg: @brand-info;
+@label-warning-bg: @brand-warning;
+@label-danger-bg: @brand-danger;
+
+@label-color: #fff;
+@label-link-hover-color: #fff;
+
+
+// Modals
+// -------------------------
+@modal-inner-padding: 20px;
+
+@modal-title-padding: 15px;
+@modal-title-line-height: @line-height-base;
+
+@modal-content-bg: #fff;
+@modal-content-border-color: rgba(0,0,0,.2);
+@modal-content-fallback-border-color: #999;
+
+@modal-backdrop-bg: #000;
+@modal-header-border-color: #e5e5e5;
+@modal-footer-border-color: @modal-header-border-color;
+
+
+// Alerts
+// -------------------------
+@alert-padding: 15px;
+@alert-border-radius: @border-radius-base;
+@alert-link-font-weight: bold;
+
+@alert-success-bg: @state-success-bg;
+@alert-success-text: @state-success-text;
+@alert-success-border: @state-success-border;
+
+@alert-info-bg: @state-info-bg;
+@alert-info-text: @state-info-text;
+@alert-info-border: @state-info-border;
+
+@alert-warning-bg: @state-warning-bg;
+@alert-warning-text: @state-warning-text;
+@alert-warning-border: @state-warning-border;
+
+@alert-danger-bg: @state-danger-bg;
+@alert-danger-text: @state-danger-text;
+@alert-danger-border: @state-danger-border;
+
+
+// Progress bars
+// -------------------------
+@progress-bg: #f5f5f5;
+@progress-bar-color: #fff;
+
+@progress-bar-bg: @brand-primary;
+@progress-bar-success-bg: @brand-success;
+@progress-bar-warning-bg: @brand-warning;
+@progress-bar-danger-bg: @brand-danger;
+@progress-bar-info-bg: @brand-info;
+
+
+// List group
+// -------------------------
+@list-group-bg: #fff;
+@list-group-border: #ddd;
+@list-group-border-radius: @border-radius-base;
+
+@list-group-hover-bg: #f5f5f5;
+@list-group-active-color: @component-active-color;
+@list-group-active-bg: @component-active-bg;
+@list-group-active-border: @list-group-active-bg;
+
+@list-group-link-color: #555;
+@list-group-link-heading-color: #333;
+
+
+// Panels
+// -------------------------
+@panel-bg: #fff;
+@panel-inner-border: #ddd;
+@panel-border-radius: @border-radius-base;
+@panel-footer-bg: #f5f5f5;
+
+@panel-default-text: @gray-dark;
+@panel-default-border: #ddd;
+@panel-default-heading-bg: #f5f5f5;
+
+@panel-primary-text: #fff;
+@panel-primary-border: @brand-primary;
+@panel-primary-heading-bg: @brand-primary;
+
+@panel-success-text: @state-success-text;
+@panel-success-border: @state-success-border;
+@panel-success-heading-bg: @state-success-bg;
+
+@panel-warning-text: @state-warning-text;
+@panel-warning-border: @state-warning-border;
+@panel-warning-heading-bg: @state-warning-bg;
+
+@panel-danger-text: @state-danger-text;
+@panel-danger-border: @state-danger-border;
+@panel-danger-heading-bg: @state-danger-bg;
+
+@panel-info-text: @state-info-text;
+@panel-info-border: @state-info-border;
+@panel-info-heading-bg: @state-info-bg;
+
+
+// Thumbnails
+// -------------------------
+@thumbnail-padding: 4px;
+@thumbnail-bg: @body-bg;
+@thumbnail-border: #ddd;
+@thumbnail-border-radius: @border-radius-base;
+
+@thumbnail-caption-color: @text-color;
+@thumbnail-caption-padding: 9px;
+
+
+// Wells
+// -------------------------
+@well-bg: #f5f5f5;
+
+
+// Badges
+// -------------------------
+@badge-color: #fff;
+@badge-link-hover-color: #fff;
+@badge-bg: @gray-light;
+
+@badge-active-color: @link-color;
+@badge-active-bg: #fff;
+
+@badge-font-weight: bold;
+@badge-line-height: 1;
+@badge-border-radius: 10px;
+
+
+// Breadcrumbs
+// -------------------------
+@breadcrumb-bg: #f5f5f5;
+@breadcrumb-color: #ccc;
+@breadcrumb-active-color: @gray-light;
+@breadcrumb-separator: "/";
+
+
+// Carousel
+// ------------------------
+
+@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color: #fff;
+@carousel-control-width: 15%;
+@carousel-control-opacity: .5;
+@carousel-control-font-size: 20px;
+
+@carousel-indicator-active-bg: #fff;
+@carousel-indicator-border-color: #fff;
+
+@carousel-caption-color: #fff;
+
+
+// Close
+// ------------------------
+@close-font-weight: bold;
+@close-color: #000;
+@close-text-shadow: 0 1px 0 #fff;
+
+
+// Code
+// ------------------------
+@code-color: #c7254e;
+@code-bg: #f9f2f4;
+
+@pre-bg: #f5f5f5;
+@pre-color: @gray-dark;
+@pre-border-color: #ccc;
+@pre-scrollable-max-height: 340px;
+
+// Type
+// ------------------------
+@text-muted: @gray-light;
+@abbr-border-color: @gray-light;
+@headings-small-color: @gray-light;
+@blockquote-small-color: @gray-light;
+@blockquote-border-color: @gray-lighter;
+@page-header-border-color: @gray-lighter;
+
+// Miscellaneous
+// -------------------------
+
+// Hr border color
+@hr-border: @gray-lighter;
+
+// Horizontal forms & lists
+@component-offset-horizontal: 180px;
+
+
+// Container sizes
+// --------------------------------------------------
+
+// Small screen / tablet
+@container-tablet: ((720px + @grid-gutter-width));
+@container-sm: @container-tablet;
+
+// Medium screen / desktop
+@container-desktop: ((940px + @grid-gutter-width));
+@container-md: @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop: ((1140px + @grid-gutter-width));
+@container-lg: @container-large-desktop;
Propchange: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less
------------------------------------------------------------------------------
svn:executable = *
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/forms.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/forms.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/forms.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/forms.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,64 @@
+/*
+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; } */
+
+
\ No newline at end of file
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,21 @@
+// 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();
+}
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/jspwiki.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/jspwiki.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/jspwiki.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/jspwiki.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,157 @@
+/*!
+ 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.
+
+ Following browser specific css hacks (IEx) can be used: (handle with care)
+ (start code)
+ // IE6 and below
+ * html <css-selector> { <css-attribute>:<css-value> }
+ <css-selector> { _<css-attribute>:<css-value> }
+
+ // IE7 and below:
+ *:first-child+html <css-selector> { <css-attribute>:<css-value> }
+ <css-selector> { *<css-attribute>:<css-value> }
+ (end)
+*/
+
+/*!
+ * 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 "variables.less";
+@import "bootstrap/mixins.less";
+
+// Reset
+@import "bootstrap/normalize.less";
+@import "bootstrap/print.less";
+@import "print.less";
+
+// Core CSS
+@import "bootstrap/scaffolding.less";
+@import "bootstrap/type.less";
+@import "type.less";
+@import "bootstrap/code.less";
+//@import "bootstrap/grid.less";
+@import "grid.less";
+
+@import "bootstrap/tables.less";
+@import "tables.less";
+@import "TableX.Sort.less";
+@import "TableX.Filter.less";
+@import "bootstrap/forms.less";
+@import "forms.less";
+@import "bootstrap/buttons.less";
+
+// Components: common
+//@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 "pagination.less";
+//@import "bootstrap/pager.less";
+
+// Components: Popovers
+@import "bootstrap/modals.less";
+@import "bootstrap/tooltip.less";
+@import "bootstrap/popovers.less";
+@import "Tips.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 "Viewer.less";
+@import "Viewer.Slimbox.less";
+@import "Viewer.Carousel.less";
+//@import "bootstrap/jumbotron.less";
+
+
+// JSPWiki: Template specific styles
+@import "Template.View.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";
+@import "Template.Edit.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 "prettify.less";
+
+// Utility classes
+@import "bootstrap/utilities.less"; // Has to be last to override when necessary
+@import "bootstrap/responsive-utilities.less";
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/pagination.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/pagination.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/pagination.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/pagination.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,38 @@
+/*
+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/prettify.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/prettify.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/prettify.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/prettify.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,55 @@
+/*
+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;
+ margin:0;
+ color:@gray-light;
+ text-align:right;
+ background:none;
+ border-color:transparent;
+}
+//pre & code blocks have clear:both;
+.prettyprint { clear:right; } //allow left floating of .prettylines
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/print.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/print.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/print.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/print.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,108 @@
+/*
+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 {
+
+// #actionsTop, #actionsBottom, #favorites,
+// #addattachment, #findhelp,
+//.collapsebox .collapseOpen, .collapsebox .collapseClose,
+//.tabmenu
+.watermark, .logo, .titlebox,
+.searchbox, .breadcrumb, .nav,
+a.editsection, a.hashlink,
+.table-filter .filterrow,
+.sidebar, .slmbx {
+ display:none;
+}
+#attachments, #addcomment,
+/*#pagelinks,*/
+#pagecontent, #editcontent, #previewcontent, #diffcontent, #infocontent,
+#findquery, #userPrefs,
+#pagecontent .tabmenu {
+ display:block;
+ visibility:visible;
+}
+
+tt,pre {
+ overflow:visible;
+ page-break-before: avoid;
+ page-break-inside: avoid;
+}
+
+// Show links as normal text
+a {
+ text-decoration:none;
+}
+/* Optional : print the href of each link
+a[href^=http]:after {
+ content: ' (' attr(href) ')';
+ color:grey;
+ font-family:"Courier New", Courier, mono; font-size:8pt;
+}
+*/
+
+// Give the content what it deserves.
+html>body #previewcontent, html>body #info, html>body #pagecontent, html>body #attach, html>body #findcontent {
+ overflow:visible;
+}
+
+// checkme: ie hack
+/*
+* html #previewcontent, * html #info, * html #pagecontent,
+* html #attach, * html #findcontent {
+ overflow-x:visible;
+}
+*/
+
+/* use !important to overwrite css style on following specified blocks */
+/*.pagename, #header, #footer, #xpage {
+ width:100% !important;
+ margin:0 !important;
+ padding:0 !important;
+ float:none !important;
+ clear:both !important;
+ position:static !important;
+ overflow:visible !important;
+}
+*/
+.pagename {
+ font-size:250%;
+ margin-bottom:1.5em;
+ padding-bottom:0.5em;
+ border-bottom:1px solid #555;
+ color:#555;
+}
+
+/* hidden tabs are made visible during print
+ * when printing a page, also the attachment tab gets printed
+ */
+.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;
+ margin:0;
+ /*border-top:none;*/
+}
+
+
+} // end of @media print
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/tables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/tables.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/tables.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/tables.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,46 @@
+// 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;
+ }
+ }
+
+ // Put the top-border back
+ &.table-bordered {
+ tr:first-child {
+ th, td {
+ border-top: 1px solid @table-border-color;
+ }
+ }
+ }
+
+ &.table-condensed {
+ th, td {
+ padding: @table-condensed-cell-padding;
+ }
+
+ }
+
+ &.table-fit { width:auto; }
+
+}
+
+.zebra-table { .table-striped(); }
Added: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/type.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/type.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/type.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/type.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,368 @@
+
+//bootstrap
+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)
+*/
+
+.edit-section, .hashlink {
+ font-weight: normal;
+ font-size:66%;
+
+ padding: .5em;
+ margin-left: .5em;
+ color:transparent; //hide
+ .transition(all 1s ease);
+}
+h2,h3,h4 {
+ &:hover {
+ .edit-section, .hashlink {
+ background-color: @wiki-hover;
+ border-radius: @border-radius-base; //button style
+ color: @btn-link-disabled-color;
+
+ &:hover {
+ color: @link-hover-color;
+ text-decoration: none;
+ }
+ }
+ }
+}
+
+.sidebar .hashlink, .sidebar .editsection, .panel-title .hashlink { .hidden; }
+
+
+
+b, i {
+ color:inherit;
+}
+
+//used by TableX.Filter, ...
+.highlight {
+ background-color: @highlight;
+ background-color: rgba(255, 255, 0, 0.2);
+}
+
+
+//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;
+}
+//.pre
+// => reuse styling of pre
+
+//extend bootstrap/code.less; show this <pre> is scrollable
+.pre-scrollable {
+ cursor: all-scroll; //not supported on ie & opera
+ /*FIXME: seems to have no effect -- trying to turn of word-wrapping in pre
+ overflow-x: scroll;
+ overflow:scroll;
+ text-wrap:none;
+ word-wrap:normal;
+ */
+}
+
+
+//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);
+}
+
+
+
+
+/*
+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; }
+
+.strike { text-decoration:line-through; }
+
+//see also bootstrap .text-center
+.center {
+ text-align:center;
+ table { text-align:left; }
+}
+
+//%%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; }
+
+
+//CHECKME
+//Note: error => danger from bootstrap
+.success, .information, .info, .warning, .error { .alert; clear:both; display:block;}
+.success { .alert-success; }
+.info, .information { .alert-info; }
+.warning { .alert-warning; }
+.error { .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/variables.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/variables.less?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/variables.less (added)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/variables.less Fri Feb 14 17:24:32 2014
@@ -0,0 +1,112 @@
+// JSPWiki color scheme an typography
+
+@white: #fff;
+@black: #000;
+@orange: #FF851B; // #f93
+@light-grey: #f9f9f9;
+
+
+// See - https://github.com/mrmrs/colors/blob/master/less/_variables.less
+// Cool
+
+@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;
+
+
+@imagePath: "images";
+
+
+// wiki color scheme
+//@wiki-header-bg: rgb(25,152,240); // blueish
+@wiki-header-bg: rgb(116,168,163); // greenish
+@wiki-page-bg: @white;
+@wiki-sidebar-bg: rgb(191, 209, 138); //rgb(183, 220, 213); //rgb(233,244,250);//fade(rgb(252,178,111),75%);
+@wiki-footer-bg: rgb(0,82,118);//rgb(41,127,185);
+
+//@pre-bg:rgb(233,244,250);
+
+
+//todo
+//theme cpt.haddock
+// rgb(41,80,112) dark blue #295070
+// rgb(115,142,163) blue/grey #738eA3
+// rgb(61,75,86Ã dark grey #3d4b57
+// rgb(66,120,163) fresh blue #4278a3
+// rgb(168,208,240) light blue #a8d0f0
+
+// herring
+// rgb(40,61,71), rgb(118,187,196), rgb(188,238,250), white, rgb(147,202,255)
+// dark green, fresh green, light green, white, light blue
+
+// sandy stone beach ocean diver color theme
+// rgb(230,226,175); rgb(167,163,126), rgb(239,236,202), rgb(4,99,128), rgb(0,47,47)
+// sand, stone(dark brown), light yellow beach, blue-green ocean, dark dark
+
+@font-family-header: 'Helvetica Neue', Arial, Helvetica, sans-serif;
+@font-family-logo: 'HelveticaNeue-UltraLight', 'Helvetica Neue UltraLight', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+
+@breadcrumb-color: @white;
+
+
+// Forms
+@wikiFormFontColor: #007; //font color for input, textarea form element
+
+// Highlight
+@wiki-hover: @dropdown-link-hover-bg;
+@highlight: rgba(255, 255, 0, 0.2); //highlight in item lists, search filter,...
+@wiki-mark: @orange; //mark search results, searchbars (amber), default graphbar
+
+// Misc.
+@wiki-link-createpage: red;
+@wiki-diff-add: #9f9; //diff inserted lines
+@wiki-diff-delete: #f93; //diff deleted lines
+@wiki-captcha-bg: @light-grey;
+@wiki-captcha-width: 125px;
+
+@pre-scrollable-max-height: 250px; //bootstrap default is 340px
+
+// Viewer
+@viewer-box-border-color: @table-border-color;
+
+// Viewer.Slimbox
+@slimbox-viewport-corona: 7px 7px 70px rgba(255,255,255,.5);
+
+@slimbox-font-family: @font-family-header;
+@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: @font-family-logo;
+@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;
+
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=1568367&r1=1568366&r2=1568367&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Install.jsp Fri Feb 14 17:24:32 2014
@@ -216,4 +216,4 @@ if ( !installer.adminExists() )
</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp?rev=1568367&r1=1568366&r2=1568367&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/admin/Admin.jsp Fri Feb 14 17:24:32 2014
@@ -45,14 +45,19 @@
{
%>
<html>
- <body>
+ <head>
+ <base href="../"/>
+ <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
+ <wiki:IncludeResources type="stylesheet"/>
+ </head>
+ <body class="container">
<h1>Disabled</h1>
<p>JSPWiki admin UI has been disabled. This is an experimental feature, and is
not guaranteed to work. You may turn it on by specifying</p>
<pre>
jspwiki-x.adminui.enable=true
</pre>
- <p>in your <tt>jspwiki.properties</tt> file.</p>
+ <p>in your <tt>jspwiki-custom.properties</tt> file.</p>
<p>Have a nice day. Don't forget to eat lots of fruits and vegetables.</p>
</body>
</html>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp?rev=1568367&r1=1568366&r2=1568367&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp Fri Feb 14 17:24:32 2014
@@ -53,7 +53,7 @@
<link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
<wiki:IncludeResources type="stylesheet"/>
</head>
- <body><div id="wikibody">
+ <body><div id="wikibody container">
<h1>Disabled</h1>
<p>JSPWiki SecurityConfig UI has been disabled. This page could reveal important security
details about your configuration to a potential attacker, so it has been turned off by
@@ -61,7 +61,7 @@
<pre>
jspwiki-x.securityconfig.enable=true
</pre>
- <p>in your <tt>jspwiki.properties</tt> file.</p>
+ <p>in your <tt>jspwiki-custom.properties</tt> file.</p>
<p>Once you are done with debugging your security configuration, please turn this page
off again by removing the preceding line, so that your system is safe again.</p>
<p>Have a nice day. May the Force be with you.</p>
@@ -82,7 +82,7 @@
<wiki:IncludeResources type="stylesheet"/>
</head>
<body>
-<div id="wikibody">
+<div id="wikibody" class="container">
<div id="page">
<div id="pagecontent">
@@ -92,17 +92,19 @@
<p>This page is dynamically generated by JSPWiki. It examines the authentication, authorization and security policy settings. When we think something looks funny, we'll try to communicate what the issue might be, and will make recommendations on how to fix the problem.</p>
-<p><strong>Please delete this JSP when you are finished troubleshooting your system.
+<blockquote>
+<p >Please delete this JSP when you are finished troubleshooting your system.
This diagnostic data presented on this page do not represent a security risk
to your system <em>per se</em>, but they do provide a significant amount of
contextual information that could be useful to an attacker. This page is
currently unconstrained, which means that anyone can view it: nice people, mean people
-and everyone in between. You have been warned. You can turn it off by setting
+and everyone in between. You have been warned. You can turn it off by setting</p>
<pre>
- jspwiki-x.securityconfig.enable=false
+ jspwiki-x.securityconfig.enable=false
</pre>
-in your jspwiki.properties.
-</strong></p>
+<p>in your jspwiki-custom.properties.
+</p>
+</blockquote>
<!--
*********************************************
Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,162 @@
+<%--
+ 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.
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.auth.*" %>
+<%@ page import="org.apache.wiki.ui.progress.*" %>
+<%@ page import="org.apache.wiki.auth.permissions.*" %>
+<%@ page import="java.security.Permission" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+<%
+ int MAXATTACHNAMELENGTH = 30;
+ WikiContext c = WikiContext.findContext(pageContext);
+ String progressId = c.getEngine().getProgressManager().getNewProgressIdentifier();
+%>
+
+<div class="page-content">
+<wiki:Permission permission="upload">
+
+ <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>"
+ class="accordion-close"
+ id="uploadform"
+ method="post"
+ enctype="multipart/form-data" accept-charset="<wiki:ContentEncoding/>" >
+
+
+ <h4><fmt:message key="attach.add"/></h4>
+ <wiki:Messages div="alert alert-danger" />
+
+ <%--
+ <p><fmt:message key="attach.add.info" /></p>
+ --%>
+ <div class="form-group">
+ <label class="control-label form-col-20" for="files"><fmt:message key="attach.add.selectfile"/></label>
+
+ <ul class="list-group form-col-50">
+ <li class="list-group-item droppable">
+ <label>Select files <%--or drop them here!--%></label>
+ <input type="file" name="files" id="files" size="60"/>
+ <a class="hidden delete btn btn-danger btn-xs pull-right">Delete</a>
+ </li>
+ </ul>
+ </div>
+ <div class="form-group">
+ <label class="control-label form-col-20" for="changenote"><fmt:message key="attach.add.changenote"/></label>
+ <input class="form-control form-col-50" type="text" name="changenote" id="changenote" maxlength="80" size="60" />
+ </div>
+ <div class="form-group">
+ <input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
+ <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+ <input class="btn btn-primary form-col-offset-20 form-col-50"
+ type="submit" name="upload" id="upload" disabled="disabled" value="<fmt:message key='attach.add.submit'/>" />
+ <input type="hidden" name="action" value="upload" />
+ </div>
+ <div class="hidden form-col-offset-20 form-col-80 progress progress-striped active">
+ <div class="progress-bar" data-progressid="<%=progressId%>" style="width: 100%;"></div>
+ </div>
+
+ </form>
+</wiki:Permission>
+<wiki:Permission permission="!upload">
+ <div class="warning"><fmt:message key="attach.add.permission"/></div>
+</wiki:Permission>
+
+
+<wiki:HasAttachments>
+
+<%--<h3><fmt:message key="attach.list"/></h3>--%>
+
+ <wiki:Permission permission="delete">
+ <%-- hidden delete form --%>
+ <form action="tbd"
+ class="hidden"
+ id="deleteForm"
+ method="post" accept-charset="<wiki:ContentEncoding />"
+ onsubmit="return(confirm('<fmt:message key="attach.deleteconfirm"/>') );" >
+
+ <%--TODO: "nextpage" is not yet implemented in Delete.jsp
+ <input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
+ --%>
+ <input class="btn btn-danger btn-xs" id="delete-all" name="delete-all" type="submit" value="Delete" />
+
+ </form>
+ </wiki:Permission>
+
+ <div class="slimbox-attachments sortable table-filter-hover-sort table-filter">
+ <table class="table">
+ <tr>
+ <th><fmt:message key="info.attachment.type"/></th>
+ <th><fmt:message key="info.attachment.name"/></th>
+ <th><fmt:message key="info.size"/></th>
+ <th><fmt:message key="info.version"/></th>
+ <th><fmt:message key="info.date"/></th>
+ <th><fmt:message key="info.author"/></th>
+ <wiki:Permission permission="delete"><th><fmt:message key="info.actions"/></th></wiki:Permission>
+ <th><fmt:message key="info.changenote"/></th>
+ </tr>
+
+ <wiki:AttachmentsIterator id="att">
+ <%
+ String name = att.getFileName();
+ int dot = name.lastIndexOf(".");
+ String attachtype = ( dot != -1 ) ? name.substring(dot+1).toLowerCase() : " ";
+
+ String sname = name;
+ if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
+ %>
+ <tr>
+ <td><div id="attach-<%= attachtype %>" class="attachtype"><%= attachtype %></div></td>
+ <td><wiki:LinkTo title="<%= name %>" ><%= sname %></wiki:LinkTo></td>
+ <td class="nowrap text-right">
+ <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
+ </td>
+ <td class="center">
+ <a href="<wiki:Link context='info' format='url'/>" title="<fmt:message key='attach.moreinfo.title'/>"><wiki:PageVersion /></a>
+ </td>
+ <td class="nowrap" jspwiki:sortvalue="<%= att.getLastModified().getTime() %>">
+ <fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+ </td>
+ <td><wiki:Author /></td>
+ <wiki:Permission permission="delete">
+ <td>
+ <input type="button"
+ class="btn btn-danger btn-xs"
+ value="<fmt:message key='attach.delete'/>"
+ src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />"
+ onclick="$('deleteForm').set('action',this.src); $('delete-all').click();" />
+
+ </td>
+ </wiki:Permission>
+ <td class="changenote">
+ <% String changenote = (String) att.getAttribute( WikiPage.CHANGENOTE ); %>
+ <%= (changenote==null) ? "" : changenote %>
+ </td>
+ </tr>
+ </wiki:AttachmentsIterator>
+
+ </table>
+ </div>
+
+</wiki:HasAttachments>
+
+</div>
+
Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp?rev=1568367&view=auto
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp (added)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp Fri Feb 14 17:24:32 2014
@@ -0,0 +1,37 @@
+<%--
+ 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.
+--%>
+
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
+
+<div class="page-content">
+<%--
+ <wiki:Tab id="pagecontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"comment.tab.discussionpage")%>'>
+ <wiki:InsertPage/>
+ </wiki:Tab>
+
+ <wiki:Tab id="commentcontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"comment.tab.addcomment")%>'>
+--%>
+
+ <wiki:Editor />
+
+</div>
\ No newline at end of file