diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-07 10:33:16 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-07 10:33:16 +0100 |
commit | 59aa1e5e7541f604363d2a1ebfd670a5d1db245f (patch) | |
tree | 6903fede247f90d63a7dc676f31efc52c244799d /client/src | |
parent | 0727cab0dfd3d53e5e9c88bfbda6bc0e090d4f12 (diff) | |
download | PeerTube-59aa1e5e7541f604363d2a1ebfd670a5d1db245f.tar.gz PeerTube-59aa1e5e7541f604363d2a1ebfd670a5d1db245f.tar.zst PeerTube-59aa1e5e7541f604363d2a1ebfd670a5d1db245f.zip |
Design confirm dialog
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/app/core/confirm/confirm.component.html | 6 | ||||
-rw-r--r-- | client/src/app/core/confirm/confirm.component.ts | 3 | ||||
-rw-r--r-- | 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 @@ | |||
6 | <button type="button" class="close" aria-label="Close" (click)="cancel()"> | 6 | <button type="button" class="close" aria-label="Close" (click)="cancel()"> |
7 | <span aria-hidden="true">×</span> | 7 | <span aria-hidden="true">×</span> |
8 | </button> | 8 | </button> |
9 | <h4 class="modal-title">{{ title }}</h4> | 9 | <h4 class="title-page title-page-single">{{ title }}</h4> |
10 | </div> | 10 | </div> |
11 | 11 | ||
12 | <div class="modal-body" [innerHtml]="message"></div> | 12 | <div class="modal-body" [innerHtml]="message"></div> |
13 | 13 | ||
14 | <div class="modal-footer"> | 14 | <div class="modal-footer"> |
15 | <button type="button" class="btn btn-default" data-dismiss="modal" (click)="cancel()">Cancel</button> | 15 | <button type="button" class="grey-button" data-dismiss="modal" (click)="cancel()">Cancel</button> |
16 | <button type="button" class="btn btn-primary" (click)="confirm()">Confirm</button> | 16 | <button type="button" class="orange-button" (click)="confirm()">Confirm</button> |
17 | </div> | 17 | </div> |
18 | </div> | 18 | </div> |
19 | </div> | 19 | </div> |
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 { | |||
11 | 11 | ||
12 | @Component({ | 12 | @Component({ |
13 | selector: 'my-confirm', | 13 | selector: 'my-confirm', |
14 | templateUrl: './confirm.component.html' | 14 | templateUrl: './confirm.component.html', |
15 | styles: [ '.button { padding: 0 13px; }' ] | ||
15 | }) | 16 | }) |
16 | export class ConfirmComponent implements OnInit { | 17 | export class ConfirmComponent implements OnInit { |
17 | @ViewChild('confirmModal') confirmModal: ModalDirective | 18 | @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 { | |||
42 | .main-col { | 42 | .main-col { |
43 | margin-left: $menu-width; | 43 | margin-left: $menu-width; |
44 | 44 | ||
45 | .title-page { | ||
46 | color: #000; | ||
47 | font-size: 16px; | ||
48 | display: inline-block; | ||
49 | margin-right: 55px; | ||
50 | font-weight: $font-semibold; | ||
51 | @include disable-default-a-behaviour; | ||
52 | |||
53 | &.active, &.title-page-single { | ||
54 | border-bottom: 2px solid $orange-color; | ||
55 | font-weight: $font-bold; | ||
56 | margin-top: 30px; | ||
57 | margin-bottom: 25px; | ||
58 | } | ||
59 | } | ||
60 | |||
61 | .margin-content { | 45 | .margin-content { |
62 | margin-left: $not-expanded-horizontal-margins; | 46 | margin-left: $not-expanded-horizontal-margins; |
63 | margin-right: $not-expanded-horizontal-margins; | 47 | margin-right: $not-expanded-horizontal-margins; |
@@ -88,6 +72,22 @@ label { | |||
88 | } | 72 | } |
89 | } | 73 | } |
90 | 74 | ||
75 | .title-page { | ||
76 | color: #000; | ||
77 | font-size: 16px; | ||
78 | display: inline-block; | ||
79 | margin-right: 55px; | ||
80 | font-weight: $font-semibold; | ||
81 | @include disable-default-a-behaviour; | ||
82 | |||
83 | &.active, &.title-page-single { | ||
84 | border-bottom: 2px solid $orange-color; | ||
85 | font-weight: $font-bold; | ||
86 | margin-top: 30px; | ||
87 | margin-bottom: 25px; | ||
88 | } | ||
89 | } | ||
90 | |||
91 | // On small screen, menu is absolute and displayed over the page | 91 | // On small screen, menu is absolute and displayed over the page |
92 | @media screen and (max-width: 500px) { | 92 | @media screen and (max-width: 500px) { |
93 | .title-menu-left { | 93 | .title-menu-left { |