Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaned and refactored app buttons #269

Merged
merged 3 commits into from
Feb 20, 2018
Merged

Cleaned and refactored app buttons #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b6e81a
First approach of button refactoring
Feb 20, 2018
0c89994
Removed old styles
Feb 20, 2018
5d67054
Added missing aria-label
Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 23 additions & 61 deletions public/less/buttons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,45 @@
/* ------------------------------------------------------------------------ */
/* ------------------------------- Buttons -------------------------------- */
/* ------------------------------------------------------------------------ */
/* -------------------------------------------------------------------------- */
/* ---------------------- Wazuh stylesheet for buttons ---------------------- */
/* -------------------------------------------------------------------------- */

.button-active.md-button:not([disabled]):hover,
.buttonBlueLightRuleset.md-button:not([disabled]):hover {
background-color: rgb(0,121,165) !important;
}

.buttonBlueLight {
background-color: rgb(0,121,165) !important;
color: white !important;
box-shadow: none !important;
}

.buttonBlueLightSettings,
.buttonBlueLightRuleset {
background-color: #005571 !important;
.wazuh-button {
background-color: rgb(0,85,113) !important;
color: white !important;
box-shadow: none !important;
}

.md-button.md-no-style {
transition: none !important;
}

.md-button.buttonMenu.md-default-theme:not([disabled]):hover {
background-color: rgba(60, 174, 210, 0.7)
}

.md-button.buttonMenu {
background-color: rgb(0,121,165);
color: white;
}

button._md-no-style.md-button.md-ink-ripple {
background: none;
}

.md-button.buttonBlueLight.md-default-theme:not([disabled]):hover {
background-color: rgb(0,121,165);
}

.button-disabled {
background: rgb(0,121,165) !important;
color: white !important;
.wazuh-button.active,
.wazuh-button:not([disabled]):hover {
background-color: rgb(0,121,165) !important;
}

/* Custom styles for Panels and Discover sub-tabs from Overview and Agents */
.tabView button._md-nav-button.md-accent.md-button.md-ink-ripple.md-active.md-primary,
.tabView button._md-nav-button.md-accent.md-button.md-ink-ripple.md-unselected:hover {
background-color: rgb(228, 228, 228);
color: black;
border-radius: 0px;
}

.md-button.buttonBlueLightSettings.md-raised.md-primary:not([disabled]):hover{
background-color: rgb(0,121,165) !important;
color: white !important;
/* Style to override outline on components but avoid hidden shadow on focus*/
:focus:not(.wazuh-button) {
box-shadow: none !important;
}

.md-button:not([disabled]):hover {
background-color: rgb(0,121,165);
/* Custom Manager/Ruleset styles */
.manager-ruleset-rules-rulbtn {
top: -3px;
}

md-select-menu.md-default-theme md-content,
md-select-menu md-content,
.button-active {
background: rgb(0,121,165) !important;
color: white !important;
box-shadow: none !important;
/* Custom Manager/Ruleset styles */
.manager-ruleset-rules-decbtn {
padding: 2px;
top: -3px;
margin-right: 0;
}

/* Play Realtime button styles */
.buttonPlayRealTime {
background-color: #005571 !important;
color: white !important;
/* Custom Manager/Logs styles */
.manager-log-buttonplay {
margin: 20px 7px !important;
}

.buttonPlayRealTime:hover {
background-color: rgb(0,121,165) !important;
margin-top: 20px;
width: 180px;
}
7 changes: 2 additions & 5 deletions public/less/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ md-select:not([disabled]):focus ._md-select-value {
color: white;
}

.horizontal-menu-right .md-whiteframe-1dp,
.horizontal-menu-right .md-whiteframe-z1 {
box-shadow: none !important;
}


md-select.md-default-theme ._md-select-value._md-select-placeholder,
md-select ._md-select-value._md-select-placeholder {
Expand Down Expand Up @@ -167,4 +164,4 @@ md-select .md-select-value.md-select-placeholder {

.cursor-pointer {
cursor: pointer !important;
}
}
39 changes: 0 additions & 39 deletions public/less/manager.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
.horizontal-menu-right .buttonMenu{
background-color: rgb(0,121,165);
color: white;
}

.horizontal-menu-right {
background-color: #f7f7f7
}

.managerConfigurationArrow {
float: right;
margin-top: 6px;
Expand Down Expand Up @@ -118,22 +109,11 @@
min-width: 150px
}

.manager-log-buttonplay {
margin-top: 20px;
width: 180px;
}

.manager-log-top-row {
height: 70px;
padding-right: 8px;
}

.manager-log-buttonplay-i {
margin-top: 0px;
margin-right: 15px;
margin-bottom: 5px;
}

.manager-log-input-1 {
margin-right: 15px;
margin-left: 15px;
Expand Down Expand Up @@ -186,16 +166,6 @@
margin: 5px;
}

.manager-groups-left-panel {
background-color: #E4E4E4;
overflow: auto;
height: 400px;
box-shadow: 0 0px 0px rgba(10, 16, 20, .15), 0 0 0px rgba(10, 16, 20, .12) !important;
margin-left: 0px;
margin-right: 0px;
width: 100%;
}

.manager-groups-search-file {
width: 100%;
height: 35px;
Expand Down Expand Up @@ -283,10 +253,6 @@
font-size: 13px !important;
}

:focus{
box-shadow: none !important;
}

.own-breadcrumb {
padding: 15px 15px 0px 20px !important;
}
Expand Down Expand Up @@ -319,8 +285,3 @@
.margin-8 {
margin: 8px !important;
}

.no-margin-btn {
margin: 0px !important;
width: 15px;
}
24 changes: 24 additions & 0 deletions public/less/not-used.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,27 @@ md-select-menu:not(._md-overflow) md-content {
padding-top: 0px !important;
padding-bottom: 0px !important;
}

.manager-groups-left-panel {
background-color: #E4E4E4;
overflow: auto;
height: 400px;
box-shadow: 0 0px 0px rgba(10, 16, 20, .15), 0 0 0px rgba(10, 16, 20, .12) !important;
margin-left: 0px;
margin-right: 0px;
width: 100%;
}

.horizontal-menu-right .md-whiteframe-1dp,
.horizontal-menu-right .md-whiteframe-z1 {
box-shadow: none !important;
}

.horizontal-menu-right .buttonMenu{
background-color: rgb(0,121,165);
color: white;
}

.horizontal-menu-right {
background-color: #f7f7f7
}
10 changes: 0 additions & 10 deletions public/less/ruleset.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,6 @@
padding-bottom: 0px;
}

.manager-ruleset-rules-rulbtn {
top: -3px;
}

.manager-ruleset-rules-decbtn {
padding: 2px;
top: -3px;
margin-right: 0;
}

.manager-ruleset-rules-mdtoolbar {
margin-top: 13px;
min-height: 38px;
Expand Down
6 changes: 3 additions & 3 deletions public/templates/auth/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ <h3>
<md-input-container class="md-block">
<label>Password</label>
<input required type="password" name="passwordField" ng-model="passwordField" minlength="1" maxlength="100" />
<md-button ng-click="submit(passwordField)" class="buttonBlueLightSettings md-raised md-primary pull-right">
<i class="fa fa-check settings-template-3" aria-hidden="true"></i> Submit
<md-button ng-click="submit(passwordField)" class="wazuh-button md-raised md-primary pull-right" aria-label="Submit password button">
<i class="fa fa-check fa-fw" aria-hidden="true"></i> Submit
</md-button>

<div role="alert" ng-show="errorFromRequest">
Expand All @@ -27,4 +27,4 @@ <h3>
</div>
<div flex layout="row"></div>
</div>
</md-content>
</md-content>
48 changes: 24 additions & 24 deletions public/templates/manager/groups/groups-preview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<!-- Selecting a group -->
<md-card-content ng-if="!lookingGroup" class="groupsFixPadding md-card-content-groups">
<wz-table-header
layout="row"
data="groups"
layout="row"
data="groups"
keys="[
{name:'Name',sortValue:'name',size:20},
{name:'Agents',sortValue:'count',size:15},
Expand All @@ -19,12 +19,12 @@
</wz-table-header>
</md-card-content>

<wz-table
layout="column"
<wz-table
layout="column"
flex
func="loadGroup(index)"
data="groups"
keys="[{col:'name',size:20},{col:'count',size:15},'merged_sum']"
func="loadGroup(index)"
data="groups"
keys="[{col:'name',size:20},{col:'count',size:15},'merged_sum']"
ng-if="!lookingGroup">
</wz-table>

Expand All @@ -39,8 +39,8 @@
<i class="fa fa-file-o"></i> Content
</md-nav-item>
</md-nav-bar>
<md-button class="no-margin-btn buttonPlayRealTime md-primary md-whiteframe-z1 buttonMenu manager-log-buttonplay" ng-click="(file) ? goBackFiles() : goBackGroups()">
<i class="fa fa-reply" aria-hidden="true"></i> Go back
<md-button class="wazuh-button md-raised md-primary manager-log-buttonplay" ng-click="(file) ? goBackFiles() : goBackGroups()" aria-label="Go back button">
<i class="fa fa-reply fa-fw" aria-hidden="true"></i> Go back
</md-button>
</div>

Expand All @@ -49,8 +49,8 @@ <h4>{{ groups.items[selectedGroup].name }}</h4>
</div>

<wz-table-header
layout="row"
data="groupAgents"
layout="row"
data="groupAgents"
keys="[
{name:'ID',sortValue:'id'},
{name:'Name',sortValue:'name'},
Expand All @@ -67,8 +67,8 @@ <h4>{{ groups.items[selectedGroup].name }}</h4>
</div>

<wz-table-header
layout="row"
data="groupFiles"
layout="row"
data="groupFiles"
keys="[
{name:'File',sortValue:'filename',size:30},
{name:'MD5 checksum'}
Expand All @@ -78,22 +78,22 @@ <h4>{{ groups.items[selectedGroup].name }}</h4>

</md-card-content>

<wz-table
layout="column"
<wz-table
layout="column"
flex
full="'agent'"
func="showAgent(agent)"
data="groupAgents"
keys="['id','name','ip','os.platform','os.version','version']"
func="showAgent(agent)"
data="groupAgents"
keys="['id','name','ip','os.platform','os.version','version']"
ng-if="lookingGroup && groupsSelectedTab==='agents'">
</wz-table>

<wz-table
layout="column"
<wz-table
layout="column"
flex
func="showFile(index)"
data="groupFiles"
keys="[{col:'filename',size:30},'hash']"
func="showFile(index)"
data="groupFiles"
keys="[{col:'filename',size:30},'hash']"
ng-if="lookingGroup && groupsSelectedTab==='files' && !file">
</wz-table>

Expand All @@ -113,4 +113,4 @@ <h4>{{ groups.items[selectedGroup].name }} / {{ filename }}</h4>
<md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="groupFiles.busy || groups.busy || groupAgents.busy"></md-progress-linear>
</div>
</div>
</md-content>
</md-content>
Loading