Merge changes in dark mode

This commit is contained in:
JuanCarlos 2019-08-27 14:35:59 +02:00
commit f6e8a0eb06
No known key found for this signature in database
GPG Key ID: B1C4FB733616273A
9 changed files with 63 additions and 10 deletions

View File

@ -1,6 +1,6 @@
<div layout="column" layout-align="start">
<div layout="row" ng-class="hideClose ? ['wz-margin-top-8', 'md-padding-h'] : ''">
<span ng-if="!hideClose" ng-click='closeFn()' class='btn btn-info wz-margin-right-8'>Cancel</span>
<span ng-if="!hideClose" ng-click='closeFn()' class='wz-margin-top-3 kuiButton kuiButton--hollow wz-margin-right-8'>Cancel</span>
<button
ng-disabled='!(currentItems || []).length || (currentList.new && !currentList.newName) || doingSaving || overwriteError'
ng-click='saveList()' class='btn wz-button pull-right'>

View File

@ -69,9 +69,13 @@ wz-menu {
/* Style for index-pattern selector */
.wz-menu-select {
border: none;
color: #373a42;
color: white;
cursor: pointer;
background-color: #FFF;
background: transparent url("../../img/icons/arrow_down.svg") no-repeat center right;
-moz-appearance: none;
-webkit-appearance: none;
padding-right: 20px;
filter: invert(1);
}
/* Style for index-pattern selector options */

View File

@ -0,0 +1,18 @@
<svg width="40" height="30" xmlns="http://www.w3.org/2000/svg">
<defs>
<style>.cls-1{fill:#fff;}</style>
</defs>
<title>Asset 1</title>
<g>
<title>background</title>
<rect fill="none" id="canvas_background" height="32" width="42" y="-1" x="-1"/>
</g>
<g>
<title>Layer 1</title>
<g id="Layer_2">
<g id="Artwork">
<polygon id="svg_1" points="25,13 30.049999237060547,19.510000228881836 35.099998474121094,13 25,13 " class="cls-1"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 480 B

View File

@ -1091,6 +1091,10 @@ md-toolbar.md-default-theme:not(.md-menu-toolbar), md-toolbar:not(.md-menu-toolb
margin: 10px;
}
.wz-margin-top-3 {
margin-top: 3px !important;
}
.wz-margin-left-10 {
margin-left: 10px;
}

View File

@ -306,4 +306,31 @@ md-divider.md-default-theme, md-divider {
.wzMultipleSelectorRemoving{
background-color: #990000!important;
}
.wz-button {
background-color: #1BA9F5 !important;
border-color: #1BA9F5 !important;
color: #000 !important;
}
.wz-button-groups.active, .wz-button-groups:not([disabled]):hover, .wz-button.active, .wz-button:not([disabled]):hover, .wz-button-flat:not([disabled]):hover {
background-color: #0a9dec !important;
border-color: #0a9dec !important;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 2px 2px -1px rgba(0, 0, 0, 0.3) !important;
color: #000 !important;
}
.kuiButton--hollow:hover {
color: #006E8A !important;
text-decoration: underline !important;
}
discover-app-w > main.container-fluid {
background: #1a1b20 !important;
}
.wz-menu-select {
filter: invert(0) !important;
}

View File

@ -49,7 +49,7 @@
<!-- XML editor for group agents -->
<div ng-show="editingFile">
<div layout="row" class="md-padding-h wz-margin-top-10">
<span ng-click='closeEditingFile()' class='btn btn-info'>Cancel</span>
<span ng-click='closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Cancel</span>
<button ng-disabled='xmlHasErrors' ng-click='doSaveGroupAgentConfig()' class='height-35 kuiButton kuiButton--secondary wz-margin-left-8'>
<span ng-show='!xmlHasErrors'>
<svg class="euiIcon euiIcon--medium" focusable="false" xmlns="http://www.w3.org/2000/svg"
@ -72,7 +72,7 @@
<div ng-if="!editingFile">
<div layout="row" class="md-padding" ng-if="lookingGroup && currentGroup && addingAgents">
<span ng-click='addMultipleAgents(false)' class='btn btn-info'>
<span ng-click='addMultipleAgents(false)' class='wz-margin-top-3 kuiButton kuiButton--hollow'>
Cancel</span>
<span ng-hide='moreThan500' ng-click='saveAddAgents()' class='btn wz-button wz-margin-left-8'><i
aria-hidden='true' class='fa fa-fw fa-save'></i>

View File

@ -150,7 +150,7 @@
<!-- XML editor for rules -->
<div layout="column" layout-align="start" ng-show="dctrl.editingFile">
<div layout="row">
<span ng-click='dctrl.closeEditingFile()' class='btn btn-info'>Close</span>
<span ng-click='dctrl.closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Close</span>
<button ng-disabled='dctrl.xmlHasErrors || dctrl.doingSaving' ng-click='dctrl.doSaveConfig()'
class='btn wz-button pull-right wz-margin-left-8'>
<span ng-show='!dctrl.xmlHasErrors'><i aria-hidden='true' class='fa fa-fw fa-save'

View File

@ -63,7 +63,7 @@
<div flex layout="column">
<div layout="row" class="wz-padding-bottom-14">
<div ng-if="!newFile && !editorReadOnly">
<span ng-click='closeEditingFile()' class='btn btn-info'>Cancel</span>
<span ng-click='closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Cancel</span>
<button ng-disabled='xmlHasErrors || doingSaving' ng-click='doSaveConfig(false)'
class='btn wz-button pull-right wz-margin-left-8'>
<span ng-show='!xmlHasErrors'><i aria-hidden='true' class='fa fa-fw fa-save'
@ -76,11 +76,11 @@
</div>
<div ng-if="editorReadOnly">
<div layout="row" layout-align="start center">
<span ng-click='closeEditingFile()' class='btn btn-info'>Close</span>
<span ng-click='closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Close</span>
</div>
</div>
<div ng-if="newFile" layout="row" class="wz-width-100">
<button ng-click="closeEditingFile()" class="height-35 kuiButton kuiButton--hollow">Cancel</button>
<button ng-click="closeEditingFile()" class="wz-margin-top-3 kuiButton kuiButton--hollow">Cancel</button>
<button ng-disabled='xmlHasErrors || newFileName === "" || doingSaving || overwriteError'
ng-click='doSaveConfig(true,newFileName)'
class="kuiButton kuiButton--secondary height-35 wz-margin-left-8">

View File

@ -181,7 +181,7 @@
<!-- XML editor for rules -->
<div layout="column" layout-align="start" ng-show="editingFile">
<div layout="row">
<span ng-click='closeEditingFile()' class='btn btn-info'>Close</span>
<span ng-click='closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Close</span>
<button ng-disabled='xmlHasErrors || doingSaving' ng-click='doSaveConfig()' class='btn wz-button pull-right wz-margin-left-8'>
<span ng-show='!xmlHasErrors'><i aria-hidden='true' class='fa fa-fw fa-save' ng-class="doingSaving ? 'fa-spin fa-spinner' : ''"></i>Save
file</span>