diff options
author | Chocobozzz <me@florianbigard.com> | 2019-01-16 16:05:40 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-01-17 10:38:18 +0100 |
commit | 457bb213b273a9b206cc5654eb085cede4e916ad (patch) | |
tree | 6b1a317872a4ca27b5d0dbe543452320b26aacff /client/src/app/videos/+video-edit/shared | |
parent | 848f499def54db2dd36437ef0dfb74dd5041c23b (diff) | |
download | PeerTube-457bb213b273a9b206cc5654eb085cede4e916ad.tar.gz PeerTube-457bb213b273a9b206cc5654eb085cede4e916ad.tar.zst PeerTube-457bb213b273a9b206cc5654eb085cede4e916ad.zip |
Refactor how we use icons
Inject them in an angular component so we can easily change their color
Diffstat (limited to 'client/src/app/videos/+video-edit/shared')
3 files changed, 6 insertions, 15 deletions
diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html index 30aefdbfc..19043eee6 100644 --- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html +++ b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | <div class="modal-header"> | 4 | <div class="modal-header"> |
5 | <h4 i18n class="modal-title">Add caption</h4> | 5 | <h4 i18n class="modal-title">Add caption</h4> |
6 | <span class="close" aria-label="Close" role="button" (click)="hide()"></span> | 6 | <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon> |
7 | </div> | 7 | </div> |
8 | 8 | ||
9 | <div class="modal-body"> | 9 | <div class="modal-body"> |
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html index bd52d686a..092c0e862 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html | |||
@@ -143,7 +143,7 @@ | |||
143 | 143 | ||
144 | <div class="captions-header"> | 144 | <div class="captions-header"> |
145 | <a (click)="openAddCaptionModal()" class="create-caption"> | 145 | <a (click)="openAddCaptionModal()" class="create-caption"> |
146 | <span class="icon icon-add"></span> | 146 | <my-global-icon iconName="add"></my-global-icon> |
147 | <ng-container i18n>Add another caption</ng-container> | 147 | <ng-container i18n>Add another caption</ng-container> |
148 | </a> | 148 | </a> |
149 | </div> | 149 | </div> |
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index 25db8e8ed..cc32fb254 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss | |||
@@ -42,7 +42,7 @@ my-peertube-checkbox { | |||
42 | text-align: right; | 42 | text-align: right; |
43 | 43 | ||
44 | .create-caption { | 44 | .create-caption { |
45 | @include create-button('../../../../assets/images/global/add.svg'); | 45 | @include create-button; |
46 | } | 46 | } |
47 | } | 47 | } |
48 | 48 | ||
@@ -100,13 +100,14 @@ my-peertube-checkbox { | |||
100 | display: inline-block; | 100 | display: inline-block; |
101 | margin-right: 25px; | 101 | margin-right: 25px; |
102 | 102 | ||
103 | color: #585858; | 103 | color: $grey-foreground-color; |
104 | font-size: 15px; | 104 | font-size: 15px; |
105 | } | 105 | } |
106 | 106 | ||
107 | .submit-button { | 107 | .submit-button { |
108 | @include peertube-button; | 108 | @include peertube-button; |
109 | @include orange-button; | 109 | @include orange-button; |
110 | @include button-with-icon(20px, 1px); | ||
110 | 111 | ||
111 | display: inline-block; | 112 | display: inline-block; |
112 | 113 | ||
@@ -119,16 +120,6 @@ my-peertube-checkbox { | |||
119 | color: inherit; | 120 | color: inherit; |
120 | font-weight: $font-semibold; | 121 | font-weight: $font-semibold; |
121 | } | 122 | } |
122 | |||
123 | .icon.icon-validate { | ||
124 | @include icon(20px); | ||
125 | |||
126 | cursor: inherit; | ||
127 | position: relative; | ||
128 | top: -1px; | ||
129 | margin-right: 4px; | ||
130 | background-image: url('../../../../assets/images/global/validate.svg'); | ||
131 | } | ||
132 | } | 123 | } |
133 | } | 124 | } |
134 | 125 | ||
@@ -202,7 +193,7 @@ p-calendar { | |||
202 | top: -1px; | 193 | top: -1px; |
203 | height: auto !important; | 194 | height: auto !important; |
204 | vertical-align: middle !important; | 195 | vertical-align: middle !important; |
205 | fill: #585858 !important; | 196 | fill: $grey-foreground-color !important; |
206 | } | 197 | } |
207 | 198 | ||
208 | &:hover { | 199 | &:hover { |