You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2016/12/17 21:21:37 UTC
[2/7] jspwiki git commit: Various HADDOCK updates & fixes
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less b/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less
index 297ef54..4db59f2 100755
--- a/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less
+++ b/jspwiki-war/src/main/styles/haddock/bootstrap/variables.less
@@ -1,141 +1,146 @@
-/*
- *
- * 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.
- *
-*/
//
// 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
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
-// Brand colors
-// -------------------------
+@gray-base: #000;
+@gray-darker: lighten(@gray-base, 13.5%); // #222
+@gray-dark: lighten(@gray-base, 20%); // #333
+@gray: lighten(@gray-base, 33.5%); // #555
+@gray-light: lighten(@gray-base, 46.7%); // #777
+@gray-lighter: lighten(@gray-base, 93.5%); // #eee
-@brand-primary: #428bca;
+@brand-primary: darken(#428bca, 6.5%); // #337ab7
@brand-success: #5cb85c;
+@brand-info: #5bc0de;
@brand-warning: #f0ad4e;
@brand-danger: #d9534f;
-@brand-info: #5bc0de;
-// Scaffolding
-// -------------------------
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+// ** Background color for `<body>`.
@body-bg: #fff;
+// ** Global text color on `<body>`.
@text-color: @gray-dark;
-// Links
-// -------------------------
-
+// ** Global textual link color.
@link-color: @brand-primary;
+// ** Link hover color set via `darken()` function.
@link-hover-color: darken(@link-color, 15%);
+// ** Link hover decoration.
+@link-hover-decoration: underline;
+
-// Typography
-// -------------------------
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
+// ** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@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-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-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
+@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
+// ** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
-@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
+// ** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
-@headings-font-family: @font-family-base;
+// ** By default, this inherits from the `<body>`.
+@headings-font-family: inherit;
@headings-font-weight: 500;
@headings-line-height: 1.1;
@headings-color: inherit;
-// Iconography
-// -------------------------
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+// ** Load fonts from this directory.
@icon-font-path: "../fonts/";
+// ** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular";
+// ** Element ID within SVG icon file.
+@icon-font-svg-id: "glyphicons_halflingsregular";
-// Components
-// -------------------------
-// Based on 14px font-size and 1.428 line-height (~20px to start)
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical: 6px;
+@padding-base-horizontal: 12px;
-@padding-base-vertical: 6px;
-@padding-base-horizontal: 12px;
+@padding-large-vertical: 10px;
+@padding-large-horizontal: 16px;
-@padding-large-vertical: 10px;
-@padding-large-horizontal: 16px;
+@padding-small-vertical: 5px;
+@padding-small-horizontal: 10px;
-@padding-small-vertical: 5px;
-@padding-small-horizontal: 10px;
+@padding-xs-vertical: 1px;
+@padding-xs-horizontal: 5px;
-@padding-xs-vertical: 1px;
-@padding-xs-horizontal: 5px;
+@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
+@line-height-small: 1.5;
-@line-height-large: 1.33;
-@line-height-small: 1.5;
+@border-radius-base: 4px;
+@border-radius-large: 6px;
+@border-radius-small: 3px;
-@border-radius-base: 4px;
-@border-radius-large: 6px;
-@border-radius-small: 3px;
+// ** Global color for active items (e.g., navs or dropdowns).
+@component-active-color: #fff;
+// ** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg: @brand-primary;
-@component-active-color: #fff;
-@component-active-bg: @brand-primary;
+// ** Width of the `border` for generating carets that indicate dropdowns.
+@caret-width-base: 4px;
+// ** Carets increase slightly in size for larger components.
+@caret-width-large: 5px;
-@caret-width-base: 4px;
-@caret-width-large: 5px;
-// Tables
-// -------------------------
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
-@table-cell-padding: 8px;
-@table-condensed-cell-padding: 5px;
+// ** Padding for `<th>`s and `<td>`s.
+@table-cell-padding: 8px;
+// ** Padding for cells in `.table-condensed`.
+@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;
+// ** Default background color used for all tables.
+@table-bg: transparent;
+// ** Background color used for `.table-striped`.
+@table-bg-accent: #f9f9f9;
+// ** Background color used for `.table-hover`.
+@table-bg-hover: #f5f5f5;
+@table-bg-active: @table-bg-hover;
-@table-border-color: #ddd; // table and cell border
+// ** Border color for table and cell borders.
+@table-border-color: #ddd;
-// Buttons
-// -------------------------
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
@btn-font-weight: normal;
@@ -151,6 +156,10 @@
@btn-success-bg: @brand-success;
@btn-success-border: darken(@btn-success-bg, 5%);
+@btn-info-color: #fff;
+@btn-info-bg: @brand-info;
+@btn-info-border: darken(@btn-info-bg, 5%);
+
@btn-warning-color: #fff;
@btn-warning-bg: @brand-warning;
@btn-warning-border: darken(@btn-warning-bg, 5%);
@@ -159,99 +168,147 @@
@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;
+// Allows for customizing button radius independently from global border radius
+@btn-border-radius-base: @border-radius-base;
+@btn-border-radius-large: @border-radius-large;
+@btn-border-radius-small: @border-radius-small;
-// Forms
-// -------------------------
+//== Forms
+//
+//##
+
+// ** `<input>` background color
@input-bg: #fff;
+// ** `<input disabled>` background color
@input-bg-disabled: @gray-lighter;
+// ** Text color for `<input>`s
@input-color: @gray;
+// ** `<input>` border color
@input-border: #ccc;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+// ** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
@input-border-radius: @border-radius-base;
+// ** Large `.form-control` border radius
+@input-border-radius-large: @border-radius-large;
+// ** Small `.form-control` border radius
+@input-border-radius-small: @border-radius-small;
+
+// ** Border color for inputs on focus
@input-border-focus: #66afe9;
-@input-color-placeholder: @gray-light;
+// ** Placeholder text color
+@input-color-placeholder: #999;
+// ** Default `.form-control` height
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
+// ** Large `.form-control` height
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+// ** Small `.form-control` height
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+// ** `.form-group` margin
+@form-group-margin-bottom: 15px;
+
@legend-color: @gray-dark;
@legend-border-color: #e5e5e5;
+// ** Background color for textual input addons
@input-group-addon-bg: @gray-lighter;
+// ** Border color for textual input addons
@input-group-addon-border-color: @input-border;
+// ** Disabled cursor for form controls and buttons.
+@cursor-disabled: not-allowed;
+
-// Dropdowns
-// -------------------------
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+// ** Background for the dropdown menu.
@dropdown-bg: #fff;
+// ** Dropdown menu `border-color`.
@dropdown-border: rgba(0,0,0,.15);
+// ** Dropdown menu `border-color` **for IE8**.
@dropdown-fallback-border: #ccc;
+// ** Divider color for between dropdown items.
@dropdown-divider-bg: #e5e5e5;
+// ** Dropdown link text color.
@dropdown-link-color: @gray-dark;
+// ** Hover color for dropdown links.
@dropdown-link-hover-color: darken(@gray-dark, 5%);
+// ** Hover background for dropdown links.
@dropdown-link-hover-bg: #f5f5f5;
+// ** Active dropdown menu item text color.
@dropdown-link-active-color: @component-active-color;
+// ** Active dropdown menu item background color.
@dropdown-link-active-bg: @component-active-bg;
+// ** Disabled dropdown menu item background color.
@dropdown-link-disabled-color: @gray-light;
+// ** Text color for headers within dropdown menus.
@dropdown-header-color: @gray-light;
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
+// ** Deprecated `@dropdown-caret-color` as of v3.1.0
+@dropdown-caret-color: #000;
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
@zindex-navbar: 1000;
@zindex-dropdown: 1000;
-@zindex-popover: 1010;
-@zindex-tooltip: 1030;
+@zindex-popover: 1060;
+@zindex-tooltip: 1070;
@zindex-navbar-fixed: 1030;
@zindex-modal-background: 1040;
@zindex-modal: 1050;
-// Media queries breakpoints
-// --------------------------------------------------
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
// Extra small screen / phone
-// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
+// ** Deprecated `@screen-xs` as of v3.0.1
@screen-xs: 480px;
+// ** Deprecated `@screen-xs-min` as of v3.2.0
@screen-xs-min: @screen-xs;
+// ** Deprecated `@screen-phone` as of v3.0.1
@screen-phone: @screen-xs-min;
// Small screen / tablet
-// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
+// ** Deprecated `@screen-sm` as of v3.0.1
@screen-sm: 768px;
@screen-sm-min: @screen-sm;
+// ** Deprecated `@screen-tablet` as of v3.0.1
@screen-tablet: @screen-sm-min;
// Medium screen / desktop
-// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
+// ** Deprecated `@screen-md` as of v3.0.1
@screen-md: 992px;
@screen-md-min: @screen-md;
+// ** Deprecated `@screen-desktop` as of v3.0.1
@screen-desktop: @screen-md-min;
// Large screen / wide desktop
-// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
+// ** Deprecated `@screen-lg` as of v3.0.1
@screen-lg: 1200px;
@screen-lg-min: @screen-lg;
+// ** Deprecated `@screen-lg-desktop` as of v3.0.1
@screen-lg-desktop: @screen-lg-min;
// So media queries don't overlap when required, provide a maximum
@@ -260,31 +317,53 @@
@screen-md-max: (@screen-lg-min - 1);
-// Grid system
-// --------------------------------------------------
+//== Grid system
+//
+//## Define your custom responsive grid.
-// Number of columns in the grid system
+// ** Number of columns in the grid.
@grid-columns: 12;
-// Padding, to be divided by two and applied to the left and right of all columns
+// ** Padding between columns. Gets divided in half for the left and right.
+@gutter: 30px; //??missing, used by grid.less??
@grid-gutter-width: 30px;
-
// Navbar collapse
-
-// Point at which the navbar becomes uncollapsed
+// ** Point at which the navbar becomes uncollapsed.
@grid-float-breakpoint: @screen-sm-min;
-// Point at which the navbar begins collapsing
+// ** Point at which the navbar begins collapsing.
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
-// Navbar
-// -------------------------
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet: (720px + @grid-gutter-width);
+// ** For `@screen-sm-min` and up.
+@container-sm: @container-tablet;
+
+// Medium screen / desktop
+@container-desktop: (940px + @grid-gutter-width);
+// ** For `@screen-md-min` and up.
+@container-md: @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop: (1140px + @grid-gutter-width);
+// ** For `@screen-lg-min` and up.
+@container-lg: @container-large-desktop;
+
+
+//== 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-horizontal: floor((@grid-gutter-width / 2));
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height: 340px;
@navbar-default-color: #777;
@navbar-default-bg: #f8f8f8;
@@ -306,19 +385,18 @@
// Navbar toggle
@navbar-default-toggle-hover-bg: #ddd;
-@navbar-default-toggle-icon-bar-bg: #ccc;
+@navbar-default-toggle-icon-bar-bg: #888;
@navbar-default-toggle-border-color: #ddd;
-// Inverted navbar
-//
+//=== Inverted navbar
// Reset inverted navbar basics
-@navbar-inverse-color: @gray-light;
+@navbar-inverse-color: lighten(@gray-light, 15%);
@navbar-inverse-bg: #222;
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links
-@navbar-inverse-link-color: @gray-light;
+@navbar-inverse-link-color: lighten(@gray-light, 15%);
@navbar-inverse-link-hover-color: #fff;
@navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
@@ -337,18 +415,18 @@
@navbar-inverse-toggle-border-color: #333;
-// Navs
-// -------------------------
+//== Navs
+//
+//##
+//=== Shared nav styles
@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
+//== Tabs
@nav-tabs-border-color: #ddd;
@nav-tabs-link-hover-border-color: @gray-lighter;
@@ -360,45 +438,64 @@
@nav-tabs-justified-link-border-color: #ddd;
@nav-tabs-justified-active-link-border-color: @body-bg;
-// Pills
+//== 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
+//
+//##
+@pagination-color: @link-color;
@pagination-bg: #fff;
@pagination-border: #ddd;
+@pagination-hover-color: @link-hover-color;
@pagination-hover-bg: @gray-lighter;
+@pagination-hover-border: #ddd;
-@pagination-active-bg: @brand-primary;
@pagination-active-color: #fff;
+@pagination-active-bg: @brand-primary;
+@pagination-active-border: @brand-primary;
@pagination-disabled-color: @gray-light;
+@pagination-disabled-bg: #fff;
+@pagination-disabled-border: #ddd;
-// Pager
-// -------------------------
+//== Pager
+//
+//##
+@pager-bg: @pagination-bg;
+@pager-border: @pagination-border;
@pager-border-radius: 15px;
-@pager-disabled-color: @gray-light;
+@pager-hover-bg: @pagination-hover-bg;
+
+@pager-active-bg: @pagination-active-bg;
+@pager-active-color: @pagination-active-color;
+
+@pager-disabled-color: @pagination-disabled-color;
-// Jumbotron
-// -------------------------
+
+//== Jumbotron
+//
+//##
@jumbotron-padding: 30px;
@jumbotron-color: inherit;
@jumbotron-bg: @gray-lighter;
@jumbotron-heading-color: inherit;
-@jumbotron-font-size: ceil(@font-size-base * 1.5);
+@jumbotron-font-size: ceil((@font-size-base * 1.5));
+@jumbotron-heading-font-size: ceil((@font-size-base * 4.5));
-// Form states and alerts
-// -------------------------
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
@state-success-text: #3c763d;
@state-success-bg: #dff0d8;
@@ -417,65 +514,113 @@
@state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
-// Tooltips
-// -------------------------
+//== Tooltips
+//
+//##
+
+// ** Tooltip max width
@tooltip-max-width: 200px;
+// ** Tooltip text color
@tooltip-color: #fff;
+// ** Tooltip background color
@tooltip-bg: #000;
+@tooltip-opacity: .9;
+// ** Tooltip arrow width
@tooltip-arrow-width: 5px;
+// ** Tooltip arrow color
@tooltip-arrow-color: @tooltip-bg;
-// Popovers
-// -------------------------
+//== Popovers
+//
+//##
+
+// ** Popover body background color
@popover-bg: #fff;
+// ** Popover maximum width
@popover-max-width: 276px;
+// ** Popover border color
@popover-border-color: rgba(0,0,0,.2);
+// ** Popover fallback border color
@popover-fallback-border-color: #ccc;
+// ** Popover title background color
@popover-title-bg: darken(@popover-bg, 3%);
+// ** Popover arrow width
@popover-arrow-width: 10px;
-@popover-arrow-color: #fff;
+// ** Popover arrow color
+@popover-arrow-color: @popover-bg;
+// ** Popover outer arrow width
@popover-arrow-outer-width: (@popover-arrow-width + 1);
-@popover-arrow-outer-color: rgba(0,0,0,.25);
-@popover-arrow-outer-fallback-color: #999;
+// ** Popover outer arrow color
+@popover-arrow-outer-color: fadein(@popover-border-color, 5%);
+// ** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%);
-// Labels
-// -------------------------
+//== Labels
+//
+//##
+// ** Default label background color
@label-default-bg: @gray-light;
+// ** Primary label background color
@label-primary-bg: @brand-primary;
+// ** Success label background color
@label-success-bg: @brand-success;
+// ** Info label background color
@label-info-bg: @brand-info;
+// ** Warning label background color
@label-warning-bg: @brand-warning;
+// ** Danger label background color
@label-danger-bg: @brand-danger;
+// ** Default label text color
@label-color: #fff;
+// ** Default text color of a linked label
@label-link-hover-color: #fff;
-// Modals
-// -------------------------
-@modal-inner-padding: 20px;
+//== Modals
+//
+//##
+
+// ** Padding applied to the modal body
+@modal-inner-padding: 15px;
+// ** Padding applied to the modal title
@modal-title-padding: 15px;
+// ** Modal title line-height
@modal-title-line-height: @line-height-base;
+// ** Background color of modal content area
@modal-content-bg: #fff;
+// ** Modal content border color
@modal-content-border-color: rgba(0,0,0,.2);
+// ** Modal content border color **for IE8**
@modal-content-fallback-border-color: #999;
+// ** Modal backdrop background color
@modal-backdrop-bg: #000;
+// ** Modal backdrop opacity
+@modal-backdrop-opacity: .5;
+// ** Modal header border color
@modal-header-border-color: #e5e5e5;
+// ** Modal footer border color
@modal-footer-border-color: @modal-header-border-color;
+@modal-lg: 900px;
+@modal-md: 600px;
+@modal-sm: 300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
-// Alerts
-// -------------------------
@alert-padding: 15px;
@alert-border-radius: @border-radius-base;
@alert-link-font-weight: bold;
@@ -497,38 +642,75 @@
@alert-danger-border: @state-danger-border;
-// Progress bars
-// -------------------------
+//== Progress bars
+//
+//##
+
+// ** Background color of the whole progress component
@progress-bg: #f5f5f5;
+// ** Progress bar text color
@progress-bar-color: #fff;
+// ** Variable for setting rounded corners on progress bar.
+@progress-border-radius: @border-radius-base;
+// ** Default progress bar color
@progress-bar-bg: @brand-primary;
+// ** Success progress bar color
@progress-bar-success-bg: @brand-success;
+// ** Warning progress bar color
@progress-bar-warning-bg: @brand-warning;
+// ** Danger progress bar color
@progress-bar-danger-bg: @brand-danger;
+// ** Info progress bar color
@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;
-
+//== List group
+//
+//##
+
+// ** Background color on `.list-group-item`
+@list-group-bg: #fff;
+// ** `.list-group-item` border color
+@list-group-border: #ddd;
+// ** List group border radius
+@list-group-border-radius: @border-radius-base;
+
+// ** Background color of single list items on hover
+@list-group-hover-bg: #f5f5f5;
+// ** Text color of active list items
+@list-group-active-color: @component-active-color;
+// ** Background color of active list items
+@list-group-active-bg: @component-active-bg;
+// ** Border color of active list elements
+@list-group-active-border: @list-group-active-bg;
+// ** Text color for content within active list items
+@list-group-active-text-color: lighten(@list-group-active-bg, 40%);
+
+// ** Text color of disabled list items
+@list-group-disabled-color: @gray-light;
+// ** Background color of disabled list items
+@list-group-disabled-bg: @gray-lighter;
+// ** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color: #555;
+@list-group-link-hover-color: @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
-// Panels
-// -------------------------
@panel-bg: #fff;
-@panel-inner-border: #ddd;
+@panel-body-padding: 15px;
+@panel-heading-padding: 10px 15px;
+@panel-footer-padding: @panel-heading-padding;
@panel-border-radius: @border-radius-base;
+
+// ** Border color for elements within panels
+@panel-inner-border: #ddd;
@panel-footer-bg: #f5f5f5;
@panel-default-text: @gray-dark;
@@ -543,6 +725,10 @@
@panel-success-border: @state-success-border;
@panel-success-heading-bg: @state-success-bg;
+@panel-info-text: @state-info-text;
+@panel-info-border: @state-info-border;
+@panel-info-heading-bg: @state-info-bg;
+
@panel-warning-text: @state-warning-text;
@panel-warning-border: @state-warning-border;
@panel-warning-heading-bg: @state-warning-bg;
@@ -551,34 +737,46 @@
@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
+//
+//##
-// Thumbnails
-// -------------------------
+// ** Padding around the thumbnail image
@thumbnail-padding: 4px;
+// ** Thumbnail background color
@thumbnail-bg: @body-bg;
+// ** Thumbnail border color
@thumbnail-border: #ddd;
+// ** Thumbnail border radius
@thumbnail-border-radius: @border-radius-base;
+// ** Custom text color for thumbnail captions
@thumbnail-caption-color: @text-color;
+// ** Padding around the thumbnail caption
@thumbnail-caption-padding: 9px;
-// Wells
-// -------------------------
+//== Wells
+//
+//##
+
@well-bg: #f5f5f5;
+@well-border: darken(@well-bg, 7%);
+
+//== Badges
+//
+//##
-// Badges
-// -------------------------
@badge-color: #fff;
+// ** Linked badge text color on hover
@badge-link-hover-color: #fff;
@badge-bg: @gray-light;
+// ** Badge text color in active nav link
@badge-active-color: @link-color;
+// ** Badge background color in active nav link
@badge-active-bg: #fff;
@badge-font-weight: bold;
@@ -586,16 +784,25 @@
@badge-border-radius: 10px;
-// Breadcrumbs
-// -------------------------
-@breadcrumb-bg: #f5f5f5;
-@breadcrumb-color: #ccc;
-@breadcrumb-active-color: @gray-light;
-@breadcrumb-separator: "/";
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical: 8px;
+@breadcrumb-padding-horizontal: 15px;
+// ** Breadcrumb background color
+@breadcrumb-bg: #f5f5f5;
+// ** Breadcrumb text color
+@breadcrumb-color: #ccc;
+// ** Text color of current page in the breadcrumb
+@breadcrumb-active-color: @gray-light;
+// ** Textual separator for between breadcrumb elements
+@breadcrumb-separator: "/";
-// Carousel
-// ------------------------
+//== Carousel
+//
+//##
@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
@@ -610,53 +817,54 @@
@carousel-caption-color: #fff;
-// Close
-// ------------------------
+//== Close
+//
+//##
+
@close-font-weight: bold;
@close-color: #000;
@close-text-shadow: 0 1px 0 #fff;
-// Code
-// ------------------------
+//== Code
+//
+//##
+
@code-color: #c7254e;
@code-bg: #f9f2f4;
+@kbd-color: #fff;
+@kbd-bg: #333;
+
@pre-bg: #f5f5f5;
@pre-color: @gray-dark;
@pre-border-color: #ccc;
@pre-scrollable-max-height: 340px;
-// Type
-// ------------------------
+
+//== Type
+//
+//##
+
+// ** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
+// ** Text muted color
@text-muted: @gray-light;
+// ** Abbreviations and acronyms border color
@abbr-border-color: @gray-light;
+// ** Headings small color
@headings-small-color: @gray-light;
+// ** Blockquote small color
@blockquote-small-color: @gray-light;
+// ** Blockquote font size
+@blockquote-font-size: (@font-size-base * 1.25);
+// ** Blockquote border color
@blockquote-border-color: @gray-lighter;
+// ** Page header border color
@page-header-border-color: @gray-lighter;
-
-// Miscellaneous
-// -------------------------
-
-// Hr border color
+// ** Width of horizontal description list titles
+@dl-horizontal-offset: @component-offset-horizontal;
+// ** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint: @grid-float-breakpoint;
+// ** Horizontal line 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;
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/bootstrap/wells.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/bootstrap/wells.less b/jspwiki-war/src/main/styles/haddock/bootstrap/wells.less
new file mode 100755
index 0000000..15d072b
--- /dev/null
+++ b/jspwiki-war/src/main/styles/haddock/bootstrap/wells.less
@@ -0,0 +1,29 @@
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+ min-height: 20px;
+ padding: 19px;
+ margin-bottom: 20px;
+ background-color: @well-bg;
+ border: 1px solid @well-border;
+ border-radius: @border-radius-base;
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+ blockquote {
+ border-color: #ddd;
+ border-color: rgba(0,0,0,.15);
+ }
+}
+
+// Sizes
+.well-lg {
+ padding: 24px;
+ border-radius: @border-radius-large;
+}
+.well-sm {
+ padding: 9px;
+ border-radius: @border-radius-small;
+}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/.crunch
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/.crunch b/jspwiki-war/src/main/styles/haddock/default/.crunch
new file mode 100644
index 0000000..fea8681
--- /dev/null
+++ b/jspwiki-war/src/main/styles/haddock/default/.crunch
@@ -0,0 +1,123 @@
+{
+ "files": {
+ "build.less": {
+ "engines": [
+ {
+ "compiler": "less",
+ "output": "build.css",
+ "options": {
+ "compress": false,
+ "ieCompat": false,
+ "strictMath": false,
+ "strictUnits": false,
+ "javascriptEnabled": false,
+ "sourceMap": true
+ }
+ }
+ ],
+ "sources": [
+ "../bootstrap/alerts.less",
+ "../bootstrap/badges.less",
+ "../bootstrap/button-groups.less",
+ "../bootstrap/buttons.less",
+ "../bootstrap/carousel.less",
+ "../bootstrap/close.less",
+ "../bootstrap/code.less",
+ "../bootstrap/dropdowns.less",
+ "../bootstrap/forms.less",
+ "../bootstrap/input-groups.less",
+ "../bootstrap/labels.less",
+ "../bootstrap/list-group.less",
+ "../bootstrap/mixins.less",
+ "../bootstrap/mixins/alerts.less",
+ "../bootstrap/mixins/background-variant.less",
+ "../bootstrap/mixins/border-radius.less",
+ "../bootstrap/mixins/buttons.less",
+ "../bootstrap/mixins/center-block.less",
+ "../bootstrap/mixins/clearfix.less",
+ "../bootstrap/mixins/forms.less",
+ "../bootstrap/mixins/gradients.less",
+ "../bootstrap/mixins/grid-framework.less",
+ "../bootstrap/mixins/grid.less",
+ "../bootstrap/mixins/hide-text.less",
+ "../bootstrap/mixins/image.less",
+ "../bootstrap/mixins/labels.less",
+ "../bootstrap/mixins/list-group.less",
+ "../bootstrap/mixins/nav-divider.less",
+ "../bootstrap/mixins/nav-vertical-align.less",
+ "../bootstrap/mixins/opacity.less",
+ "../bootstrap/mixins/pagination.less",
+ "../bootstrap/mixins/panels.less",
+ "../bootstrap/mixins/progress-bar.less",
+ "../bootstrap/mixins/reset-filter.less",
+ "../bootstrap/mixins/reset-text.less",
+ "../bootstrap/mixins/resize.less",
+ "../bootstrap/mixins/responsive-visibility.less",
+ "../bootstrap/mixins/size.less",
+ "../bootstrap/mixins/tab-focus.less",
+ "../bootstrap/mixins/table-row.less",
+ "../bootstrap/mixins/text-emphasis.less",
+ "../bootstrap/mixins/text-overflow.less",
+ "../bootstrap/mixins/vendor-prefixes.less",
+ "../bootstrap/navs.less",
+ "../bootstrap/normalize.less",
+ "../bootstrap/panels.less",
+ "../bootstrap/popovers.less",
+ "../bootstrap/progress-bars.less",
+ "../bootstrap/responsive-utilities.less",
+ "../bootstrap/scaffolding.less",
+ "../bootstrap/tables.less",
+ "../bootstrap/tooltip.less",
+ "../bootstrap/type.less",
+ "../bootstrap/utilities.less",
+ "../bootstrap/variables.less",
+ "../fontjspwiki/core.less",
+ "../fontjspwiki/font-jspwiki.less",
+ "../fontjspwiki/icons.less",
+ "../fontjspwiki/path.less",
+ "Accordion.less",
+ "Category.less",
+ "Collapsible.less",
+ "Columns.less",
+ "CommentBox.less",
+ "Dialog.less",
+ "Flip.less",
+ "GraphBar.less",
+ "ImagePlugin.less",
+ "IndexPlugin.less",
+ "Invisibles.less",
+ "RecentChangesPlugin.less",
+ "TOCPlugin.less",
+ "TableX.Filter.less",
+ "TableX.Sort.less",
+ "Tabs.less",
+ "Template.Attach.less",
+ "Template.Content.less",
+ "Template.Diff.less",
+ "Template.Edit.less",
+ "Template.Nav.less",
+ "Template.Preview.less",
+ "Template.Search.less",
+ "Template.SearchBox.less",
+ "Template.Sidebar.less",
+ "Template.UserBox.less",
+ "Template.View.less",
+ "Template.Workflow.less",
+ "Tips.less",
+ "Viewer.Carousel.less",
+ "Viewer.Slimbox.less",
+ "Viewer.less",
+ "WeblogPlugin.less",
+ "forms.less",
+ "grid.less",
+ "modals.less",
+ "pagination.less",
+ "prettify.less",
+ "print.less",
+ "tables.less",
+ "type.less",
+ "variables.less"
+ ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/Calendar.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Calendar.less b/jspwiki-war/src/main/styles/haddock/default/Calendar.less
deleted file mode 100644
index 03c790d..0000000
--- a/jspwiki-war/src/main/styles/haddock/default/Calendar.less
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *
- * 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.
- *
-*/
-//
-// Section: Taglibs
-// - Stylesheet definitions for some of the JSP-tags shipped with JSPWiki.
-//
-
-/*
-Style: CalendarTag
-
-DOM structure:
-
-*/
-.calendar {
- border:1px solid black;
-}
-.calendar td {
- text-align:center;
-}
-.calendar .othermonth {
- color:#707070;
-}
-.calendar .link {
- background:@gray-light;
-}
-//.calendar tr.month ...
-//.calendar tr.weekdays ...
-.calendar .weekdays {
- color:red;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/Dialog.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Dialog.less b/jspwiki-war/src/main/styles/haddock/default/Dialog.less
index a9a86f0..0e8a998 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Dialog.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Dialog.less
@@ -151,12 +151,22 @@ DOM structure:
}
- &.dialog-horizontal .item { float: left; padding:0.5em; }
&.dialog-horizontal {
width: auto;
- .body { padding: 0 2em 0 0.5em; } //reserve place for the .close button
+
+ .body { padding: 0 2em 0 0.5em; } //reserve space for the .close button on the right
+
+ .item {
+ float: left;
+ padding: 0.5em;
+ }
+
+ .divider {
+ float: left;
+ margin: 0 0.5em;
+ padding: 1.5em 1px 1em 0; //1px is the width of the divider
+ }
}
- //&.dialog-horizontal .item:nth-child(6n) { float: none; }
}
.dialog.chars .item { text-align:center; }
@@ -235,7 +245,8 @@ Style: .dialog.color
position:absolute;
//FIXME: dimensions copied from forms/.form-control - should be other ways to inherit this
- height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
+ //Make inputs at least the height of their button counterpart (base line-height + padding + border)
+ height: @input-height-base;
padding: @padding-base-vertical @padding-base-horizontal;
font-size: @font-size-base;
//line-height: @line-height-base;
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/Invisibles.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Invisibles.less b/jspwiki-war/src/main/styles/haddock/default/Invisibles.less
index 8b93054..6583b82 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Invisibles.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Invisibles.less
@@ -24,7 +24,7 @@ Behavior: %%invisibles
*/
.token.tab:not(:empty):before,
.token.cr:before,
-.token.lf:before { color: @red; }
+.token.lf:before { color: @wiki-mark; text-shadow:0 1px 0 @white; }
.token.tab:not(:empty):before { content: '\21B3'; }
.token.cr:before { content: '\240D'; }
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less b/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less
index 05c2f58..2faabe3 100644
--- a/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less
+++ b/jspwiki-war/src/main/styles/haddock/default/RecentChangesPlugin.less
@@ -27,7 +27,6 @@ DOM structure:
.recentchanges {
table-layout:fixed; // this renders faster
- .table-hover;
td {
&:first-child:not(.date) {
@@ -37,12 +36,7 @@ DOM structure:
border-bottom:2px solid @wiki-recentchanges-date-bg;
padding-top:1em;
}
- &.changenote {
- .small;
- font-style:normal;
- }
- }
- tr.odd td {
- background-color:transparent;
+
}
+
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/TOCPlugin.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/TOCPlugin.less b/jspwiki-war/src/main/styles/haddock/default/TOCPlugin.less
index 2cd23fc..02c4616 100644
--- a/jspwiki-war/src/main/styles/haddock/default/TOCPlugin.less
+++ b/jspwiki-war/src/main/styles/haddock/default/TOCPlugin.less
@@ -33,19 +33,24 @@ Style: TableOfContentsPlugin
DOM structure:
(begin)
div.toc
- div.collapsebox
- b.bullet xpand|clpse
- h4#section-TOC Table Of Contents
+ div.collapsebox.panel.panel-default
+ div.panel-head
+ b.bullet xpand|clpse
+ h4#section-TOC Table Of Contents
div.xpand|clpse
- ul
- li.toclevel-1
- li.toclevel-2
- li.toclevel-3
+ div.panel-body
+ ul
+ li.toclevel-1
+ li.toclevel-2
+ li.toclevel-3
(end)
*/
.toc {
width: (100% - @wiki-commentbox-width);
+ //when collapsed the header bottom border doubles with the bottom panel border
+ .panel-heading { border-bottom:none; } //ugh -- for now just hide the border
+
ul {
.list-unstyled;
li:hover { background:@dropdown-link-hover-bg; }
@@ -55,6 +60,7 @@ DOM structure:
.toclevel-2 { padding-left:2.4em; }
.toclevel-3 { padding-left:4.6em; }
}
+//in case a TOC is added to the sidebar; it will show the TOC of the main page
.sidebar .toc {
width:100%;
.toclevel-1 { padding-left:.25em; }
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/Template.Content.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Template.Content.less b/jspwiki-war/src/main/styles/haddock/default/Template.Content.less
index 0c8119e..5699c77 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Template.Content.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Template.Content.less
@@ -56,8 +56,6 @@ DOM Structure:
width:@wiki-sidebar-width;
margin-left:-@wiki-sidebar-width;
padding:@padding-base-horizontal;
- //padding-left:@padding-base-horizontal;
- //padding-right:@padding-base-horizontal;
overflow-x:hidden;
}
.page, .sidebar {
@@ -121,7 +119,7 @@ We may just hide the on/off toggle in css
//& > h2, & > h3, & > h4, { margin-top:0; }
}
.page-content {
- padding: @padding-base-horizontal;
+ padding: @padding-base-vertical @padding-base-horizontal;
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less b/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less
index 1263aa2..a496009 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Template.Edit.less
@@ -39,21 +39,10 @@ textarea { white-space: pre-wrap; }
}
}
-.editform input[name=changenote] {
- position: absolute;
- z-index: 2; //appear on top of the button group
- width: 480px;
-}
-
-
-.editform .commentsignature {
- position: absolute;
- z-index: 2; //appear on top of the button group
-}
-
-.editform .open + .editor-tools {
- opacity:0;
+//save or post-comment button dropdown-menu : increase width of standard dropdown
+button[name=ok] + .dropdown-menu input[type=text] {
+ width: 340px;
}
.editor {
@@ -63,58 +52,111 @@ textarea { white-space: pre-wrap; }
background: @wiki-editor-bg;
color:inherit;
font-size:90%;
+ border-radius:0;
}
//base styling similar to .page-content in Template.Content.less;
.ajaxpreview {
-
- &:empty:before {
- content:"PREVIEW";
- }
-
- .hide;
- background: @wiki-preview-bg;
- padding: 0 0 .5em @grid-gutter-width/2; //cannot use margin here, as width=50%
+ //background: @wiki-preview-bg;
+ padding: .5em 0 .5em @grid-gutter-width/2; //cannot use margin here, as width=50%
overflow: auto;
//-ms-overflow-style: -ms-autohiding-scrollbar;
- border: 2px dashed transparent;
+ //border: 2px dashed transparent; //make space for the .loading effect
+ border: 1px solid @input-border;
+ border-left: none;
+ //.transition(background 0.2s ease-in-out);
&.loading {
- border: 2px dashed red;
+ //background: @wiki-empty-preview-bg;
+ }
+
+ &.empty {
+ .lead;
+ margin: 0; //reset .lead margin setting
+ .center;
+ background: @wiki-empty-preview-bg;
+ padding-top:2em;
}
}
-//Layout of editor and preview area
+/*
+Layout of editor and preview area
+
+HORIZONTAL SIDE BY SIDE VIEW (.previewcolumn)
+ div.snip
+ div.toolbar
+ div.edit-area.livepreview.previewcolumn
+ div
+ div.dialog.selection
+ div {position:absolue} => textarea-mirror
+ textarea.editor.snipeable
+ textarea#editorarea.editor.hidden
+ div.ajaxpreview
+ div.resizer[data-resize]
+
+VERTICAL VIEW
+ div.snip
+ div.toolbar
+ div.edit-area.livepreview
+ div
+ div.dialog.selection
+ div {position:absolue} => textarea-mirror
+ textarea.editor.snipeable
+ textarea#editorarea.editor.hidden
+ div.resizer[data-resize]
+ div.ajaxpreview
+*/
//default: show the editor (and preview) areas at 100%
-.edit-area .col-50,
-.edit-area + .resizer + .ajaxpreview.col-50 { width:100%; }
+.edit-area > div,
+.ajaxpreview { width:100%; }
-//when livepreview is on, show the ajaxpreview area
-.edit-area.livepreview .ajaxpreview { .show; }
-.edit-area.livepreview + .resizer + .ajaxpreview { .show; height:auto !important; }
+//when .previewcolumn (side by side) is on, set width of edit-area children to 50%
+.edit-area.livepreview.previewcolumn > div {
+ width:50%;
+ float:left;
+}
-//when livepreview is on AND previewcolumn (side by side) is on, set width to 50%
-.edit-area.livepreview.previewcolumn .col-50 { width:50%; float:left; }
+//only show the .ajaxpreview area when the .livepreview is on
+.edit-area:not(.livepreview) .ajaxpreview,
+.edit-area:not(.livepreview) ~ .ajaxpreview {
+ .hide;
+}
+.edit-area ~ .ajaxpreview {
+ height:auto !important;
+ border-left:1px solid @input-border
+}
.resizer {
- background: @wiki-resizer;
+ //background-color: @wiki-resizer;
cursor:row-resize;
- width:100%;
- height:8px;
- line-height:8px;
- margin-top:4px;
- margin-bottom:.5em;
- border-radius:4px;
+ height:.5em;//4px;
+ line-height:.5em; //4px;
+ //margin:.25em 0;
+ //border-radius:2px;
z-index:3;
+ position:relative;
&.dragging {
- .progress-striped .progress-bar;
- .progress.active .progress-bar;
+ //border:1px solid @input-border;
+ //.progress-striped .progress-bar;
+ //.progress.active .progress-bar;
}
}
+.comment-page {
+ height: 150px;
+ overflow-y: scroll;
+}
+.comment-page + [data-resize] {
+ cursor:row-resize;
+ background-color: @white;
+ border-top: 3px double @silver;
+ border-radius:0;
+ //fit horizontal resizer to screen width (hack to offset paddings of parent)
+ margin:4px -@padding-base-horizontal 7px -@padding-base-horizontal;
+}
//CHECK: move to dropdown.less ..
//reset bootstrap/form.less style on labels inside dropdown menu-s
@@ -122,8 +164,8 @@ textarea { white-space: pre-wrap; }
label { font-weight: normal; }
}
-.toolbar {
+.toolbar {
padding-bottom: 1em;
.btn-group {
border:1px solid @link-color;
@@ -133,6 +175,7 @@ textarea { white-space: pre-wrap; }
}
+
/*
Horizontal Dropdown Menu (based on bootstrap)
FIXME: used a hack to fix the min-width of the default dropdown menu ; there must be a better way !
@@ -154,13 +197,26 @@ ul.dropdown-menu.dropdown-menu-horizontal {
}
+.dropdown-size-4 {
+ width:18.2em;
+ > li {
+ display:inline-block;
+ float:left;
+ width:6em;
+ //border:1px solid red;
+ text-align:center;
+ }
+ > li:nth-child(3n+1) { clear:both;}
+}
+
+
// icons only, or text labels ?
// [data-cmd] { &:after { content: " " attr(data-cmd); } }
[data-cmd='find'] + .dropdown-menu {
padding:5px 20px;
- background-color: fade(@dropdown-bg,80%); //white background
+ background-color: fade(@dropdown-bg, 80%); //white background
.tbHITS {
position:absolute;
@@ -170,6 +226,7 @@ ul.dropdown-menu.dropdown-menu-horizontal {
}
+
[data-cmd='color'] {
background:url("@{imagePath}/color-wheel.png") no-repeat center;
}
@@ -191,12 +248,10 @@ General styles to support wysiwyg editors
.ajaxpreview {
padding:1em;
- //font-size: 90%;
font-family: @font-family-monospace;
white-space: pre-wrap; //Lines are broken at newline characters, at <br>, and as necessary to fill line boxes.
- border:1px solid silver;
+ border:1px solid @pre-border-color;
word-wrap:normal;
-
}
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/Tips.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/Tips.less b/jspwiki-war/src/main/styles/haddock/default/Tips.less
index f5172f8..6f91fc9 100644
--- a/jspwiki-war/src/main/styles/haddock/default/Tips.less
+++ b/jspwiki-war/src/main/styles/haddock/default/Tips.less
@@ -46,9 +46,10 @@ Bootstrap
*/
.tip-link {
- .category-link;
+ border-bottom: .1em dotted;
> [class^=tip] { .hidden; }
+ &:hover { text-decoration:none; }
}
+.tooltip-inner {
-@tooltip-bg: rgba(0,0,0,.7);
-@tooltip-arrow-color: rgba(0,0,0,.7);
\ No newline at end of file
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less b/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
index c20e2be..22a555f 100644
--- a/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
+++ b/jspwiki-war/src/main/styles/haddock/default/WeblogPlugin.less
@@ -48,14 +48,14 @@ a[href*="NewBlogEntry.jsp"] { .btn; .btn-xs; .btn-success; }
margin:(@line-height-computed / 2) 0;
}
.weblogentryheading {
- margin-top: @line-height-computed/2;
- padding:@padding-base-vertical @padding-base-horizontal;
.small;
- float:right;
- .badge;
+ position:absolute;
+ padding-top: @line-height-computed*2;
+ color:@btn-link-disabled-color;
}
.weblogentrytitle {
.h1;
+ padding-bottom:(@line-height-computed );
margin-bottom:(@line-height-computed / 2);
border-bottom: 2px solid @pre-bg;
@@ -64,16 +64,22 @@ a[href*="NewBlogEntry.jsp"] { .btn; .btn-xs; .btn-success; }
.weblogentrybody {
.p;
clear:both;
+ max-height:33vh;
+ overflow:auto;
}
.weblogentryfooter {
.small;
padding:@padding-base-vertical @padding-base-horizontal;
+ margin-bottom:@line-height-computed ;
background-color:@pre-bg;
clear:both;
- a { .btn; .btn-xs; }
- a[href*="_blogentry_"] { .btn-primary; }
- a[href*="_comments_"] { .btn-default; }
+ a {
+ .btn; .btn-xs;
+ vertical-align:inherit;
+ &[href*="_blogentry_"] { .btn-primary; }
+ &[href*="_comments_"] { .btn-default; }
+ }
}
@@ -124,3 +130,46 @@ div.weblogcomments
content:"\u2014"; //—
}
}
+
+
+/*
+DOM Structure of <Wiki:Calendar />
+
+table.calendar
+ tbody
+ tr
+ td a[href=<prev-month>] <<
+ td.month[colspan=5]
+ td a[href=<next-month>] >>
+ tr
+ td.weekdays Mon,Tue ... Sun
+ tr
+ td.othermonth
+ td.days
+ td.link a[herf=<...startDate=ddmmyy>]
+*/
+table.calendar {
+ width: 100%;
+ .small;
+ .panel;
+
+ td { text-align:center; }
+
+ .month { .panel-title; font-family:@wiki-logo-font-family; }
+ //tr:first-child > td:first-child, tr:first-child > td:last-child { } //next, previous months buttons
+ .weekdays {
+ font-family:@font-family-monospace;
+ border-bottom:1px solid @silver;
+ background-color:@white;
+ }
+ //td:nth-child(6){ border-left:1px dashed @silver; } //divider for week and weekend days
+ td:nth-child(6):not(.weekdays),
+ td:nth-child(7):not(.weekdays) {
+ background: @pre-bg;
+ }
+
+ .othermonth { color:@gray-light; /*disabled*/ }
+ //.days { }
+ .link a { .badge; }
+}
+
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/build.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/build.less b/jspwiki-war/src/main/styles/haddock/default/build.less
index 6c3ff75..5ab0796 100755
--- a/jspwiki-war/src/main/styles/haddock/default/build.less
+++ b/jspwiki-war/src/main/styles/haddock/default/build.less
@@ -18,28 +18,19 @@
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.
+ Where possible, it extends from bootstrap 3.3.6.
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";
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/grid.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/grid.less b/jspwiki-war/src/main/styles/haddock/default/grid.less
index 8946a6a..a093695 100644
--- a/jspwiki-war/src/main/styles/haddock/default/grid.less
+++ b/jspwiki-war/src/main/styles/haddock/default/grid.less
@@ -22,7 +22,7 @@
// Set the container width, and override it for fixed navbars in media queries
-.container {
+.container {
.container-fixed();
@media (min-width: @screen-sm) {
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/prettify.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/prettify.less b/jspwiki-war/src/main/styles/haddock/default/prettify.less
index 001d8da..f200d4f 100644
--- a/jspwiki-war/src/main/styles/haddock/default/prettify.less
+++ b/jspwiki-war/src/main/styles/haddock/default/prettify.less
@@ -44,7 +44,7 @@ DOM structure:
.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 */
+ .fun { color: @red; } /* a function name */
}
// Use higher contrast and text-weight for printable form.
@@ -78,4 +78,16 @@ pre.prettylines {
overflow: auto;
white-space: pre; //overwrite default 'pre-wrap'
word-wrap: normal; //overwrite default 'break-word'
+ word-spacing: normal;
+ word-break: normal;
+
+ -moz-tab-size: 4;
+ -o-tab-size: 4;
+ tab-size: 4;
+
+ -webkit-hyphens: none;
+ -moz-hyphens: none;
+ -ms-hyphens: none;
+ hyphens: none;
+
}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/type.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/type.less b/jspwiki-war/src/main/styles/haddock/default/type.less
index 599f294..1743e7e 100644
--- a/jspwiki-war/src/main/styles/haddock/default/type.less
+++ b/jspwiki-war/src/main/styles/haddock/default/type.less
@@ -67,6 +67,15 @@ h2,h3,h4 {
.sidebar .hashlink, .sidebar .editsection, .panel-title .hashlink { .hidden; }
+.lead {
+ font-family:@wiki-logo-font-family;
+}
+//mimicing .quote in a dialog dropdown
+.dialog .lead-item {
+ .lead;
+ font-size:@font-size-base;
+}
+
b, i {
color:inherit;
@@ -113,7 +122,7 @@ br { clear: both; }
}
/* closing vertical connecting corner */
.tree ul li:last-child::after {
- height: 1em;
+ height: .95em;
}
//dl { .dl-horizontal; }
@@ -146,6 +155,20 @@ PRE and xflow:
*/
+pre {
+ //FFS: overwrite bootstrap default, which only sets the bottom margin of a PRE
+ //better is to set top & bottom margins, in case the previous dom elements is a text node
+ // margin: (@line-height-computed / 2) 0;
+
+ //overwrite bootstratp defaults: use alpha/transparency to also support dark backgrounds.
+ //color: @pre-color;
+ background-color: fadeout(@pre-bg,50%);
+ border: 1px solid fadeout(@pre-border-color,50%);
+
+}
+.small pre {
+ font-size: (@font-size-base - 1) * 0.85; // 14px to 13px
+}
//inline code: jspwiki uses <tt> ; styles copied from bootstrap/code.less
tt {
@@ -156,6 +179,8 @@ tt {
white-space: nowrap;
border-radius: @border-radius-base;
}
+
+
// => reuse styling of pre
//list-unstyled : bootstrap
@@ -207,12 +232,14 @@ a:hover { cursor:pointer; }
//TODO: Overrule standard small red arrow; replace by ... FIXME
img.outlink { display:none; }
a.external:after {
- content: "\279A";
+ //.sup;
+ .small;
+ 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);
}
-a.attachment + a.infolink,
-a.attachment + button + a.infolink {
+a.infolink,
+button + a.infolink {
.icon--all;
&:after {
margin-left:.1em;
@@ -223,19 +250,61 @@ a.attachment + button + a.infolink {
/*
-Interwiki link
- Reader : show pages without sidebar,minimal header/footer
- <a class="interwiki" href="Wiki.jsp?page=XXX&skin=reader">XXX</a>
+Interwiki links
*/
-a.interwiki[href$="skin=reader"]:hover {
- border-bottom: 1px dashed @link-hover-color;
+.interwiki-reader,
+a.interwiki[href$="skin=reader"] {
+ &::after {
+ color:@link-color;
+ .icon--all;
+ .sup;
+ content:"\f212"; //icon-leanpub
+ }
+ &:hover::after {
+ //text-decoraction:none; //FIXME: doesnt work ...
+ }
}
-a.interwiki[href$="skin=raw"]:hover {
- border-bottom: 1px dotted @link-hover-color;
+.interwiki-raw,
+a.interwiki[href$="skin=raw"] {
+ &::after {
+ .icon--text();
+ content:"raw";
+ }
+ &:hover::after {
+ //text-decoraction:none;
+ background-color:@link-hover-color;
+ }
+}
+.interwiki-edit,
+a.interwiki[href*="Edit.jsp?page="] {
+ &::after {
+ .icon--text;
+ content:"edit";
+ //color:@link-color;
+ //.icon--all;
+ //.sup;
+ //content:"\f040"; //icon-pencil
+ }
+ &:hover::after {
+ //text-decoraction:none;
+ background-color:@link-hover-color;
+ }
+}
+.interwiki-group,
+a.interwiki[href*="Group.jsp?group="] {
+ &::after {
+ .icon--text;
+ content:"group";
+ //color:@link-color;
+ //.icon--all;
+ //.sup;
+ //content:"\f0c0"; //icon-group
+ }
+ &:hover::after {
+ //text-decoraction:none;
+ background-color:@link-hover-color;
+ }
}
-
-a.reader-view > [class^="icon-"] { color:@link-color; }
-
/*
Footnotes
@@ -252,19 +321,15 @@ Images
img {
&.inline { .img-responsive; /*max-width:100%;*/ }
}
-img { position:relative;}
-img:before {
- content:"\e607 ";
- font-family: FontJspwiki;
- color:@red;
-}
-img:after {
- content: "Broken Image: [" attr(alt) "]";
- position: absolute;
- display:inline-block; width:100%;height:100%;
- background:@white;
- left:20px;padding-top:.5em;
- color:@red;
+/* broken images */
+
+.img-error {
+ &::before {
+ .icon--all;
+ content: "\e607 "; //icon-picture
+ padding-right:.5em;
+ }
+ > span { padding-left:.5em;}
}
//img.inline
@@ -273,7 +338,7 @@ img:after {
// Utility class to support un-scaled, scrollable images,
-.scrollable-image {
+.scrollable-img, .scrollable-image {
overflow:scroll;
img.inline { width:auto; max-width:none; }
@@ -333,7 +398,12 @@ div.dropcaps {
//%%quote .. /%
-//.quote is replaced by <blockquote>, to reuse bootstraps styling
+//.quote is replaced by <blockquote>, to reuse bootstraps styling -- see Wiki.Behaviour.js
+//when showing the quote style in a dialog dropdown, use .quote-item -- see Wiki.Snips.js
+.dialog .quote-item {
+ border-left: 5px solid @blockquote-border-color;
+ padding-left: @line-height-computed;
+}
.page-break {
display:block;
@@ -369,8 +439,10 @@ div.dropcaps {
//checkme: still used?
.accesskey { text-decoration:underline; }
-.changenote { max-width:240px; font-style: italic; }
-
+.changenote {
+ max-width:240px;
+ .small;
+}
.nowrap { white-space:nowrap; }
[class^=tangle-] { background: @yellow; }
@@ -378,12 +450,13 @@ div.dropcaps {
//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;
+ //clear:both;
+ //display:block;
+ //.clearfix;
}
//support inline information blocks
span.default, span.success, span.information, span.info, span.warning, span.error, span.danger {
- display:inline;
+ display: inline;
padding: .05em .25em;
}
@@ -400,6 +473,10 @@ td .success, td .information, td .warning, td .error { margin:0; }
//BETTER: td > .alert { margin:0; }
+.text-smallcaps { font-variant: small-caps; }
+
+
+
/*
Style: CAPTCHA tables and images
*/
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/default/variables.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/default/variables.less b/jspwiki-war/src/main/styles/haddock/default/variables.less
index a76bdea..412da0a 100644
--- a/jspwiki-war/src/main/styles/haddock/default/variables.less
+++ b/jspwiki-war/src/main/styles/haddock/default/variables.less
@@ -166,5 +166,11 @@ images/feather-small.png wxh 162x286
//Editor
@wiki-editor-bg : @white;
@wiki-preview-bg : transparent; //@white;
+@wiki-empty-preview-bg : rgba(243, 156, 18, 0.03); //@pre-bg;
@wiki-resizer: @btn-primary-bg;
-@wiki-editor-focus: rgba(243, 156, 18, 0.1);
\ No newline at end of file
+@wiki-editor-focus: rgba(243, 156, 18, 0.1);
+
+//Tip
+//overwrite bootstrap default style
+@tooltip-bg: rgba(0,0,0,.7);
+@tooltip-arrow-color: rgba(0,0,0,.7);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less b/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less
index 33182cd..731ad03 100644
--- a/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less
+++ b/jspwiki-war/src/main/styles/haddock/fontjspwiki/core.less
@@ -26,7 +26,7 @@
font-weight: normal;
font-variant: normal;
text-transform: none;
- line-height: @line-height-base;
+ line-height: 1; //@line-height-base;
position:relative;
top:.1em;
@@ -37,3 +37,14 @@
&:hover { text-decoration:none; }
}
+.icon--text {
+ position:relative;
+ top:-0.7em;
+ font-family:@font-family-monospace;
+ font-size:65%;
+ color:@white;
+ padding:0 2px 1px;
+ margin-left:1px;
+ background-color:@link-color;
+ border-radius:@border-radius-small;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less b/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less
index 9e22e64..70989a3 100644
--- a/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less
+++ b/jspwiki-war/src/main/styles/haddock/fontjspwiki/path.less
@@ -13,7 +13,7 @@
font-style: normal;
}
*/
-
+/*
@font-face {
font-family: 'FontJspwiki';
src:url('fonts/FontJspwiki.eot?-y8je1z');
@@ -24,3 +24,14 @@
font-weight: normal;
font-style: normal;
}
+*/
+@font-face {
+ font-family: 'FontJspwiki';
+ src:url('fonts/FontJspwiki.eot');
+ src:url('fonts/FontJspwiki.eot') format('embedded-opentype'),
+ url('fonts/FontJspwiki.ttf') format('truetype'),
+ url('fonts/FontJspwiki.woff') format('woff'),
+ url('fonts/FontJspwiki.svg') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/Comment.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/Comment.jsp b/jspwiki-war/src/main/webapp/Comment.jsp
index 4d0fb28..641727c 100644
--- a/jspwiki-war/src/main/webapp/Comment.jsp
+++ b/jspwiki-war/src/main/webapp/Comment.jsp
@@ -183,6 +183,7 @@
}
String commentText = EditorManager.getEditedText(pageContext);
+ //log.info("comment text"+commentText);
//
// WYSIWYG editor sends us its greetings
@@ -208,7 +209,7 @@
}
Calendar cal = Calendar.getInstance();
- SimpleDateFormat fmt = Preferences.getDateFormat( wikiContext , TimeFormat.DATETIME);
+ SimpleDateFormat fmt = Preferences.getDateFormat( wikiContext , TimeFormat.DATETIME);
pageText.append("\n\n%%signature\n"+signature+", "+fmt.format(cal.getTime())+"\n/%");
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/DeleteGroup.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/DeleteGroup.jsp b/jspwiki-war/src/main/webapp/DeleteGroup.jsp
index 2dc7efe..827c725 100644
--- a/jspwiki-war/src/main/webapp/DeleteGroup.jsp
+++ b/jspwiki-war/src/main/webapp/DeleteGroup.jsp
@@ -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.
--%>
<%@ page import="org.apache.log4j.*" %>
@@ -26,7 +26,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%!
+<%!
Logger log = Logger.getLogger("JSPWiki");
%>
@@ -39,7 +39,7 @@
WikiSession wikiSession = wikiContext.getWikiSession();
GroupManager groupMgr = wiki.getGroupManager();
String name = request.getParameter( "group" );
-
+
if ( name == null )
{
// Group parameter was null
@@ -60,10 +60,11 @@
}
// Now, let's delete the group
- try
+ try
{
groupMgr.removeGroup( name );
- response.sendRedirect( "." );
+ //response.sendRedirect( "." );
+ response.sendRedirect( "Group.jsp?group=" + name );
}
catch ( WikiSecurityException e )
{
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/Install.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/Install.jsp b/jspwiki-war/src/main/webapp/Install.jsp
index 337e7e2..6d58bc4 100644
--- a/jspwiki-war/src/main/webapp/Install.jsp
+++ b/jspwiki-war/src/main/webapp/Install.jsp
@@ -84,7 +84,7 @@ if ( !installer.adminExists() )
<link rel="stylesheet" media="screen, projection" type="text/css" href='<wiki:Link format="url" templatefile="jspwiki.css"/>'/>
<wiki:IncludeResources type="stylesheet"/>
</head>
-<body class="view">
+<body class="container">
<div id="wikibody">
<div id="page">
<div id="pagecontent">
@@ -98,7 +98,7 @@ if ( !installer.adminExists() )
<p><fmt:message key="install.jsp.intro.p3" /></p>
<!-- Any messages or errors? -->
-<div class="instructions">
+<div class="help-block">
<wiki:Messages div="information" topic="<%=Installer.INSTALL_INFO%>" prefix='<%= rb.getString( "install.jsp.install.info" )%>'/>
<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" )%>'/>
@@ -110,30 +110,30 @@ 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">
+ <label class="control-label" ><fmt:message key="install.jsp.basics.appname.label" />
+ <input class="form-control" type="text" name="<%=Installer.APP_NAME%>" size="20" value="<%=installer.getProperty( Installer.APP_NAME )%>"/>
+ </label>
+ <div class="help-block">
<fmt:message key="install.jsp.basics.appname.desc"/>
</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">
+ <label class="control-label" ><fmt:message key="install.jsp.basics.baseurl.label" />
+ <input class="form-control" type="url" name="<%=Installer.BASE_URL%>" size="40" value="<%=installer.getProperty( Installer.BASE_URL )%>"/>
+ </label>
+ <div class="help-block">
<fmt:message key="install.jsp.basics.baseurl.desc" />
</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">
+ <label class="control-label" ><fmt:message key="install.jsp.basics.page.storage.label" />
+ <input class="form-control" type="text" name="<%=Installer.PAGE_DIR%>" size="40" value="<%=installer.getProperty( Installer.PAGE_DIR )%>"/>
+ </label>
+ <div class="help-block">
<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 )
@@ -141,7 +141,7 @@ if ( !installer.adminExists() )
if ( password != null )
{
%>
- <label><fmt:message key="install.jsp.security.admaccount.label" /></label>
+ <label class="control-label" ><fmt:message key="install.jsp.security.admaccount.label" /></label>
<p><fmt:message key="install.jsp.security.admaccount.enabled" /></p>
<div class="description">
<fmt:message key="install.jsp.security.admaccount.enabled.desc" />
@@ -152,40 +152,38 @@ if ( !installer.adminExists() )
else
{
%>
- <label><fmt:message key="install.jsp.security.admaccount.label" /></label>
+ <label class="control-label" ><fmt:message key="install.jsp.security.admaccount.label" /></label>
<p><fmt:message key="install.jsp.security.admaccount.notenabled" /></p>
- <div class="description">
+ <div class="help-block">
<fmt:message key="install.jsp.security.admaccount.notenabled.desc" />
</div>
<%
}
%>
- </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>
- <input type="text" name="<%=Installer.LOG_FILE%>" value="<%=installer.getProperty( Installer.LOG_FILE )%>" size="40"/>
- <div class="description">
+
+ <label class="control-label" ><fmt:message key="install.jsp.adv.settings.logfile.label" />
+ <input class="form-control" type="url" name="<%=Installer.LOG_FILE%>" value="<%=installer.getProperty( Installer.LOG_FILE )%>" size="40"/>
+ </label>
+ <div class="help-block">
<fmt:message key="install.jsp.adv.settings.logfile.desc" />
</div> <br/>
- <label><fmt:message key="install.jsp.adv.settings.workdir.label" /></label>
- <input type="text" name="<%=Installer.WORK_DIR%>" size="40" value="<%=installer.getProperty( Installer.WORK_DIR )%>"/>
- <div class="description">
+ <label class="control-label" ><fmt:message key="install.jsp.adv.settings.workdir.label" />
+ <input class="form-control" type="url" name="<%=Installer.WORK_DIR%>" size="40" value="<%=installer.getProperty( Installer.WORK_DIR )%>"/>
+ </label>
+ <div class="help-block">
<fmt:message key="install.jsp.adv.settings.workdir.desc" />
</div>
- </div>
- <br/>
- <div class="block">
- <div class="instructions">
+
+ <p class="help-block">
<fmt:message key="install.jsp.instr.desc" >
<fmt:param><%=installer.getPropertiesPath()%></fmt:param>
</fmt:message>
- </div>
- <input type="submit" name="submit" value="<fmt:message key="install.jsp.instr.submit" />" />
- </div>
+ </p>
+ <input class="btn btn-primary" type="submit" name="submit" value="<fmt:message key="install.jsp.instr.submit" />" />
</form>
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/XHRMarkup2Wysiwyg.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/XHRMarkup2Wysiwyg.jsp b/jspwiki-war/src/main/webapp/XHRMarkup2Wysiwyg.jsp
new file mode 100644
index 0000000..f9bdf54
--- /dev/null
+++ b/jspwiki-war/src/main/webapp/XHRMarkup2Wysiwyg.jsp
@@ -0,0 +1,84 @@
+<%--
+ 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.
+--%>
+
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ page import="org.apache.log4j.*" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.render.*" %>
+<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%!
+ public void jspInit()
+ {
+ wiki = WikiEngine.getInstance( getServletConfig() );
+ }
+ //Logger log = Logger.getLogger("XHRMarkup2Wysiwyg");
+ WikiEngine wiki;
+%>
+<%
+ WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
+ //WikiEngine engine = wikiContext.getEngine();
+
+ if( !wiki.getAuthorizationManager().hasAccess( wikiContext, response ) ) return;
+
+ response.setContentType("text/html; charset="+wiki.getContentEncoding() );
+ //response.setHeader( "Cache-control", "max-age=0" );
+ //response.setDateHeader( "Expires", new Date().getTime() );
+ //response.setDateHeader( "Last-Modified", new Date().getTime() );
+
+ String usertext = request.getParameter( "markupPageText" );
+
+ if( usertext != null )
+ {
+
+ RenderingManager renderingManager = new RenderingManager();
+
+ // since the WikiProperties are shared, we'll want to make our own copy of it for modifying.
+ Properties copyOfWikiProperties = new Properties();
+ copyOfWikiProperties.putAll( wiki.getWikiProperties() );
+ copyOfWikiProperties.setProperty( "jspwiki.renderingManager.renderer", WysiwygEditingRenderer.class.getName() );
+ renderingManager.initialize( wiki, copyOfWikiProperties );
+
+ String pageAsHtml;
+ try
+ {
+ pageAsHtml = renderingManager.getHTML( wikiContext, usertext );
+
+ }
+ catch( Exception e )
+ {
+ pageAsHtml = "<div class='error'>Error in converting wiki-markup to well-formed HTML <br/>" + e.toString() + "</div>";
+
+ /*
+ java.io.StringWriter sw = new java.io.StringWriter();
+ java.io.PrintWriter pw = new java.io.PrintWriter(sw);
+ e.printStackTrace(pw);
+ pageAsHtml += "<pre>" + sw.toString() + "</pre>";
+ */
+ }
+
+ // Disable the WYSIWYG_EDITOR_MODE and reset the other properties immediately
+ // after the XHTML for wysiwyg editor has been rendered.
+ context.setVariable( RenderingManager.WYSIWYG_EDITOR_MODE, Boolean.FALSE );
+ context.setVariable( WikiEngine.PROP_RUNFILTERS, null );
+
+
+%><%= pageAsHtml %><%
+ }
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp b/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
index 089a8af..e2a6ff0 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
@@ -42,7 +42,7 @@
method="post"
enctype="multipart/form-data" accept-charset="<wiki:ContentEncoding/>" >
- <h4><fmt:message key="attach.add"/></h4>
+ <h4><span class="icon-paper-clip"></span> <fmt:message key="attach.add"/></h4>
<input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
<input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
<input type="hidden" name="action" value="upload" />
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp b/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp
index 0a0b9b6..411b6204 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp
@@ -18,11 +18,25 @@
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
-
+<%--
+ First insert the main page or the corresponding blog-entry page
+ Then a horizontal resizer
+ And finally the editor for writing the comment
+--%>
<div class="page-content">
+ <div class="row comment-page">
+ <c:set var="mainblogpage" value="${fn:substringBefore(param.page,'_comments_')}" />
+ <c:if test="${not empty mainblogpage}">
+ <c:set var="blogentrypage" value="${fn:replace(param.page,'_comments_','_blogentry_')}" />
+ <wiki:InsertPage page="${blogentrypage}" />
+ </c:if>
+ <wiki:InsertPage />
+ </div>
+ <div data-resize=".comment-page" title="<fmt:message key='editor.plain.comment.resize'/>" ></div>
<wiki:Editor />
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp b/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
index 5a1f87e..0268701 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/DiffTab.jsp
@@ -37,7 +37,7 @@
method="get" accept-charset="UTF-8">
<input type="hidden" name="page" value="<wiki:PageName />" />
- <p class="btn btn-lg btn-primary btn-block">
+ <p class="btn btn-default btn-block">
<fmt:message key="diff.difference">
<fmt:param>
<select class="form-control" id="r1" name="r1" onchange="this.form.submit();" >
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp b/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp
index 896480d..1a1f1ad 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp
@@ -43,7 +43,7 @@
<wiki:Include page="commonheader.jsp"/>
</head>
-<body class="<wiki:Variable var='requestcontext' />" >
+<body class="context-<wiki:Variable var='requestcontext' />" >
<div class="container${prefs.Layout=='fluid' ? '-fluid' : ''} ${prefs.Orientation}">
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp b/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
index 547b374..5a2b164 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
@@ -42,7 +42,7 @@
title="<fmt:message key='actions.home.title' ><fmt:param>${frontpage}</fmt:param></fmt:message> ">apache<b>jspωiki</b></a>
<wiki:PageExists page="HomeMenu">
- <ul class="dropdown-menu" data-hover-parent=".cage" style="color:black;">
+ <ul class="dropdown-menu" data-hover-parent=".cage">
<li class="logo-menu"><wiki:InsertPage page="HomeMenu" /></li>
</ul>
</wiki:PageExists>
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/19b54311/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp b/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
index 72d7bd4..4815fd4 100644
--- a/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
@@ -263,7 +263,7 @@
<%-- Do NOT change the order of wikiname and content, otherwise the
servlet won't find its parts. --%>
- <h4><fmt:message key="info.uploadnew"/></h4>
+ <h4><span class="icon-paper-clip"></span> <fmt:message key="info.uploadnew"/></h4>
<div class="form-group">
<label class="control-label form-col-20" for="files"><fmt:message key="attach.add.selectfile"/></label>