Change navigation structure
Change-Id: I12c819293ce1eda188dc9f257ae9370f1b73cb18
Signed-off-by: Iftekharul Islam <iislam@us.ibm.com>
diff --git a/app/common/styles/base/core.scss b/app/common/styles/base/core.scss
index 18f78aa..13ba9e6 100644
--- a/app/common/styles/base/core.scss
+++ b/app/common/styles/base/core.scss
@@ -17,7 +17,6 @@
}
&:hover {
color: $links__hover;
- text-decoration: underline;
}
:focus {
color: $links;
diff --git a/app/common/styles/base/mixins.scss b/app/common/styles/base/mixins.scss
index 3313a88..acc8fd4 100644
--- a/app/common/styles/base/mixins.scss
+++ b/app/common/styles/base/mixins.scss
@@ -57,18 +57,18 @@
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: #b8c1c1'></polygon></svg>");
}
-//Offset allows to subtract a custom padding/margin offset
+
@mixin calcColumn-4 ($offset: 0) {
min-width: calc(100% * (1/4) - #{$offset});
}
-@mixin calcColumn-3 ($offset: 0){
- min-width: calc(100% * (1/3) - #{$offset});
+@mixin calcColumn-3 {
+ min-width: calc(100% * (1/3) - 5px);
}
-@mixin calcSplitColumn ($offset: 0) {
- min-width: calc(100% * (1/2) - #{$offset});
+@mixin calcSplitColumn {
+ min-width: calc(100% * (1/2) - 5px);
}
diff --git a/app/common/styles/directives/app-navigation.scss b/app/common/styles/directives/app-navigation.scss
index 29932e4..99fef2b 100644
--- a/app/common/styles/directives/app-navigation.scss
+++ b/app/common/styles/directives/app-navigation.scss
@@ -1,4 +1,4 @@
-$nav__toplvlWidth: 120px;
+$nav__toplvlWidth: 125px;
$nav__seclvlWidth: 240px;
// Top level navigation
diff --git a/app/common/styles/elements/accordion.scss b/app/common/styles/elements/accordion.scss
index 9cf310f..c3d9e0f 100644
--- a/app/common/styles/elements/accordion.scss
+++ b/app/common/styles/elements/accordion.scss
@@ -7,18 +7,16 @@
background: $darkpurple;
color: $white;
margin-left: 0;
-
.event__actions {
margin-top: 1em;
margin-right: 10px;
@include mediaQuery(medium) {
- margin-top: 0;
+ margin-top: -6px;
}
@include mediaQuery(large) {
margin-right: -20px;
}
}
-
}
.accord-trigger {
diff --git a/app/common/styles/elements/content-search.scss b/app/common/styles/elements/content-search.scss
index fe67af2..3bb3ffa 100644
--- a/app/common/styles/elements/content-search.scss
+++ b/app/common/styles/elements/content-search.scss
@@ -9,7 +9,6 @@
position: relative;
margin-right: 1em;
margin-top: .5em;
- margin-bottom: 1em;
#content__search-input {
margin: 0;
border: 1px solid $lightgrey;
diff --git a/app/common/styles/elements/index.scss b/app/common/styles/elements/index.scss
index d0208ac..d35b79a 100644
--- a/app/common/styles/elements/index.scss
+++ b/app/common/styles/elements/index.scss
@@ -2,10 +2,11 @@
@import "toggle-switch";
@import "toggle-filter";
@import "status";
+@import "tags";
@import "alerts";
@import "inline-confirm";
@import "accordion";
@import "content-search";
@import "paginate";
-@import "export";
-@import "thresholds";
\ No newline at end of file
+@import "thresholds";
+@import "export";
\ No newline at end of file
diff --git a/app/common/styles/elements/paginate.scss b/app/common/styles/elements/paginate.scss
index 2df88cc..461b854 100644
--- a/app/common/styles/elements/paginate.scss
+++ b/app/common/styles/elements/paginate.scss
@@ -11,6 +11,7 @@
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
+ padding: 0 10px;
}
.pagination li { background-color: transparent; list-style-type: none; }
@@ -65,15 +66,15 @@
}
.pagination li:first-child a::before,
-.pagination li:last-child a::after { content: "\027A0"; }
+
.pagination li:nth-of-type(2) a::before,
-.pagination li:nth-last-of-type(2) a::after { content: "\0279E"; }
+
.pagination li:first-child a::before,
.pagination li:nth-of-type(2) a::before { -webkit-transform: rotate(180deg); transform: rotate(180deg); }
-.pagination li.current a {
+.pagination li.current a, .pagination li.active a {
padding-top:.25em;
color: $white;
background-color: $lightbg__primary;
diff --git a/app/common/styles/elements/thresholds.scss b/app/common/styles/elements/thresholds.scss
index e8192b3..06e872f 100644
--- a/app/common/styles/elements/thresholds.scss
+++ b/app/common/styles/elements/thresholds.scss
@@ -3,10 +3,9 @@
$threshColorLighten: 5%;
.threshold-chart__wrapper {
position: relative;
- padding-bottom: 2em;
.threshold__label {
position: absolute;
- top: 25%;
+ top: 38%;
transform: translateY(-50%);
font-weight: 700;
&.low {
@@ -24,7 +23,7 @@
.threshold-chart {
position: relative;
line-height: 0;
- padding: .8em 0 2em 3px;
+ padding: .8em 0 2em 0;
margin: 0 2.5em;
//margin: 0 auto;
.threshold__marker {
@@ -46,12 +45,7 @@
white-space: nowrap;
}
}
- .threshold__marker {
- &.thresh__low-critical .threshold__value {
- left: 0;
- @include slowTransition-all;
- }
- }
+
.threshold {
display: inline-block;
background-color: $thresh-normal;
diff --git a/app/common/styles/layout/content.scss b/app/common/styles/layout/content.scss
index 18c34b9..e36fa66 100644
--- a/app/common/styles/layout/content.scss
+++ b/app/common/styles/layout/content.scss
@@ -11,6 +11,6 @@
}
section.row {
- //padding-left: 0;
- //padding-right: 0;
+ padding-left: 0;
+ padding-right: 0;
}
\ No newline at end of file