diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-03-16 20:59:56 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-03-16 20:59:56 +0100 |
commit | 763bed9ba0f70eff8bb1834d6d5dcf44aacac147 (patch) | |
tree | 318ff87ac63b0784e5945c4b8e439f8a454bca6c | |
parent | a0382b70d03213f7bfa342982bbeafc8c85f1d73 (diff) | |
download | PeerTube-763bed9ba0f70eff8bb1834d6d5dcf44aacac147.tar.gz PeerTube-763bed9ba0f70eff8bb1834d6d5dcf44aacac147.tar.zst PeerTube-763bed9ba0f70eff8bb1834d6d5dcf44aacac147.zip |
Some small css modifications
5 files changed, 19 insertions, 22 deletions
diff --git a/client/angular/app/app.component.scss b/client/angular/app/app.component.scss index 346460a31..6e36c73e3 100644 --- a/client/angular/app/app.component.scss +++ b/client/angular/app/app.component.scss | |||
@@ -29,6 +29,6 @@ menu { | |||
29 | } | 29 | } |
30 | } | 30 | } |
31 | 31 | ||
32 | footer { | 32 | .panel_block:not(:last-child) { |
33 | margin-top: 30px; | 33 | border-bottom: 1px solid rgba(0, 0, 0, 0.1); |
34 | } | 34 | } |
diff --git a/client/angular/videos/components/add/videos-add.component.html b/client/angular/videos/components/add/videos-add.component.html index 5f28ae650..4252d7abd 100644 --- a/client/angular/videos/components/add/videos-add.component.html +++ b/client/angular/videos/components/add/videos-add.component.html | |||
@@ -12,12 +12,14 @@ | |||
12 | </div> | 12 | </div> |
13 | </div> | 13 | </div> |
14 | 14 | ||
15 | <div class="btn btn-default btn-file"> | 15 | <div class="form-group"> |
16 | <span>Select the video...</span> | 16 | <div class="btn btn-default btn-file"> |
17 | <input type="file" name="input_video" id="input_video"> | 17 | <span>Select the video...</span> |
18 | </div> | 18 | <input type="file" name="input_video" id="input_video"> |
19 | </div> | ||
19 | 20 | ||
20 | <span *ngIf="fileToUpload">{{ fileToUpload.name }}</span> | 21 | <span *ngIf="fileToUpload">{{ fileToUpload.name }}</span> |
22 | </div> | ||
21 | 23 | ||
22 | <div class="form-group"> | 24 | <div class="form-group"> |
23 | <label for="description">Description</label> | 25 | <label for="description">Description</label> |
diff --git a/client/angular/videos/components/add/videos-add.component.scss b/client/angular/videos/components/add/videos-add.component.scss index f4187088b..01195f017 100644 --- a/client/angular/videos/components/add/videos-add.component.scss +++ b/client/angular/videos/components/add/videos-add.component.scss | |||
@@ -23,3 +23,11 @@ | |||
23 | display: inline-block; | 23 | display: inline-block; |
24 | margin-left: 10px; | 24 | margin-left: 10px; |
25 | } | 25 | } |
26 | |||
27 | .form-group { | ||
28 | margin-bottom: 10px; | ||
29 | } | ||
30 | |||
31 | #progress { | ||
32 | margin-bottom: 10px; | ||
33 | } | ||
diff --git a/client/angular/videos/components/add/videos-add.component.ts b/client/angular/videos/components/add/videos-add.component.ts index 8ff6cfec8..3a7b02133 100644 --- a/client/angular/videos/components/add/videos-add.component.ts +++ b/client/angular/videos/components/add/videos-add.component.ts | |||
@@ -36,7 +36,7 @@ export class VideosAddComponent implements OnInit { | |||
36 | 36 | ||
37 | progressall: (e, data) => { | 37 | progressall: (e, data) => { |
38 | this.progressBar.value = data.loaded; | 38 | this.progressBar.value = data.loaded; |
39 | this.progressBar.max= data.total; | 39 | this.progressBar.max = data.total; |
40 | }, | 40 | }, |
41 | 41 | ||
42 | done: (e, data) => { | 42 | done: (e, data) => { |
diff --git a/client/stylesheets/base.scss b/client/stylesheets/base.scss index 14da74e0c..5c56e9507 100644 --- a/client/stylesheets/base.scss +++ b/client/stylesheets/base.scss | |||
@@ -7,18 +7,5 @@ footer { | |||
7 | padding-top: 10px; | 7 | padding-top: 10px; |
8 | text-align: center; | 8 | text-align: center; |
9 | font-size: small; | 9 | font-size: small; |
10 | } | 10 | margin-top: 30px; |
11 | |||
12 | .search-group { | ||
13 | .search-btn { | ||
14 | position: relative; | ||
15 | left: -40px; | ||
16 | top: 0; | ||
17 | |||
18 | &:hover { text-decoration: none; } | ||
19 | } | ||
20 | } | ||
21 | |||
22 | .panel_block:not(:last-child) { | ||
23 | border-bottom: 1px solid rgba(0, 0, 0, 0.1); | ||
24 | } | 11 | } |