diff --git a/src/app/pages/dashboard/dashboard.component.scss b/src/app/pages/dashboard/dashboard.component.scss index de60fd2..fb26b1d 100644 --- a/src/app/pages/dashboard/dashboard.component.scss +++ b/src/app/pages/dashboard/dashboard.component.scss @@ -32,7 +32,7 @@ } &.-select { - background-color: rgba($color-1, .5); + background-color: rgba($color-1, 1); color: $color-3; } } diff --git a/src/app/shared/menu/menu.component.html b/src/app/shared/menu/menu.component.html index 2d2e8e2..47160d5 100644 --- a/src/app/shared/menu/menu.component.html +++ b/src/app/shared/menu/menu.component.html @@ -1,14 +1,14 @@
-
\ No newline at end of file + diff --git a/src/app/shared/menu/menu.component.scss b/src/app/shared/menu/menu.component.scss index 59082ac..28fce0f 100644 --- a/src/app/shared/menu/menu.component.scss +++ b/src/app/shared/menu/menu.component.scss @@ -10,6 +10,7 @@ padding: 40px 0 20px; position: fixed; width: 100px; + box-shadow: 1px 0px 5px #222; .sidebar-top { @@ -24,21 +25,6 @@ font-size: $font-size-big; padding: 0 30px 25px; } - - &::before { - background-color: $color-3; - content: ''; - display: block; - height: 2px; - position: absolute; - top: -10px; - width: 40px; - - @media #{$mq-tablet} { - height: 4px; - width: 84px; - } - } } .sidebar-option { @@ -68,7 +54,7 @@ app-button { display: block; - margin: 55px auto 0; + margin: 20px auto 0; width: calc(100% - 50px); } } @@ -77,4 +63,4 @@ padding: 40px 0 45px; width: 250px; } -} \ No newline at end of file +} diff --git a/src/app/shared/plugin/plugin.component.html b/src/app/shared/plugin/plugin.component.html index 0dfa07d..2cc390b 100644 --- a/src/app/shared/plugin/plugin.component.html +++ b/src/app/shared/plugin/plugin.component.html @@ -4,6 +4,8 @@

{{plugin.name}} + / activated_ + / desactivated_

@@ -11,8 +13,8 @@

File/module: {{plugin.mainFile}}

- +
- \ No newline at end of file + diff --git a/src/app/shared/plugin/plugin.component.scss b/src/app/shared/plugin/plugin.component.scss index 7ee88eb..61f8f48 100644 --- a/src/app/shared/plugin/plugin.component.scss +++ b/src/app/shared/plugin/plugin.component.scss @@ -11,15 +11,27 @@ position: relative; width: 100%; + .active-text { + font-size: $font-size-normal; + color: $color-9; + font-weight: $font-weight-bold; + } + + .desactive-text { + font-size: $font-size-normal; + color: $color-7; + font-weight: $font-weight-bold; + } + .button-refresh { background-color: $color-3; border: 1px solid $color-6; cursor: pointer; font-family: $font-family-1; - padding: 10px 15px; + padding: 5px 15px; position: absolute; right: -1px; - top: -19px; + top: -25px; transition: .2s; &:hover { @@ -87,15 +99,15 @@ } &:last-child { - border-bottom: 8px solid $color-7; + border-bottom: 8px solid $color-5; &:active { border-bottom: 4px solid $color-7; top: 5px; } - &.green-active { - border-bottom: 8px solid $color-9; + &.orange-active { + border-bottom: 8px solid $color-5; &:active { border-bottom: 4px solid $color-9; @@ -105,4 +117,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/assets/styles/_base.scss b/src/assets/styles/_base.scss index 0c47ee9..677962a 100644 --- a/src/assets/styles/_base.scss +++ b/src/assets/styles/_base.scss @@ -33,6 +33,7 @@ body { a { text-decoration: none; + color: $color-2; } h1, diff --git a/src/assets/styles/_settings.scss b/src/assets/styles/_settings.scss index 5cecee3..94742c7 100644 --- a/src/assets/styles/_settings.scss +++ b/src/assets/styles/_settings.scss @@ -35,14 +35,14 @@ $font-weight-normal: 400; $font-weight-bold: 700; // Colors -$color-1: #3c61e5; -$color-2: #111; +$color-1: #ec6f53; +$color-2: #222; $color-3: #fff; $color-4: #f7f7f7; $color-5: #d5dee5; $color-6: #858a94; $color-7: #ff4646; -$color-8: #2448ca; +$color-8: #ff8165; $color-9: #5bbd66; diff --git a/src/assets/styles/mapglyphs.scss b/src/assets/styles/mapglyphs.scss index f49b302..f6a0ad7 100755 --- a/src/assets/styles/mapglyphs.scss +++ b/src/assets/styles/mapglyphs.scss @@ -47,7 +47,7 @@ font-size: 140px; &::after { - background-color: #3c61e5; + background-color: #ec6f53; content: ''; display: inline-block; height: 50px; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ace5cb1..59f736d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,5 +5,5 @@ export const environment = { production: false, - apiUrl: 'https://staging-api.globalforestwatch.org' + apiUrl: 'http://staging-api.globalforestwatch.org' };