valitydev/wazuh-kibana-app
14
0
Fork 0
mirror of https://github.com/valitydev/wazuh-kibana-app.git synced 2024-11-06 18:05:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
Jesús Ángel González 2018-03-08 13:01:12 +01:00
commit f957d702a9
5 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/directives/wz-menu/wz-menu.less
View File

@ -1,6 +1,6 @@
.wz-menu-nav div md-nav-ink-bar {
left: 0px;
width: 0px;
left: 0px !important;
width: 0px !important;
}
.wz-menu-nav div nav {
@ -67,4 +67,4 @@
.wz-menu-select:focus,
.wz-menu-select > md-select-value {
color: white !important;
}
}

24
public/less/cleaned.less
View File

@ -104,11 +104,7 @@
/* ------------------------------------------------------------------- */
/* ------------------- Wazuh stylesheet for buttons ------------------ */
/* ------------------------------------------------------------------- */
.wazuh-button {
@ -121,14 +117,12 @@
background-color: rgb(0, 121, 165) !important;
}
/* Custom Manager/Ruleset styles */
.manager-ruleset-rules-rulbtn {
top: -3px;
}
/* Custom Manager/Ruleset styles */
.manager-ruleset-rules-decbtn {
@ -137,7 +131,6 @@
margin-right: 0;
}
/* Custom Manager/Logs styles */
.manager-log-buttonplay {
@ -244,13 +237,8 @@ visualization {
padding-right: 17px;
}
/* ------------------------------------------------------------------------ */
/* -------------------------- Manager status ------------------------------ */
/* ------------------------------------------------------------------------ */
.status {
@ -285,26 +273,16 @@ visualization {
float: right;
}
/* ------------------------------------------------------------------------ */
/* ----------------------- Manager Configuration ---------------------- */
/* ------------------------------------------------------------------------ */
.wazuh-greyed {
color: #b7b7b7 !important;
}
/* ------------------------------------------------------------------------ */
/* -------------------------- Manager Tab Styles -------------------------- */
/* ------------------------------------------------------------------------ */
.manager-status-subtitle {
@ -417,4 +395,4 @@ visualization {
border-radius: 0;
box-shadow: 0 2px 2px -1px rgba(0, 0, 0, 0.1) !important;
border: 1px solid #D9D9D9;
}
}

2
public/less/common.less
View File

@ -12,7 +12,7 @@
}
.loading-logo {
position:relative ;
position: relative;
top: -157px;
width: 85px;
text-align: center;

6
public/less/media-queries.less
View File

@ -67,7 +67,7 @@
}
@media (min-width: 960px) {
md-tooltip .md-content {
height: auto !important;
}
md-tooltip .md-content {
height: auto !important;
}
}

4
public/templates/settings/settings.html
View File

@ -5,7 +5,7 @@
</div>
<div class="headBar" layout="row" layout-align="center start">
<md-nav-bar flex class="padding-right-0" md-selected-nav-item="submenuNavItem" nav-bar-aria-label="navigation submenu">
<md-nav-bar flex class="padding-right-0 wz-md-navbar" md-selected-nav-item="submenuNavItem" nav-bar-aria-label="navigation submenu">
<md-nav-item md-nav-click="submenuNavItem = 'api'" name="api">API</md-nav-item>
<md-nav-item md-nav-click="submenuNavItem = 'extensions'" name="extensions">Extensions</md-nav-item>
<md-nav-item md-nav-click="submenuNavItem = 'pattern'" name="pattern">Pattern</md-nav-item>
@ -338,4 +338,4 @@
</md-content>
</div>
</div>
</div>