Merge pull request #58 from wazuh/fixing-searchbar-57

Searchbar and some styles fixed
This commit is contained in:
Manuel Albarral 2017-07-21 13:53:58 +02:00 committed by GitHub
commit 3fb9dcd8ec
14 changed files with 58 additions and 65 deletions

View File

@ -102,7 +102,7 @@ app.controller('overviewController', function ($scope, appState, $window, generi
// Watchers
$scope.$watch('tabView', function() {
$location.search('view', $scope.tabView);
$location.search('view', $scope.tabView);
});
// Watch for timefilter changes

View File

@ -57,7 +57,7 @@ SavedObjectRegistryProvider.register(savedSearchProvider);
var app = uiModules.get('app/wazuh', [])
.directive('kbnDis', [function() {
.directive('kbnDis', [function() {
return {
restrict: 'E',
scope: {

View File

@ -3,6 +3,19 @@ body{
width:100%;
}
.vis-editor-content text, h2.index-pattern-label{
font-weight: normal !important;
}
.wazuh-discover-searchbar{
margin-top: -50px !important;
z-index:9999;
}
.wazuh-searchbar navbar{
margin-top: -40px !important;
}
.no-legend visualize-legend{
visibility: hidden;
width: 0px;
@ -50,7 +63,7 @@ span.md-headline {
.md-headline-small{
font-size: 18px;
}
.h3, h3 {
.wazuh-h3 {
font-size: 18px !important;
font-weight: 400 !important;
}
@ -444,7 +457,7 @@ md-toolbar.md-default-theme:not(.md-menu-toolbar), md-toolbar:not(.md-menu-toolb
border: none !important;
}
.md-toolbar-tools h1, .md-toolbar-tools h2, .md-toolbar-tools h3 {
.md-toolbar-tools h1, .md-toolbar-tools .wazuh-h2, .md-toolbar-tools h3 {
font-size: inherit;
font-weight: 500;
text-transform: uppercase;
@ -591,6 +604,7 @@ md-autocomplete input:-ms-input-placeholder {
.wazuh-h1 {
font-size: 24px !important;
}
md-chips.md-default-theme .md-chips, md-chips .md-chips {
box-shadow: none;
}

View File

@ -1,7 +1,7 @@
<md-content ng-if="submenuNavItem == 'audit' && _agent" id="agents-audit" ng-controller="auditController">
<!-- Kibana search bar -->
<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
<!-- No results message -->
<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

View File

@ -1,7 +1,7 @@
<md-content ng-if="submenuNavItem == 'fim' && _agent" id="agents-fim" ng-controller="fimController">
<!-- Kibana search bar -->
<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
<!-- No results message -->
<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

View File

@ -1,7 +1,7 @@
<md-content ng-if="submenuNavItem == 'oscap' && _agent" id="agents-oscap" ng-controller="oscapController">
<!-- Kibana search bar -->
<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
<!-- No results message -->
<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

View File

@ -1,7 +1,7 @@
<md-content ng-if="submenuNavItem == 'overview' && agentInfo" ng-controller="agentsOverviewController">
<!-- Kibana search bar -->
<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
<div ng-if="tabView == 'panels'">
<md-content layout="row">

View File

@ -1,7 +1,7 @@
<md-content ng-if="submenuNavItem == 'pci' && _agent" id="agents-pci" ng-controller="PCIController">
<!-- Kibana search bar -->
<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
<!-- No results message -->
<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

View File

@ -1,7 +1,7 @@
<md-content ng-if="submenuNavItem == 'policy_monitoring' && _agent" id="agents-pm" ng-controller="pmController">
<!-- Kibana search bar -->
<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
<!-- No results message -->
<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

View File

@ -39,7 +39,7 @@
</div>
<div ng-if="!_agent">
<h2 style="text-transform: none; font-size: 20px;">
<h2 class="wazuh-h2" style="text-transform: none; font-size: 20px;">
<i style="margin-right: 5px; " class="fa fa-desktop" aria-hidden="true"></i> Agents overview
</h2>
</div>

View File

@ -2,7 +2,9 @@
<kbn-top-nav name="discover" config="topNavMenu">
<!-- Transcluded elements. -->
<div data-transclude-slots>
</kbn-top-nav>
<div data-transclude-slots class="wazuh-discover-searchbar">
<!-- Breadcrumbs. -->
<div data-transclude-slot="topLeftCorner" class="kuiLocalBreadcrumbs">
<h1 tabindex="0" id="kui_local_breadcrumb" class="kuiLocalBreadcrumb">
@ -16,54 +18,31 @@
</div>
<!-- Search. -->
<form
data-transclude-slot="bottomRow"
class="fullWidth"
role="form"
name="discoverSearch"
ng-submit="fetch()"
>
<div class="typeahead" kbn-typeahead="discover" on-select="fetch()">
<div class="kuiLocalSearch">
<div class="kuiLocalSearchAssistedInput">
<input
parse-query
input-focus
kbn-typeahead-input
ng-model="state.query"
placeholder="Search... (e.g. status:200 AND extension:PHP)"
aria-label="Search input"
type="text"
class="kuiLocalSearchInput kuiLocalSearchInput--lucene"
ng-class="{'kuiLocalSearchInput-isInvalid': discoverSearch.$invalid}"
>
<div class="kuiLocalSearchAssistedInput__assistance">
<p class="kuiText">
<a
class="kuiLink"
ng-href="{{queryDocLinks.luceneQuerySyntax}}"
target="_blank"
>
Uses lucene query syntax
</a>
</p>
</div>
</div>
<button
type="submit"
aria-label="Search"
class="kuiLocalSearchButton"
ng-disabled="discoverSearch.$invalid"
>
<span class="kuiIcon fa-search" aria-hidden="true"></span>
</button>
</div>
<kbn-typeahead-items></kbn-typeahead-items>
</div>
</form>
<navbar name="discover-search">
<form role="form" class="fill inline-form" ng-submit="fetch()" name="discoverSearch">
<div class="typeahead" kbn-typeahead="discover">
<div class="input-group"
ng-class="discoverSearch.$invalid ? 'has-error' : ''">
<input
parse-query
input-focus
kbn-typeahead-input
ng-model="stateQuery"
placeholder="Search..."
aria-label="Search input"
type="text"
class="form-control">
<button type="submit"
ng-disabled="discoverSearch.$invalid"
aria-label="Search">
<span aria-hidden="true" class="fa fa-search"></span></button>
</div>
<kbn-typeahead-items></kbn-typeahead-items>
</div>
</form>
<div class="button-group" role="toolbar"></div>
</navbar>
</div>
</kbn-top-nav>
<div class="container-fluid" role="main">
<div class="row">

View File

@ -48,7 +48,7 @@
<div layout="row" layout-align="start start">
<md-card layout="column" flex="50">
<md-card-content>
<h3>Manager information</h3>
<h3 class="wazuh-h3">Manager information</h3>
<div layout="column">
<span layout="row">
<p style="font-weight: bold; min-width: 150px" >Version</p>
@ -88,7 +88,7 @@
<md-card layout="column" flex="50">
<md-card-content>
<h3>Last registered agent</h3>
<h3 class="wazuh-h3">Last registered agent</h3>
<div layout="column" flex>
<span layout="row">
<p style="font-weight: bold; min-width: 150px" >Name</p>

View File

@ -1,7 +1,7 @@
<md-content flex layout="column" ng-if="submenuNavItem == 'general'" ng-controller="overviewGeneralController" layout-align="start">
<!-- Kibana search bar -->
<kbn-searchbar ng-if="tabView == 'panels'"></kbn-searchbar>
<kbn-searchbar class="wazuh-searchbar" ng-if="tabView == 'panels'"></kbn-searchbar>
<!-- No results message -->
<md-content flex layout="row" layout-align="start start" ng-if="!results && tabView == 'panels'">

View File

@ -150,7 +150,7 @@
<md-card flex layout="column" ng-if="rule.groups.length > 0">
<md-card-content>
<h3>Groups</h3>
<h3 class="wazuh-h3">Groups</h3>
<span ng-repeat="group in rule.groups">
<span class="listHover" ng-click="rulesApplyFilter({type: 'group', value: group})" layout="row" layout-align="space-between center"><p>{{ group }}</p></span>
<md-divider ng-if="!$last"></md-divider>
@ -160,7 +160,7 @@
<md-card flex layout="column" ng-if="rule.pci.length > 0">
<md-card-content>
<h3>PCI DSS </h3>
<h3 class="wazuh-h3">PCI DSS </h3>
<span ng-repeat="pci in rule.pci">
<span class="listHover" ng-click="rulesApplyFilter({type: 'pci', value: pci})" layout="row" layout-align="space-between center"><p>{{ pci }}</p></span>
<md-divider ng-if="!$last"></md-divider>
@ -170,7 +170,7 @@
<md-card flex layout="column">
<md-card-content>
<h3>Extra settings</h3>
<h3 class="wazuh-h3">Extra settings</h3>
<span ng-repeat="(detailk, detailv) in rule.details">
<span layout="row" layout-align="space-between center">
<p>{{detailk}}</p>