You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/11/10 10:07:38 UTC
[myfaces-tobago] branch master updated (d54a1a9 -> 058b1be)
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from d54a1a9 fix checkstyle
new b2fd83b TOBAGO-1802 Rebuild theme speyside * new speyside theme * improve demo: tc:box inside tc:box; second box looks different
new 058b1be rebuild themes after update
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../20-component/050-container/10-box/box.xhtml | 8 +
.../tobago-theme-charlotteville/rebuild-theme.log | 48 +-
.../tobago-theme-roxborough/rebuild-theme.log | 54 +-
.../tobago-theme-scarborough/rebuild-theme.log | 48 +-
.../tobago-theme-speyside/rebuild-theme.log | 62 +-
.../tobago-bootstrap/_version/css/bootstrap.css | 2048 ++++++++++++++------
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../src/main/scss/_custom.scss | 257 ++-
.../src/main/scss/_speyside-classes.scss | 136 ++
.../src/main/scss/_speyside-overwrites.scss | 924 +++++++++
.../src/main/scss/_tobago-theme.scss | 2 +
.../tobago-theme-standard/rebuild-theme.log | 56 +-
14 files changed, 2869 insertions(+), 780 deletions(-)
create mode 100644 tobago-theme/tobago-theme-speyside/src/main/scss/_speyside-classes.scss
create mode 100644 tobago-theme/tobago-theme-speyside/src/main/scss/_speyside-overwrites.scss
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-tobago] 01/02: TOBAGO-1802 Rebuild theme speyside * new
speyside theme * improve demo: tc:box inside tc:box;
second box looks different
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit b2fd83bda225588b4ccdd2e04c933d488a6fa9f8
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Nov 10 10:45:56 2017 +0100
TOBAGO-1802 Rebuild theme speyside
* new speyside theme
* improve demo: tc:box inside tc:box; second box looks different
---
.../20-component/050-container/10-box/box.xhtml | 8 +
.../src/main/scss/_custom.scss | 257 +++++-
.../src/main/scss/_speyside-classes.scss | 136 +++
.../src/main/scss/_speyside-overwrites.scss | 924 +++++++++++++++++++++
.../src/main/scss/_tobago-theme.scss | 2 +
5 files changed, 1323 insertions(+), 4 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
index d9e9abb..2c0f641 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
@@ -77,4 +77,12 @@
Box with <code class="language-markup"><f:facet name="bar"></code>.
</tc:box>
</tc:section>
+
+ <tc:section label="Box in a box">
+ <tc:box label="Box 1">
+ <tc:box label="Box 2">
+ <p>content</p>
+ </tc:box>
+ </tc:box>
+ </tc:section>
</ui:composition>
diff --git a/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss b/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss
index 887d3a1..ef56b60 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss
+++ b/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss
@@ -15,9 +15,258 @@
* limitations under the License.
*/
-// Bootstrap overrides
+//Colors
+
+$white: #fff;
+$lightsilver: rgba(233,229,210,0.5);
+$silvergrey: rgba(199,199,199,0.1);
+$greygold: #e0d0be;
+$red: rgb(211,0,64);
+$orange: #d90;
+$orange-light: #ea0;
+$orange-lighter: rgba(255, 123, 0, 0.25);
+$yellow-lighter: #fec;
+$brown-light: #ce8636;
+$darkbrown: rgb(138,83,24);
+$brown: rgb(163,103,37);
+$purple: rgb(58,37,100);
+$darkgreen: rgb(24,87,34);
+$green: rgb(29,163,50);
+
+$gray-100: #f7f7f7;
+$gray-200: #e3e4e5;
+$gray-300: #d7d7d7;
+$gray-500: #acacac;
+$gray-600: rgb(120,140,148);
+$gray-700: #55595c;
+$gray-800: #323232;
+
+$primary: $darkgreen;
+$secondary: $gray-300;
+$success: $green;
+$info: #5bc0de;
+$warning: #f0ad4e;
+$danger: $red;
+$light: $gray-100;
+$dark: $gray-800;
+
+$theme-colors: ();
+$theme-colors: map-merge((
+ "primary": $primary,
+ "secondary": $secondary,
+ "success": $success,
+ "info": $info,
+ "warning": $warning,
+ "danger": $danger,
+ "light": $light,
+ "dark": $dark
+), $theme-colors);
+
+
+// Options
+$header-height: 80px;
+$header-height-collapsed: 30px;
+
+$enable-rounded: false;
+$enable-transitions: true;
+$enable-hover-media-query: false;
+
+// Spacing
+$spacer: 1rem;
+
+
+// Body
+//
+// Settings for the `<body>` element.
+
+$body-bg: white;
+
+
+// Links
+//
+// Style anchor elements.
+
+$link-color: $brown-light;
+$link-hover-color: $darkbrown;
+$link-hover-decoration: none;
+
+
+// Grid breakpoints
+//
+// Define the minimum and maximum dimensions at which your layout will change,
+// adapting to different screen sizes, for use in media queries.
+
+
+// Grid containers
+//
+// Define the maximum width of `.container` for different screen sizes.
+
+
+// Grid columns
+//
+// Set the number of columns and specify the width of the gutters.
+
+
+// Typography
+//
+// Font, line-height, and color for body text, headings, and more.
+
+$font-family-sans-serif: verdana, sans-serif;
+$font-family-base: $font-family-sans-serif;
+
+// Pixel value used to responsively scale all typography. Applied to the `<html>` element.
+$font-size-root: 12px;
+
+$font-size-base: 1rem;
+
+$h1-font-size: 1.7rem;
+$h2-font-size: 1.55rem;
+$h3-font-size: 1.4rem;
+$h4-font-size: 1.1rem;
+$h5-font-size: 1rem;
+$h6-font-size: 1rem;
+
+$headings-margin-bottom: ($spacer);
+
+// Components
+//
+// Define common padding and border radius sizes and more.
+
+// Tables
+//
+// Customizes the `.table` component with basic values, each used across all table variations.
+
+$table-cell-padding: .5rem;
+
+$table-bg: white;
+$table-accent-bg: $silvergrey;
+$table-hover-bg: $lightsilver;
+
+$pagination-color: $link-color;
+
+$pagination-active-bg: theme-color("primary");
+$pagination-active-border-color: theme-color("primary");
+
+// Buttons
+//
+// For each of Bootstrap's buttons, define text, background and border color.
+
+$input-btn-padding-x: .75rem;
+$input-btn-padding-y: .375rem;
+$input-btn-padding-x-sm: .75rem;
+$input-btn-padding-y-sm: .275rem;
+$input-btn-padding-x-lg: 1.25rem;
+$input-btn-padding-y-lg: .75rem;
+
+$btn-padding-x: 1rem;
+$btn-padding-y: .375rem;
+$btn-font-weight: normal;
+
+$box-spacer-x: .5rem;
+$box-title-background-color: $greygold;
+
+$btn-primary-active-hover-background-color: $black;
+$btn-primary-active-hover-border-color: $black;
+$btn-secondary-active-hover-background-color: $gray-500;
+$btn-secondary-active-hover-border-color: $gray-600;
+
+
+// Forms
+
+$input-placeholder-color: #999;
+$input-disabled-bg: $gray-100;
+$input-border-color: #ccc;
+
+
+// Dropdowns
+//
+// Dropdown menu container and contents.
+
+$dropdown-link-active-bg: $brown;
+
+// 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.
+
+// Navbar
+
+$navbar-light-color: $darkgreen;
+$navbar-light-hover-color: $orange;
+$navbar-light-active-color: $orange;
+$navbar-light-disabled-color: $gray-600;
+
+
+// Navs
+
+$nav-link-padding-y: .5rem;
+$nav-link-padding-x: 1rem;
+$nav-link-disabled-color: $gray-300;
+
+$nav-tabs-border-color: white;
+$nav-tabs-border-width: white;
+$nav-pills-link-active-color: $darkgreen;
+$nav-pills-link-active-bg: white;
+
+
+// Pagination
+
+
+// Jumbotron
+
+
+// Form states and alerts
+//
+// Define colors for form feedback states and, by default, alerts.
+
+
+// Cards
+$card-border-color: #e5e5e5;
+
+// Tooltips
+
+$tooltip-bg: $darkgreen;
+
+// Popovers
+
+
+// Modals
+
+// Padding applied to the modal body
+$modal-title-line-height: 1.3;
+
+$modal-content-bg: #fff;
+$modal-content-border-color: rgba(0,0,0,.2);
+
+$modal-lg: 900px;
+$modal-md: 600px;
+$modal-sm: 300px;
+
+
+// Alerts
//
-// Copy variables from `_variables.scss` to this file to override default values
-// without modifying source files.
+// Define alert colors, border radius, and padding.
+
+
+// Progress bars
+
+$progress-bg: $gray-200;
+$progress-bar-color: $orange;
+$progress-bar-bg: $orange;
+
+
+// List group
+
+// Image thumbnails
+
+// Figures
+
+// Breadcrumbs
+
+// Media Objects
+
+// Carousel
+
+// Close
-$body-bg: #e2e2e2;
+// Code
diff --git a/tobago-theme/tobago-theme-speyside/src/main/scss/_speyside-classes.scss b/tobago-theme/tobago-theme-speyside/src/main/scss/_speyside-classes.scss
new file mode 100644
index 0000000..5cc964f
--- /dev/null
+++ b/tobago-theme/tobago-theme-speyside/src/main/scss/_speyside-classes.scss
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@font-face {
+ font-family: Verdana,sans-serif;
+ font-weight: 300;
+ font-style: normal
+}
+
+@font-face {
+ font-family: Verdana,sans-serif;
+ font-weight: normal;
+ font-style: normal
+}
+
+/* Reduce font size */
+.reduceFontsize {
+ font-size: 70%;
+}
+
+.svg-support .main-logo {
+ background-size: contain;
+}
+
+.main-logo {
+ display: inline-block;
+ vertical-align: middle;
+ width: 130px;
+ height: $header-height;
+ float: right;
+ position: absolute;
+ top: 0;
+ right: 1em;
+}
+
+.card {
+ border: 0;
+ box-shadow: none;
+ border-left: 10px solid $box-title-background-color;
+}
+
+.card-header {
+ overflow: hidden;
+ border-bottom: 0;
+ background-color: $box-title-background-color;
+ padding-left: $box-spacer-x;
+
+ h3 {
+ margin-bottom: 0;
+ }
+}
+
+h3::before {
+ content: "# ";
+ color: $gray-600;
+}
+
+h4 {
+ color: $gray-600;
+}
+
+.card .card, .tab-pane .card {
+ .card-header {
+ padding-top: 0;
+ padding-bottom: 0;
+ }
+
+ .card-header::after {
+ display: none;
+ }
+
+ .card-header h3 {
+ padding: 0.375em 1em 0.375em 0.375em;
+ font-size: 1em;
+ font-weight: bold;
+ }
+
+ .card-body {
+ background-color: $gray-100;
+ padding-left: 1em;
+ margin-top: auto;
+ margin-top: initial;
+ }
+
+ .card-header h3::before {
+ content: "";
+ }
+}
+
+/* KeyValue tables */
+.key-values-table {
+ text-align: center;
+ border: 0.4em solid #e3e4e5;
+ margin-bottom: 1em;
+
+ th {
+ text-align: center;
+ background-color: #e3e4e5;
+ }
+
+ td {
+ padding: 1em 1em 0.5em 1em;
+ border: 0.25em solid #e3e4e5;
+ }
+}
+
+/* special markups */
+.red {
+ color: $red;
+}
+
+.green {
+ color: $green;
+}
+
+.largest-font {
+ font-size: $h1-font-size;
+}
+
+.larger-font {
+ font-size: $h3-font-size;
+}
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/scss/_speyside-overwrites.scss b/tobago-theme/tobago-theme-speyside/src/main/scss/_speyside-overwrites.scss
new file mode 100644
index 0000000..ce62d89
--- /dev/null
+++ b/tobago-theme/tobago-theme-speyside/src/main/scss/_speyside-overwrites.scss
@@ -0,0 +1,924 @@
+/*
+ * 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.
+ */
+
+html {
+ font-size: $font-size-root;
+}
+
+button, input, optgroup, select, textarea {
+ // overwrite _normalize.scss
+ font-family: $font-family-sans-serif;
+}
+
+// header styling
+header.tobago-header.fixed-top {
+ padding: 0;
+ vertical-align: middle;
+ margin-bottom: 1em;
+ line-height: $header-height;
+
+ .navbar {
+ padding-top: 0;
+ padding-bottom: 0;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ justify-content: flex-start;
+ }
+ .form-group {
+ margin-bottom: 0;
+ }
+ .tobago-link > i.fa {
+ font-size: 1.345em;
+ margin-right: 0.5rem;
+ }
+ button.tobago-link.dropdown-item {
+ color: theme-color("primary");
+ background-color: transparent;
+
+ &:active {
+ color: $navbar-light-active-color;
+ }
+ &:hover, &:focus {
+ color: $navbar-light-hover-color;
+ }
+ }
+ .tobago-dropdown-submenu.dropdown-item {
+ background-color: transparent;
+ }
+ .nav-link {
+ padding-top: 0;
+ padding-bottom: 0;
+ }
+ .nav-item {
+ font-size: 1.16em;
+ float: left;
+ }
+
+ a, button.tobago-link:not(.dropdown-item) {
+ color: theme-color("primary");
+ text-decoration: none;
+
+ &:hover, &:focus {
+ color: $navbar-light-hover-color;
+ cursor: pointer;
+ text-decoration: none;
+ }
+ }
+}
+
+button {
+ &.tobago-link {
+ font-family: $font-family-base;
+
+ > span {
+ position: relative;
+ }
+ }
+
+ &.tobago-link, &.tobago-command, &.tobago-treeCommand {
+ color: $link-color;
+ text-decoration: none;
+
+ &:focus, &:hover {
+ color: $link-hover-color;
+ text-decoration: none;
+ }
+ }
+}
+
+.btn:focus {
+ box-shadow: none;
+}
+
+.btn-primary:active:hover, .btn-primary:active:focus {
+ background-color: $btn-primary-active-hover-background-color;
+ border-color: $btn-primary-active-hover-border-color;
+}
+
+.btn-secondary:active:hover, .btn-secondary:active:focus {
+ background-color: $btn-secondary-active-hover-background-color;
+ border-color: $btn-secondary-active-hover-border-color;
+}
+
+.btn-info {
+ color: $white;
+}
+
+td button {
+ &.tobago-link, &.tobago-command, &.tobago-treeCommand {
+ padding-top: 5px;
+ margin-bottom: 12px;
+ }
+}
+
+.form-group, .tobago-label {
+ ~ a.tobago-link {
+ padding-top: 0.46em;
+ margin-bottom: 0;
+ }
+ ~ button.tobago-link {
+ margin-bottom: 1rem;
+ }
+}
+
+.tobago-sheet-cell {
+ button.tobago-link {
+ margin-bottom: 0;
+ }
+}
+
+header.fixed-top {
+ a[disabled], a[disabled]:hover, button[disabled], button[disabled]:hover {
+ color: $gray-600 !important;
+ }
+}
+
+.navbar-light {
+ background-color: $gray-300;
+
+ .navbar-brand {
+ color: theme-color("primary");
+ }
+}
+
+.tobago-bar.navbar-light .navbar-brand > .tobago-link {
+ color: theme-color("primary");
+
+}
+
+.navbar-brand {
+ font-size: 1.16em;
+ font-weight: bold;
+ padding-top: 0;
+ padding-bottom: 0;
+
+ > a.tobago-link > span {
+ white-space: nowrap;
+ }
+
+ button.tobago-link {
+ font-weight: bold;
+ }
+}
+
+.navbar {
+ .nav-item.dropdown > .dropdown-menu, .tobago-dropdown-submenu > .dropdown-menu {
+ border: 0;
+ background: $gray-200;
+ margin-top: 0;
+ margin-left: 0;
+ }
+
+ .dropdown-item {
+ color: theme-color("primary");
+ font-size: 1.1em;
+
+ &:focus, &:hover {
+ background: $gray-200;
+ color: $orange;
+ }
+ }
+}
+
+/** collapsed menu */
+@media (max-width: 991px) {
+ header.tobago-header.fixed-top .navbar-collapse.collapse.show {
+ line-height: $header-height-collapsed;
+ padding: $spacer 0;
+ }
+}
+
+/* expanded menu */
+@media (min-width: 992px) {
+
+ .sidebar {
+ display: none;
+
+ a.nav-link {
+ padding-top: 0;
+ padding-bottom: 0;
+ padding-right: 0;
+ }
+
+ &.show, .show {
+ display: inline;
+ }
+ > ul {
+ visibility: hidden;
+ opacity: 0;
+ transition: visibility 0s 0.2s, opacity 0.2s ease;
+ padding: 10px;
+ position: fixed;
+ max-width: 200px;
+ right: 0px;
+ background-color: white;
+ box-shadow: 1px 2px 4px 0px rgba(0, 0, 0, 0.1);
+ margin-top: 2em;
+ z-index: 2000;
+ }
+ ul {
+ display: none;
+ }
+ > ul.showhide {
+ visibility: visible;
+ transition: visibility 0s 0s, opacity 0.2s ease;
+ opacity: 1;
+ }
+ }
+ * {
+ outline: none !important;
+ }
+ .sidebar {
+ ul > li:hover > ul {
+ display: inline !important;
+ }
+ .nav .dropdown-item {
+ /* Custom sidemenu styling */
+ display: inline;
+ font-size: small;
+ color: #788c94;
+ }
+ a:focus {
+ color: #788c94;
+ }
+
+ .active.dropdown-item {
+ background-color: transparent;
+ }
+ .active.dropdown-item, .nav .dropdown-item {
+ &:focus, &:hover {
+ background-color: transparent;
+ }
+ }
+
+ li {
+ a.active {
+ padding-left: 3px !important;
+ border-left: 2px solid $darkgreen !important;
+ color: $darkgreen !important;
+ }
+ li a.active {
+ padding-left: 18px !important;
+ }
+ li li a.active {
+ padding-left: 38px !important;
+ }
+ a {
+ padding-left: 5px;
+ &:hover {
+ padding-left: 4px;
+ border-left: 1px solid $darkgreen;
+ color: $darkgreen !important;
+ }
+ }
+ li li a:hover {
+ padding-left: 39px;
+ }
+ li a:hover {
+ padding-left: 19px;
+ }
+ li a {
+ padding-left: 20px;
+ }
+ li li a {
+ padding-left: 40px;
+ }
+ }
+ }
+
+ #blur {
+ background-color: rgba(240, 240, 240, 0.5);
+ width: 100%;
+ height: 100%;
+ z-index: 999;
+ display: none;
+ top: 0px;
+ left: 0px;
+ position: fixed;
+ &.blur {
+ display: block;
+ }
+ }
+ .nav .dropdown-item:focus {
+ color: $darkgreen;
+ }
+ .collapse.navbar-collapse > ul > li > span > ul > li > span > a {
+ color: $darkgreen !important;
+ cursor: default;
+ }
+ .navbar-toggleable-xs > ul > li > span > ul > li > span {
+ cursor: default;
+ }
+ html.opendd {
+ overflow: hidden;
+ }
+ body.opendd {
+ position: fixed;
+ }
+
+ .navbar-collapsed-top-tools, .navbar-collapsed-bottom-tools {
+ display: none;
+ }
+
+ header.fixed-top {
+ .open {
+ background-image: url('../image/top_menu_active.png');
+ background-repeat: no-repeat;
+ background-position: 50% 70px;
+ }
+
+ .navbar {
+ .navbar-toggler {
+ display: none;
+ }
+ .navbar-nav {
+ flex-direction: row;
+ }
+ }
+
+ .nav-item.dropdown {
+
+ > button.dropdown-toggle {
+ padding-top: 0px;
+ padding-bottom: 0px;
+ color: $darkgreen;
+ text-decoration: none;
+
+ &:hover, &:focus {
+ color: $navbar-light-hover-color;
+ }
+ }
+
+ > .dropdown-menu {
+ position: fixed;
+ width: 100%;
+ top: auto;
+ top: initial;
+ left: 0;
+ line-height: normal;
+ line-height: initial;
+ padding: 0 10% 1em 10%;
+
+ > .dropdown-item {
+ display: inline-block;
+ font-size: 1.3em;
+ width: calc(25% - 3px);
+ min-width: 250px;
+ vertical-align: top;
+ padding-top: 1em;
+
+ > a, > button {
+ margin-bottom: 0.5em;
+ }
+ }
+ }
+ }
+
+ .navbar-nav > .nav-item.dropdown > .dropdown-toggle {
+ padding-left: 22px;
+ padding-right: .5rem;
+
+ &::before {
+ content: "\F107";
+ font-family: FontAwesome;
+ left: -5px;
+ position: absolute;
+ top: 0;
+ margin-left: 10px;
+ }
+ }
+
+ .tobago-dropdown-submenu {
+ &.dropdown-item {
+ display: block;
+
+ > .dropdown-menu {
+ display: block;
+ border-radius: 0;
+ position: static;
+ float: none;
+ padding: 0;
+
+ .dropdown-item {
+ padding-left: 0;
+
+ &::before {
+ content: "> ";
+ position: relative;
+ vertical-align: top;
+ }
+ }
+ }
+ }
+
+ &::after {
+ content: none;
+ }
+ }
+ }
+
+ .dropdown-item .nav-link {
+ display: inline-block;
+ }
+}
+
+.nav-item > .dropdown > button {
+ &.tobago-link, &.tobago-command {
+ padding-top: 0px;
+ padding-bottom: 0px;
+ }
+}
+
+.navbar-nav {
+
+ .dropdown-toggle {
+ // overwrite default toggle
+ &::after {
+ display: inline-block;
+ width: 0;
+ height: 0;
+ margin-right: 0;
+ margin-left: 0;
+ vertical-align: middle;
+ content: "";
+ border-top: 0;
+ border-right: 0;
+ border-left: 0;
+ }
+
+ // Prevent the focus on the dropdown toggle when closing dropdowns
+ &:focus {
+ outline: 0;
+ }
+
+ }
+ .nav-item {
+ float: none;
+ display: inline;
+ }
+
+}
+
+h1, h2, h3, h4, h5, h6 {
+ font-weight: 300;
+}
+
+p, .control-label {
+ hyphens: auto;
+}
+
+// Tabs
+.nav-tabs {
+ background-color: $gray-300;
+
+ .nav-item {
+ border-right: 1px solid white;
+
+ .nav-link {
+ color: $darkgreen;
+
+ &:hover {
+ color: $orange;
+ cursor: pointer;
+ }
+ }
+ .nav-link.active {
+ background-color: white;
+ }
+ }
+ .nav-item.tobago-tab-markup-disabled {
+ background-color: $gray-100;
+
+ > a, > button.tobago-link {
+ color: $gray-300;
+
+ &:hover {
+ color: $gray-300;
+ cursor: default;
+ }
+ }
+ }
+}
+
+.card-body {
+ .nav-tabs {
+ border-left: 1px solid $gray-300;
+ }
+
+ .tab-content {
+ margin-top: 1.5em;
+ padding: 0;
+ }
+}
+
+/* padding: 0.1px = hack! Padding '0' would be remove margin-bottom from .form-group */
+.tab-content {
+ background-color: white;
+ padding: 1.25rem 1.25rem 0.1px 1.25rem;
+ border-width: 0;
+}
+
+.nav-tabs .nav-item + .nav-item {
+ margin-left: 0;
+}
+
+.tobago-box-header {
+ h3 {
+ display: inline;
+ }
+ > .navbar, > .tobago-links {
+ float: right;
+
+ .nav-item > .tobago-link {
+ padding: 0 .5rem;
+ }
+ }
+ .navbar {
+ .navbar-toggler {
+ display: none;
+ }
+ .navbar-collapse.collapse {
+ display: flex;
+ flex-basis: auto;
+ position: static;
+ width: auto;
+
+ .tobago-links.navbar-nav {
+ flex-direction: row;
+ position: static;
+ width: auto;
+ background-color: transparent;
+
+ .nav-item {
+ border: 0;
+ }
+ }
+ }
+ }
+}
+
+.tobago-box, .tobago-tabGroup {
+ .tobago-box {
+ .tobago-box-header {
+ // second level boxes
+ h3 {
+ float: left;
+ }
+ }
+ .card-body {
+ .tobago-in-markup-disabled {
+ border-color: $input-border-color;
+ }
+ }
+ }
+}
+
+.tobago-footer {
+}
+
+.table {
+ background-color: white;
+
+ .checkbox {
+ margin-bottom: initial;
+ margin-bottom: auto;
+ }
+
+ select[disabled] {
+ margin-left: -4px;
+ }
+
+ .btn[disabled] {
+ display: none;
+ }
+}
+
+a, button.tobago-link, button.tobago-command, button.tobago-treeCommand {
+ &[disabled] {
+ color: $gray-300;
+ }
+}
+
+select[disabled] {
+ text-indent: 0.01px;
+ text-overflow: '';
+ appearance: none;
+}
+
+input.form-control {
+ border-radius: 0;
+}
+
+.input-group-btn {
+ .btn {
+ box-shadow: none;
+ margin-bottom: 0;
+ padding: $input-btn-padding-y $input-btn-padding-x;
+ }
+
+ > .form-control {
+ flex-direction: row;
+ }
+}
+
+.input-group-addon {
+ .btn {
+ margin: 0;
+ box-shadow: none;
+ }
+
+ > .form-group {
+ margin-bottom: 0;
+ }
+
+ .form-control-static {
+ padding-top: 0; // for tc:out
+ }
+}
+
+.tobago-flexLayout > .mce-container {
+ // identical width for tinymce / textarea
+ margin-left: 3px;
+ margin-right: 3px;
+}
+
+td .form-group {
+ margin-bottom: 0
+}
+
+li:last-child {
+ margin-bottom: 0;
+}
+
+.form-group {
+ ol, ul, dl {
+ margin-bottom: 0;
+ }
+}
+
+.btn {
+ padding: $btn-padding-y $btn-padding-x;
+ box-shadow: 1px 2px 4px 0px rgba(0, 0, 0, 0.1);
+}
+
+.modal-dialog .card {
+ margin-bottom: 0;
+}
+
+// border from disabled form-controls should have background-color
+.form-control {
+ &:disabled, &[readonly] {
+ border-color: $gray-100;
+ &:focus {
+ border-color: $gray-100;
+ }
+ }
+ &:focus {
+ border-color: $orange-light;
+ box-shadow: 0 0 0 0.2rem $orange-lighter;
+ }
+}
+
+// Errormessages
+.alert > label {
+ display: block;
+}
+
+.input-group-addon {
+ line-height: 1.3em;
+}
+
+// Nav-Stacks
+.nav-stacked {
+ text-align: center;
+ font-size: 0.9em;
+ margin-right: 1em;
+ margin-top: 1em;
+ margin-left: -1.5em;
+
+ .active .fa {
+ color: white;
+ }
+
+ .fa {
+ font-size: 2em;
+ color: #788C94;
+ display: block;
+ padding-bottom: 0.2em;
+ }
+
+ .nav-item {
+ padding: 0.3em 0;
+ }
+}
+
+.bootstrap-datetimepicker-widget .datepicker-days {
+ .past.day {
+ opacity: 0.7;
+ }
+ .old.day, .new.day {
+ opacity: 0.5;
+ }
+}
+
+.label {
+ display: inline-block;
+ padding: .25em .4em;
+ font-size: 75%;
+ font-weight: 700;
+ line-height: 1;
+ color: #fff;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: baseline;
+ border-radius: .25rem
+
+}
+
+.label-pill {
+ padding-right: .6em;
+ padding-left: .6em;
+ border-radius: 10rem
+}
+
+.label-danger {
+ background-color: theme-color("danger");
+}
+
+.label-info {
+ background-color: theme-color("info");
+}
+
+.label-warning {
+ background-color: theme-color("warning");
+}
+
+.label-success {
+ background-color: theme-color("success");
+}
+
+.label-primary {
+ background-color: theme-color("primary");
+}
+
+.label-default {
+ background-color: $gray-700;
+}
+
+// checkboxes and radio buttons
+.tobago-selectBooleanCheckbox, .tobago-selectManyCheckbox, .tobago-selectOneRadio {
+ &-markup-readonly .form-check-label {
+ cursor: default;
+ }
+ .form-check-label {
+ padding-left: 0;
+
+ .tobago-inputPseudo {
+ margin-bottom: 2px;
+ height: 14px;
+ width: 14px;
+ display: inline-block;
+ margin-right: 5px;
+ transition: all 0.2s;
+ vertical-align: middle;
+ border: 1px solid $gray-300;
+ background: #fff;
+
+ &:before {
+ content: "";
+ }
+ }
+ }
+}
+
+.tobago-selectBooleanCheckbox, .tobago-selectManyCheckbox {
+ .form-check-label {
+ .tobago-inputPseudo {
+ overflow: hidden;
+
+ &:before {
+ font-size: medium;
+ color: $dropdown-link-active-bg;
+ position: relative;
+ top: -6px;
+ left: 13px;
+ }
+ }
+ input[type="checkbox"]:checked + .tobago-inputPseudo {
+ border-color: $dropdown-link-active-bg;
+ &:before {
+ content: "\f00c";
+ }
+ }
+ input[type="checkbox"]:active + .tobago-inputPseudo,
+ input[type="checkbox"]:focus + .tobago-inputPseudo {
+ border-color: $orange-light;
+ }
+ input[type="checkbox"]:active:not(:disabled) + .tobago-inputPseudo:before,
+ input[type="checkbox"]:focus:not(:disabled) + .tobago-inputPseudo:before {
+ text-shadow: none;
+ }
+ input[type="checkbox"] {
+ &[readonly], &[disabled] {
+ & + .tobago-inputPseudo {
+ opacity: 0.6;
+ background: $input-disabled-bg;
+ }
+ }
+ }
+ }
+}
+
+.tobago-selectOneRadio {
+ .form-check-label {
+ .tobago-inputPseudo {
+ border-radius: 100%;
+ }
+ input[type="radio"]:checked + .tobago-inputPseudo {
+ background: $dropdown-link-active-bg;
+ border: 0;
+ &:before {
+ content: "";
+ }
+ }
+ input[type="radio"]:active + .tobago-inputPseudo,
+ input[type="radio"]:focus + .tobago-inputPseudo {
+ border: 1px solid $orange-light;
+ }
+ input[type="radio"] {
+ &[readonly], &[disabled] {
+ & + .tobago-inputPseudo {
+ opacity: 0.6;
+ background: $input-disabled-bg;
+ }
+ }
+ }
+ }
+}
+
+.tobago-dropdown-submenu > .dropdown-menu {
+ border-radius: 0;
+}
+
+.dropdown-menu {
+ border-radius: 0;
+
+ .tobago-selectBooleanCheckbox, .tobago-selectManyCheckbox, .tobago-selectOneRadio {
+ .form-check-label {
+ padding-left: $dropdown-item-padding-x;
+ }
+ }
+}
+
+.dropdown-toggle:after {
+ vertical-align: 0.1em;
+}
+
+.tobago-dropdown-submenu:after {
+ margin-top: 5px;
+}
+
+.tobago-selectBooleanCheckbox.form-check,
+.tobago-selectManyCheckbox-inline,
+.tobago-selectOneRadio-inline,
+.slider {
+ min-height: 26px;
+}
+
+// fix tobago-suggest
+.twitter-typeahead {
+ width: 100%;
+ display: inherit !important;
+}
+
+.tobago-sheet-cell > .twitter-typeahead {
+ display: block !important;
+}
+
+.tobago-section-header {
+ border-bottom: 1px solid rgba(1, 1, 1, 0.05);
+ margin-bottom: .5rem;
+
+ h1 {
+ margin-bottom: 0;
+ }
+
+ h2, h3, h4, h5, h6 {
+ margin-top: 1rem;
+ margin-bottom: 0;
+ }
+}
diff --git a/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss b/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss
index 270a84b..71b6539 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss
+++ b/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss
@@ -20,3 +20,5 @@
@import "tobago";
+@import "speyside-classes";
+@import "speyside-overwrites";
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 02/02: rebuild themes after update
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 058b1bea9461755c44d30a858c899f69a32a3d42
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Nov 10 11:07:15 2017 +0100
rebuild themes after update
---
.../tobago-theme-charlotteville/rebuild-theme.log | 48 +-
.../tobago-theme-roxborough/rebuild-theme.log | 54 +-
.../tobago-theme-scarborough/rebuild-theme.log | 48 +-
.../tobago-theme-speyside/rebuild-theme.log | 62 +-
.../tobago-bootstrap/_version/css/bootstrap.css | 2048 ++++++++++++++------
.../_version/css/bootstrap.css.map | 2 +-
.../_version/css/bootstrap.min.css | 2 +-
.../_version/css/bootstrap.min.css.map | 2 +-
.../tobago-theme-standard/rebuild-theme.log | 56 +-
9 files changed, 1546 insertions(+), 776 deletions(-)
diff --git a/tobago-theme/tobago-theme-charlotteville/rebuild-theme.log b/tobago-theme/tobago-theme-charlotteville/rebuild-theme.log
index 162957c..937e5f6 100644
--- a/tobago-theme/tobago-theme-charlotteville/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-charlotteville/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-09 14:15:36
+Build date: 2017-11-10 10:46:56
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -13,8 +13,8 @@ Build date: 2017-11-09 14:15:36
[INFO] Removing __CURRENT__/tobago-theme-charlotteville/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-charlotteville/target && git clone --branch v4.0.0-beta.2 https://github.com/twbs/bootstrap __CURRENT__/tobago-theme-charlotteville/target/checkout
[INFO] Working directory: __CURRENT__/tobago-theme-charlotteville/target
-[INFO] Executing: /bin/sh -c cd /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/ && git ls-remote https://github.com/twbs/bootstrap
-[INFO] Working directory: /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T
+[INFO] Executing: /bin/sh -c cd /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/ && git ls-remote https://github.com/twbs/bootstrap
+[INFO] Working directory: /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-charlotteville/target/checkout && git pull https://github.com/twbs/bootstrap v4.0.0-beta.2:v4.0.0-beta.2
[INFO] Working directory: __CURRENT__/tobago-theme-charlotteville/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-charlotteville/target/checkout && git checkout v4.0.0-beta.2
@@ -65,11 +65,11 @@ Build date: 2017-11-09 14:15:36
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-charlotteville/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510233450853/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-charlotteville/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510307323940/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-charlotteville/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-charlotteville/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -1032,11 +1032,11 @@ Build date: 2017-11-09 14:15:36
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-grid.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-reboot.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-reboot.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-charlotteville/target/bootstrap/dist/css/bootstrap-reboot.css.map
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-charlotteville ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-charlotteville/target/bootstrap
@@ -1044,12 +1044,12 @@ Build date: 2017-11-09 14:15:36
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.36 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.37 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.37 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.37 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.37 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.37 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.12 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.12 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.12 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.12 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.12 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.12 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-charlotteville ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-charlotteville/target/bootstrap
@@ -1077,10 +1077,6 @@ Build date: 2017-11-09 14:15:36
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-charlotteville/target/bootstrap
-[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
@@ -1088,6 +1084,10 @@ Build date: 2017-11-09 14:15:36
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
+[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-charlotteville/target/bootstrap
+[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
+[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-charlotteville/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
[ERROR]
@@ -1104,22 +1104,22 @@ Build date: 2017-11-09 14:15:36
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 2s
-[ERROR] created dist/js/bootstrap.bundle.js in 2.2s
+[ERROR] created dist/js/bootstrap.js in 2.8s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.9s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-charlotteville/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.5s
+[ERROR] created dist/js/bootstrap.js in 1.7s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-charlotteville/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR] created dist/js/bootstrap.bundle.js in 1.7s
+[ERROR] created dist/js/bootstrap.bundle.js in 1.8s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-charlotteville/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
@@ -1210,7 +1210,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:30 min
-[INFO] Finished at: 2017-11-09T14:18:07+01:00
-[INFO] Final Memory: 29M/375M
+[INFO] Total time: 02:23 min
+[INFO] Finished at: 2017-11-10T10:49:23+01:00
+[INFO] Final Memory: 31M/399M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-roxborough/rebuild-theme.log b/tobago-theme/tobago-theme-roxborough/rebuild-theme.log
index 602c3fb..6d08b79 100644
--- a/tobago-theme/tobago-theme-roxborough/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-roxborough/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-09 14:18:08
+Build date: 2017-11-10 10:49:23
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -13,8 +13,8 @@ Build date: 2017-11-09 14:18:08
[INFO] Removing __CURRENT__/tobago-theme-roxborough/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-roxborough/target && git clone --branch v4.0.0-beta.2 https://github.com/twbs/bootstrap __CURRENT__/tobago-theme-roxborough/target/checkout
[INFO] Working directory: __CURRENT__/tobago-theme-roxborough/target
-[INFO] Executing: /bin/sh -c cd /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/ && git ls-remote https://github.com/twbs/bootstrap
-[INFO] Working directory: /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T
+[INFO] Executing: /bin/sh -c cd /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/ && git ls-remote https://github.com/twbs/bootstrap
+[INFO] Working directory: /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-roxborough/target/checkout && git pull https://github.com/twbs/bootstrap v4.0.0-beta.2:v4.0.0-beta.2
[INFO] Working directory: __CURRENT__/tobago-theme-roxborough/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-roxborough/target/checkout && git checkout v4.0.0-beta.2
@@ -65,11 +65,11 @@ Build date: 2017-11-09 14:18:08
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510233607191/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510307525491/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-roxborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -150,7 +150,6 @@ Build date: 2017-11-09 14:18:08
[INFO] │ │ │ ├─┬ rc@1.2.1
[INFO] │ │ │ │ ├── deep-extend@0.4.2
[INFO] │ │ │ │ ├── ini@1.3.4
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ ├── minimist@1.2.0
[INFO] │ │ │ │ └── strip-json-comments@2.0.1
[INFO] │ │ │ ├─┬ request@2.81.0
@@ -264,6 +263,7 @@ Build date: 2017-11-09 14:18:08
[INFO] │ ├─┬ @babel/traverse@7.0.0-beta.31
[INFO] │ │ ├─┬ @babel/helper-function-name@7.0.0-beta.31
[INFO] │ │ │ ├── @babel/helper-get-function-arity@7.0.0-beta.31
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ └─┬ @babel/template@7.0.0-beta.31
[INFO] │ │ │ └── babylon@7.0.0-beta.31
[INFO] │ │ ├── babylon@7.0.0-beta.31
@@ -1032,8 +1032,8 @@ Build date: 2017-11-09 14:18:08
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap.css
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Rendering Complete, saving .css file...
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-reboot.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-roxborough/target/bootstrap/dist/css/bootstrap-reboot.css.map
@@ -1044,12 +1044,12 @@ Build date: 2017-11-09 14:18:08
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.69 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.69 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.69 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.69 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.69 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.69 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.1 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.1 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.1 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.1 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.1 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.1 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-roxborough ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-roxborough/target/bootstrap
@@ -1077,14 +1077,14 @@ Build date: 2017-11-09 14:18:08
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-roxborough/target/bootstrap
-[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
@@ -1104,8 +1104,8 @@ Build date: 2017-11-09 14:18:08
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 1.8s
-[ERROR] created dist/js/bootstrap.bundle.js in 2s
+[ERROR] created dist/js/bootstrap.js in 2.4s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.6s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
@@ -1141,6 +1141,10 @@ Build date: 2017-11-09 14:18:08
[INFO] > npm-run-all --parallel js-minify-*
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
+[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
[INFO]
@@ -1148,12 +1152,8 @@ Build date: 2017-11-09 14:18:08
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
-[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-roxborough/target/bootstrap
-[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
-[INFO]
-[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
+[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-roxborough/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
@@ -1210,7 +1210,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:34 min
-[INFO] Finished at: 2017-11-09T14:20:43+01:00
-[INFO] Final Memory: 30M/384M
+[INFO] Total time: 03:27 min
+[INFO] Finished at: 2017-11-10T10:52:51+01:00
+[INFO] Final Memory: 34M/500M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-scarborough/rebuild-theme.log b/tobago-theme/tobago-theme-scarborough/rebuild-theme.log
index 5faf6f1..55690fa 100644
--- a/tobago-theme/tobago-theme-scarborough/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-scarborough/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-09 14:20:44
+Build date: 2017-11-10 10:52:51
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -13,8 +13,8 @@ Build date: 2017-11-09 14:20:44
[INFO] Removing __CURRENT__/tobago-theme-scarborough/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-scarborough/target && git clone --branch v4.0.0-beta.2 https://github.com/twbs/bootstrap __CURRENT__/tobago-theme-scarborough/target/checkout
[INFO] Working directory: __CURRENT__/tobago-theme-scarborough/target
-[INFO] Executing: /bin/sh -c cd /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/ && git ls-remote https://github.com/twbs/bootstrap
-[INFO] Working directory: /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T
+[INFO] Executing: /bin/sh -c cd /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/ && git ls-remote https://github.com/twbs/bootstrap
+[INFO] Working directory: /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-scarborough/target/checkout && git pull https://github.com/twbs/bootstrap v4.0.0-beta.2:v4.0.0-beta.2
[INFO] Working directory: __CURRENT__/tobago-theme-scarborough/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-scarborough/target/checkout && git checkout v4.0.0-beta.2
@@ -65,11 +65,11 @@ Build date: 2017-11-09 14:20:44
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510233748499/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510307726274/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-scarborough/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -221,7 +221,6 @@ Build date: 2017-11-09 14:20:44
[INFO] │ │ │ │ ├─┬ fstream@1.0.11
[INFO] │ │ │ │ │ └── graceful-fs@4.1.11
[INFO] │ │ │ │ └── inherits@2.0.3
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ └─┬ tar-pack@3.4.0
[INFO] │ │ │ ├─┬ debug@2.6.8
[INFO] │ │ │ │ └── ms@2.0.0
@@ -1021,6 +1020,7 @@ Build date: 2017-11-09 14:20:44
[INFO] │ └── lodash.templatesettings@4.1.0
[INFO] └── workbox-sw@2.1.1
[INFO]
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
@@ -1035,8 +1035,8 @@ Build date: 2017-11-09 14:20:44
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-grid.css
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-reboot.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-reboot.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-scarborough/target/bootstrap/dist/css/bootstrap-reboot.css
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
@@ -1044,12 +1044,12 @@ Build date: 2017-11-09 14:20:44
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.08 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.08 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (2.82 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (2.82 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (2.82 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (2.82 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (2.82 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (2.82 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-scarborough ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-scarborough/target/bootstrap
@@ -1104,22 +1104,22 @@ Build date: 2017-11-09 14:20:44
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 2.5s
-[ERROR] created dist/js/bootstrap.bundle.js in 2.7s
+[ERROR] created dist/js/bootstrap.js in 2.9s
+[ERROR] created dist/js/bootstrap.bundle.js in 3.1s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.5s
+[ERROR] created dist/js/bootstrap.js in 2s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-scarborough/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
-[ERROR] created dist/js/bootstrap.bundle.js in 1.7s
+[ERROR] created dist/js/bootstrap.bundle.js in 3.3s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
@@ -1141,6 +1141,10 @@ Build date: 2017-11-09 14:20:44
[INFO] > npm-run-all --parallel js-minify-*
[INFO]
[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-scarborough/target/bootstrap
+[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
+[INFO]
+[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-bundle __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
[INFO]
@@ -1148,10 +1152,6 @@ Build date: 2017-11-09 14:20:44
[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-scarborough/target/bootstrap
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
[INFO]
-[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-scarborough/target/bootstrap
-[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
-[INFO]
[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[INFO]
@@ -1210,7 +1210,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:19 min
-[INFO] Finished at: 2017-11-09T14:23:04+01:00
-[INFO] Final Memory: 29M/377M
+[INFO] Total time: 03:32 min
+[INFO] Finished at: 2017-11-10T10:56:26+01:00
+[INFO] Final Memory: 29M/406M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-speyside/rebuild-theme.log b/tobago-theme/tobago-theme-speyside/rebuild-theme.log
index ee46c4f..8ba60fb 100644
--- a/tobago-theme/tobago-theme-speyside/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-speyside/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-09 14:23:04
+Build date: 2017-11-10 10:56:26
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -13,8 +13,8 @@ Build date: 2017-11-09 14:23:04
[INFO] Removing __CURRENT__/tobago-theme-speyside/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-speyside/target && git clone --branch v4.0.0-beta.2 https://github.com/twbs/bootstrap __CURRENT__/tobago-theme-speyside/target/checkout
[INFO] Working directory: __CURRENT__/tobago-theme-speyside/target
-[INFO] Executing: /bin/sh -c cd /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/ && git ls-remote https://github.com/twbs/bootstrap
-[INFO] Working directory: /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T
+[INFO] Executing: /bin/sh -c cd /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/ && git ls-remote https://github.com/twbs/bootstrap
+[INFO] Working directory: /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-speyside/target/checkout && git pull https://github.com/twbs/bootstrap v4.0.0-beta.2:v4.0.0-beta.2
[INFO] Working directory: __CURRENT__/tobago-theme-speyside/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-speyside/target/checkout && git checkout v4.0.0-beta.2
@@ -28,7 +28,7 @@ Build date: 2017-11-09 14:23:04
[INFO]
[INFO] --- maven-resources-plugin:2.7:copy-resources (step #3: copy-custom) @ tobago-theme-speyside ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
-[INFO] Copying 2 resources
+[INFO] Copying 4 resources
[INFO]
[INFO] --- maven-patch-plugin:1.2:apply (step #4: append-tobago-theme-to-bootstrap) @ tobago-theme-speyside ---
[INFO] Applying patch: append-tobago-theme-to-bootstrap.patch
@@ -65,11 +65,11 @@ Build date: 2017-11-09 14:23:04
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510233871196/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510307894071/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-speyside/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -140,7 +140,6 @@ Build date: 2017-11-09 14:23:04
[INFO] │ │ │ │ │ ├── object-assign@4.1.1
[INFO] │ │ │ │ │ ├── signal-exit@3.0.2
[INFO] │ │ │ │ │ ├─┬ string-width@1.0.2
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ │ │ ├── code-point-at@1.1.0
[INFO] │ │ │ │ │ │ └─┬ is-fullwidth-code-point@1.0.0
[INFO] │ │ │ │ │ │ └── number-is-nan@1.0.1
@@ -1021,6 +1020,7 @@ Build date: 2017-11-09 14:23:04
[INFO] │ └── lodash.templatesettings@4.1.0
[INFO] └── workbox-sw@2.1.1
[INFO]
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #8: npm run css-compile) @ tobago-theme-speyside ---
[INFO] Running 'npm run css-compile' in __CURRENT__/tobago-theme-speyside/target/bootstrap
@@ -1029,14 +1029,14 @@ Build date: 2017-11-09 14:23:04
[INFO] > node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css
[INFO]
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap.css
[ERROR] Rendering Complete, saving .css file...
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-grid.css
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-reboot.css
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-reboot.css.map
+[ERROR] Wrote CSS to __CURRENT__/tobago-theme-speyside/target/bootstrap/dist/css/bootstrap-reboot.css
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-speyside ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-speyside/target/bootstrap
@@ -1044,12 +1044,12 @@ Build date: 2017-11-09 14:23:04
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.29 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.29 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.3 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.29 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.29 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.29 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.31 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.31 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.31 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.31 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.31 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.31 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-speyside ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-speyside/target/bootstrap
@@ -1077,21 +1077,21 @@ Build date: 2017-11-09 14:23:04
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-speyside/target/bootstrap
-[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-speyside/target/bootstrap
+[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-speyside/target/bootstrap
-[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-speyside/target/bootstrap
+[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR]
[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
[INFO] js/src/alert.js -> js/dist/alert.js
[INFO] js/src/button.js -> js/dist/button.js
[INFO] js/src/carousel.js -> js/dist/carousel.js
@@ -1104,15 +1104,15 @@ Build date: 2017-11-09 14:23:04
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 1.8s
-[ERROR] created dist/js/bootstrap.bundle.js in 1.9s
+[ERROR] created dist/js/bootstrap.js in 2.5s
+[ERROR] created dist/js/bootstrap.bundle.js in 2.6s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-speyside/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.5s
+[ERROR] created dist/js/bootstrap.js in 1.6s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
@@ -1145,13 +1145,13 @@ Build date: 2017-11-09 14:23:04
[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.bundle.js.map,includeSources,url=bootstrap.bundle.min.js.map" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
-[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
-[INFO]
-[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-minify-docs __CURRENT__/tobago-theme-speyside/target/bootstrap
[INFO] > uglifyjs --mangle --comments "/^!/" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js
[INFO]
+[INFO]
+[INFO] > bootstrap@4.0.0-beta.2 js-minify-standalone __CURRENT__/tobago-theme-speyside/target/bootstrap
+[INFO] > uglifyjs --compress typeofs=false --mangle --comments "/^!/" --source-map "content=dist/js/bootstrap.js.map,includeSources,url=bootstrap.min.js.map" --output dist/js/bootstrap.min.js dist/js/bootstrap.js
+[INFO]
[ERROR] INFO: Using input source map: dist/js/bootstrap.bundle.js.map
[ERROR] INFO: Using input source map: dist/js/bootstrap.js.map
[INFO]
@@ -1210,7 +1210,7 @@ main:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:01 min
-[INFO] Finished at: 2017-11-09T14:25:06+01:00
-[INFO] Final Memory: 29M/379M
+[INFO] Total time: 02:32 min
+[INFO] Finished at: 2017-11-10T10:59:00+01:00
+[INFO] Final Memory: 34M/504M
[INFO] ------------------------------------------------------------------------
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css
index 55321e3..90cdb56 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css
@@ -35,20 +35,20 @@
--white: #fff;
--gray: #868e96;
--gray-dark: #343a40;
- --primary: #007bff;
- --secondary: #868e96;
- --success: #28a745;
- --info: #17a2b8;
- --warning: #ffc107;
- --danger: #dc3545;
- --light: #f8f9fa;
- --dark: #343a40;
+ --primary: #185722;
+ --secondary: #d7d7d7;
+ --success: #1da332;
+ --info: #5bc0de;
+ --warning: #f0ad4e;
+ --danger: #d30040;
+ --light: #f7f7f7;
+ --dark: #323232;
--breakpoint-xs: 0;
--breakpoint-sm: 576px;
--breakpoint-md: 768px;
--breakpoint-lg: 992px;
--breakpoint-xl: 1200px;
- --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ --font-family-sans-serif: verdana, sans-serif;
--font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}
@@ -135,13 +135,13 @@ article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, s
body {
margin: 0;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ font-family: verdana, sans-serif;
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
color: #212529;
text-align: left;
- background-color: #e2e2e2;
+ background-color: white;
}
[tabindex="-1"]:focus {
@@ -156,7 +156,7 @@ hr {
h1, h2, h3, h4, h5, h6 {
margin-top: 0;
- margin-bottom: 0.5rem;
+ margin-bottom: 1rem;
}
p {
@@ -236,15 +236,15 @@ sup {
}
a {
- color: #007bff;
+ color: #ce8636;
text-decoration: none;
background-color: transparent;
-webkit-text-decoration-skip: objects;
}
a:hover {
- color: #0056b3;
- text-decoration: underline;
+ color: #8a5318;
+ text-decoration: none;
}
a:not([href]):not([tabindex]) {
@@ -307,8 +307,8 @@ table {
}
caption {
- padding-top: 0.75rem;
- padding-bottom: 0.75rem;
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
color: #868e96;
text-align: left;
caption-side: bottom;
@@ -447,7 +447,7 @@ template {
h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6 {
- margin-bottom: 0.5rem;
+ margin-bottom: 1rem;
font-family: inherit;
font-weight: 500;
line-height: 1.2;
@@ -455,23 +455,23 @@ h1, h2, h3, h4, h5, h6,
}
h1, .h1 {
- font-size: 2.5rem;
+ font-size: 1.7rem;
}
h2, .h2 {
- font-size: 2rem;
+ font-size: 1.55rem;
}
h3, .h3 {
- font-size: 1.75rem;
+ font-size: 1.4rem;
}
h4, .h4 {
- font-size: 1.5rem;
+ font-size: 1.1rem;
}
h5, .h5 {
- font-size: 1.25rem;
+ font-size: 1rem;
}
h6, .h6 {
@@ -573,7 +573,6 @@ mark,
padding: 0.25rem;
background-color: #fff;
border: 1px solid #ddd;
- border-radius: 0.25rem;
transition: all 0.2s ease-in-out;
max-width: 100%;
height: auto;
@@ -605,7 +604,6 @@ code {
font-size: 90%;
color: #bd4147;
background-color: #f8f9fa;
- border-radius: 0.25rem;
}
a > code {
@@ -619,7 +617,6 @@ kbd {
font-size: 90%;
color: #fff;
background-color: #212529;
- border-radius: 0.2rem;
}
kbd kbd {
@@ -1578,12 +1575,12 @@ pre code {
width: 100%;
max-width: 100%;
margin-bottom: 1rem;
- background-color: transparent;
+ background-color: white;
}
.table th,
.table td {
- padding: 0.75rem;
+ padding: 0.5rem;
vertical-align: top;
border-top: 1px solid #e9ecef;
}
@@ -1598,7 +1595,7 @@ pre code {
}
.table .table {
- background-color: #e2e2e2;
+ background-color: white;
}
.table-sm th,
@@ -1621,131 +1618,131 @@ pre code {
}
.table-striped tbody tr:nth-of-type(odd) {
- background-color: rgba(0, 0, 0, 0.05);
+ background-color: rgba(199, 199, 199, 0.1);
}
.table-hover tbody tr:hover {
- background-color: rgba(0, 0, 0, 0.075);
+ background-color: rgba(233, 229, 210, 0.5);
}
.table-primary,
.table-primary > th,
.table-primary > td {
- background-color: #b8daff;
+ background-color: #bed0c1;
}
.table-hover .table-primary:hover {
- background-color: #9fcdff;
+ background-color: #afc5b3;
}
.table-hover .table-primary:hover > td,
.table-hover .table-primary:hover > th {
- background-color: #9fcdff;
+ background-color: #afc5b3;
}
.table-secondary,
.table-secondary > th,
.table-secondary > td {
- background-color: #dddfe2;
+ background-color: #f4f4f4;
}
.table-hover .table-secondary:hover {
- background-color: #cfd2d6;
+ background-color: #e7e7e7;
}
.table-hover .table-secondary:hover > td,
.table-hover .table-secondary:hover > th {
- background-color: #cfd2d6;
+ background-color: #e7e7e7;
}
.table-success,
.table-success > th,
.table-success > td {
- background-color: #c3e6cb;
+ background-color: #c0e5c6;
}
.table-hover .table-success:hover {
- background-color: #b1dfbb;
+ background-color: #aedeb6;
}
.table-hover .table-success:hover > td,
.table-hover .table-success:hover > th {
- background-color: #b1dfbb;
+ background-color: #aedeb6;
}
.table-info,
.table-info > th,
.table-info > td {
- background-color: #bee5eb;
+ background-color: #d1edf6;
}
.table-hover .table-info:hover {
- background-color: #abdde5;
+ background-color: #bce5f2;
}
.table-hover .table-info:hover > td,
.table-hover .table-info:hover > th {
- background-color: #abdde5;
+ background-color: #bce5f2;
}
.table-warning,
.table-warning > th,
.table-warning > td {
- background-color: #ffeeba;
+ background-color: #fbe8cd;
}
.table-hover .table-warning:hover {
- background-color: #ffe8a1;
+ background-color: #f9ddb5;
}
.table-hover .table-warning:hover > td,
.table-hover .table-warning:hover > th {
- background-color: #ffe8a1;
+ background-color: #f9ddb5;
}
.table-danger,
.table-danger > th,
.table-danger > td {
- background-color: #f5c6cb;
+ background-color: #f3b8ca;
}
.table-hover .table-danger:hover {
- background-color: #f1b0b7;
+ background-color: #efa2ba;
}
.table-hover .table-danger:hover > td,
.table-hover .table-danger:hover > th {
- background-color: #f1b0b7;
+ background-color: #efa2ba;
}
.table-light,
.table-light > th,
.table-light > td {
- background-color: #fdfdfe;
+ background-color: #fdfdfd;
}
.table-hover .table-light:hover {
- background-color: #ececf6;
+ background-color: #f0f0f0;
}
.table-hover .table-light:hover > td,
.table-hover .table-light:hover > th {
- background-color: #ececf6;
+ background-color: #f0f0f0;
}
.table-dark,
.table-dark > th,
.table-dark > td {
- background-color: #c6c8ca;
+ background-color: #c6c6c6;
}
.table-hover .table-dark:hover {
- background-color: #b9bbbe;
+ background-color: #b9b9b9;
}
.table-hover .table-dark:hover > td,
.table-hover .table-dark:hover > th {
- background-color: #b9bbbe;
+ background-color: #b9b9b9;
}
.table-active,
@@ -1872,8 +1869,8 @@ pre code {
background-color: #fff;
background-image: none;
background-clip: padding-box;
- border: 1px solid #ced4da;
- border-radius: 0.25rem;
+ border: 1px solid #ccc;
+ border-radius: 0;
transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
}
@@ -1891,27 +1888,27 @@ pre code {
}
.form-control::-webkit-input-placeholder {
- color: #868e96;
+ color: #999;
opacity: 1;
}
.form-control:-ms-input-placeholder {
- color: #868e96;
+ color: #999;
opacity: 1;
}
.form-control::-ms-input-placeholder {
- color: #868e96;
+ color: #999;
opacity: 1;
}
.form-control::placeholder {
- color: #868e96;
+ color: #999;
opacity: 1;
}
.form-control:disabled, .form-control[readonly] {
- background-color: #e9ecef;
+ background-color: #f7f7f7;
opacity: 1;
}
@@ -1937,15 +1934,15 @@ select.form-control:focus::-ms-value {
}
.col-form-label-lg {
- padding-top: calc(0.5rem + 1px);
- padding-bottom: calc(0.5rem + 1px);
+ padding-top: calc(0.75rem + 1px);
+ padding-bottom: calc(0.75rem + 1px);
font-size: 1.25rem;
line-height: 1.5;
}
.col-form-label-sm {
- padding-top: calc(0.25rem + 1px);
- padding-bottom: calc(0.25rem + 1px);
+ padding-top: calc(0.275rem + 1px);
+ padding-bottom: calc(0.275rem + 1px);
font-size: 0.875rem;
line-height: 1.5;
}
@@ -1979,10 +1976,9 @@ select.form-control:focus::-ms-value {
.form-control-sm, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn {
- padding: 0.25rem 0.5rem;
+ padding: 0.275rem 0.75rem;
font-size: 0.875rem;
line-height: 1.5;
- border-radius: 0.2rem;
}
select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.form-control:not([size]):not([multiple]),
@@ -1994,10 +1990,9 @@ select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.for
.form-control-lg, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
- padding: 0.5rem 1rem;
+ padding: 0.75rem 1.25rem;
font-size: 1.25rem;
line-height: 1.5;
- border-radius: 0.3rem;
}
select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.form-control:not([size]):not([multiple]),
@@ -2285,7 +2280,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.btn {
display: inline-block;
- font-weight: 400;
+ font-weight: normal;
text-align: center;
white-space: nowrap;
vertical-align: middle;
@@ -2297,7 +2292,6 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
padding: 0.375rem 0.75rem;
font-size: 1rem;
line-height: 1.5;
- border-radius: 0.25rem;
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
}
@@ -2325,485 +2319,485 @@ fieldset[disabled] a.btn {
.btn-primary {
color: #fff;
- background-color: #007bff;
- border-color: #007bff;
+ background-color: #185722;
+ border-color: #185722;
}
.btn-primary:hover {
color: #fff;
- background-color: #0069d9;
- border-color: #0062cc;
+ background-color: #103916;
+ border-color: #0d2f12;
}
.btn-primary:focus, .btn-primary.focus {
- box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(24, 87, 34, 0.5);
}
.btn-primary.disabled, .btn-primary:disabled {
- background-color: #007bff;
- border-color: #007bff;
+ background-color: #185722;
+ border-color: #185722;
}
.btn-primary:not([disabled]):not(.disabled):active, .btn-primary:not([disabled]):not(.disabled).active,
.show > .btn-primary.dropdown-toggle {
color: #fff;
- background-color: #0062cc;
- border-color: #005cbf;
- box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+ background-color: #0d2f12;
+ border-color: #0a250e;
+ box-shadow: 0 0 0 0.2rem rgba(24, 87, 34, 0.5);
}
.btn-secondary {
- color: #fff;
- background-color: #868e96;
- border-color: #868e96;
+ color: #111;
+ background-color: #d7d7d7;
+ border-color: #d7d7d7;
}
.btn-secondary:hover {
- color: #fff;
- background-color: #727b84;
- border-color: #6c757d;
+ color: #111;
+ background-color: #c4c4c4;
+ border-color: #bebebe;
}
.btn-secondary:focus, .btn-secondary.focus {
- box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(215, 215, 215, 0.5);
}
.btn-secondary.disabled, .btn-secondary:disabled {
- background-color: #868e96;
- border-color: #868e96;
+ background-color: #d7d7d7;
+ border-color: #d7d7d7;
}
.btn-secondary:not([disabled]):not(.disabled):active, .btn-secondary:not([disabled]):not(.disabled).active,
.show > .btn-secondary.dropdown-toggle {
- color: #fff;
- background-color: #6c757d;
- border-color: #666e76;
- box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5);
+ color: #111;
+ background-color: #bebebe;
+ border-color: #b7b7b7;
+ box-shadow: 0 0 0 0.2rem rgba(215, 215, 215, 0.5);
}
.btn-success {
color: #fff;
- background-color: #28a745;
- border-color: #28a745;
+ background-color: #1da332;
+ border-color: #1da332;
}
.btn-success:hover {
color: #fff;
- background-color: #218838;
- border-color: #1e7e34;
+ background-color: #178328;
+ border-color: #157825;
}
.btn-success:focus, .btn-success.focus {
- box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(29, 163, 50, 0.5);
}
.btn-success.disabled, .btn-success:disabled {
- background-color: #28a745;
- border-color: #28a745;
+ background-color: #1da332;
+ border-color: #1da332;
}
.btn-success:not([disabled]):not(.disabled):active, .btn-success:not([disabled]):not(.disabled).active,
.show > .btn-success.dropdown-toggle {
color: #fff;
- background-color: #1e7e34;
- border-color: #1c7430;
- box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+ background-color: #157825;
+ border-color: #136d21;
+ box-shadow: 0 0 0 0.2rem rgba(29, 163, 50, 0.5);
}
.btn-info {
- color: #fff;
- background-color: #17a2b8;
- border-color: #17a2b8;
+ color: #111;
+ background-color: #5bc0de;
+ border-color: #5bc0de;
}
.btn-info:hover {
color: #fff;
- background-color: #138496;
- border-color: #117a8b;
+ background-color: #3bb4d8;
+ border-color: #31b0d5;
}
.btn-info:focus, .btn-info.focus {
- box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5);
}
.btn-info.disabled, .btn-info:disabled {
- background-color: #17a2b8;
- border-color: #17a2b8;
+ background-color: #5bc0de;
+ border-color: #5bc0de;
}
.btn-info:not([disabled]):not(.disabled):active, .btn-info:not([disabled]):not(.disabled).active,
.show > .btn-info.dropdown-toggle {
color: #fff;
- background-color: #117a8b;
- border-color: #10707f;
- box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
+ background-color: #31b0d5;
+ border-color: #2aaacf;
+ box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5);
}
.btn-warning {
color: #111;
- background-color: #ffc107;
- border-color: #ffc107;
+ background-color: #f0ad4e;
+ border-color: #f0ad4e;
}
.btn-warning:hover {
color: #111;
- background-color: #e0a800;
- border-color: #d39e00;
+ background-color: #ed9d2b;
+ border-color: #ec971f;
}
.btn-warning:focus, .btn-warning.focus {
- box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(240, 173, 78, 0.5);
}
.btn-warning.disabled, .btn-warning:disabled {
- background-color: #ffc107;
- border-color: #ffc107;
+ background-color: #f0ad4e;
+ border-color: #f0ad4e;
}
.btn-warning:not([disabled]):not(.disabled):active, .btn-warning:not([disabled]):not(.disabled).active,
.show > .btn-warning.dropdown-toggle {
color: #111;
- background-color: #d39e00;
- border-color: #c69500;
- box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
+ background-color: #ec971f;
+ border-color: #ea9214;
+ box-shadow: 0 0 0 0.2rem rgba(240, 173, 78, 0.5);
}
.btn-danger {
color: #fff;
- background-color: #dc3545;
- border-color: #dc3545;
+ background-color: #d30040;
+ border-color: #d30040;
}
.btn-danger:hover {
color: #fff;
- background-color: #c82333;
- border-color: #bd2130;
+ background-color: #ad0034;
+ border-color: #a00031;
}
.btn-danger:focus, .btn-danger.focus {
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(211, 0, 64, 0.5);
}
.btn-danger.disabled, .btn-danger:disabled {
- background-color: #dc3545;
- border-color: #dc3545;
+ background-color: #d30040;
+ border-color: #d30040;
}
.btn-danger:not([disabled]):not(.disabled):active, .btn-danger:not([disabled]):not(.disabled).active,
.show > .btn-danger.dropdown-toggle {
color: #fff;
- background-color: #bd2130;
- border-color: #b21f2d;
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
+ background-color: #a00031;
+ border-color: #93002d;
+ box-shadow: 0 0 0 0.2rem rgba(211, 0, 64, 0.5);
}
.btn-light {
color: #111;
- background-color: #f8f9fa;
- border-color: #f8f9fa;
+ background-color: #f7f7f7;
+ border-color: #f7f7f7;
}
.btn-light:hover {
color: #111;
- background-color: #e2e6ea;
- border-color: #dae0e5;
+ background-color: #e4e4e4;
+ border-color: #dedede;
}
.btn-light:focus, .btn-light.focus {
- box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(247, 247, 247, 0.5);
}
.btn-light.disabled, .btn-light:disabled {
- background-color: #f8f9fa;
- border-color: #f8f9fa;
+ background-color: #f7f7f7;
+ border-color: #f7f7f7;
}
.btn-light:not([disabled]):not(.disabled):active, .btn-light:not([disabled]):not(.disabled).active,
.show > .btn-light.dropdown-toggle {
color: #111;
- background-color: #dae0e5;
- border-color: #d3d9df;
- box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+ background-color: #dedede;
+ border-color: #d7d7d7;
+ box-shadow: 0 0 0 0.2rem rgba(247, 247, 247, 0.5);
}
.btn-dark {
color: #fff;
- background-color: #343a40;
- border-color: #343a40;
+ background-color: #323232;
+ border-color: #323232;
}
.btn-dark:hover {
color: #fff;
- background-color: #23272b;
- border-color: #1d2124;
+ background-color: #1f1f1f;
+ border-color: #191919;
}
.btn-dark:focus, .btn-dark.focus {
- box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(50, 50, 50, 0.5);
}
.btn-dark.disabled, .btn-dark:disabled {
- background-color: #343a40;
- border-color: #343a40;
+ background-color: #323232;
+ border-color: #323232;
}
.btn-dark:not([disabled]):not(.disabled):active, .btn-dark:not([disabled]):not(.disabled).active,
.show > .btn-dark.dropdown-toggle {
color: #fff;
- background-color: #1d2124;
- border-color: #171a1d;
- box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+ background-color: #191919;
+ border-color: #121212;
+ box-shadow: 0 0 0 0.2rem rgba(50, 50, 50, 0.5);
}
.btn-outline-primary {
- color: #007bff;
+ color: #185722;
background-color: transparent;
background-image: none;
- border-color: #007bff;
+ border-color: #185722;
}
.btn-outline-primary:hover {
color: #fff;
- background-color: #007bff;
- border-color: #007bff;
+ background-color: #185722;
+ border-color: #185722;
}
.btn-outline-primary:focus, .btn-outline-primary.focus {
- box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(24, 87, 34, 0.5);
}
.btn-outline-primary.disabled, .btn-outline-primary:disabled {
- color: #007bff;
+ color: #185722;
background-color: transparent;
}
.btn-outline-primary:not([disabled]):not(.disabled):active, .btn-outline-primary:not([disabled]):not(.disabled).active,
.show > .btn-outline-primary.dropdown-toggle {
color: #fff;
- background-color: #007bff;
- border-color: #007bff;
- box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
+ background-color: #185722;
+ border-color: #185722;
+ box-shadow: 0 0 0 0.2rem rgba(24, 87, 34, 0.5);
}
.btn-outline-secondary {
- color: #868e96;
+ color: #d7d7d7;
background-color: transparent;
background-image: none;
- border-color: #868e96;
+ border-color: #d7d7d7;
}
.btn-outline-secondary:hover {
color: #fff;
- background-color: #868e96;
- border-color: #868e96;
+ background-color: #d7d7d7;
+ border-color: #d7d7d7;
}
.btn-outline-secondary:focus, .btn-outline-secondary.focus {
- box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(215, 215, 215, 0.5);
}
.btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
- color: #868e96;
+ color: #d7d7d7;
background-color: transparent;
}
.btn-outline-secondary:not([disabled]):not(.disabled):active, .btn-outline-secondary:not([disabled]):not(.disabled).active,
.show > .btn-outline-secondary.dropdown-toggle {
color: #fff;
- background-color: #868e96;
- border-color: #868e96;
- box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5);
+ background-color: #d7d7d7;
+ border-color: #d7d7d7;
+ box-shadow: 0 0 0 0.2rem rgba(215, 215, 215, 0.5);
}
.btn-outline-success {
- color: #28a745;
+ color: #1da332;
background-color: transparent;
background-image: none;
- border-color: #28a745;
+ border-color: #1da332;
}
.btn-outline-success:hover {
color: #fff;
- background-color: #28a745;
- border-color: #28a745;
+ background-color: #1da332;
+ border-color: #1da332;
}
.btn-outline-success:focus, .btn-outline-success.focus {
- box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(29, 163, 50, 0.5);
}
.btn-outline-success.disabled, .btn-outline-success:disabled {
- color: #28a745;
+ color: #1da332;
background-color: transparent;
}
.btn-outline-success:not([disabled]):not(.disabled):active, .btn-outline-success:not([disabled]):not(.disabled).active,
.show > .btn-outline-success.dropdown-toggle {
color: #fff;
- background-color: #28a745;
- border-color: #28a745;
- box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+ background-color: #1da332;
+ border-color: #1da332;
+ box-shadow: 0 0 0 0.2rem rgba(29, 163, 50, 0.5);
}
.btn-outline-info {
- color: #17a2b8;
+ color: #5bc0de;
background-color: transparent;
background-image: none;
- border-color: #17a2b8;
+ border-color: #5bc0de;
}
.btn-outline-info:hover {
color: #fff;
- background-color: #17a2b8;
- border-color: #17a2b8;
+ background-color: #5bc0de;
+ border-color: #5bc0de;
}
.btn-outline-info:focus, .btn-outline-info.focus {
- box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5);
}
.btn-outline-info.disabled, .btn-outline-info:disabled {
- color: #17a2b8;
+ color: #5bc0de;
background-color: transparent;
}
.btn-outline-info:not([disabled]):not(.disabled):active, .btn-outline-info:not([disabled]):not(.disabled).active,
.show > .btn-outline-info.dropdown-toggle {
color: #fff;
- background-color: #17a2b8;
- border-color: #17a2b8;
- box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
+ background-color: #5bc0de;
+ border-color: #5bc0de;
+ box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5);
}
.btn-outline-warning {
- color: #ffc107;
+ color: #f0ad4e;
background-color: transparent;
background-image: none;
- border-color: #ffc107;
+ border-color: #f0ad4e;
}
.btn-outline-warning:hover {
color: #fff;
- background-color: #ffc107;
- border-color: #ffc107;
+ background-color: #f0ad4e;
+ border-color: #f0ad4e;
}
.btn-outline-warning:focus, .btn-outline-warning.focus {
- box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(240, 173, 78, 0.5);
}
.btn-outline-warning.disabled, .btn-outline-warning:disabled {
- color: #ffc107;
+ color: #f0ad4e;
background-color: transparent;
}
.btn-outline-warning:not([disabled]):not(.disabled):active, .btn-outline-warning:not([disabled]):not(.disabled).active,
.show > .btn-outline-warning.dropdown-toggle {
color: #fff;
- background-color: #ffc107;
- border-color: #ffc107;
- box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
+ background-color: #f0ad4e;
+ border-color: #f0ad4e;
+ box-shadow: 0 0 0 0.2rem rgba(240, 173, 78, 0.5);
}
.btn-outline-danger {
- color: #dc3545;
+ color: #d30040;
background-color: transparent;
background-image: none;
- border-color: #dc3545;
+ border-color: #d30040;
}
.btn-outline-danger:hover {
color: #fff;
- background-color: #dc3545;
- border-color: #dc3545;
+ background-color: #d30040;
+ border-color: #d30040;
}
.btn-outline-danger:focus, .btn-outline-danger.focus {
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(211, 0, 64, 0.5);
}
.btn-outline-danger.disabled, .btn-outline-danger:disabled {
- color: #dc3545;
+ color: #d30040;
background-color: transparent;
}
.btn-outline-danger:not([disabled]):not(.disabled):active, .btn-outline-danger:not([disabled]):not(.disabled).active,
.show > .btn-outline-danger.dropdown-toggle {
color: #fff;
- background-color: #dc3545;
- border-color: #dc3545;
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
+ background-color: #d30040;
+ border-color: #d30040;
+ box-shadow: 0 0 0 0.2rem rgba(211, 0, 64, 0.5);
}
.btn-outline-light {
- color: #f8f9fa;
+ color: #f7f7f7;
background-color: transparent;
background-image: none;
- border-color: #f8f9fa;
+ border-color: #f7f7f7;
}
.btn-outline-light:hover {
color: #212529;
- background-color: #f8f9fa;
- border-color: #f8f9fa;
+ background-color: #f7f7f7;
+ border-color: #f7f7f7;
}
.btn-outline-light:focus, .btn-outline-light.focus {
- box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(247, 247, 247, 0.5);
}
.btn-outline-light.disabled, .btn-outline-light:disabled {
- color: #f8f9fa;
+ color: #f7f7f7;
background-color: transparent;
}
.btn-outline-light:not([disabled]):not(.disabled):active, .btn-outline-light:not([disabled]):not(.disabled).active,
.show > .btn-outline-light.dropdown-toggle {
color: #212529;
- background-color: #f8f9fa;
- border-color: #f8f9fa;
- box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
+ background-color: #f7f7f7;
+ border-color: #f7f7f7;
+ box-shadow: 0 0 0 0.2rem rgba(247, 247, 247, 0.5);
}
.btn-outline-dark {
- color: #343a40;
+ color: #323232;
background-color: transparent;
background-image: none;
- border-color: #343a40;
+ border-color: #323232;
}
.btn-outline-dark:hover {
color: #fff;
- background-color: #343a40;
- border-color: #343a40;
+ background-color: #323232;
+ border-color: #323232;
}
.btn-outline-dark:focus, .btn-outline-dark.focus {
- box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(50, 50, 50, 0.5);
}
.btn-outline-dark.disabled, .btn-outline-dark:disabled {
- color: #343a40;
+ color: #323232;
background-color: transparent;
}
.btn-outline-dark:not([disabled]):not(.disabled):active, .btn-outline-dark:not([disabled]):not(.disabled).active,
.show > .btn-outline-dark.dropdown-toggle {
color: #fff;
- background-color: #343a40;
- border-color: #343a40;
- box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
+ background-color: #323232;
+ border-color: #323232;
+ box-shadow: 0 0 0 0.2rem rgba(50, 50, 50, 0.5);
}
.btn-link {
font-weight: 400;
- color: #007bff;
+ color: #ce8636;
background-color: transparent;
}
.btn-link:hover {
- color: #0056b3;
- text-decoration: underline;
+ color: #8a5318;
+ text-decoration: none;
background-color: transparent;
border-color: transparent;
}
@@ -2818,17 +2812,15 @@ fieldset[disabled] a.btn {
}
.btn-lg, .btn-group-lg > .btn {
- padding: 0.5rem 1rem;
+ padding: 0.75rem 1.25rem;
font-size: 1.25rem;
line-height: 1.5;
- border-radius: 0.3rem;
}
.btn-sm, .btn-group-sm > .btn {
- padding: 0.25rem 0.5rem;
+ padding: 0.275rem 0.75rem;
font-size: 0.875rem;
line-height: 1.5;
- border-radius: 0.2rem;
}
.btn-block {
@@ -2917,7 +2909,6 @@ tbody.collapse.show {
background-color: #fff;
background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.15);
- border-radius: 0.25rem;
}
.dropup .dropdown-menu {
@@ -2971,7 +2962,7 @@ tbody.collapse.show {
.dropdown-item.active, .dropdown-item:active {
color: #fff;
text-decoration: none;
- background-color: #007bff;
+ background-color: #a36725;
}
.dropdown-item.disabled, .dropdown-item:disabled {
@@ -3051,17 +3042,6 @@ tbody.collapse.show {
margin-left: 0;
}
-.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-.btn-group > .btn:last-child:not(:first-child),
-.btn-group > .dropdown-toggle:not(:first-child) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
.btn-group > .btn-group {
float: left;
}
@@ -3070,17 +3050,6 @@ tbody.collapse.show {
border-radius: 0;
}
-.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
-.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
.btn + .dropdown-toggle-split {
padding-right: 0.5625rem;
padding-left: 0.5625rem;
@@ -3091,13 +3060,13 @@ tbody.collapse.show {
}
.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {
- padding-right: 0.375rem;
- padding-left: 0.375rem;
+ padding-right: 0.5625rem;
+ padding-left: 0.5625rem;
}
.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
- padding-right: 0.75rem;
- padding-left: 0.75rem;
+ padding-right: 0.9375rem;
+ padding-left: 0.9375rem;
}
.btn-group-vertical {
@@ -3126,31 +3095,10 @@ tbody.collapse.show {
border-radius: 0;
}
-.btn-group-vertical > .btn:first-child:not(:last-child) {
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-.btn-group-vertical > .btn:last-child:not(:first-child) {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
-}
-
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0;
}
-.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
-}
-
-.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
-}
-
[data-toggle="buttons"] > .btn input[type="radio"],
[data-toggle="buttons"] > .btn input[type="checkbox"],
[data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
@@ -3191,12 +3139,6 @@ tbody.collapse.show {
align-items: center;
}
-.input-group-addon:not(:first-child):not(:last-child),
-.input-group-btn:not(:first-child):not(:last-child),
-.input-group .form-control:not(:first-child):not(:last-child) {
- border-radius: 0;
-}
-
.input-group-addon,
.input-group-btn {
white-space: nowrap;
@@ -3212,23 +3154,20 @@ tbody.collapse.show {
text-align: center;
background-color: #e9ecef;
border: 1px solid #ced4da;
- border-radius: 0.25rem;
}
.input-group-addon.form-control-sm,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .input-group-addon.btn {
- padding: 0.25rem 0.5rem;
+ padding: 0.275rem 0.75rem;
font-size: 0.875rem;
- border-radius: 0.2rem;
}
.input-group-addon.form-control-lg,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .input-group-addon.btn {
- padding: 0.5rem 1rem;
+ padding: 0.75rem 1.25rem;
font-size: 1.25rem;
- border-radius: 0.3rem;
}
.input-group-addon input[type="radio"],
@@ -3236,32 +3175,10 @@ tbody.collapse.show {
margin-top: 0;
}
-.input-group .form-control:not(:last-child),
-.input-group-addon:not(:last-child),
-.input-group-btn:not(:last-child) > .btn,
-.input-group-btn:not(:last-child) > .btn-group > .btn,
-.input-group-btn:not(:last-child) > .dropdown-toggle,
-.input-group-btn:not(:first-child) > .btn:not(:last-child):not(.dropdown-toggle),
-.input-group-btn:not(:first-child) > .btn-group:not(:last-child) > .btn {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
.input-group-addon:not(:last-child) {
border-right: 0;
}
-.input-group .form-control:not(:first-child),
-.input-group-addon:not(:first-child),
-.input-group-btn:not(:first-child) > .btn,
-.input-group-btn:not(:first-child) > .btn-group > .btn,
-.input-group-btn:not(:first-child) > .dropdown-toggle,
-.input-group-btn:not(:last-child) > .btn:not(:first-child),
-.input-group-btn:not(:last-child) > .btn-group:not(:first-child) > .btn {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-
.form-control + .input-group-addon:not(:first-child) {
border-left: 0;
}
@@ -3368,10 +3285,6 @@ tbody.collapse.show {
background-size: 50% 50%;
}
-.custom-checkbox .custom-control-indicator {
- border-radius: 0.25rem;
-}
-
.custom-checkbox .custom-control-input:checked ~ .custom-control-indicator {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E");
}
@@ -3415,7 +3328,7 @@ tbody.collapse.show {
background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23333' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right 0.75rem center;
background-size: 8px 10px;
border: 1px solid #ced4da;
- border-radius: 0.25rem;
+ border-radius: 0;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
@@ -3489,7 +3402,6 @@ tbody.collapse.show {
user-select: none;
background-color: #fff;
border: 1px solid #ced4da;
- border-radius: 0.25rem;
}
.custom-file-control:lang(en):empty::after {
@@ -3509,7 +3421,6 @@ tbody.collapse.show {
color: #495057;
background-color: #e9ecef;
border: 1px solid #ced4da;
- border-radius: 0 0.25rem 0.25rem 0;
}
.custom-file-control:lang(en)::before {
@@ -3536,29 +3447,27 @@ tbody.collapse.show {
}
.nav-link.disabled {
- color: #868e96;
+ color: #d7d7d7;
}
.nav-tabs {
- border-bottom: 1px solid #ddd;
+ border-bottom: white solid white;
}
.nav-tabs .nav-item {
- margin-bottom: -1px;
+ margin-bottom: -white;
}
.nav-tabs .nav-link {
- border: 1px solid transparent;
- border-top-left-radius: 0.25rem;
- border-top-right-radius: 0.25rem;
+ border: white solid transparent;
}
.nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover {
- border-color: #e9ecef #e9ecef #ddd;
+ border-color: #e9ecef #e9ecef white;
}
.nav-tabs .nav-link.disabled {
- color: #868e96;
+ color: #d7d7d7;
background-color: transparent;
border-color: transparent;
}
@@ -3571,19 +3480,13 @@ tbody.collapse.show {
}
.nav-tabs .dropdown-menu {
- margin-top: -1px;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
-}
-
-.nav-pills .nav-link {
- border-radius: 0.25rem;
+ margin-top: -white;
}
.nav-pills .nav-link.active,
.nav-pills .show > .nav-link {
- color: #fff;
- background-color: #007bff;
+ color: #185722;
+ background-color: white;
}
.nav-fill .nav-item {
@@ -3688,7 +3591,6 @@ tbody.collapse.show {
line-height: 1;
background: transparent;
border: 1px solid transparent;
- border-radius: 0.25rem;
}
.navbar-toggler:focus, .navbar-toggler:hover {
@@ -3960,34 +3862,34 @@ tbody.collapse.show {
}
.navbar-light .navbar-brand {
- color: rgba(0, 0, 0, 0.9);
+ color: #d90;
}
.navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover {
- color: rgba(0, 0, 0, 0.9);
+ color: #d90;
}
.navbar-light .navbar-nav .nav-link {
- color: rgba(0, 0, 0, 0.5);
+ color: #185722;
}
.navbar-light .navbar-nav .nav-link:focus, .navbar-light .navbar-nav .nav-link:hover {
- color: rgba(0, 0, 0, 0.7);
+ color: #d90;
}
.navbar-light .navbar-nav .nav-link.disabled {
- color: rgba(0, 0, 0, 0.3);
+ color: #788c94;
}
.navbar-light .navbar-nav .show > .nav-link,
.navbar-light .navbar-nav .active > .nav-link,
.navbar-light .navbar-nav .nav-link.show,
.navbar-light .navbar-nav .nav-link.active {
- color: rgba(0, 0, 0, 0.9);
+ color: #d90;
}
.navbar-light .navbar-toggler {
- color: rgba(0, 0, 0, 0.5);
+ color: #185722;
border-color: rgba(0, 0, 0, 0.1);
}
@@ -3996,15 +3898,15 @@ tbody.collapse.show {
}
.navbar-light .navbar-text {
- color: rgba(0, 0, 0, 0.5);
+ color: #185722;
}
.navbar-light .navbar-text a {
- color: rgba(0, 0, 0, 0.9);
+ color: #d90;
}
.navbar-light .navbar-text a:focus, .navbar-light .navbar-text a:hover {
- color: rgba(0, 0, 0, 0.9);
+ color: #d90;
}
.navbar-dark .navbar-brand {
@@ -4065,8 +3967,7 @@ tbody.collapse.show {
word-wrap: break-word;
background-color: #fff;
background-clip: border-box;
- border: 1px solid rgba(0, 0, 0, 0.125);
- border-radius: 0.25rem;
+ border: 1px solid #e5e5e5;
}
.card > hr {
@@ -4074,16 +3975,6 @@ tbody.collapse.show {
margin-left: 0;
}
-.card > .list-group:first-child .list-group-item:first-child {
- border-top-left-radius: 0.25rem;
- border-top-right-radius: 0.25rem;
-}
-
-.card > .list-group:last-child .list-group-item:last-child {
- border-bottom-right-radius: 0.25rem;
- border-bottom-left-radius: 0.25rem;
-}
-
.card-body {
-ms-flex: 1 1 auto;
flex: 1 1 auto;
@@ -4115,11 +4006,7 @@ tbody.collapse.show {
padding: 0.75rem 1.25rem;
margin-bottom: 0;
background-color: rgba(0, 0, 0, 0.03);
- border-bottom: 1px solid rgba(0, 0, 0, 0.125);
-}
-
-.card-header:first-child {
- border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
+ border-bottom: 1px solid #e5e5e5;
}
.card-header + .list-group .list-group-item:first-child {
@@ -4129,11 +4016,7 @@ tbody.collapse.show {
.card-footer {
padding: 0.75rem 1.25rem;
background-color: rgba(0, 0, 0, 0.03);
- border-top: 1px solid rgba(0, 0, 0, 0.125);
-}
-
-.card-footer:last-child {
- border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px);
+ border-top: 1px solid #e5e5e5;
}
.card-header-tabs {
@@ -4159,19 +4042,14 @@ tbody.collapse.show {
.card-img {
width: 100%;
- border-radius: calc(0.25rem - 1px);
}
.card-img-top {
width: 100%;
- border-top-left-radius: calc(0.25rem - 1px);
- border-top-right-radius: calc(0.25rem - 1px);
}
.card-img-bottom {
width: 100%;
- border-bottom-right-radius: calc(0.25rem - 1px);
- border-bottom-left-radius: calc(0.25rem - 1px);
}
.card-deck {
@@ -4230,44 +4108,6 @@ tbody.collapse.show {
margin-left: 0;
border-left: 0;
}
- .card-group .card:first-child {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
- }
- .card-group .card:first-child .card-img-top {
- border-top-right-radius: 0;
- }
- .card-group .card:first-child .card-img-bottom {
- border-bottom-right-radius: 0;
- }
- .card-group .card:last-child {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- }
- .card-group .card:last-child .card-img-top {
- border-top-left-radius: 0;
- }
- .card-group .card:last-child .card-img-bottom {
- border-bottom-left-radius: 0;
- }
- .card-group .card:only-child {
- border-radius: 0.25rem;
- }
- .card-group .card:only-child .card-img-top {
- border-top-left-radius: 0.25rem;
- border-top-right-radius: 0.25rem;
- }
- .card-group .card:only-child .card-img-bottom {
- border-bottom-right-radius: 0.25rem;
- border-bottom-left-radius: 0.25rem;
- }
- .card-group .card:not(:first-child):not(:last-child):not(:only-child) {
- border-radius: 0;
- }
- .card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-top,
- .card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom {
- border-radius: 0;
- }
}
.card-columns .card {
@@ -4296,7 +4136,6 @@ tbody.collapse.show {
margin-bottom: 1rem;
list-style: none;
background-color: #e9ecef;
- border-radius: 0.25rem;
}
.breadcrumb-item + .breadcrumb-item::before {
@@ -4324,25 +4163,17 @@ tbody.collapse.show {
display: flex;
padding-left: 0;
list-style: none;
- border-radius: 0.25rem;
}
.page-item:first-child .page-link {
margin-left: 0;
- border-top-left-radius: 0.25rem;
- border-bottom-left-radius: 0.25rem;
-}
-
-.page-item:last-child .page-link {
- border-top-right-radius: 0.25rem;
- border-bottom-right-radius: 0.25rem;
}
.page-item.active .page-link {
z-index: 2;
color: #fff;
- background-color: #007bff;
- border-color: #007bff;
+ background-color: #185722;
+ border-color: #185722;
}
.page-item.disabled .page-link {
@@ -4358,7 +4189,7 @@ tbody.collapse.show {
padding: 0.5rem 0.75rem;
margin-left: -1px;
line-height: 1.25;
- color: #007bff;
+ color: #ce8636;
background-color: #fff;
border: 1px solid #ddd;
}
@@ -4376,32 +4207,12 @@ tbody.collapse.show {
line-height: 1.5;
}
-.pagination-lg .page-item:first-child .page-link {
- border-top-left-radius: 0.3rem;
- border-bottom-left-radius: 0.3rem;
-}
-
-.pagination-lg .page-item:last-child .page-link {
- border-top-right-radius: 0.3rem;
- border-bottom-right-radius: 0.3rem;
-}
-
.pagination-sm .page-link {
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
}
-.pagination-sm .page-item:first-child .page-link {
- border-top-left-radius: 0.2rem;
- border-bottom-left-radius: 0.2rem;
-}
-
-.pagination-sm .page-item:last-child .page-link {
- border-top-right-radius: 0.2rem;
- border-bottom-right-radius: 0.2rem;
-}
-
.badge {
display: inline-block;
padding: 0.25em 0.4em;
@@ -4411,7 +4222,6 @@ tbody.collapse.show {
text-align: center;
white-space: nowrap;
vertical-align: baseline;
- border-radius: 0.25rem;
}
.badge:empty {
@@ -4426,102 +4236,100 @@ tbody.collapse.show {
.badge-pill {
padding-right: 0.6em;
padding-left: 0.6em;
- border-radius: 10rem;
}
.badge-primary {
color: #fff;
- background-color: #007bff;
+ background-color: #185722;
}
.badge-primary[href]:focus, .badge-primary[href]:hover {
color: #fff;
text-decoration: none;
- background-color: #0062cc;
+ background-color: #0d2f12;
}
.badge-secondary {
- color: #fff;
- background-color: #868e96;
+ color: #111;
+ background-color: #d7d7d7;
}
.badge-secondary[href]:focus, .badge-secondary[href]:hover {
- color: #fff;
+ color: #111;
text-decoration: none;
- background-color: #6c757d;
+ background-color: #bebebe;
}
.badge-success {
color: #fff;
- background-color: #28a745;
+ background-color: #1da332;
}
.badge-success[href]:focus, .badge-success[href]:hover {
color: #fff;
text-decoration: none;
- background-color: #1e7e34;
+ background-color: #157825;
}
.badge-info {
- color: #fff;
- background-color: #17a2b8;
+ color: #111;
+ background-color: #5bc0de;
}
.badge-info[href]:focus, .badge-info[href]:hover {
- color: #fff;
+ color: #111;
text-decoration: none;
- background-color: #117a8b;
+ background-color: #31b0d5;
}
.badge-warning {
color: #111;
- background-color: #ffc107;
+ background-color: #f0ad4e;
}
.badge-warning[href]:focus, .badge-warning[href]:hover {
color: #111;
text-decoration: none;
- background-color: #d39e00;
+ background-color: #ec971f;
}
.badge-danger {
color: #fff;
- background-color: #dc3545;
+ background-color: #d30040;
}
.badge-danger[href]:focus, .badge-danger[href]:hover {
color: #fff;
text-decoration: none;
- background-color: #bd2130;
+ background-color: #a00031;
}
.badge-light {
color: #111;
- background-color: #f8f9fa;
+ background-color: #f7f7f7;
}
.badge-light[href]:focus, .badge-light[href]:hover {
color: #111;
text-decoration: none;
- background-color: #dae0e5;
+ background-color: #dedede;
}
.badge-dark {
color: #fff;
- background-color: #343a40;
+ background-color: #323232;
}
.badge-dark[href]:focus, .badge-dark[href]:hover {
color: #fff;
text-decoration: none;
- background-color: #1d2124;
+ background-color: #191919;
}
.jumbotron {
padding: 2rem 1rem;
margin-bottom: 2rem;
background-color: #e9ecef;
- border-radius: 0.3rem;
}
@media (min-width: 576px) {
@@ -4533,7 +4341,6 @@ tbody.collapse.show {
.jumbotron-fluid {
padding-right: 0;
padding-left: 0;
- border-radius: 0;
}
.alert {
@@ -4541,7 +4348,6 @@ tbody.collapse.show {
padding: 0.75rem 1.25rem;
margin-bottom: 1rem;
border: 1px solid transparent;
- border-radius: 0.25rem;
}
.alert-heading {
@@ -4561,115 +4367,115 @@ tbody.collapse.show {
}
.alert-primary {
- color: #004085;
- background-color: #cce5ff;
- border-color: #b8daff;
+ color: #0c2d12;
+ background-color: #d1ddd3;
+ border-color: #bed0c1;
}
.alert-primary hr {
- border-top-color: #9fcdff;
+ border-top-color: #afc5b3;
}
.alert-primary .alert-link {
- color: #002752;
+ color: #010502;
}
.alert-secondary {
- color: #464a4e;
- background-color: #e7e8ea;
- border-color: #dddfe2;
+ color: #707070;
+ background-color: #f7f7f7;
+ border-color: #f4f4f4;
}
.alert-secondary hr {
- border-top-color: #cfd2d6;
+ border-top-color: #e7e7e7;
}
.alert-secondary .alert-link {
- color: #2e3133;
+ color: #575757;
}
.alert-success {
- color: #155724;
- background-color: #d4edda;
- border-color: #c3e6cb;
+ color: #0f551a;
+ background-color: #d2edd6;
+ border-color: #c0e5c6;
}
.alert-success hr {
- border-top-color: #b1dfbb;
+ border-top-color: #aedeb6;
}
.alert-success .alert-link {
- color: #0b2e13;
+ color: #072a0d;
}
.alert-info {
- color: #0c5460;
- background-color: #d1ecf1;
- border-color: #bee5eb;
+ color: #2f6473;
+ background-color: #def2f8;
+ border-color: #d1edf6;
}
.alert-info hr {
- border-top-color: #abdde5;
+ border-top-color: #bce5f2;
}
.alert-info .alert-link {
- color: #062c33;
+ color: #20454f;
}
.alert-warning {
- color: #856404;
- background-color: #fff3cd;
- border-color: #ffeeba;
+ color: #7d5a29;
+ background-color: #fcefdc;
+ border-color: #fbe8cd;
}
.alert-warning hr {
- border-top-color: #ffe8a1;
+ border-top-color: #f9ddb5;
}
.alert-warning .alert-link {
- color: #533f03;
+ color: #573e1c;
}
.alert-danger {
- color: #721c24;
- background-color: #f8d7da;
- border-color: #f5c6cb;
+ color: #6e0021;
+ background-color: #f6ccd9;
+ border-color: #f3b8ca;
}
.alert-danger hr {
- border-top-color: #f1b0b7;
+ border-top-color: #efa2ba;
}
.alert-danger .alert-link {
- color: #491217;
+ color: #3b0012;
}
.alert-light {
- color: #818182;
- background-color: #fefefe;
- border-color: #fdfdfe;
+ color: gray;
+ background-color: #fdfdfd;
+ border-color: #fdfdfd;
}
.alert-light hr {
- border-top-color: #ececf6;
+ border-top-color: #f0f0f0;
}
.alert-light .alert-link {
- color: #686868;
+ color: #676767;
}
.alert-dark {
- color: #1b1e21;
- background-color: #d6d8d9;
- border-color: #c6c8ca;
+ color: #1a1a1a;
+ background-color: #d6d6d6;
+ border-color: #c6c6c6;
}
.alert-dark hr {
- border-top-color: #b9bbbe;
+ border-top-color: #b9b9b9;
}
.alert-dark .alert-link {
- color: #040505;
+ color: #010101;
}
@-webkit-keyframes progress-bar-stripes {
@@ -4696,8 +4502,7 @@ tbody.collapse.show {
height: 1rem;
overflow: hidden;
font-size: 0.75rem;
- background-color: #e9ecef;
- border-radius: 0.25rem;
+ background-color: #e3e4e5;
}
.progress-bar {
@@ -4707,8 +4512,8 @@ tbody.collapse.show {
align-items: center;
-ms-flex-pack: center;
justify-content: center;
- color: #fff;
- background-color: #007bff;
+ color: #d90;
+ background-color: #d90;
}
.progress-bar-striped {
@@ -4768,15 +4573,8 @@ tbody.collapse.show {
border: 1px solid rgba(0, 0, 0, 0.125);
}
-.list-group-item:first-child {
- border-top-left-radius: 0.25rem;
- border-top-right-radius: 0.25rem;
-}
-
.list-group-item:last-child {
margin-bottom: 0;
- border-bottom-right-radius: 0.25rem;
- border-bottom-left-radius: 0.25rem;
}
.list-group-item:focus, .list-group-item:hover {
@@ -4810,195 +4608,195 @@ tbody.collapse.show {
}
.list-group-item-primary {
- color: #004085;
- background-color: #b8daff;
+ color: #0c2d12;
+ background-color: #bed0c1;
}
a.list-group-item-primary,
button.list-group-item-primary {
- color: #004085;
+ color: #0c2d12;
}
a.list-group-item-primary:focus, a.list-group-item-primary:hover,
button.list-group-item-primary:focus,
button.list-group-item-primary:hover {
- color: #004085;
- background-color: #9fcdff;
+ color: #0c2d12;
+ background-color: #afc5b3;
}
a.list-group-item-primary.active,
button.list-group-item-primary.active {
color: #fff;
- background-color: #004085;
- border-color: #004085;
+ background-color: #0c2d12;
+ border-color: #0c2d12;
}
.list-group-item-secondary {
- color: #464a4e;
- background-color: #dddfe2;
+ color: #707070;
+ background-color: #f4f4f4;
}
a.list-group-item-secondary,
button.list-group-item-secondary {
- color: #464a4e;
+ color: #707070;
}
a.list-group-item-secondary:focus, a.list-group-item-secondary:hover,
button.list-group-item-secondary:focus,
button.list-group-item-secondary:hover {
- color: #464a4e;
- background-color: #cfd2d6;
+ color: #707070;
+ background-color: #e7e7e7;
}
a.list-group-item-secondary.active,
button.list-group-item-secondary.active {
color: #fff;
- background-color: #464a4e;
- border-color: #464a4e;
+ background-color: #707070;
+ border-color: #707070;
}
.list-group-item-success {
- color: #155724;
- background-color: #c3e6cb;
+ color: #0f551a;
+ background-color: #c0e5c6;
}
a.list-group-item-success,
button.list-group-item-success {
- color: #155724;
+ color: #0f551a;
}
a.list-group-item-success:focus, a.list-group-item-success:hover,
button.list-group-item-success:focus,
button.list-group-item-success:hover {
- color: #155724;
- background-color: #b1dfbb;
+ color: #0f551a;
+ background-color: #aedeb6;
}
a.list-group-item-success.active,
button.list-group-item-success.active {
color: #fff;
- background-color: #155724;
- border-color: #155724;
+ background-color: #0f551a;
+ border-color: #0f551a;
}
.list-group-item-info {
- color: #0c5460;
- background-color: #bee5eb;
+ color: #2f6473;
+ background-color: #d1edf6;
}
a.list-group-item-info,
button.list-group-item-info {
- color: #0c5460;
+ color: #2f6473;
}
a.list-group-item-info:focus, a.list-group-item-info:hover,
button.list-group-item-info:focus,
button.list-group-item-info:hover {
- color: #0c5460;
- background-color: #abdde5;
+ color: #2f6473;
+ background-color: #bce5f2;
}
a.list-group-item-info.active,
button.list-group-item-info.active {
color: #fff;
- background-color: #0c5460;
- border-color: #0c5460;
+ background-color: #2f6473;
+ border-color: #2f6473;
}
.list-group-item-warning {
- color: #856404;
- background-color: #ffeeba;
+ color: #7d5a29;
+ background-color: #fbe8cd;
}
a.list-group-item-warning,
button.list-group-item-warning {
- color: #856404;
+ color: #7d5a29;
}
a.list-group-item-warning:focus, a.list-group-item-warning:hover,
button.list-group-item-warning:focus,
button.list-group-item-warning:hover {
- color: #856404;
- background-color: #ffe8a1;
+ color: #7d5a29;
+ background-color: #f9ddb5;
}
a.list-group-item-warning.active,
button.list-group-item-warning.active {
color: #fff;
- background-color: #856404;
- border-color: #856404;
+ background-color: #7d5a29;
+ border-color: #7d5a29;
}
.list-group-item-danger {
- color: #721c24;
- background-color: #f5c6cb;
+ color: #6e0021;
+ background-color: #f3b8ca;
}
a.list-group-item-danger,
button.list-group-item-danger {
- color: #721c24;
+ color: #6e0021;
}
a.list-group-item-danger:focus, a.list-group-item-danger:hover,
button.list-group-item-danger:focus,
button.list-group-item-danger:hover {
- color: #721c24;
- background-color: #f1b0b7;
+ color: #6e0021;
+ background-color: #efa2ba;
}
a.list-group-item-danger.active,
button.list-group-item-danger.active {
color: #fff;
- background-color: #721c24;
- border-color: #721c24;
+ background-color: #6e0021;
+ border-color: #6e0021;
}
.list-group-item-light {
- color: #818182;
- background-color: #fdfdfe;
+ color: gray;
+ background-color: #fdfdfd;
}
a.list-group-item-light,
button.list-group-item-light {
- color: #818182;
+ color: gray;
}
a.list-group-item-light:focus, a.list-group-item-light:hover,
button.list-group-item-light:focus,
button.list-group-item-light:hover {
- color: #818182;
- background-color: #ececf6;
+ color: gray;
+ background-color: #f0f0f0;
}
a.list-group-item-light.active,
button.list-group-item-light.active {
color: #fff;
- background-color: #818182;
- border-color: #818182;
+ background-color: gray;
+ border-color: gray;
}
.list-group-item-dark {
- color: #1b1e21;
- background-color: #c6c8ca;
+ color: #1a1a1a;
+ background-color: #c6c6c6;
}
a.list-group-item-dark,
button.list-group-item-dark {
- color: #1b1e21;
+ color: #1a1a1a;
}
a.list-group-item-dark:focus, a.list-group-item-dark:hover,
button.list-group-item-dark:focus,
button.list-group-item-dark:hover {
- color: #1b1e21;
- background-color: #b9bbbe;
+ color: #1a1a1a;
+ background-color: #b9b9b9;
}
a.list-group-item-dark.active,
button.list-group-item-dark.active {
color: #fff;
- background-color: #1b1e21;
- border-color: #1b1e21;
+ background-color: #1a1a1a;
+ border-color: #1a1a1a;
}
.close {
@@ -5075,7 +4873,6 @@ button.close {
background-color: #fff;
background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.2);
- border-radius: 0.3rem;
outline: 0;
}
@@ -5106,8 +4903,6 @@ button.close {
justify-content: space-between;
padding: 15px;
border-bottom: 1px solid #e9ecef;
- border-top-left-radius: 0.3rem;
- border-top-right-radius: 0.3rem;
}
.modal-header .close {
@@ -5117,7 +4912,7 @@ button.close {
.modal-title {
margin-bottom: 0;
- line-height: 1.5;
+ line-height: 1.3;
}
.modal-body {
@@ -5156,7 +4951,7 @@ button.close {
@media (min-width: 576px) {
.modal-dialog {
- max-width: 500px;
+ max-width: 600px;
margin: 30px auto;
}
.modal-sm {
@@ -5166,7 +4961,7 @@ button.close {
@media (min-width: 992px) {
.modal-lg {
- max-width: 800px;
+ max-width: 900px;
}
}
@@ -5175,7 +4970,7 @@ button.close {
z-index: 1070;
display: block;
margin: 0;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ font-family: verdana, sans-serif;
font-style: normal;
font-weight: 400;
line-height: 1.5;
@@ -5277,8 +5072,7 @@ button.close {
padding: 3px 8px;
color: #fff;
text-align: center;
- background-color: #000;
- border-radius: 0.25rem;
+ background-color: #185722;
}
.popover {
@@ -5288,7 +5082,7 @@ button.close {
z-index: 1060;
display: block;
max-width: 276px;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ font-family: verdana, sans-serif;
font-style: normal;
font-weight: 400;
line-height: 1.5;
@@ -5307,7 +5101,6 @@ button.close {
background-color: #fff;
background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.2);
- border-radius: 0.3rem;
}
.popover .arrow {
@@ -5450,8 +5243,6 @@ button.close {
color: inherit;
background-color: #f7f7f7;
border-bottom: 1px solid #ebebeb;
- border-top-left-radius: calc(0.3rem - 1px);
- border-top-right-radius: calc(0.3rem - 1px);
}
.popover-header:empty {
@@ -5682,67 +5473,67 @@ button.close {
}
.bg-primary {
- background-color: #007bff !important;
+ background-color: #185722 !important;
}
a.bg-primary:focus, a.bg-primary:hover {
- background-color: #0062cc !important;
+ background-color: #0d2f12 !important;
}
.bg-secondary {
- background-color: #868e96 !important;
+ background-color: #d7d7d7 !important;
}
a.bg-secondary:focus, a.bg-secondary:hover {
- background-color: #6c757d !important;
+ background-color: #bebebe !important;
}
.bg-success {
- background-color: #28a745 !important;
+ background-color: #1da332 !important;
}
a.bg-success:focus, a.bg-success:hover {
- background-color: #1e7e34 !important;
+ background-color: #157825 !important;
}
.bg-info {
- background-color: #17a2b8 !important;
+ background-color: #5bc0de !important;
}
a.bg-info:focus, a.bg-info:hover {
- background-color: #117a8b !important;
+ background-color: #31b0d5 !important;
}
.bg-warning {
- background-color: #ffc107 !important;
+ background-color: #f0ad4e !important;
}
a.bg-warning:focus, a.bg-warning:hover {
- background-color: #d39e00 !important;
+ background-color: #ec971f !important;
}
.bg-danger {
- background-color: #dc3545 !important;
+ background-color: #d30040 !important;
}
a.bg-danger:focus, a.bg-danger:hover {
- background-color: #bd2130 !important;
+ background-color: #a00031 !important;
}
.bg-light {
- background-color: #f8f9fa !important;
+ background-color: #f7f7f7 !important;
}
a.bg-light:focus, a.bg-light:hover {
- background-color: #dae0e5 !important;
+ background-color: #dedede !important;
}
.bg-dark {
- background-color: #343a40 !important;
+ background-color: #323232 !important;
}
a.bg-dark:focus, a.bg-dark:hover {
- background-color: #1d2124 !important;
+ background-color: #191919 !important;
}
.bg-white {
@@ -5778,35 +5569,35 @@ a.bg-dark:focus, a.bg-dark:hover {
}
.border-primary {
- border-color: #007bff !important;
+ border-color: #185722 !important;
}
.border-secondary {
- border-color: #868e96 !important;
+ border-color: #d7d7d7 !important;
}
.border-success {
- border-color: #28a745 !important;
+ border-color: #1da332 !important;
}
.border-info {
- border-color: #17a2b8 !important;
+ border-color: #5bc0de !important;
}
.border-warning {
- border-color: #ffc107 !important;
+ border-color: #f0ad4e !important;
}
.border-danger {
- border-color: #dc3545 !important;
+ border-color: #d30040 !important;
}
.border-light {
- border-color: #f8f9fa !important;
+ border-color: #f7f7f7 !important;
}
.border-dark {
- border-color: #343a40 !important;
+ border-color: #323232 !important;
}
.border-white {
@@ -8306,67 +8097,67 @@ a.bg-dark:focus, a.bg-dark:hover {
}
.text-primary {
- color: #007bff !important;
+ color: #185722 !important;
}
a.text-primary:focus, a.text-primary:hover {
- color: #0062cc !important;
+ color: #0d2f12 !important;
}
.text-secondary {
- color: #868e96 !important;
+ color: #d7d7d7 !important;
}
a.text-secondary:focus, a.text-secondary:hover {
- color: #6c757d !important;
+ color: #bebebe !important;
}
.text-success {
- color: #28a745 !important;
+ color: #1da332 !important;
}
a.text-success:focus, a.text-success:hover {
- color: #1e7e34 !important;
+ color: #157825 !important;
}
.text-info {
- color: #17a2b8 !important;
+ color: #5bc0de !important;
}
a.text-info:focus, a.text-info:hover {
- color: #117a8b !important;
+ color: #31b0d5 !important;
}
.text-warning {
- color: #ffc107 !important;
+ color: #f0ad4e !important;
}
a.text-warning:focus, a.text-warning:hover {
- color: #d39e00 !important;
+ color: #ec971f !important;
}
.text-danger {
- color: #dc3545 !important;
+ color: #d30040 !important;
}
a.text-danger:focus, a.text-danger:hover {
- color: #bd2130 !important;
+ color: #a00031 !important;
}
.text-light {
- color: #f8f9fa !important;
+ color: #f7f7f7 !important;
}
a.text-light:focus, a.text-light:hover {
- color: #dae0e5 !important;
+ color: #dedede !important;
}
.text-dark {
- color: #343a40 !important;
+ color: #323232 !important;
}
a.text-dark:focus, a.text-dark:hover {
- color: #1d2124 !important;
+ color: #191919 !important;
}
.text-muted {
@@ -8448,7 +8239,7 @@ Todo: check, if this is needed? (It doesn't work with the build system)
*/
/* bar -------------------------------------------------------------- */
.tobago-bar.navbar-light .navbar-brand > .tobago-link {
- color: rgba(0, 0, 0, 0.9);
+ color: #d90;
}
.tobago-bar.navbar-light .navbar-brand > .tobago-link:hover, .tobago-bar.navbar-light .navbar-brand > .tobago-link:focus {
@@ -8706,7 +8497,7 @@ button.tobago-link, button.tobago-treeCommand {
}
button.tobago-link:focus, button.tobago-link:hover, button.tobago-treeCommand:focus, button.tobago-treeCommand:hover {
- color: #0056b3;
+ color: #8a5318;
cursor: pointer;
outline: none;
text-decoration: underline;
@@ -9518,7 +9309,7 @@ th.tobago-sheet-headerCell-markup-filler > .tobago-sheet-header {
.tobago-selectOneListbox-markup-error.border-danger:focus,
.tobago-textarea-markup-fatal.border-danger:focus,
.tobago-textarea-markup-error.border-danger:focus {
- box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(211, 0, 64, 0.25);
}
.tobago-date-markup-warn.border-warning:focus,
@@ -9527,7 +9318,7 @@ th.tobago-sheet-headerCell-markup-filler > .tobago-sheet-header {
.tobago-selectOneChoice-markup-warn.border-warning:focus,
.tobago-selectOneListbox-markup-warn.border-warning:focus,
.tobago-textarea-markup-warn.border-warning:focus {
- box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(240, 173, 78, 0.25);
}
.tobago-date-markup-info.border-info:focus,
@@ -9536,7 +9327,7 @@ th.tobago-sheet-headerCell-markup-filler > .tobago-sheet-header {
.tobago-selectOneChoice-markup-info.border-info:focus,
.tobago-selectOneListbox-markup-info.border-info:focus,
.tobago-textarea-markup-info.border-info:focus {
- box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.25);
+ box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.25);
}
/* menuStore -------------------------------------------------------- */
@@ -9592,4 +9383,983 @@ fixme: there is a problem with the selectManyShuttle with this style.
.bootstrap-datetimepicker-widget th, .bootstrap-datetimepicker-widget td {
padding: 5px;
}
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@font-face {
+ font-family: Verdana,sans-serif;
+ font-weight: 300;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: Verdana,sans-serif;
+ font-weight: normal;
+ font-style: normal;
+}
+
+/* Reduce font size */
+.reduceFontsize {
+ font-size: 70%;
+}
+
+.svg-support .main-logo {
+ background-size: contain;
+}
+
+.main-logo {
+ display: inline-block;
+ vertical-align: middle;
+ width: 130px;
+ height: 80px;
+ float: right;
+ position: absolute;
+ top: 0;
+ right: 1em;
+}
+
+.card {
+ border: 0;
+ box-shadow: none;
+ border-left: 10px solid #e0d0be;
+}
+
+.card-header {
+ overflow: hidden;
+ border-bottom: 0;
+ background-color: #e0d0be;
+ padding-left: 0.5rem;
+}
+
+.card-header h3 {
+ margin-bottom: 0;
+}
+
+h3::before {
+ content: "# ";
+ color: #788c94;
+}
+
+h4 {
+ color: #788c94;
+}
+
+.card .card .card-header, .tab-pane .card .card-header {
+ padding-top: 0;
+ padding-bottom: 0;
+}
+
+.card .card .card-header::after, .tab-pane .card .card-header::after {
+ display: none;
+}
+
+.card .card .card-header h3, .tab-pane .card .card-header h3 {
+ padding: 0.375em 1em 0.375em 0.375em;
+ font-size: 1em;
+ font-weight: bold;
+}
+
+.card .card .card-body, .tab-pane .card .card-body {
+ background-color: #f7f7f7;
+ padding-left: 1em;
+ margin-top: auto;
+ margin-top: initial;
+}
+
+.card .card .card-header h3::before, .tab-pane .card .card-header h3::before {
+ content: "";
+}
+
+/* KeyValue tables */
+.key-values-table {
+ text-align: center;
+ border: 0.4em solid #e3e4e5;
+ margin-bottom: 1em;
+}
+
+.key-values-table th {
+ text-align: center;
+ background-color: #e3e4e5;
+}
+
+.key-values-table td {
+ padding: 1em 1em 0.5em 1em;
+ border: 0.25em solid #e3e4e5;
+}
+
+/* special markups */
+.red {
+ color: #d30040;
+}
+
+.green {
+ color: #1da332;
+}
+
+.largest-font {
+ font-size: 1.7rem;
+}
+
+.larger-font {
+ font-size: 1.4rem;
+}
+
+/*
+ * 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.
+ */
+html {
+ font-size: 12px;
+}
+
+button, input, optgroup, select, textarea {
+ font-family: verdana, sans-serif;
+}
+
+header.tobago-header.fixed-top {
+ padding: 0;
+ vertical-align: middle;
+ margin-bottom: 1em;
+ line-height: 80px;
+}
+
+header.tobago-header.fixed-top .navbar {
+ padding-top: 0;
+ padding-bottom: 0;
+ -ms-flex-direction: row;
+ flex-direction: row;
+ -ms-flex-wrap: nowrap;
+ flex-wrap: nowrap;
+ -ms-flex-pack: start;
+ justify-content: flex-start;
+}
+
+header.tobago-header.fixed-top .form-group {
+ margin-bottom: 0;
+}
+
+header.tobago-header.fixed-top .tobago-link > i.fa {
+ font-size: 1.345em;
+ margin-right: 0.5rem;
+}
+
+header.tobago-header.fixed-top button.tobago-link.dropdown-item {
+ color: #185722;
+ background-color: transparent;
+}
+
+header.tobago-header.fixed-top button.tobago-link.dropdown-item:active {
+ color: #d90;
+}
+
+header.tobago-header.fixed-top button.tobago-link.dropdown-item:hover, header.tobago-header.fixed-top button.tobago-link.dropdown-item:focus {
+ color: #d90;
+}
+
+header.tobago-header.fixed-top .tobago-dropdown-submenu.dropdown-item {
+ background-color: transparent;
+}
+
+header.tobago-header.fixed-top .nav-link {
+ padding-top: 0;
+ padding-bottom: 0;
+}
+
+header.tobago-header.fixed-top .nav-item {
+ font-size: 1.16em;
+ float: left;
+}
+
+header.tobago-header.fixed-top a, header.tobago-header.fixed-top button.tobago-link:not(.dropdown-item) {
+ color: #185722;
+ text-decoration: none;
+}
+
+header.tobago-header.fixed-top a:hover, header.tobago-header.fixed-top a:focus, header.tobago-header.fixed-top button.tobago-link:not(.dropdown-item):hover, header.tobago-header.fixed-top button.tobago-link:not(.dropdown-item):focus {
+ color: #d90;
+ cursor: pointer;
+ text-decoration: none;
+}
+
+button.tobago-link {
+ font-family: verdana, sans-serif;
+}
+
+button.tobago-link > span {
+ position: relative;
+}
+
+button.tobago-link, button.tobago-command, button.tobago-treeCommand {
+ color: #ce8636;
+ text-decoration: none;
+}
+
+button.tobago-link:focus, button.tobago-link:hover, button.tobago-command:focus, button.tobago-command:hover, button.tobago-treeCommand:focus, button.tobago-treeCommand:hover {
+ color: #8a5318;
+ text-decoration: none;
+}
+
+.btn:focus {
+ box-shadow: none;
+}
+
+.btn-primary:active:hover, .btn-primary:active:focus {
+ background-color: #000;
+ border-color: #000;
+}
+
+.btn-secondary:active:hover, .btn-secondary:active:focus {
+ background-color: #acacac;
+ border-color: #788c94;
+}
+
+.btn-info {
+ color: #fff;
+}
+
+td button.tobago-link, td button.tobago-command, td button.tobago-treeCommand {
+ padding-top: 5px;
+ margin-bottom: 12px;
+}
+
+.form-group ~ a.tobago-link, .tobago-label ~ a.tobago-link {
+ padding-top: 0.46em;
+ margin-bottom: 0;
+}
+
+.form-group ~ button.tobago-link, .tobago-label ~ button.tobago-link {
+ margin-bottom: 1rem;
+}
+
+.tobago-sheet-cell button.tobago-link {
+ margin-bottom: 0;
+}
+
+header.fixed-top a[disabled], header.fixed-top a[disabled]:hover, header.fixed-top button[disabled], header.fixed-top button[disabled]:hover {
+ color: #788c94 !important;
+}
+
+.navbar-light {
+ background-color: #d7d7d7;
+}
+
+.navbar-light .navbar-brand {
+ color: #185722;
+}
+
+.tobago-bar.navbar-light .navbar-brand > .tobago-link {
+ color: #185722;
+}
+
+.navbar-brand {
+ font-size: 1.16em;
+ font-weight: bold;
+ padding-top: 0;
+ padding-bottom: 0;
+}
+
+.navbar-brand > a.tobago-link > span {
+ white-space: nowrap;
+}
+
+.navbar-brand button.tobago-link {
+ font-weight: bold;
+}
+
+.navbar .nav-item.dropdown > .dropdown-menu, .navbar .tobago-dropdown-submenu > .dropdown-menu {
+ border: 0;
+ background: #e3e4e5;
+ margin-top: 0;
+ margin-left: 0;
+}
+
+.navbar .dropdown-item {
+ color: #185722;
+ font-size: 1.1em;
+}
+
+.navbar .dropdown-item:focus, .navbar .dropdown-item:hover {
+ background: #e3e4e5;
+ color: #d90;
+}
+
+/** collapsed menu */
+@media (max-width: 991px) {
+ header.tobago-header.fixed-top .navbar-collapse.collapse.show {
+ line-height: 30px;
+ padding: 1rem 0;
+ }
+}
+
+/* expanded menu */
+@media (min-width: 992px) {
+ .sidebar {
+ display: none;
+ }
+ .sidebar a.nav-link {
+ padding-top: 0;
+ padding-bottom: 0;
+ padding-right: 0;
+ }
+ .sidebar.show, .sidebar .show {
+ display: inline;
+ }
+ .sidebar > ul {
+ visibility: hidden;
+ opacity: 0;
+ transition: visibility 0s 0.2s, opacity 0.2s ease;
+ padding: 10px;
+ position: fixed;
+ max-width: 200px;
+ right: 0px;
+ background-color: white;
+ box-shadow: 1px 2px 4px 0px rgba(0, 0, 0, 0.1);
+ margin-top: 2em;
+ z-index: 2000;
+ }
+ .sidebar ul {
+ display: none;
+ }
+ .sidebar > ul.showhide {
+ visibility: visible;
+ transition: visibility 0s 0s, opacity 0.2s ease;
+ opacity: 1;
+ }
+ * {
+ outline: none !important;
+ }
+ .sidebar ul > li:hover > ul {
+ display: inline !important;
+ }
+ .sidebar .nav .dropdown-item {
+ /* Custom sidemenu styling */
+ display: inline;
+ font-size: small;
+ color: #788c94;
+ }
+ .sidebar a:focus {
+ color: #788c94;
+ }
+ .sidebar .active.dropdown-item {
+ background-color: transparent;
+ }
+ .sidebar .active.dropdown-item:focus, .sidebar .active.dropdown-item:hover, .sidebar .nav .dropdown-item:focus, .sidebar .nav .dropdown-item:hover {
+ background-color: transparent;
+ }
+ .sidebar li a.active {
+ padding-left: 3px !important;
+ border-left: 2px solid #185722 !important;
+ color: #185722 !important;
+ }
+ .sidebar li li a.active {
+ padding-left: 18px !important;
+ }
+ .sidebar li li li a.active {
+ padding-left: 38px !important;
+ }
+ .sidebar li a {
+ padding-left: 5px;
+ }
+ .sidebar li a:hover {
+ padding-left: 4px;
+ border-left: 1px solid #185722;
+ color: #185722 !important;
+ }
+ .sidebar li li li a:hover {
+ padding-left: 39px;
+ }
+ .sidebar li li a:hover {
+ padding-left: 19px;
+ }
+ .sidebar li li a {
+ padding-left: 20px;
+ }
+ .sidebar li li li a {
+ padding-left: 40px;
+ }
+ #blur {
+ background-color: rgba(240, 240, 240, 0.5);
+ width: 100%;
+ height: 100%;
+ z-index: 999;
+ display: none;
+ top: 0px;
+ left: 0px;
+ position: fixed;
+ }
+ #blur.blur {
+ display: block;
+ }
+ .nav .dropdown-item:focus {
+ color: #185722;
+ }
+ .collapse.navbar-collapse > ul > li > span > ul > li > span > a {
+ color: #185722 !important;
+ cursor: default;
+ }
+ .navbar-toggleable-xs > ul > li > span > ul > li > span {
+ cursor: default;
+ }
+ html.opendd {
+ overflow: hidden;
+ }
+ body.opendd {
+ position: fixed;
+ }
+ .navbar-collapsed-top-tools, .navbar-collapsed-bottom-tools {
+ display: none;
+ }
+ header.fixed-top .open {
+ background-image: url("../image/top_menu_active.png");
+ background-repeat: no-repeat;
+ background-position: 50% 70px;
+ }
+ header.fixed-top .navbar .navbar-toggler {
+ display: none;
+ }
+ header.fixed-top .navbar .navbar-nav {
+ -ms-flex-direction: row;
+ flex-direction: row;
+ }
+ header.fixed-top .nav-item.dropdown > button.dropdown-toggle {
+ padding-top: 0px;
+ padding-bottom: 0px;
+ color: #185722;
+ text-decoration: none;
+ }
+ header.fixed-top .nav-item.dropdown > button.dropdown-toggle:hover, header.fixed-top .nav-item.dropdown > button.dropdown-toggle:focus {
+ color: #d90;
+ }
+ header.fixed-top .nav-item.dropdown > .dropdown-menu {
+ position: fixed;
+ width: 100%;
+ top: auto;
+ top: initial;
+ left: 0;
+ line-height: normal;
+ line-height: initial;
+ padding: 0 10% 1em 10%;
+ }
+ header.fixed-top .nav-item.dropdown > .dropdown-menu > .dropdown-item {
+ display: inline-block;
+ font-size: 1.3em;
+ width: calc(25% - 3px);
+ min-width: 250px;
+ vertical-align: top;
+ padding-top: 1em;
+ }
+ header.fixed-top .nav-item.dropdown > .dropdown-menu > .dropdown-item > a, header.fixed-top .nav-item.dropdown > .dropdown-menu > .dropdown-item > button {
+ margin-bottom: 0.5em;
+ }
+ header.fixed-top .navbar-nav > .nav-item.dropdown > .dropdown-toggle {
+ padding-left: 22px;
+ padding-right: .5rem;
+ }
+ header.fixed-top .navbar-nav > .nav-item.dropdown > .dropdown-toggle::before {
+ content: "\F107";
+ font-family: FontAwesome;
+ left: -5px;
+ position: absolute;
+ top: 0;
+ margin-left: 10px;
+ }
+ header.fixed-top .tobago-dropdown-submenu.dropdown-item {
+ display: block;
+ }
+ header.fixed-top .tobago-dropdown-submenu.dropdown-item > .dropdown-menu {
+ display: block;
+ border-radius: 0;
+ position: static;
+ float: none;
+ padding: 0;
+ }
+ header.fixed-top .tobago-dropdown-submenu.dropdown-item > .dropdown-menu .dropdown-item {
+ padding-left: 0;
+ }
+ header.fixed-top .tobago-dropdown-submenu.dropdown-item > .dropdown-menu .dropdown-item::before {
+ content: "> ";
+ position: relative;
+ vertical-align: top;
+ }
+ header.fixed-top .tobago-dropdown-submenu::after {
+ content: none;
+ }
+ .dropdown-item .nav-link {
+ display: inline-block;
+ }
+}
+
+.nav-item > .dropdown > button.tobago-link, .nav-item > .dropdown > button.tobago-command {
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
+
+.navbar-nav .dropdown-toggle::after {
+ display: inline-block;
+ width: 0;
+ height: 0;
+ margin-right: 0;
+ margin-left: 0;
+ vertical-align: middle;
+ content: "";
+ border-top: 0;
+ border-right: 0;
+ border-left: 0;
+}
+
+.navbar-nav .dropdown-toggle:focus {
+ outline: 0;
+}
+
+.navbar-nav .nav-item {
+ float: none;
+ display: inline;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ font-weight: 300;
+}
+
+p, .control-label {
+ -webkit-hyphens: auto;
+ -ms-hyphens: auto;
+ hyphens: auto;
+}
+
+.nav-tabs {
+ background-color: #d7d7d7;
+}
+
+.nav-tabs .nav-item {
+ border-right: 1px solid white;
+}
+
+.nav-tabs .nav-item .nav-link {
+ color: #185722;
+}
+
+.nav-tabs .nav-item .nav-link:hover {
+ color: #d90;
+ cursor: pointer;
+}
+
+.nav-tabs .nav-item .nav-link.active {
+ background-color: white;
+}
+
+.nav-tabs .nav-item.tobago-tab-markup-disabled {
+ background-color: #f7f7f7;
+}
+
+.nav-tabs .nav-item.tobago-tab-markup-disabled > a, .nav-tabs .nav-item.tobago-tab-markup-disabled > button.tobago-link {
+ color: #d7d7d7;
+}
+
+.nav-tabs .nav-item.tobago-tab-markup-disabled > a:hover, .nav-tabs .nav-item.tobago-tab-markup-disabled > button.tobago-link:hover {
+ color: #d7d7d7;
+ cursor: default;
+}
+
+.card-body .nav-tabs {
+ border-left: 1px solid #d7d7d7;
+}
+
+.card-body .tab-content {
+ margin-top: 1.5em;
+ padding: 0;
+}
+
+/* padding: 0.1px = hack! Padding '0' would be remove margin-bottom from .form-group */
+.tab-content {
+ background-color: white;
+ padding: 1.25rem 1.25rem 0.1px 1.25rem;
+ border-width: 0;
+}
+
+.nav-tabs .nav-item + .nav-item {
+ margin-left: 0;
+}
+
+.tobago-box-header h3 {
+ display: inline;
+}
+
+.tobago-box-header > .navbar, .tobago-box-header > .tobago-links {
+ float: right;
+}
+
+.tobago-box-header > .navbar .nav-item > .tobago-link, .tobago-box-header > .tobago-links .nav-item > .tobago-link {
+ padding: 0 .5rem;
+}
+
+.tobago-box-header .navbar .navbar-toggler {
+ display: none;
+}
+
+.tobago-box-header .navbar .navbar-collapse.collapse {
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-preferred-size: auto;
+ flex-basis: auto;
+ position: static;
+ width: auto;
+}
+
+.tobago-box-header .navbar .navbar-collapse.collapse .tobago-links.navbar-nav {
+ -ms-flex-direction: row;
+ flex-direction: row;
+ position: static;
+ width: auto;
+ background-color: transparent;
+}
+
+.tobago-box-header .navbar .navbar-collapse.collapse .tobago-links.navbar-nav .nav-item {
+ border: 0;
+}
+
+.tobago-box .tobago-box .tobago-box-header h3, .tobago-tabGroup .tobago-box .tobago-box-header h3 {
+ float: left;
+}
+
+.tobago-box .tobago-box .card-body .tobago-in-markup-disabled, .tobago-tabGroup .tobago-box .card-body .tobago-in-markup-disabled {
+ border-color: #ccc;
+}
+
+.table {
+ background-color: white;
+}
+
+.table .checkbox {
+ margin-bottom: initial;
+ margin-bottom: auto;
+}
+
+.table select[disabled] {
+ margin-left: -4px;
+}
+
+.table .btn[disabled] {
+ display: none;
+}
+
+a[disabled], button.tobago-link[disabled], button.tobago-command[disabled], button.tobago-treeCommand[disabled] {
+ color: #d7d7d7;
+}
+
+select[disabled] {
+ text-indent: 0.01px;
+ text-overflow: '';
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+}
+
+input.form-control {
+ border-radius: 0;
+}
+
+.input-group-btn .btn {
+ box-shadow: none;
+ margin-bottom: 0;
+ padding: 0.375rem 0.75rem;
+}
+
+.input-group-btn > .form-control {
+ -ms-flex-direction: row;
+ flex-direction: row;
+}
+
+.input-group-addon .btn {
+ margin: 0;
+ box-shadow: none;
+}
+
+.input-group-addon > .form-group {
+ margin-bottom: 0;
+}
+
+.input-group-addon .form-control-static {
+ padding-top: 0;
+}
+
+.tobago-flexLayout > .mce-container {
+ margin-left: 3px;
+ margin-right: 3px;
+}
+
+td .form-group {
+ margin-bottom: 0;
+}
+
+li:last-child {
+ margin-bottom: 0;
+}
+
+.form-group ol, .form-group ul, .form-group dl {
+ margin-bottom: 0;
+}
+
+.btn {
+ padding: 0.375rem 1rem;
+ box-shadow: 1px 2px 4px 0px rgba(0, 0, 0, 0.1);
+}
+
+.modal-dialog .card {
+ margin-bottom: 0;
+}
+
+.form-control:disabled, .form-control[readonly] {
+ border-color: #f7f7f7;
+}
+
+.form-control:disabled:focus, .form-control[readonly]:focus {
+ border-color: #f7f7f7;
+}
+
+.form-control:focus {
+ border-color: #ea0;
+ box-shadow: 0 0 0 0.2rem rgba(255, 123, 0, 0.25);
+}
+
+.alert > label {
+ display: block;
+}
+
+.input-group-addon {
+ line-height: 1.3em;
+}
+
+.nav-stacked {
+ text-align: center;
+ font-size: 0.9em;
+ margin-right: 1em;
+ margin-top: 1em;
+ margin-left: -1.5em;
+}
+
+.nav-stacked .active .fa {
+ color: white;
+}
+
+.nav-stacked .fa {
+ font-size: 2em;
+ color: #788C94;
+ display: block;
+ padding-bottom: 0.2em;
+}
+
+.nav-stacked .nav-item {
+ padding: 0.3em 0;
+}
+
+.bootstrap-datetimepicker-widget .datepicker-days .past.day {
+ opacity: 0.7;
+}
+
+.bootstrap-datetimepicker-widget .datepicker-days .old.day, .bootstrap-datetimepicker-widget .datepicker-days .new.day {
+ opacity: 0.5;
+}
+
+.label {
+ display: inline-block;
+ padding: .25em .4em;
+ font-size: 75%;
+ font-weight: 700;
+ line-height: 1;
+ color: #fff;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: baseline;
+ border-radius: .25rem;
+}
+
+.label-pill {
+ padding-right: .6em;
+ padding-left: .6em;
+ border-radius: 10rem;
+}
+
+.label-danger {
+ background-color: #d30040;
+}
+
+.label-info {
+ background-color: #5bc0de;
+}
+
+.label-warning {
+ background-color: #f0ad4e;
+}
+
+.label-success {
+ background-color: #1da332;
+}
+
+.label-primary {
+ background-color: #185722;
+}
+
+.label-default {
+ background-color: #55595c;
+}
+
+.tobago-selectBooleanCheckbox-markup-readonly .form-check-label, .tobago-selectManyCheckbox-markup-readonly .form-check-label, .tobago-selectOneRadio-markup-readonly .form-check-label {
+ cursor: default;
+}
+
+.tobago-selectBooleanCheckbox .form-check-label, .tobago-selectManyCheckbox .form-check-label, .tobago-selectOneRadio .form-check-label {
+ padding-left: 0;
+}
+
+.tobago-selectBooleanCheckbox .form-check-label .tobago-inputPseudo, .tobago-selectManyCheckbox .form-check-label .tobago-inputPseudo, .tobago-selectOneRadio .form-check-label .tobago-inputPseudo {
+ margin-bottom: 2px;
+ height: 14px;
+ width: 14px;
+ display: inline-block;
+ margin-right: 5px;
+ transition: all 0.2s;
+ vertical-align: middle;
+ border: 1px solid #d7d7d7;
+ background: #fff;
+}
+
+.tobago-selectBooleanCheckbox .form-check-label .tobago-inputPseudo:before, .tobago-selectManyCheckbox .form-check-label .tobago-inputPseudo:before, .tobago-selectOneRadio .form-check-label .tobago-inputPseudo:before {
+ content: "";
+}
+
+.tobago-selectBooleanCheckbox .form-check-label .tobago-inputPseudo, .tobago-selectManyCheckbox .form-check-label .tobago-inputPseudo {
+ overflow: hidden;
+}
+
+.tobago-selectBooleanCheckbox .form-check-label .tobago-inputPseudo:before, .tobago-selectManyCheckbox .form-check-label .tobago-inputPseudo:before {
+ font-size: medium;
+ color: #a36725;
+ position: relative;
+ top: -6px;
+ left: 13px;
+}
+
+.tobago-selectBooleanCheckbox .form-check-label input[type="checkbox"]:checked + .tobago-inputPseudo, .tobago-selectManyCheckbox .form-check-label input[type="checkbox"]:checked + .tobago-inputPseudo {
+ border-color: #a36725;
+}
+
+.tobago-selectBooleanCheckbox .form-check-label input[type="checkbox"]:checked + .tobago-inputPseudo:before, .tobago-selectManyCheckbox .form-check-label input[type="checkbox"]:checked + .tobago-inputPseudo:before {
+ content: "\f00c";
+}
+
+.tobago-selectBooleanCheckbox .form-check-label input[type="checkbox"]:active + .tobago-inputPseudo,
+.tobago-selectBooleanCheckbox .form-check-label input[type="checkbox"]:focus + .tobago-inputPseudo, .tobago-selectManyCheckbox .form-check-label input[type="checkbox"]:active + .tobago-inputPseudo,
+.tobago-selectManyCheckbox .form-check-label input[type="checkbox"]:focus + .tobago-inputPseudo {
+ border-color: #ea0;
+}
+
+.tobago-selectBooleanCheckbox .form-check-label input[type="checkbox"]:active:not(:disabled) + .tobago-inputPseudo:before,
+.tobago-selectBooleanCheckbox .form-check-label input[type="checkbox"]:focus:not(:disabled) + .tobago-inputPseudo:before, .tobago-selectManyCheckbox .form-check-label input[type="checkbox"]:active:not(:disabled) + .tobago-inputPseudo:before,
+.tobago-selectManyCheckbox .form-check-label input[type="checkbox"]:focus:not(:disabled) + .tobago-inputPseudo:before {
+ text-shadow: none;
+}
+
+.tobago-selectBooleanCheckbox .form-check-label input[type="checkbox"][readonly] + .tobago-inputPseudo, .tobago-selectBooleanCheckbox .form-check-label input[type="checkbox"][disabled] + .tobago-inputPseudo, .tobago-selectManyCheckbox .form-check-label input[type="checkbox"][readonly] + .tobago-inputPseudo, .tobago-selectManyCheckbox .form-check-label input[type="checkbox"][disabled] + .tobago-inputPseudo {
+ opacity: 0.6;
+ background: #f7f7f7;
+}
+
+.tobago-selectOneRadio .form-check-label .tobago-inputPseudo {
+ border-radius: 100%;
+}
+
+.tobago-selectOneRadio .form-check-label input[type="radio"]:checked + .tobago-inputPseudo {
+ background: #a36725;
+ border: 0;
+}
+
+.tobago-selectOneRadio .form-check-label input[type="radio"]:checked + .tobago-inputPseudo:before {
+ content: "";
+}
+
+.tobago-selectOneRadio .form-check-label input[type="radio"]:active + .tobago-inputPseudo,
+.tobago-selectOneRadio .form-check-label input[type="radio"]:focus + .tobago-inputPseudo {
+ border: 1px solid #ea0;
+}
+
+.tobago-selectOneRadio .form-check-label input[type="radio"][readonly] + .tobago-inputPseudo, .tobago-selectOneRadio .form-check-label input[type="radio"][disabled] + .tobago-inputPseudo {
+ opacity: 0.6;
+ background: #f7f7f7;
+}
+
+.tobago-dropdown-submenu > .dropdown-menu {
+ border-radius: 0;
+}
+
+.dropdown-menu {
+ border-radius: 0;
+}
+
+.dropdown-menu .tobago-selectBooleanCheckbox .form-check-label, .dropdown-menu .tobago-selectManyCheckbox .form-check-label, .dropdown-menu .tobago-selectOneRadio .form-check-label {
+ padding-left: 1.5rem;
+}
+
+.dropdown-toggle:after {
+ vertical-align: 0.1em;
+}
+
+.tobago-dropdown-submenu:after {
+ margin-top: 5px;
+}
+
+.tobago-selectBooleanCheckbox.form-check,
+.tobago-selectManyCheckbox-inline,
+.tobago-selectOneRadio-inline,
+.slider {
+ min-height: 26px;
+}
+
+.twitter-typeahead {
+ width: 100%;
+ display: inherit !important;
+}
+
+.tobago-sheet-cell > .twitter-typeahead {
+ display: block !important;
+}
+
+.tobago-section-header {
+ border-bottom: 1px solid rgba(1, 1, 1, 0.05);
+ margin-bottom: .5rem;
+}
+
+.tobago-section-header h1 {
+ margin-bottom: 0;
+}
+
+.tobago-section-header h2, .tobago-section-header h3, .tobago-section-header h4, .tobago-section-header h5, .tobago-section-header h6 {
+ margin-top: 1rem;
+ margin-bottom: 0;
+}
/*# sourceMappingURL=bootstrap.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css.map b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css.map
index e0347f7..e6d535a 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css.map
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.css.map
@@ -1 +1 @@
-{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_gri [...]
\ No newline at end of file
+{"version":3,"sources":["bootstrap.css","../../scss/bootstrap.scss","../../scss/_custom.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints. [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css
index 275fa5f..400e27a 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css
@@ -3,5 +3,5 @@
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#007bff;--secondary:#868e96;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-s [...]
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#868e96;--gray-dark:#343a40;--primary:#185722;--secondary:#d7d7d7;--success:#1da332;--info:#5bc0de;--warning:#f0ad4e;--danger:#d30040;--light:#f7f7f7;--dark:#323232;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:verdana, [...]
/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css.map b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css.map
index 0aadedb..94d63e9 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css.map
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/resources/tobago/speyside/tobago-bootstrap/_version/css/bootstrap.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_br [...]
\ No newline at end of file
+{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_print.scss","dist/css/bootstrap.css","../../scss/_reboot.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/rebuild-theme.log b/tobago-theme/tobago-theme-standard/rebuild-theme.log
index 90f15fd..a36e404 100644
--- a/tobago-theme/tobago-theme-standard/rebuild-theme.log
+++ b/tobago-theme/tobago-theme-standard/rebuild-theme.log
@@ -1,4 +1,4 @@
-Build date: 2017-11-09 14:25:07
+Build date: 2017-11-10 10:59:00
[INFO] Scanning for projects...
[INFO]
[INFO] ------------------------------------------------------------------------
@@ -13,8 +13,8 @@ Build date: 2017-11-09 14:25:07
[INFO] Removing __CURRENT__/tobago-theme-standard/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-standard/target && git clone --branch v4.0.0-beta.2 https://github.com/twbs/bootstrap __CURRENT__/tobago-theme-standard/target/checkout
[INFO] Working directory: __CURRENT__/tobago-theme-standard/target
-[INFO] Executing: /bin/sh -c cd /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/ && git ls-remote https://github.com/twbs/bootstrap
-[INFO] Working directory: /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T
+[INFO] Executing: /bin/sh -c cd /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/ && git ls-remote https://github.com/twbs/bootstrap
+[INFO] Working directory: /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-standard/target/checkout && git pull https://github.com/twbs/bootstrap v4.0.0-beta.2:v4.0.0-beta.2
[INFO] Working directory: __CURRENT__/tobago-theme-standard/target/checkout
[INFO] Executing: /bin/sh -c cd __CURRENT__/tobago-theme-standard/target/checkout && git checkout v4.0.0-beta.2
@@ -65,11 +65,11 @@ Build date: 2017-11-09 14:25:07
[INFO] > node install.js
[INFO]
[INFO] PhantomJS not found on PATH
-[INFO] Download already available at /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip
+[INFO] Download already available at /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip
[INFO] Verified checksum of previously downloaded file
[INFO] Extracting zip contents
[INFO] Removing __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
-[INFO] Copying extracted folder /var/folders/w0/pg4pxr7972l6bq85x08s5cl00000gn/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510234044690/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
+[INFO] Copying extracted folder /var/folders/yp/1vrxjnrs20798ydt_yl8wrpr0000gp/T/phantomjs/phantomjs-2.1.1-macosx.zip-extract-1510308053184/phantomjs-2.1.1-macosx -> __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom
[INFO] Writing location.js file
[INFO] Done. Phantomjs binary available at __CURRENT__/tobago-theme-standard/target/bootstrap/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
[INFO]
@@ -169,6 +169,7 @@ Build date: 2017-11-09 14:25:07
[INFO] │ │ │ │ │ │ └── jsonify@0.0.0
[INFO] │ │ │ │ │ └── har-schema@1.0.5
[INFO] │ │ │ │ ├─┬ hawk@3.1.3
+[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ │ ├── boom@2.10.1
[INFO] │ │ │ │ │ ├── cryptiles@2.0.5
[INFO] │ │ │ │ │ ├── hoek@2.16.3
@@ -182,7 +183,6 @@ Build date: 2017-11-09 14:25:07
[INFO] │ │ │ │ │ │ └── verror@1.3.6
[INFO] │ │ │ │ │ └─┬ sshpk@1.13.0
[INFO] │ │ │ │ │ ├── asn1@0.2.3
-[WARNING] npm WARN bootstrap@4.0.0-beta.2 requires a peer of jquery@1.9.1 - 3 but none was installed.
[INFO] │ │ │ │ │ ├── assert-plus@1.0.0
[INFO] │ │ │ │ │ ├── bcrypt-pbkdf@1.0.1
[INFO] │ │ │ │ │ ├─┬ dashdash@1.14.1
@@ -1035,8 +1035,8 @@ Build date: 2017-11-09 14:25:07
[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-grid.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-grid.css
[ERROR] Rendering Complete, saving .css file...
-[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-reboot.css.map
[ERROR] Wrote CSS to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-reboot.css
+[ERROR] Wrote Source Map to __CURRENT__/tobago-theme-standard/target/bootstrap/dist/css/bootstrap-reboot.css.map
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #9: npm run css-prefix) @ tobago-theme-standard ---
[INFO] Running 'npm run css-prefix' in __CURRENT__/tobago-theme-standard/target/bootstrap
@@ -1044,12 +1044,12 @@ Build date: 2017-11-09 14:25:07
[INFO] > bootstrap@4.0.0-beta.2 css-prefix __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > postcss --config build/postcss.config.js --replace "dist/css/*.css"
[INFO]
-[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.45 s)
-[ERROR] ✔ Finished dist/css/bootstrap.css (1.45 s)
-[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.45 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.45 s)
-[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.45 s)
-[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.45 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.min.css (1.09 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.min.css (1.09 s)
+[ERROR] ✔ Finished dist/css/bootstrap.min.css (1.09 s)
+[ERROR] ✔ Finished dist/css/bootstrap-grid.css (1.09 s)
+[ERROR] ✔ Finished dist/css/bootstrap.css (1.09 s)
+[ERROR] ✔ Finished dist/css/bootstrap-reboot.css (1.09 s)
[INFO]
[INFO] --- frontend-maven-plugin:1.4:npm (step #10: npm run css-minify) @ tobago-theme-standard ---
[INFO] Running 'npm run css-minify' in __CURRENT__/tobago-theme-standard/target/bootstrap
@@ -1077,21 +1077,21 @@ Build date: 2017-11-09 14:25:07
[INFO] > npm-run-all --parallel js-compile-*
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
-[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-standard/target/bootstrap
+[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
[INFO]
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
[INFO]
[INFO]
-[INFO] > bootstrap@4.0.0-beta.2 js-compile-plugins __CURRENT__/tobago-theme-standard/target/bootstrap
-[INFO] > cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps
+[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
+[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
-[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR]
[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.bundle.js...
+[ERROR]
+[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
[INFO] js/src/alert.js -> js/dist/alert.js
[INFO] js/src/button.js -> js/dist/button.js
[INFO] js/src/carousel.js -> js/dist/carousel.js
@@ -1104,15 +1104,15 @@ Build date: 2017-11-09 14:25:07
[INFO] js/src/tab.js -> js/dist/tab.js
[INFO] js/src/tooltip.js -> js/dist/tooltip.js
[INFO] js/src/util.js -> js/dist/util.js
-[ERROR] created dist/js/bootstrap.js in 2.2s
-[ERROR] created dist/js/bootstrap.bundle.js in 2.5s
+[ERROR] created dist/js/bootstrap.js in 3s
+[ERROR] created dist/js/bootstrap.bundle.js in 3.1s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-standalone __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap
[INFO]
[ERROR]
[ERROR] __CURRENT__/tobago-theme-standard/target/bootstrap/js/src/index.js → dist/js/bootstrap.js...
-[ERROR] created dist/js/bootstrap.js in 1.5s
+[ERROR] created dist/js/bootstrap.js in 1.6s
[INFO]
[INFO] > bootstrap@4.0.0-beta.2 js-compile-bundle __CURRENT__/tobago-theme-standard/target/bootstrap
[INFO] > cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap
@@ -1204,11 +1204,11 @@ Build date: 2017-11-09 14:25:07
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether-theme-basic.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether-theme-arrows-dark.min.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tether/1.1.1/css/tether-theme-arrows.min.css is younger than original, use 'force' option or clean your target
-[INFO] bootstrap.min.css (146119b) -> bootstrap.min.min.css (145863b)[99%]
+[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/tobago-bootstrap/_version/css/bootstrap.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/font-awesome/4.7.0/css/font-awesome.min.css is younger than original, use 'force' option or clean your target
[INFO] nothing to do, __CURRENT__/tobago-theme-standard/target/classes/META-INF/resources/tobago/standard/font-awesome/4.7.0/css/font-awesome.min.min.css is younger than original, use 'force' option or clean your target
-[INFO] total input (531563b) -> output (486865b)[91%]
+[INFO] total input (385444b) -> output (341002b)[88%]
[INFO] nb warnings: 0, nb errors: 0
[INFO]
[INFO] --- maven-compiler-plugin:3.6.2:compile (default-compile) @ tobago-theme-standard ---
@@ -1242,7 +1242,7 @@ main:
T E S T S
-------------------------------------------------------
Running org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.32 sec - in org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.271 sec - in org.apache.myfaces.tobago.renderkit.css.BootstrapClassUnitTest
Results :
@@ -1261,7 +1261,7 @@ Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 03:01 min
-[INFO] Finished at: 2017-11-09T14:28:10+01:00
-[INFO] Final Memory: 40M/582M
+[INFO] Total time: 02:34 min
+[INFO] Finished at: 2017-11-10T11:01:37+01:00
+[INFO] Final Memory: 39M/634M
[INFO] ------------------------------------------------------------------------
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.