diff --git a/src/core_plugins/console/public/src/directives/help.html b/src/core_plugins/console/public/src/directives/help.html index 9030f8559b668..5fbb645b095e8 100644 --- a/src/core_plugins/console/public/src/directives/help.html +++ b/src/core_plugins/console/public/src/directives/help.html @@ -1,4 +1,4 @@ -
Help
+

Help

diff --git a/src/core_plugins/console/public/src/directives/history.html b/src/core_plugins/console/public/src/directives/history.html index 120fc615d6a38..630ab2b264578 100644 --- a/src/core_plugins/console/public/src/directives/history.html +++ b/src/core_plugins/console/public/src/directives/history.html @@ -1,4 +1,4 @@ -
History
+

History

    Settings
+

Settings

-
+
-
Font Size
-
- -
- + Font Size +
-
- -
+ -
+ + -
+
-
Autocomplete
-
- -
- + + Autocomplete +
-
- -
+ -
+ + -
+
+
+

Welcome to Console

Quick intro to the UI

diff --git a/src/core_plugins/kibana/public/dashboard/top_nav/add_panel.html b/src/core_plugins/kibana/public/dashboard/top_nav/add_panel.html index 2adca99113b41..eb0a8d786b74a 100644 --- a/src/core_plugins/kibana/public/dashboard/top_nav/add_panel.html +++ b/src/core_plugins/kibana/public/dashboard/top_nav/add_panel.html @@ -2,7 +2,9 @@ ng-switch="mode" ng-init="mode = 'visualization'" > -
Add Panels
+

+ Add Panels +

+ diff --git a/src/core_plugins/kibana/public/visualize/editor/panels/save.html b/src/core_plugins/kibana/public/visualize/editor/panels/save.html index 48dc4102b18b3..ad0b52fce0d96 100644 --- a/src/core_plugins/kibana/public/visualize/editor/panels/save.html +++ b/src/core_plugins/kibana/public/visualize/editor/panels/save.html @@ -2,7 +2,10 @@ role="form" ng-submit="opts.doSave()" > -
Save Visualization
+

+ Save Visualization +

+ - + diff --git a/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.html b/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.html index c8c22b9597295..7799142f512f5 100644 --- a/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.html +++ b/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.html @@ -366,9 +366,9 @@

Transforming your data: the real fun begins!

-
+

Help -

+ diff --git a/src/core_plugins/timelion/public/partials/load_sheet.html b/src/core_plugins/timelion/public/partials/load_sheet.html index 6594d5cd759b5..7b9815130e0f5 100644 --- a/src/core_plugins/timelion/public/partials/load_sheet.html +++ b/src/core_plugins/timelion/public/partials/load_sheet.html @@ -1,4 +1,10 @@
-
Open Sheet
- +

+ Open Sheet +

+ +
diff --git a/src/core_plugins/timelion/public/partials/save_sheet.html b/src/core_plugins/timelion/public/partials/save_sheet.html index c96e3ef0270f5..ecc80d14b4a59 100644 --- a/src/core_plugins/timelion/public/partials/save_sheet.html +++ b/src/core_plugins/timelion/public/partials/save_sheet.html @@ -10,17 +10,34 @@

Save entire Timelion sheet

-
- - -
+ - -
- -
+ + + + +
diff --git a/src/core_plugins/timelion/public/partials/sheet_options.html b/src/core_plugins/timelion/public/partials/sheet_options.html index 004f1db538599..3331e54129cd2 100644 --- a/src/core_plugins/timelion/public/partials/sheet_options.html +++ b/src/core_plugins/timelion/public/partials/sheet_options.html @@ -1,5 +1,8 @@
-
Sheet options
+

+ Sheet options +

+
diff --git a/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.html b/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.html index 63e03489ad642..7a60990d20ed6 100644 --- a/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.html +++ b/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.html @@ -1,14 +1,20 @@
-
+
In previous versions of Kibana, changing the name of a {{savedObject.getDisplayName()}} would make a copy with the new name. Use the 'Save as a new {{savedObject.getDisplayName()}}' checkbox to do this now.
-
+ diff --git a/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js b/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js index ee7fc1ee84960..71e9561042d7d 100644 --- a/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js +++ b/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js @@ -7,6 +7,7 @@ uiModules return { restrict: 'E', template: saveObjectSaveAsCheckboxTemplate, + replace: true, scope: { savedObject: '=' } diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js index 9fd9dc244c3ea..cdba256288134 100644 --- a/src/ui/public/directives/__tests__/timepicker.js +++ b/src/ui/public/directives/__tests__/timepicker.js @@ -132,14 +132,14 @@ describe('timepicker directive', function () { }); it('should highlight the right mode', function () { - expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be('quick'); + expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be('Quick'); // Each of the 3 modes const modes = ['absolute', 'relative', 'quick']; _.each(modes, function (mode) { $scope.setMode(mode); $scope.$digest(); - expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be(mode); + expect($elem.find('.kbn-timepicker-modes .active').text().trim().toLowerCase()).to.be(mode); }); }); }); diff --git a/src/ui/public/share/views/share.html b/src/ui/public/share/views/share.html index fd325c0c08f54..72ea890010a26 100644 --- a/src/ui/public/share/views/share.html +++ b/src/ui/public/share/views/share.html @@ -2,12 +2,12 @@
-
Share saved {{share.objectType}} -
+
@@ -99,9 +99,9 @@
-
+

Share Snapshot -

+
diff --git a/src/ui/public/styles/config.less b/src/ui/public/styles/config.less index 72fcb2e05b142..1fd7401359e19 100644 --- a/src/ui/public/styles/config.less +++ b/src/ui/public/styles/config.less @@ -6,15 +6,6 @@ border-bottom: 1px solid; border-bottom-color: @config-border; - .config-close { - width: 100%; - background-color: @config-close-bg; - border-radius: 0; - text-align: right; - padding: 10px; - line-height: 1em; - } - .container-fluid { background-color: @config-bg; padding: 10px; diff --git a/src/ui/public/styles/dark-theme.less b/src/ui/public/styles/dark-theme.less index f093046076084..3dc5687b705ed 100644 --- a/src/ui/public/styles/dark-theme.less +++ b/src/ui/public/styles/dark-theme.less @@ -466,10 +466,6 @@ .config { border-bottom: 0 none transparent; - .config-close { - background-color: @config-close-bg; - } - .container-fluid { background-color: @config-bg; } diff --git a/src/ui/public/styles/dark-variables.less b/src/ui/public/styles/dark-variables.less index 4bd6b74327b56..c846c7eff00a1 100644 --- a/src/ui/public/styles/dark-variables.less +++ b/src/ui/public/styles/dark-variables.less @@ -128,7 +128,6 @@ @config-border: @gray4; @config-bg: @body-bg; -@config-close-bg: @gray3; @saved-object-finder-link-color: @text-color; @saved-object-finder-icon-color: darken(@saved-object-finder-link-color, 10%); diff --git a/src/ui/public/styles/variables/for-theme.less b/src/ui/public/styles/variables/for-theme.less index 2a030f29464ac..8000bdd343ce6 100644 --- a/src/ui/public/styles/variables/for-theme.less +++ b/src/ui/public/styles/variables/for-theme.less @@ -212,8 +212,6 @@ @config-border: darken(@body-bg, 10%); @config-bg: @kibanaGray6; -@config-close-bg: @globalColorLightGray; - // Hintbox ===================================================================== @hintbox-link-color: @link-color; diff --git a/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.html b/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.html index 6e659719b4a9a..8496c66effbbd 100644 --- a/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.html +++ b/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.html @@ -3,6 +3,7 @@
  • -
    -
    -
    +
    +

    Time Range +

    + +
    + + Quick + + + + Relative + + + + Absolute +
    -
    -
    + +
    -
    Refresh Interval
    +

    + Refresh Interval +

    +
    • diff --git a/src/ui/public/timepicker/timepicker.less b/src/ui/public/timepicker/timepicker.less index 8f37ac089ddd4..752d085fe38ae 100644 --- a/src/ui/public/timepicker/timepicker.less +++ b/src/ui/public/timepicker/timepicker.less @@ -1,4 +1,5 @@ -@import '../styles/bootstrap/variables.less'; +@import (reference) '../styles/variables.less'; + .kbn-timepicker { display: flex; justify-content: flex-end; @@ -59,6 +60,12 @@ display: flex; justify-content: space-between; } + /** + * 1. Override kuiLocalNav styles. + */ + .kbn-timepicker-title__text { + margin-bottom: 0 !important; /* 1 */ + } .kbn-timepicker-title__section { display: flex; align-items: center; @@ -66,6 +73,13 @@ .kbn-timerpicker-nav-button { padding: 3px 10px; font-size: 14px; + border-radius: 4px; + display: block; + + &.active { + color: @globalColorWhite; + background-color: @globalColorBlue; + } } /** * Avoid last nav overlaping collapse button diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css index 50b479774453a..02e8bfd518e1c 100644 --- a/ui_framework/dist/ui_framework.css +++ b/ui_framework/dist/ui_framework.css @@ -1475,6 +1475,11 @@ main { .kuiCheckBox:disabled { opacity: 0.3; cursor: not-allowed; } + .theme-dark .kuiCheckBox { + background-color: #444444; + border-color: #444444; } + .theme-dark .kuiCheckBox:checked { + background-color: #0079a5; } .kuiCheckBoxLabel { display: -webkit-box; @@ -2327,7 +2332,12 @@ main { .kuiLocalDropdownPanel--right { margin-left: 30px; } +/** + * 1. Override inherited styles. + */ .kuiLocalDropdownTitle { + margin-top: 0; + /* 1 */ margin-bottom: 12px; font-size: 18px; color: #2d2d2d; } @@ -2354,9 +2364,14 @@ main { justify-content: space-between; margin-bottom: 6px; } +/** + * 1. Override inherited styles. + */ .kuiLocalDropdownHeader__label { font-size: 14px; font-weight: 700; + margin-bottom: 0; + /* 1 */ color: #2d2d2d; } .theme-dark .kuiLocalDropdownHeader__label { color: #cecece; } diff --git a/ui_framework/doc_site/src/views/form/form_example.js b/ui_framework/doc_site/src/views/form/form_example.js index 39d93432c5e2b..cf1cb4f84f8cd 100644 --- a/ui_framework/doc_site/src/views/form/form_example.js +++ b/ui_framework/doc_site/src/views/form/form_example.js @@ -59,7 +59,7 @@ export default props => ( @@ -83,7 +83,7 @@ export default props => ( @@ -100,7 +100,7 @@ export default props => ( @@ -133,7 +133,7 @@ export default props => ( @@ -159,6 +159,11 @@ export default props => ( + + ( diff --git a/ui_framework/src/components/form/_check_box.scss b/ui_framework/src/components/form/_check_box.scss index 519581fd2050d..69ef8987b2b7f 100644 --- a/ui_framework/src/components/form/_check_box.scss +++ b/ui_framework/src/components/form/_check_box.scss @@ -52,6 +52,15 @@ $checkboxDisabledOpacity: 0.3; opacity: $checkboxDisabledOpacity; cursor: not-allowed; } + + @include darkTheme { + background-color: $globalInputBackgroundColor--darkTheme; + border-color: $globalInputBorderColor--darkTheme; + + &:checked { + background-color: $checkboxCheckedBackgroundColor; + } + } } .kuiCheckBoxLabel { diff --git a/ui_framework/src/components/local_nav/_local_dropdown.scss b/ui_framework/src/components/local_nav/_local_dropdown.scss index 56e1c2b617b14..099739861b808 100644 --- a/ui_framework/src/components/local_nav/_local_dropdown.scss +++ b/ui_framework/src/components/local_nav/_local_dropdown.scss @@ -41,7 +41,11 @@ margin-left: 30px; } +/** + * 1. Override inherited styles. + */ .kuiLocalDropdownTitle { + margin-top: 0; /* 1 */ margin-bottom: 12px; font-size: 18px; color: $localNavTextColor; @@ -66,9 +70,13 @@ margin-bottom: 6px; } + /** + * 1. Override inherited styles. + */ .kuiLocalDropdownHeader__label { font-size: 14px; font-weight: 700; + margin-bottom: 0; /* 1 */ color: $localNavTextColor; @include darkTheme {