Commit 29063a30 authored by Gary Cunningham-Lee's avatar Gary Cunningham-Lee
Browse files

[FIX][UI] bs5: Misc. CSS updates and fixes.


(cherry picked from commit 1d40a8fe)
parent 853b4d3f
Pipeline #713436668 passed with stages
in 8 minutes and 54 seconds
......@@ -26,7 +26,7 @@
</a>
<ul class="dropdown-menu {if $prefs.theme_navbar_color_variant_admin eq 'dark'} dropdown-menu-dark{/if} border" role="menu">
<li class="dropdown-item d-none">
<span class="dropdown-title">{tr}Preference Filters{/tr}</span>
<span class="dropdown-header">{tr}Preference Filters{/tr}</span>
<input type="hidden" name="pref_filters[]" value="basic">
</li>
{foreach from=$pref_filters key=name item=info}
......
......@@ -15,7 +15,7 @@
{icon name='menu-extra'}
</a>
<ul class="dropdown-menu dropdown-menu-end">
<li class="dropdown-title">
<li class="dropdown-header">
{tr}Monitoring{/tr}
</li>
<li class="dropdown-divider"></li>
......
......@@ -18,7 +18,7 @@
<ul class="dropdown-menu dropdown-menu-end">
{if $edit_mode neq 'y' and $dup_mode neq 'y'}
<li class="dropdown-divider"></li>
<li class="dropdown-title">
<li class="dropdown-header">
{tr}Views{/tr}
</li>
<li class="dropdown-divider"></li>
......@@ -49,7 +49,7 @@
{/if}
{/if}
<li class="dropdown-divider"></li>
<li class="dropdown-title">
<li class="dropdown-header">
{tr}Gallery actions{/tr}
</li>
<li class="dropdown-divider"></li>
......
......@@ -60,7 +60,7 @@
{icon name="menu-extra"}
</a>
<div class="dropdown-menu dropdown-menu-end">
<h6 class="dropdown-title">
<h6 class="dropdown-header">
{tr}Thread actions{/tr}
</h6>
<div class="dropdown-divider"></div>
......
......@@ -27,7 +27,7 @@
{icon name="menu-extra"}
</a>
<ul class="dropdown-menu dropdown-menu-end">
<li class="dropdown-title">
<li class="dropdown-header">
{tr}Tracker actions{/tr}
</li>
<li class="dropdown-divider"></li>
......
......@@ -14,7 +14,7 @@
{icon name='menu-extra'}
</a>
<ul class="dropdown-menu dropdown-menu-end">
<li class="dropdown-title">
<li class="dropdown-header">
{tr}Tracker item actions{/tr}
</li>
<li class="dropdown-divider"></li>
......
......@@ -410,7 +410,7 @@ progress {
}
.lead {
font-size: 1.25rem;
font-weight: 300;
font-weight: inherit;
}
.display-1 {
font-size: calc(1.625rem + 4.5vw);
......@@ -10439,17 +10439,6 @@ table.treetable.objectperms td.removed {
.btn-primary.highlight:hover {
background: #e19e70;
}
.btn.active.btn-link {
color: #ede0ab;
text-decoration: underline;
background-color: transparent;
border-color: transparent;
}
.btn.active.btn-link:hover {
color: #ede0ab;
background-color: transparent;
border-color: transparent;
}
.btn-primary.btn-link, .btn-primary.btn-link:hover {
background: transparent;
border: none;
......
......@@ -216,7 +216,7 @@
margin-left: 0;
margin-right: 0;
}
.tiki-admin .dropdown-menu .dropdown-title {
.tiki-admin .dropdown-menu .dropdown-header {
margin-left: -0.9rem;
}
.tiki-admin .top_modules .dropdown-menu {
......
......@@ -1091,7 +1091,7 @@ span.btn-link {
content: "";
clear: both;
}
.dropdown-title {
.dropdown-header {
text-align: center;
padding-right: 5px;
padding-left: 5px;
......@@ -3003,6 +3003,10 @@ a.admbox.btn.btn-primary.disabled.disabled-clickable {
.adminoptionboxchild legend {
margin-bottom: 0;
}
.adminoptionbox.sitetitle, .adminoptionbox.sitesubtitle {
font-size: inherit;
font-weight: inherit;
}
.tiki-admin fieldset {
width: 100%;
}
......@@ -4121,6 +4125,7 @@ table.wikiplugin_trackerlist {
}
.editplugin {
vertical-align: bottom;
margin-left: 0.3rem;
}
.plugin-mouseover {
position: absolute;
......
......@@ -129,6 +129,13 @@ a.admbox.btn.btn-primary.disabled.disabled-clickable {
}
}
// Don't apply actual site title styling to admin labels
.adminoptionbox.sitetitle,
.adminoptionbox.sitesubtitle {
font-size: inherit;
font-weight: inherit;
}
.tiki-admin fieldset {
width: 100%;
}
......
......@@ -396,7 +396,7 @@ span.btn-link {
}
//Title for bootstrap dropdowns that drop down upon hover
.dropdown-title {
.dropdown-header {
text-align: center;
padding-right: 5px;
padding-left: 5px;
......
......@@ -128,6 +128,7 @@ table.wikiplugin_trackerlist {
.editplugin {
vertical-align: bottom;
margin-left: 0.3rem;
}
// /* mouseover plugin */
......
......@@ -302,7 +302,7 @@ $color-light: rgba(0, 0, 0, 0.5); // Not replaced as it's only used for minor de
margin-right: 0;
}
.tiki-admin .dropdown-menu .dropdown-title {
.tiki-admin .dropdown-menu .dropdown-header {
margin-left: -.9rem;
}
......@@ -483,7 +483,7 @@ $color-light: rgba(0, 0, 0, 0.5); // Not replaced as it's only used for minor de
}
//.tiki-admin .bg-dark .dropdown-item .dropdown-title, .tiki-admin .bg-dark .dropdown-item label, .tiki-admin .navbar-dark .navbar-nav .nav-link, .tiki-admin aside.admin-nav .navbar-dark .navbar-nav .nav-link, .tiki-admin .top_modules.navbar-dark-parent .dropdown-header, .tiki-admin .dropdown-item:hover, .tiki-admin .top_modules.navbar-light-parent .dropdown-menu a:hover, .tiki-admin aside.admin-nav .navbar-dark .navbar-nav ul .nav-link:hover, .tiki-admin .top_modules.navbar-dark-parent .dropdown-item, .tiki-admin aside.admin-nav, .tiki-admin aside.admin-nav p, .tiki-admin .top_modules.navbar-dark-parent, .tiki-admin .top_modules.navbar-dark-parent a, .tiki-admin .top_modules.navbar-dark-parent button, .tiki-admin .bg-dark a {
//.tiki-admin .bg-dark .dropdown-item .dropdown-header, .tiki-admin .bg-dark .dropdown-item label, .tiki-admin .navbar-dark .navbar-nav .nav-link, .tiki-admin aside.admin-nav .navbar-dark .navbar-nav .nav-link, .tiki-admin .top_modules.navbar-dark-parent .dropdown-header, .tiki-admin .dropdown-item:hover, .tiki-admin .top_modules.navbar-light-parent .dropdown-menu a:hover, .tiki-admin aside.admin-nav .navbar-dark .navbar-nav ul .nav-link:hover, .tiki-admin .top_modules.navbar-dark-parent .dropdown-item, .tiki-admin aside.admin-nav, .tiki-admin aside.admin-nav p, .tiki-admin .top_modules.navbar-dark-parent, .tiki-admin .top_modules.navbar-dark-parent a, .tiki-admin .top_modules.navbar-dark-parent button, .tiki-admin .bg-dark a {
// color: white !important;
//}
......@@ -524,7 +524,7 @@ $color-light: rgba(0, 0, 0, 0.5); // Not replaced as it's only used for minor de
border: none;
}
//.tiki-admin .bg-light .dropdown-item .dropdown-title, .tiki-admin .bg-light .dropdown-item label, .tiki-admin .navbar-light .navbar-nav .nav-link, .tiki-admin aside.admin-nav .navbar-light .navbar-nav .nav-link, .tiki-admin .top_modules.navbar-light-parent .dropdown-header, .tiki-admin aside.admin-nav .navbar-light .navbar-nav ul .nav-link:hover, .tiki-admin .top_modules.navbar-light-parent .dropdown-item, .tiki-admin .top_modules.navbar-light-parent, .tiki-admin .top_modules.navbar-light-parent a, .tiki-admin .bg-light a {
//.tiki-admin .bg-light .dropdown-item .dropdown-header, .tiki-admin .bg-light .dropdown-item label, .tiki-admin .navbar-light .navbar-nav .nav-link, .tiki-admin aside.admin-nav .navbar-light .navbar-nav .nav-link, .tiki-admin .top_modules.navbar-light-parent .dropdown-header, .tiki-admin aside.admin-nav .navbar-light .navbar-nav ul .nav-link:hover, .tiki-admin .top_modules.navbar-light-parent .dropdown-item, .tiki-admin .top_modules.navbar-light-parent, .tiki-admin .top_modules.navbar-light-parent a, .tiki-admin .bg-light a {
// color: $color-light;
//}
// Below: Nav links are especially important on admin pages - why make them smaller here? (gary)
......
......@@ -380,7 +380,7 @@ progress {
}
.lead {
font-size: 1.25rem;
font-weight: 400;
font-weight: inherit;
}
.display-1 {
font-size: 5rem;
......@@ -10048,17 +10048,6 @@ table.treetable.objectperms td.removed {
.btn-primary.highlight:hover {
background: #87280d;
}
.btn.active.btn-link {
color: black;
text-decoration: underline;
background-color: transparent;
border-color: transparent;
}
.btn.active.btn-link:hover {
color: #f16e00;
background-color: transparent;
border-color: transparent;
}
.btn-primary.btn-link, .btn-primary.btn-link:hover {
background: transparent;
border: none;
......
......@@ -77,7 +77,7 @@
"// Framework grid generation\n//\n// Used only by Bootstrap to generate the correct number of grid classes given\n// any value of `$grid-columns`.\n\n@mixin make-grid-columns($columns: $grid-columns, $gutter: $grid-gutter-width, $breakpoints: $grid-breakpoints) {\n // Common properties for all breakpoints\n %grid-column {\n position: relative;\n width: 100%;\n min-height: 1px; // Prevent columns from collapsing when empty\n padding-right: ($gutter / 2);\n padding-left: ($gutter / 2);\n }\n\n @each $breakpoint in map-keys($breakpoints) {\n $infix: breakpoint-infix($breakpoint, $breakpoints);\n\n // Allow columns to stretch full width below their breakpoints\n @for $i from 1 through $columns {\n .col#{$infix}-#{$i} {\n @extend %grid-column;\n }\n }\n .col#{$infix},\n .col#{$infix}-auto {\n @extend %grid-column;\n }\n\n @include media-breakpoint-up($breakpoint, $breakpoints) {\n // Provide basic `.col-{bp}` classes for equal-width flexbox columns\n .col#{$infix} {\n flex-basis: 0;\n flex-grow: 1;\n max-width: 100%;\n }\n .col#{$infix}-auto {\n flex: 0 0 auto;\n width: auto;\n max-width: none; // Reset earlier grid tiers\n }\n\n @for $i from 1 through $columns {\n .col#{$infix}-#{$i} {\n @include make-col($i, $columns);\n }\n }\n\n .order#{$infix}-first {\n order: -1;\n }\n\n @for $i from 1 through $columns {\n .order#{$infix}-#{$i} {\n order: $i;\n }\n }\n\n // `$columns - 1` because offsetting by the width of an entire row isn't possible\n @for $i from 0 through ($columns - 1) {\n @if not ($infix == \"\" and $i == 0) { // Avoid emitting useless .offset-0\n .offset#{$infix}-#{$i} {\n @include make-col-offset($i, $columns);\n }\n }\n }\n }\n }\n}\n",
"/// Grid system\n//\n// Generate semantic grid columns with these mixins.\n\n@mixin make-container() {\n width: 100%;\n padding-right: ($grid-gutter-width / 2);\n padding-left: ($grid-gutter-width / 2);\n margin-right: auto;\n margin-left: auto;\n}\n\n\n// For each breakpoint, define the maximum width of the container in a media query\n@mixin make-container-max-widths($max-widths: $container-max-widths, $breakpoints: $grid-breakpoints) {\n @each $breakpoint, $container-max-width in $max-widths {\n @include media-breakpoint-up($breakpoint, $breakpoints) {\n max-width: $container-max-width;\n }\n }\n}\n\n@mixin make-row() {\n display: flex;\n flex-wrap: wrap;\n margin-right: ($grid-gutter-width / -2);\n margin-left: ($grid-gutter-width / -2);\n}\n\n@mixin make-col-ready() {\n position: relative;\n // Prevent columns from becoming too narrow when at smaller grid tiers by\n // always setting `width: 100%;`. This works because we use `flex` values\n // later on to override this initial width.\n width: 100%;\n min-height: 1px; // Prevent collapsing\n padding-right: ($grid-gutter-width / 2);\n padding-left: ($grid-gutter-width / 2);\n}\n\n@mixin make-col($size, $columns: $grid-columns) {\n flex: 0 0 percentage($size / $columns);\n // Add a `max-width` to ensure content within each column does not blow out\n // the width of the column. Applies to IE10+ and Firefox. Chrome and Safari\n // do not appear to require this.\n max-width: percentage($size / $columns);\n}\n\n@mixin make-col-offset($size, $columns: $grid-columns) {\n $num: $size / $columns;\n margin-left: if($num == 0, 0, percentage($num));\n}\n",
"// stylelint-disable declaration-no-important\n\n@mixin float-left {\n float: left !important;\n}\n@mixin float-right {\n float: right !important;\n}\n@mixin float-none {\n float: none !important;\n}\n",
"// $Id: _tiki-variables.scss 64438 2017-10-31 06:02:47Z chibaguy $\n// Values are specified here to be used in the files imported by tiki_base.scss and theme style sheets.\n@import \"bs3-bs4-transition.scss\";\n//@import \"../../default/scss/variables\";\n$padding-y: .5rem; // Not sure where this is used besides buttons and pagination; not sure where it's defined in BS4\n$padding-x: .75rem;\n// Older\n$topmodules-row-sidemargins: 0;\n$topbar-row-sidemargins: 0;\n$topbar-row-margin-bottom: 1rem;\n$panel-heading-padding: .8rem 15px;\n$navbar-fixed-height: 3.25rem;\n$form-horizontal-sidemargins: 15px;\n\n// Add Tiki legacy breadcrumb styles as variables.\n$breadcrumb-font-style: normal;\n$breadcrumb-font-size: 90%;\n$breadcrumb-display: block;\n\n// These rules are to map Bootstrap variables to superfish menus and topbar div styling.\n$cssmenu_horiz_li_hover_bg: transparent;\n$cssmenu_ul_border: $dropdown-border-color;\n$cssmenu_ul_li_a_bg: $dropdown-bg;\n$cssmenu_ul_li_a_color: $dropdown-link-color;\n$cssmenu_ul_li_hover_a_color: $dropdown-link-hover-color;\n$cssmenu_ul_li_hover_a_bg: $dropdown-link-hover-bg;\n$topbar_bg: $dark;\n$navbar-dark-bg: $dark; // Not sure how BS4 specifies this.\n$topbar_color: $navbar-dark-color;\n$topbar_link_color: $navbar-dark-color;\n$topbar_link_padding_top: $navbar-padding-y;\n$topbar_link_padding_bottom: $navbar-padding-y;\n$topbar_link_hover_color: $navbar-dark-hover-color;\n\n$dropdown-title-color: $dropdown-link-color;\n\n// These can be used in div class=\"row\" or others that don't have a bottom margin but need one.\n// For Bootstrap 4, add in HTML: .mb-1, .mb-2 , .mb-3 , .mb-4 or 5 or custom; see https://v4-alpha.getbootstrap.com/utilities/spacing/\n.margin-bottom-xs {\tmargin-bottom: ($line-height-base/4) + 0rem; } // https://css-tricks.com/snippets/sass/correctly-adding-unit-number/\n.margin-bottom-sm { margin-bottom: ceil($line-height-base / 2) + 0rem; }\n.margin-bottom-md {\tmargin-bottom: ($line-height-base) + 0rem; }\n.margin-bottom-lg { margin-bottom: ceil($line-height-base * 2) + 0rem; }\n\n// Enable bringing center column background back up to topbar when side column toggle icons are used\n$top-margin-compensation-for-side-col-toggle: -$line-height-base;\n\n// Map Bootstrap variables to Chosen selectors\n$chosen-background: $input-bg;\n$chosen-border: 1px solid $input-border-color;\n$chosen-border-radius: $input-border-radius;\n$chosen-multi-border-radius: $chosen-border-radius;\n$chosen-box-shadow: \"inset 0 1px 1px rgba(0, 0, 0, .075)\";\n$chosen-drop-border: $input-border-color;\n$chosen-drop-box-shadow: \"0 8px 8px rgba(0, 0, 0, .25)\";\n$chosen-drop-zindex: 1060;\n$chosen-focus-border: 1px solid $input-focus-border-color;\n$chosen-focus-box-shadow: \"0 1px 1px rgba(0, 0, 0, .075) inset, 0 0 8px rgba(82, 168, 236, .6)\";\n$chosen-focus-transition: \"border linear .2s, box-shadow linear .2s\";\n$chosen-height: $input-height;\n$chosen-multi-height: $input-height + .4rem;\n$chosen-active-result: $input-color;\n$chosen-single-height: $input-height; // \"Make inputs at least the height of their button counterpart (base line-height + padding + border)\"\n$chosen-padding-base-vertical: $padding-y;\n$chosen-padding-base-horizontal: $padding-x;\n$chosen-font-size-base: $font-size-base;\n$chosen-line-height: $line-height-base;\n\n$chosen-sprite-path: \"../../../vendor_bundled/vendor/alxlit/bootstrap-chosen/chosen-sprite.png\";\n$chosen-sprite-retina-path: \"../../../vendor_bundled/vendor/alxlit/bootstrap-chosen/chosen-sprite$2x.png\";\n\n// Calendars\n$calendarweek-bottom-border-color: $table-border-color;\n$calprio1: #dae0e0;\n$calprio2: #dadcdc;\n$calprio3: #dad0d0;\n$calprio4: #dacaca;\n$calprio5: #cac0d0;\n$calprio6: #dababa;\n$calprio7: #cab0b0;\n$calprio8: #daaaaa;\n$calprio9: #da9a9a;\n/* Todo - button variables are simpler in BS4 - need to figure it out\n// Admin\n$admbox-border: $btn-primary-border; //#cccccc;\n$admbox-bg: $btn-primary-bg; // #cccccc;\n$admbox-color: $btn-primary-color; // #333333;\n$admbox-hover-border: lighten($btn-primary-border, 5%); // #333333;\n$admbox-hover-bg: lighten($btn-primary-bg, 5%); // #aaaaaa;\n$admbox-hover-color: lighten($btn-primary-color, 5%); //#ffffff;\n$admbox-off-border: darken($btn-primary-border, 40%); //#a9a9a9;\n$admbox-off-color: darken($btn-primary-color, 40%); //#9f9f9f;\n$admbox-off-hover-border: darken($btn-primary-border, 40%); //#a9a9a9;\n$admbox-off-hover-color: darken($btn-primary-color, 40%); //#666666;\n*/\n\n$table-column-bg-odd: darken($table-accent-bg, 5%);\n// Correction for path for sorich87/bootstrap-tour's bootstrap-tour-standalone.less\n$bootstrap-path: \"../../../twbs/bootstrap/scss/\";\n\n// inline code\n$code-color: #444444;\n$code-bg: #f8f8f8;\n\n// Tracker\n$modal-link-color: $link-color;\n$modal-link-hover-color: $link-hover-color;\n\n// Make hierarchical arrangement of admin options more clear\n$secondary-legend-font-size: ceil(($font-size-base * 1.35));\n\n// Plugin Pivot Table variables\n$pvt-color: $body-color;\n$pvt-bg: $body-bg;\n$pvt-font-size: $font-size-base;\n$pvt-table-bg: $table-bg;\n$pvt-table-th-bg: $panel-info-heading-bg;\n$pvt-table-th-color: $panel-info-text;\n$pvt-table-border-color: $table-border-color;\n$pvt-modal-content-bg: $modal-content-bg;\n$pvtAttr-color: $btn-default-color;\n$pvtFilterBox-button-color: $btn-default-color;\n$pvtFilterBox-button-bg: $btn-default-bg;\n$pvtFilterBox-button-hover-bg: adjust-hue($btn-default-bg, 10%);\n$pvtAggregator-color: $input-color;\n$pvtAggregator-bg: $input-bg;\n$pvtAggregator-border: $input-border-color;\n$pvtAggregator-border-radius: $input-border-radius;\n$pvtSelect-font-size: $font-size-base;\n$c3-color: $body-color;\n\n// Theme overrides of jQuery-UI styles\n$jq-ui-btn-font-weight: normal;\n$tiki-sheet-font-size: $font-size-base;\n$tiki-sheet-border-color: $table-border-color;\n\n// CKEditor colors\n$editor-bg: $body-bg;\n$editor-text-color: $body-color;\n\n",
"// $Id: _tiki-variables.scss 64438 2017-10-31 06:02:47Z chibaguy $\n// Values are specified here to be used in the files imported by tiki_base.scss and theme style sheets.\n@import \"bs3-bs4-transition.scss\";\n//@import \"../../default/scss/variables\";\n$padding-y: .5rem; // Not sure where this is used besides buttons and pagination; not sure where it's defined in BS4\n$padding-x: .75rem;\n// Older\n$topmodules-row-sidemargins: 0;\n$topbar-row-sidemargins: 0;\n$topbar-row-margin-bottom: 1rem;\n$panel-heading-padding: .8rem 15px;\n$navbar-fixed-height: 3.25rem;\n$form-horizontal-sidemargins: 15px;\n\n// Add Tiki legacy breadcrumb styles as variables.\n$breadcrumb-font-style: normal;\n$breadcrumb-font-size: 90%;\n$breadcrumb-display: block;\n\n// These rules are to map Bootstrap variables to superfish menus and topbar div styling.\n$cssmenu_horiz_li_hover_bg: transparent;\n$cssmenu_ul_border: $dropdown-border-color;\n$cssmenu_ul_li_a_bg: $dropdown-bg;\n$cssmenu_ul_li_a_color: $dropdown-link-color;\n$cssmenu_ul_li_hover_a_color: $dropdown-link-hover-color;\n$cssmenu_ul_li_hover_a_bg: $dropdown-link-hover-bg;\n$topbar_bg: $dark;\n$navbar-dark-bg: $dark; // Not sure how BS4 specifies this.\n$topbar_color: $navbar-dark-color;\n$topbar_link_color: $navbar-dark-color;\n$topbar_link_padding_top: $navbar-padding-y;\n$topbar_link_padding_bottom: $navbar-padding-y;\n$topbar_link_hover_color: $navbar-dark-hover-color;\n\n$dropdown-header-color: $dropdown-link-color;\n\n// These can be used in div class=\"row\" or others that don't have a bottom margin but need one.\n// For Bootstrap 4, add in HTML: .mb-1, .mb-2 , .mb-3 , .mb-4 or 5 or custom; see https://v4-alpha.getbootstrap.com/utilities/spacing/\n.margin-bottom-xs {\tmargin-bottom: ($line-height-base/4) + 0rem; } // https://css-tricks.com/snippets/sass/correctly-adding-unit-number/\n.margin-bottom-sm { margin-bottom: ceil($line-height-base / 2) + 0rem; }\n.margin-bottom-md {\tmargin-bottom: ($line-height-base) + 0rem; }\n.margin-bottom-lg { margin-bottom: ceil($line-height-base * 2) + 0rem; }\n\n// Enable bringing center column background back up to topbar when side column toggle icons are used\n$top-margin-compensation-for-side-col-toggle: -$line-height-base;\n\n// Map Bootstrap variables to Chosen selectors\n$chosen-background: $input-bg;\n$chosen-border: 1px solid $input-border-color;\n$chosen-border-radius: $input-border-radius;\n$chosen-multi-border-radius: $chosen-border-radius;\n$chosen-box-shadow: \"inset 0 1px 1px rgba(0, 0, 0, .075)\";\n$chosen-drop-border: $input-border-color;\n$chosen-drop-box-shadow: \"0 8px 8px rgba(0, 0, 0, .25)\";\n$chosen-drop-zindex: 1060;\n$chosen-focus-border: 1px solid $input-focus-border-color;\n$chosen-focus-box-shadow: \"0 1px 1px rgba(0, 0, 0, .075) inset, 0 0 8px rgba(82, 168, 236, .6)\";\n$chosen-focus-transition: \"border linear .2s, box-shadow linear .2s\";\n$chosen-height: $input-height;\n$chosen-multi-height: $input-height + .4rem;\n$chosen-active-result: $input-color;\n$chosen-single-height: $input-height; // \"Make inputs at least the height of their button counterpart (base line-height + padding + border)\"\n$chosen-padding-base-vertical: $padding-y;\n$chosen-padding-base-horizontal: $padding-x;\n$chosen-font-size-base: $font-size-base;\n$chosen-line-height: $line-height-base;\n\n$chosen-sprite-path: \"../../../vendor_bundled/vendor/alxlit/bootstrap-chosen/chosen-sprite.png\";\n$chosen-sprite-retina-path: \"../../../vendor_bundled/vendor/alxlit/bootstrap-chosen/chosen-sprite$2x.png\";\n\n// Calendars\n$calendarweek-bottom-border-color: $table-border-color;\n$calprio1: #dae0e0;\n$calprio2: #dadcdc;\n$calprio3: #dad0d0;\n$calprio4: #dacaca;\n$calprio5: #cac0d0;\n$calprio6: #dababa;\n$calprio7: #cab0b0;\n$calprio8: #daaaaa;\n$calprio9: #da9a9a;\n/* Todo - button variables are simpler in BS4 - need to figure it out\n// Admin\n$admbox-border: $btn-primary-border; //#cccccc;\n$admbox-bg: $btn-primary-bg; // #cccccc;\n$admbox-color: $btn-primary-color; // #333333;\n$admbox-hover-border: lighten($btn-primary-border, 5%); // #333333;\n$admbox-hover-bg: lighten($btn-primary-bg, 5%); // #aaaaaa;\n$admbox-hover-color: lighten($btn-primary-color, 5%); //#ffffff;\n$admbox-off-border: darken($btn-primary-border, 40%); //#a9a9a9;\n$admbox-off-color: darken($btn-primary-color, 40%); //#9f9f9f;\n$admbox-off-hover-border: darken($btn-primary-border, 40%); //#a9a9a9;\n$admbox-off-hover-color: darken($btn-primary-color, 40%); //#666666;\n*/\n\n$table-column-bg-odd: darken($table-accent-bg, 5%);\n// Correction for path for sorich87/bootstrap-tour's bootstrap-tour-standalone.less\n$bootstrap-path: \"../../../twbs/bootstrap/scss/\";\n\n// inline code\n$code-color: #444444;\n$code-bg: #f8f8f8;\n\n// Tracker\n$modal-link-color: $link-color;\n$modal-link-hover-color: $link-hover-color;\n\n// Make hierarchical arrangement of admin options more clear\n$secondary-legend-font-size: ceil(($font-size-base * 1.35));\n\n// Plugin Pivot Table variables\n$pvt-color: $body-color;\n$pvt-bg: $body-bg;\n$pvt-font-size: $font-size-base;\n$pvt-table-bg: $table-bg;\n$pvt-table-th-bg: $panel-info-heading-bg;\n$pvt-table-th-color: $panel-info-text;\n$pvt-table-border-color: $table-border-color;\n$pvt-modal-content-bg: $modal-content-bg;\n$pvtAttr-color: $btn-default-color;\n$pvtFilterBox-button-color: $btn-default-color;\n$pvtFilterBox-button-bg: $btn-default-bg;\n$pvtFilterBox-button-hover-bg: adjust-hue($btn-default-bg, 10%);\n$pvtAggregator-color: $input-color;\n$pvtAggregator-bg: $input-bg;\n$pvtAggregator-border: $input-border-color;\n$pvtAggregator-border-radius: $input-border-radius;\n$pvtSelect-font-size: $font-size-base;\n$c3-color: $body-color;\n\n// Theme overrides of jQuery-UI styles\n$jq-ui-btn-font-weight: normal;\n$tiki-sheet-font-size: $font-size-base;\n$tiki-sheet-border-color: $table-border-color;\n\n// CKEditor colors\n$editor-bg: $body-bg;\n$editor-text-color: $body-color;\n\n",
"// $Id$\n// This temporary file is to provide definitions for Bootstrap 3 variables so the SCSS compile process goes smoothly,\n// especially for variables that have many instances.\n\n\n$body-bg: #fff;\n$body-color: #000000;\n$btn-default-bg: $body-bg;\n$btn-default-border: $body-color;\n$btn-default-color: $body-color;\n\n$btn-primary-bg: $body-bg;\n$btn-primary-color: $body-color;\n$btn-primary-border: $body-color;\n\n$btn-info-bg: $body-bg;\n$btn-info-color: $body-color;\n$bg-inverse: #000;\n$padding-y: .5rem !default; // Not sure where this is used besides buttons and pagination; not sure where it's defined in BS4\n$padding-x: .75rem !default;\n\n$table-bg-accent: darken($body-bg, 2.5%);\n$panel-info-heading-bg: $body-bg; // tiki-variables.scss:123\n$panel-info-text: $body-color;\n$panel-bg: $body-bg;\n$panel-default-text: $body-color;\n$card-text: $body-color; // How does bs4 specify text color specific to a panel?\n$panel-success-heading-bg: turquoise; // $alert-success-bg;\n$alert-padding: 1.5rem; // $alert-padding-x; // Didn't see \"-y\"\n$navbar-dark-bg: #000; // cerulean complained\n$topbar_bg: $navbar-dark-bg;\n//$navbar-dark-link-color: $navbar-dark-color;\n$navbar-inverse-bg: #fff; // Should be theme specific; Cerulean didn't have one.\n$navbar-inverse-link-color: blue; // \"\n$navbar-inverse-border: $body-color;\n$navbar-inverse-link-active-color: red;\n$panel-default-border: $body-color;\n$navbar-dark-brand-color: #ccc;\n$panel-primary-border: $card-border-color;\n$panel-success-text: #000;\n$panel-warning-text: red;\n\n$alert-success-text: #fff;\n$alert-warning-text: #fff;\n",
"// $Id$\n// Custom styles for a new theme.\n\n//$theme-colors: (\n//\t\"primary\": #0082e0,\n//);\n\n//$gray-800: darken($gray-500,20%);\n//$gray-700: darken($gray-500, 15%);\n//$gray-600: darken($gray-500, 10%);\n//$gray-500: #737373; //lighten(@gray-base, 33.5%);\n//$gray-300: lighten($gray-500, 10%);\n//$gray-200: lighten($gray-500, 20%);\n\n//$body-color: $gray-800;\n\n//$font-family-sans-serif: Verdana, Geneva, Arial, Helvetica, sans-serif;\n\n//$btn-default-color: #ffffff;\n//$btn-default-bg: #3676c4;\n//$btn-default-border: #3676c4;\n\n//$btn-primary-color: #ffffff;\n//$btn-primary-bg: #3676c4;\n\n//$input-border: #dddddd;\n\n// // Navbar\n\n//$navbar-dark-color:\t\t\t #ffffff;\n//$navbar-dark-bg:\t\t\t\t #1f5daa;\n//$navbar-dark-border:\t\t\t darken($navbar-dark-bg, 6.5%);\n\n// // Navbar links\n//$navbar-dark-color: \t\t\t\t #ffffff;\n//$navbar-dark-hover-color: \t\t darken(#fff, 10%);\n//$navbar-dark-hover-bg: \t\t\t #3270bd;\n//$navbar-dark-active-color: \t\t #ffffff;\n//$navbar-dark-active-bg: \t\t\t #3270bd;\n//$navbar-dark-disabled-color:\t\t #cccccc;\n\n// // Modals\n//$modal-header-border-color: #386dbb;\n\n// // Cards\n//$card-border-radius: $border-radius-lg;\n//$card-text: #fff; // @gray-lighter;\n//$card-heading-bg: #386dbb;\n\n//$table-border-color: \t\t\t #dddddd;\n\n"
],
......
......@@ -398,7 +398,7 @@ progress {
}
.lead {
font-size: 1.25rem;
font-weight: 300;
font-weight: inherit;
}
.display-1 {
font-size: calc(1.625rem + 4.5vw);
......@@ -10258,17 +10258,6 @@ table.treetable.objectperms td.removed {
.btn-primary.highlight:hover {
background: #791e1a;
}
.btn.active.btn-link {
color: #004a80;
text-decoration: underline;
background-color: transparent;
border-color: transparent;
}
.btn.active.btn-link:hover {
color: #00477a;
background-color: transparent;
border-color: transparent;
}
.btn-primary.btn-link, .btn-primary.btn-link:hover {
background: transparent;
border: none;
......
......@@ -9994,17 +9994,6 @@ table.treetable.objectperms td.removed {
.btn-primary.highlight:hover {
background: #841317;
}
.btn.active.btn-link {
color: #126ca0;
text-decoration: underline;
background-color: transparent;
border-color: transparent;
}
.btn.active.btn-link:hover {
color: #116292;
background-color: transparent;
border-color: transparent;
}
.btn-primary.btn-link, .btn-primary.btn-link:hover {
background: transparent;
border: none;
......
......@@ -9697,17 +9697,6 @@ table.treetable.objectperms td.removed {
.btn-primary.highlight:hover {
background: #9a0021;
}
.btn.active.btn-link {
color: #0f3d71;
text-decoration: underline;
background-color: transparent;
border-color: transparent;
}
.btn.active.btn-link:hover {
color: #0e3a6c;
background-color: transparent;
border-color: transparent;
}
.btn-primary.btn-link, .btn-primary.btn-link:hover {
background: transparent;
border: none;
......
......@@ -10052,17 +10052,6 @@ table.treetable.objectperms td.removed {
.btn-primary.highlight:hover {
background: maroon;
}
.btn.active.btn-link {
color: #258fc1;
text-decoration: underline;
background-color: transparent;
border-color: transparent;
}
.btn.active.btn-link:hover {
color: #227fab;
background-color: transparent;
border-color: transparent;
}
.btn-primary.btn-link, .btn-primary.btn-link:hover {
background: transparent;
border: none;
......
......@@ -9986,17 +9986,6 @@ table.treetable.objectperms td.removed {
.btn-primary.highlight:hover {
background: #bf2718;
}
.btn.active.btn-link {
color: #00a379;
text-decoration: underline;
background-color: transparent;
border-color: transparent;
}
.btn.active.btn-link:hover {
color: #009670;
background-color: transparent;
border-color: transparent;
}
.btn-primary.btn-link, .btn-primary.btn-link:hover {
background: transparent;
border: none;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment