HTML/CSS cleaning and refactoring

This commit is contained in:
Juanjo Jiménez 2018-03-14 10:28:56 +01:00
parent 4537e9199c
commit 1797de32f5
9 changed files with 26 additions and 78 deletions

View File

@ -7,8 +7,8 @@
<md-nav-item class="wz-color-white" ng-class="{'wz-nav-item-change-color': menuNavItem == 'agents' }" md-nav-click="goToClick('#/agents-preview')" id="agents"><i class="fa fa-tv"></i> Agents</md-nav-item>
<md-nav-item class="wz-color-white" ng-class="{'wz-nav-item-change-color': menuNavItem == 'discover' }" md-nav-click="goToClick('#/wazuh-discover')" id="discover"><i class="fa fa-compass"></i> Discover</md-nav-item>
<div class="wz-menu-nav-bar-api" layout="row" ng-show="theresAPI || theresPattern">
<div ng-show="theresAPI" layout layout-align="center center" tooltip="Selected API" tooltip-placement="bottom"><i class="fa fa-star fa-fw wz-menu-star" aria-hidden="true"></i>{{ currentAPI }}&nbsp;&ndash;&nbsp;</div>
<div ng-show="!theresAPI" layout layout-align="center center" tooltip="Selected API" tooltip-placement="bottom"><i class="fa fa-star fa-fw wz-menu-star" aria-hidden="true"></i>No API &nbsp;&ndash;&nbsp;</div>
<div ng-show="theresAPI" layout layout-align="center center" tooltip="Selected API" tooltip-placement="bottom"><i class="fa fa-star fa-fw wz-color-orange" aria-hidden="true"></i>{{ currentAPI }}&nbsp;&ndash;&nbsp;</div>
<div ng-show="!theresAPI" layout layout-align="center center" tooltip="Selected API" tooltip-placement="bottom"><i class="fa fa-star fa-fw wz-color-orange" aria-hidden="true"></i>No API &nbsp;&ndash;&nbsp;</div>
<div ng-show="theresPattern && patternList && patternList.length > 1" layout layout-align="center center">
<md-select ng-model="currentSelectedPattern" ng-change="changePattern(currentSelectedPattern)" placeholder="Index pattern" class="wz-menu-select md-no-underline wz-border-none" aria-label="Select index pattern" tooltip="Selected index pattern" tooltip-placement="bottom">
<md-option ng-repeat="pattern in patternList" value="{{ pattern.id }}">{{ pattern.attributes.title }}</md-option>

View File

@ -42,11 +42,6 @@
background-color: #00445a;
}
.wz-menu-star {
color: #f39c12;
font-size: 18px;
}
.wz-menu-nav-gear {
float: right;
position: absolute;

View File

@ -1,64 +1,22 @@
// RULESET
.manager-ruleset-decoders-top-span {
padding-left: 0px;
margin-right: 5px;
}
.manager-ruleset-decoders-top-24 {
margin: 0;
height: 220px;
}
.manager-ruleset-decoders-no-padding {
padding: 0px;
}
.manager-ruleset-decoders-btn {
padding: 2px;
top: -3px;
}
.manager-ruleset-decoders-selector {
margin-top: -1px;
margin-bottom: 0;
border-radius: 3px;
margin-left: 10px;
}
.manager-ruleset-decoders-top-content {
padding-left: 0px;
padding-right: 0px;
min-height: 53px;
height: 53px;
padding-top: 5px;
padding-bottom: 0px;
}
.manager-ruleset-rules-top-row {
padding: 0px !important;
height: 200px;
}
// SETTINGS
.settings-template-1 {
color: #f39c12;
font-size: 18px;
}
.settings-template-2 {
margin-left: 7px;
font-size: 18px;
}
// OVERVIEW
.overview-head-2 {
width: 16px;
margin-right: 6px;
.manager-ruleset-decoders-btn {
padding: 2px;
top: -3px;
}
// KBN
.wz-background-transparent {
background-color: transparent;
}
@ -160,21 +118,12 @@ kbn-vis .vis-container {
background-color: #e4f2f5 !important;
}
.wz-margin-10 {
margin: 10px;
}
.wz-margin-10 .md-whiteframe-z1 {
box-shadow: rgba(0, 0, 0, 0.2) 0px 0px 2px 0px, rgba(0, 0, 0, 0.137255) 0px 0px 0px 0px, rgba(0, 0, 0, 0.117647) 0px 0px 0px 0px;
}
.wz-margin-top-17 {
margin-top: 17px;
}
.wz-margin-10 md-input-container {
height: 41px;
padding: 2px;
.wz-margin-left-7 {
margin-left: 7px;
}
.wz-width-100 {

View File

@ -24,6 +24,10 @@ html, body, button:not(.fa):not(.fa-times), textarea, input, select {
color: #ff9999;
}
.wz-color-orange {
color: #f39c12 !important;
}
.color-pointer {
color: #0079a5 !important;
}

View File

@ -47,7 +47,7 @@
<div layout="row" layout-align="start stretch">
<wz-search-bar flex="60" class="wz-margin-top-17 wz-padding-right" height="'height-41'" data="agents" term="searchTerm" placetext="'Filter agents...'"></wz-search-bar>
<div flex="20" layout="column" class="height-41 md-block md-whiteframe-z1 md-input-margin wz-margin-top-17 wz-margin-right-15 wz-select-input">
<div flex="20" layout="column" class="height-41 wz-margin-top-17 wz-margin-right-15 wz-select-input">
<select flex class="kuiSelect wz-border-none cursor-pointer" id="eventBox" ng-model="status" ng-change="agents.addFilter('status', status)" aria-label="Filter by status">
<option value="all">All states</option>
<option value="active">Active</option>
@ -56,7 +56,7 @@
</select>
</div>
<div flex="20" layout="column" class="height-41 md-block md-whiteframe-z1 wz-margin-top-17 wz-select-input">
<div flex="20" layout="column" class="height-41 wz-margin-top-17 wz-select-input">
<select flex class="kuiSelect wz-border-none cursor-pointer" id="eventBox" ng-model="osPlatform" ng-change="applyFilters(osPlatform)" aria-label="Filter by operative system">
<option value="all">All OS platforms</option>
<option ng-repeat='platform in osPlatforms' value="{{platform.platform}} - {{platform.version}}">

View File

@ -1,7 +1,7 @@
<div flex ng-cloak ng-if="!loading && submenuNavItem == 'logs'" layout="column" ng-controller="managerLogController">
<div layout="row" layout-align="start start" class="manager-log-top-row wz-padding-left-16">
<div flex="20" layout="column" class="height-41 md-block md-whiteframe-z1 md-input-margin wz-margin-top-17 wz-margin-right-15 wz-select-input">
<div flex="20" layout="column" class="height-41 wz-margin-top-17 wz-margin-right-15 wz-select-input">
<select flex class="kuiSelect wz-border-none cursor-pointer" ng-disabled="realtime" id="categoryBox" ng-model="category" ng-change="category == 'all' ? logs.removeFilter('category', true) : logs.addFilter('category', category)"
aria-label="Logs category">
<option value="all">Choose daemon</option>
@ -9,7 +9,7 @@
</select>
</div>
<div flex="20" layout="column" class="height-41 md-block md-whiteframe-z1 md-input-margin wz-margin-top-17 wz-margin-right-15 wz-select-input">
<div flex="20" layout="column" class="height-41 wz-margin-top-17 wz-select-input">
<select flex class="kuiSelect wz-border-none cursor-pointer" ng-disabled="realtime" id="levelBox" ng-model="type_log" ng-change="type_log == 'all' ? logs.removeFilter('type_log', true) : logs.addFilter('type_log', type_log)"
aria-label="Logs level">
<option value="all">Choose log level</option>

View File

@ -15,9 +15,9 @@
</md-card>
</div>
<div ng-show="!loading" flex layout="column" class="manager-ruleset-decoders-no-padding">
<div id="content" layout="row" layout-align="start start" class="manager-ruleset-decoders-top-content">
<span layout="row" class="manager-ruleset-decoders-top-span" flex layout-align="space-between center">
<div ng-show="!loading" flex layout="column">
<div id="content" layout="row" layout-align="start start">
<span layout="row" flex layout-align="space-between center">
<md-autocomplete flex id="Auto" class="wz-autocomplete" md-input-id="autocomplete" md-select-on-match="true" md-no-cache="noCache" md-selected-item="filter"
md-selected-item-change="decoders.addFilter('search', filter.name)" md-search-text="searchTerm" md-items="decoder in analizeDecoders(searchTerm)"
md-item-text="decoder.name +' '+ decoder.file" md-min-length="0" md-no-asterisk="false" md-menu-class="autocomplete-custom-agents-bar"
@ -45,7 +45,7 @@
class="wazuh-button md-raised md-primary manager-ruleset-decoders-btn" aria-label="Ruleset decoders button">
Decoders
</md-button>
<div flex="20" layout="column" class="height-41 md-block md-whiteframe-z1 md-input-margin wz-margin-right-15 wz-select-input">
<div flex="20" layout="column" class="height-41 wz-select-input">
<select flex class="kuiSelect wz-border-none cursor-pointer" ng-model="typeFilter" ng-change="applyFilter(typeFilter)" aria-label="Filter by type" ng-init="'All'">
<option value="all">All</option>
<option value="parents">Parents only</option>

View File

@ -37,7 +37,7 @@
</div>
<div ng-show="!loading" flex layout="column">
<div id="content" layout="row" layout-align="start start" class="manager-ruleset-decoders-top-content">
<div id="content" layout="row" layout-align="start start">
<span layout="row" flex layout-align="space-between center">
<md-autocomplete flex class="wz-autocomplete"
id="Auto"

View File

@ -90,16 +90,16 @@
<div ng-repeat="entry in apiEntries">
<div layout="row" layout-align="space-between center">
<p flex="15">
<i ng-show="(entry._id === currentDefault)" tooltip="Set as default Manager" tooltip-placement="right" class="fa fa-star settings-template-1" aria-hidden="true"></i> {{entry._source.cluster_info.cluster}}</p>
<i ng-show="(entry._id === currentDefault)" tooltip="Set as default Manager" tooltip-placement="right" class="fa fa-star wz-color-orange" aria-hidden="true"></i> {{entry._source.cluster_info.cluster}}</p>
<p flex="20">{{entry._source.cluster_info.manager}}</p>
<p flex="15">{{entry._source.url}}</p>
<p flex="15">{{entry._source.api_port}}</p>
<p flex="15">{{entry._source.api_user}}</p>
<p flex="20">
<i ng-click="setDefault(entry)" tooltip="Set as default Manager" class="fa fa-star font-size-18 cursor-pointer" aria-hidden="true"></i>
<i ng-click="removeManager(entry)" tooltip="Remove manager" class="fa fa-trash settings-template-2 cursor-pointer" aria-hidden="true"></i>
<i ng-click="checkManager(entry)" tooltip="Check connection" class="fa fa-refresh settings-template-2 cursor-pointer" aria-hidden="true"></i>
<i ng-click="toggleEditor(entry)" tooltip="Edit" class="fa fa-pencil settings-template-2 cursor-pointer" aria-hidden="true"></i>
<i ng-click="removeManager(entry)" tooltip="Remove manager" class="fa fa-trash wz-margin-left-7 cursor-pointer" aria-hidden="true"></i>
<i ng-click="checkManager(entry)" tooltip="Check connection" class="fa fa-refresh wz-margin-left-7 cursor-pointer" aria-hidden="true"></i>
<i ng-click="toggleEditor(entry)" tooltip="Edit" class="fa fa-pencil wz-margin-left-7 cursor-pointer" aria-hidden="true"></i>
</p>
</div>
<div layout="row" layout-align="space-between center" ng-if="showEditForm[entry._id] && isEditing">
@ -276,7 +276,7 @@
<strong>Warning:</strong>&nbsp;modifying the index-pattern will change it to ALL of the users.
</div>
<div flex="20" layout="column" class="height-41 md-block md-whiteframe-z1 md-input-margin wz-margin-top-17 wz-margin-right-15 wz-select-input">
<div flex="20" layout="column" class="height-41 md-block wz-margin-top-17 wz-margin-right-15 wz-select-input">
<select flex class="kuiSelect wz-border-none cursor-pointer" ng-model="selectedIndexPattern" ng-change="changeIndexPattern(selectedIndexPattern)"
aria-label="Select index pattern">
<option ng-repeat="indexPattern in indexPatterns" value="{{indexPattern.id}}">{{indexPattern.attributes.title}}</option>