From 59aa1e5e7541f604363d2a1ebfd670a5d1db245f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 7 Dec 2017 10:33:16 +0100 Subject: [PATCH] Design confirm dialog --- .../app/core/confirm/confirm.component.html | 6 ++-- .../src/app/core/confirm/confirm.component.ts | 3 +- client/src/sass/application.scss | 32 +++++++++---------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/client/src/app/core/confirm/confirm.component.html b/client/src/app/core/confirm/confirm.component.html index 2726af6cc..31b735f97 100644 --- a/client/src/app/core/confirm/confirm.component.html +++ b/client/src/app/core/confirm/confirm.component.html @@ -6,14 +6,14 @@ - +

{{ title }}

diff --git a/client/src/app/core/confirm/confirm.component.ts b/client/src/app/core/confirm/confirm.component.ts index c8e41e233..0515d969a 100644 --- a/client/src/app/core/confirm/confirm.component.ts +++ b/client/src/app/core/confirm/confirm.component.ts @@ -11,7 +11,8 @@ export interface ConfigChangedEvent { @Component({ selector: 'my-confirm', - templateUrl: './confirm.component.html' + templateUrl: './confirm.component.html', + styles: [ '.button { padding: 0 13px; }' ] }) export class ConfirmComponent implements OnInit { @ViewChild('confirmModal') confirmModal: ModalDirective diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index dc1f4dba0..0c999d659 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -42,22 +42,6 @@ label { .main-col { margin-left: $menu-width; - .title-page { - color: #000; - font-size: 16px; - display: inline-block; - margin-right: 55px; - font-weight: $font-semibold; - @include disable-default-a-behaviour; - - &.active, &.title-page-single { - border-bottom: 2px solid $orange-color; - font-weight: $font-bold; - margin-top: 30px; - margin-bottom: 25px; - } - } - .margin-content { margin-left: $not-expanded-horizontal-margins; margin-right: $not-expanded-horizontal-margins; @@ -88,6 +72,22 @@ label { } } +.title-page { + color: #000; + font-size: 16px; + display: inline-block; + margin-right: 55px; + font-weight: $font-semibold; + @include disable-default-a-behaviour; + + &.active, &.title-page-single { + border-bottom: 2px solid $orange-color; + font-weight: $font-bold; + margin-top: 30px; + margin-bottom: 25px; + } +} + // On small screen, menu is absolute and displayed over the page @media screen and (max-width: 500px) { .title-menu-left { -- 2.25.1