aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-07 10:02:01 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-12-07 10:02:01 +0100
commit7b272fd73f1ea67e83c1924f2cc33503b8759811 (patch)
tree5c171a051c25878bd8010eab0f3ed503efe0da1c /client/src
parent41c3dfac99c41d2daec2a55554bb517ed5d59fc4 (diff)
downloadPeerTube-7b272fd73f1ea67e83c1924f2cc33503b8759811.tar.gz
PeerTube-7b272fd73f1ea67e83c1924f2cc33503b8759811.tar.zst
PeerTube-7b272fd73f1ea67e83c1924f2cc33503b8759811.zip
Fix dropdown menu in video watch
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/account/account-settings/account-change-password/account-change-password.component.scss2
-rw-r--r--client/src/app/account/account-settings/account-details/account-details.component.scss1
-rw-r--r--client/src/app/account/account-videos/account-videos.component.scss2
-rw-r--r--client/src/app/header/header.component.scss5
-rw-r--r--client/src/app/login/login.component.scss1
-rw-r--r--client/src/app/signup/signup.component.scss1
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html34
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss92
-rw-r--r--client/src/assets/images/global/edit.svg (renamed from client/src/assets/images/account/edit.svg)0
-rw-r--r--client/src/assets/images/video/alert.svg16
-rw-r--r--client/src/assets/images/video/dislike-grey.svg (renamed from client/src/assets/images/video/dislike.svg)0
-rw-r--r--client/src/assets/images/video/dislike-white.svg14
-rw-r--r--client/src/assets/images/video/download.svg16
-rw-r--r--client/src/assets/images/video/eye-closed.svg18
-rw-r--r--client/src/assets/images/video/like-grey.svg (renamed from client/src/assets/images/video/like.svg)0
-rw-r--r--client/src/assets/images/video/like-white.svg15
-rw-r--r--client/src/sass/_mixins.scss24
-rw-r--r--client/src/sass/_variables.scss12
-rw-r--r--client/src/sass/application.scss14
19 files changed, 194 insertions, 73 deletions
diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss b/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss
index 75827abbf..7a4fdb34d 100644
--- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss
+++ b/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss
@@ -9,6 +9,8 @@ input[type=password] {
9 9
10input[type=submit] { 10input[type=submit] {
11 @include peertube-button; 11 @include peertube-button;
12 @include orange-button;
13
12 margin-top: 15px; 14 margin-top: 15px;
13} 15}
14 16
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.scss b/client/src/app/account/account-settings/account-details/account-details.component.scss
index 687166d9e..5c369f968 100644
--- a/client/src/app/account/account-settings/account-details/account-details.component.scss
+++ b/client/src/app/account/account-settings/account-details/account-details.component.scss
@@ -6,6 +6,7 @@ label {
6 6
7input[type=submit] { 7input[type=submit] {
8 @include peertube-button; 8 @include peertube-button;
9 @include orange-button;
9 10
10 display: block; 11 display: block;
11 margin-top: 15px; 12 margin-top: 15px;
diff --git a/client/src/app/account/account-videos/account-videos.component.scss b/client/src/app/account/account-videos/account-videos.component.scss
index e76e3f4e5..04aaa8e89 100644
--- a/client/src/app/account/account-videos/account-videos.component.scss
+++ b/client/src/app/account/account-videos/account-videos.component.scss
@@ -42,7 +42,7 @@
42 top: -2px; 42 top: -2px;
43 43
44 &.icon-edit { 44 &.icon-edit {
45 background-image: url('../../../assets/images/account/edit.svg'); 45 background-image: url('../../../assets/images/global/edit.svg');
46 } 46 }
47 47
48 &.icon-delete-grey { 48 &.icon-delete-grey {
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss
index 7ba8ef26c..e7761a9df 100644
--- a/client/src/app/header/header.component.scss
+++ b/client/src/app/header/header.component.scss
@@ -10,7 +10,7 @@
10 10
11.icon.icon-search { 11.icon.icon-search {
12 display: inline-block; 12 display: inline-block;
13 background: url('../../../assets/images/header/search.svg') no-repeat; 13 background: url('../../assets/images/header/search.svg') no-repeat;
14 background-size: contain; 14 background-size: contain;
15 width: 25px; 15 width: 25px;
16 height: 21px; 16 height: 21px;
@@ -24,12 +24,13 @@
24 24
25.upload-button { 25.upload-button {
26 @include peertube-button-link; 26 @include peertube-button-link;
27 @include orange-button;
27 28
28 margin-right: 25px; 29 margin-right: 25px;
29 30
30 .icon.icon-upload { 31 .icon.icon-upload {
31 display: inline-block; 32 display: inline-block;
32 background: url('../../../assets/images/header/upload.svg') no-repeat; 33 background: url('../../assets/images/header/upload.svg') no-repeat;
33 background-size: contain; 34 background-size: contain;
34 width: 22px; 35 width: 22px;
35 height: 24px; 36 height: 24px;
diff --git a/client/src/app/login/login.component.scss b/client/src/app/login/login.component.scss
index fd6981c59..3b4326de4 100644
--- a/client/src/app/login/login.component.scss
+++ b/client/src/app/login/login.component.scss
@@ -5,4 +5,5 @@ input:not([type=submit]) {
5 5
6input[type=submit] { 6input[type=submit] {
7 @include peertube-button; 7 @include peertube-button;
8 @include orange-button;
8} 9}
diff --git a/client/src/app/signup/signup.component.scss b/client/src/app/signup/signup.component.scss
index fd6981c59..3b4326de4 100644
--- a/client/src/app/signup/signup.component.scss
+++ b/client/src/app/signup/signup.component.scss
@@ -5,4 +5,5 @@ input:not([type=submit]) {
5 5
6input[type=submit] { 6input[type=submit] {
7 @include peertube-button; 7 @include peertube-button;
8 @include orange-button;
8} 9}
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 88d89f9e4..583da4685 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -14,18 +14,12 @@
14 <div class="video-info-name">{{ video.name }}</div> 14 <div class="video-info-name">{{ video.name }}</div>
15 15
16 <div class="video-info-actions"> 16 <div class="video-info-actions">
17 <div class="action-button"> 17 <div *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" class="action-button">
18 <span 18 <span class="icon icon-like" title="Like this video" (click)="setLike()"></span>
19 class="icon icon-like" title="Like this video"
20 [ngClass]="{ 'interactive': isUserLoggedIn(), 'activated': userRating === 'like' }" (click)="setLike()"
21 ></span>
22 </div> 19 </div>
23 20
24 <div class="action-button"> 21 <div *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" class="action-button">
25 <span 22 <span class="icon icon-dislike" title="Dislike this video" (click)="setDislike()"></span>
26 class="icon icon-dislike" title="Dislike this video"
27 [ngClass]="{ 'interactive': isUserLoggedIn(), 'activated': userRating === 'dislike' }" (click)="setDislike()"
28 ></span>
29 </div> 23 </div>
30 24
31 <div (click)="showShareModal()" class="action-button"> 25 <div (click)="showShareModal()" class="action-button">
@@ -39,33 +33,21 @@
39 </div> 33 </div>
40 34
41 <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button"> 35 <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button">
42 <li *ngIf="canUserUpdateVideo()" role="menuitem">
43 <a class="dropdown-item" title="Update this video" href="#" [routerLink]="[ '/videos/edit', video.uuid ]">
44 <span class="glyphicon glyphicon-pencil"></span> Update
45 </a>
46 </li>
47
48 <li role="menuitem"> 36 <li role="menuitem">
49 <a class="dropdown-item" title="Download the video" href="#" (click)="showDownloadModal($event)"> 37 <a class="dropdown-item" title="Download the video" href="#" (click)="showDownloadModal($event)">
50 <span class="glyphicon glyphicon-download-alt"></span> Download 38 <span class="icon icon-download"></span> Download
51 </a> 39 </a>
52 </li> 40 </li>
53 41
54 <li *ngIf="isUserLoggedIn()" role="menuitem"> 42 <li *ngIf="isUserLoggedIn()" role="menuitem">
55 <a class="dropdown-item" title="Report this video" href="#" (click)="showReportModal($event)"> 43 <a class="dropdown-item" title="Report this video" href="#" (click)="showReportModal($event)">
56 <span class="glyphicon glyphicon-alert"></span> Report 44 <span class="icon icon-alert"></span> Report
57 </a>
58 </li>
59
60 <li *ngIf="isVideoRemovable()" role="menuitem">
61 <a class="dropdown-item" title="Delete this video" href="#" (click)="removeVideo($event)">
62 <span class="glyphicon glyphicon-remove"></span> Delete
63 </a> 45 </a>
64 </li> 46 </li>
65 47
66 <li *ngIf="isVideoBlacklistable()" role="menuitem"> 48 <li *ngIf="isVideoBlacklistable()" role="menuitem">
67 <a class="dropdown-item" title="Blacklist this video" href="#" (click)="blacklistVideo($event)"> 49 <a class="dropdown-item" title="Blacklist this video" href="#" (click)="blacklistVideo($event)">
68 <span class="glyphicon glyphicon-eye-close"></span> Blacklist 50 <span class="icon icon-blacklist"></span> Blacklist
69 </a> 51 </a>
70 </li> 52 </li>
71 </ul> 53 </ul>
@@ -78,7 +60,7 @@
78 {{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views 60 {{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
79 </div> 61 </div>
80 62
81 <div class="video-info-likes-dislikes-bar"> 63 <div *ngIf="video.likes !== 0 || video.dislikes !== 0" class="video-info-likes-dislikes-bar">
82 <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div> 64 <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
83 </div> 65 </div>
84 </div> 66 </div>
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index d7f47ed75..3f36410f4 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -6,6 +6,11 @@
6 #video-element { 6 #video-element {
7 width: 888px; 7 width: 888px;
8 height: 500px; 8 height: 500px;
9
10 // VideoJS create an inner video player
11 video {
12 outline: 0;
13 }
9 } 14 }
10} 15}
11 16
@@ -38,47 +43,78 @@
38 .video-info-actions { 43 .video-info-actions {
39 .action-button { 44 .action-button {
40 @include peertube-button; 45 @include peertube-button;
46 @include grey-button;
41 47
42 font-size: 15px; 48 font-size: 15px;
43 font-weight: $font-semibold; 49 font-weight: $font-semibold;
44 color: #585858;
45 background-color: #E5E5E5;
46 display: inline-block; 50 display: inline-block;
47 padding: 0 10px 0 10px; 51 padding: 0 10px 0 10px;
48 52
49 &:hover { 53 .icon {
50 background-color: #EFEFEF; 54 display: inline-block;
55 background-repeat: no-repeat;
56 background-size: contain;
57 width: 21px;
58 height: 21px;
59 vertical-align: middle;
60 position: relative;
61 top: -2px;
62
63 &.icon-like {
64 background-image: url('../../../assets/images/video/like-grey.svg');
65 }
66
67 &.icon-dislike {
68 background-image: url('../../../assets/images/video/dislike-grey.svg');
69 }
70
71 &.icon-share {
72 background-image: url('../../../assets/images/video/share.svg');
73 }
74
75 &.icon-more {
76 background-image: url('../../../assets/images/video/more.svg');
77 }
51 } 78 }
52 }
53 79
54 .action-more { 80 &.activated {
55 display: inline-block; 81 @include orange-button;
56 }
57 82
58 .icon { 83 .icon-like {
59 display: inline-block; 84 background-image: url('../../../assets/images/video/like-white.svg');
60 background-repeat: no-repeat; 85 }
61 background-size: contain;
62 width: 21px;
63 height: 21px;
64 vertical-align: middle;
65 position: relative;
66 top: -2px;
67
68 &.icon-like {
69 background-image: url('../../../assets/images/video/like.svg');
70 }
71 86
72 &.icon-dislike { 87 .icon-dislike {
73 background-image: url('../../../assets/images/video/dislike.svg'); 88 background-image: url('../../../assets/images/video/dislike-white.svg');
89 }
74 } 90 }
91 }
75 92
76 &.icon-share { 93 .action-more {
77 background-image: url('../../../assets/images/video/share.svg'); 94 display: inline-block;
78 }
79 95
80 &.icon-more { 96 .dropdown-menu .icon {
81 background-image: url('../../../assets/images/video/more.svg'); 97 display: inline-block;
98 background-repeat: no-repeat;
99 background-size: contain;
100 width: 21px;
101 height: 21px;
102 vertical-align: middle;
103 margin-right: 5px;
104 position: relative;
105 top: -1px;
106
107 &.icon-download {
108 background-image: url('../../../assets/images/video/download.svg');
109 }
110
111 &.icon-alert {
112 background-image: url('../../../assets/images/video/alert.svg');
113 }
114
115 &.icon-blacklist {
116 background-image: url('../../../assets/images/video/eye-closed.svg');
117 }
82 } 118 }
83 } 119 }
84 } 120 }
diff --git a/client/src/assets/images/account/edit.svg b/client/src/assets/images/global/edit.svg
index 23ece68f1..23ece68f1 100644
--- a/client/src/assets/images/account/edit.svg
+++ b/client/src/assets/images/global/edit.svg
diff --git a/client/src/assets/images/video/alert.svg b/client/src/assets/images/video/alert.svg
new file mode 100644
index 000000000..6d3af029f
--- /dev/null
+++ b/client/src/assets/images/video/alert.svg
@@ -0,0 +1,16 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
4 <title>alert</title>
5 <desc>Created with Sketch.</desc>
6 <defs></defs>
7 <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
8 <g id="Artboard-4" transform="translate(-48.000000, -467.000000)">
9 <g id="161" transform="translate(48.000000, 467.000000)">
10 <path d="M12.8715755,3.50973876 L12,1.96027114 L11.1284245,3.50973876 L2.12842446,19.5097388 L1.29015252,21 L3,21 L21,21 L22.7098475,21 L21.8715755,19.5097388 L12.8715755,3.50973876 Z" id="Triangle-2" stroke="#585858" stroke-width="2" stroke-linejoin="round"></path>
11 <path d="M12,17.75 C12.6903559,17.75 13.25,17.1903559 13.25,16.5 C13.25,15.8096441 12.6903559,15.25 12,15.25 C11.3096441,15.25 10.75,15.8096441 10.75,16.5 C10.75,17.1903559 11.3096441,17.75 12,17.75 Z" id="Oval-8" fill="#585858"></path>
12 <rect id="Rectangle-3" fill="#585858" x="11" y="9" width="2" height="5" rx="1"></rect>
13 </g>
14 </g>
15 </g>
16</svg>
diff --git a/client/src/assets/images/video/dislike.svg b/client/src/assets/images/video/dislike-grey.svg
index 56a7908fb..56a7908fb 100644
--- a/client/src/assets/images/video/dislike.svg
+++ b/client/src/assets/images/video/dislike-grey.svg
diff --git a/client/src/assets/images/video/dislike-white.svg b/client/src/assets/images/video/dislike-white.svg
new file mode 100644
index 000000000..cfc6eaa1f
--- /dev/null
+++ b/client/src/assets/images/video/dislike-white.svg
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <defs></defs>
4 <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
5 <g id="Artboard-4" transform="translate(-752.000000, -1090.000000)" stroke="#ffffff" stroke-width="2">
6 <g id="Extras" transform="translate(48.000000, 1046.000000)">
7 <g id="thumbs-down" transform="translate(704.000000, 44.000000)">
8 <path d="M6,16 C6,18.5 6.5,21 8,21 L16.9938335,21 C17.5495239,21 18.1819788,20.5956028 18.4072817,20.0949295 L20.8562951,14.6526776 C21.7640882,12.6353595 20.7154925,11 18.5092545,11 L15.5,11 C15.5,11 18.5,5 15,5 C12.5,5 11.5,11 8,11 C6.5,11 6,13.5 6,16 Z" id="Path-188" stroke-linejoin="round" transform="translate(13.591488, 13.000000) scale(1, -1) translate(-13.591488, -13.000000) "></path>
9 <path d="M4,4.5 C4,4.5 3,7 3,10 C3,13 4,15.5 4,15.5" id="Path-189" transform="translate(3.500000, 10.000000) scale(1, -1) translate(-3.500000, -10.000000) "></path>
10 </g>
11 </g>
12 </g>
13 </g>
14</svg>
diff --git a/client/src/assets/images/video/download.svg b/client/src/assets/images/video/download.svg
new file mode 100644
index 000000000..5b0cca5ef
--- /dev/null
+++ b/client/src/assets/images/video/download.svg
@@ -0,0 +1,16 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
4 <title>download</title>
5 <desc>Created with Sketch.</desc>
6 <defs></defs>
7 <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
8 <g id="Artboard-4" transform="translate(-180.000000, -291.000000)" stroke="#585858" stroke-width="2">
9 <g id="84" transform="translate(180.000000, 291.000000)">
10 <path d="M12,3 L12,15" id="Path-58"></path>
11 <polyline id="Path-59" stroke-linejoin="round" transform="translate(12.000000, 14.000000) rotate(-270.000000) translate(-12.000000, -14.000000) " points="9 8 15 14 9 20"></polyline>
12 <path d="M3,18 L3,20.0590859 C3,20.6127331 3.44494889,21.0615528 3.99340349,21.0615528 L20.0067018,21.0615528 C20.5553434,21.0615528 21.0001052,20.6098102 21.0001051,20.0590859 L21.0001049,18" id="Path-12" stroke-linejoin="round"></path>
13 </g>
14 </g>
15 </g>
16</svg>
diff --git a/client/src/assets/images/video/eye-closed.svg b/client/src/assets/images/video/eye-closed.svg
new file mode 100644
index 000000000..c5b739659
--- /dev/null
+++ b/client/src/assets/images/video/eye-closed.svg
@@ -0,0 +1,18 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <defs></defs>
4 <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
5 <g id="Artboard-4" transform="translate(-796.000000, -1046.000000)" stroke="#585858" stroke-width="2">
6 <g id="Extras" transform="translate(48.000000, 1046.000000)">
7 <g id="eye-closed" transform="translate(760.000000, 12.000000) scale(1, -1) translate(-760.000000, -12.000000) translate(748.000000, 0.000000)">
8 <path d="M2,14 C2,14 5,7 12,7 C19,7 22,14 22,14" id="Path-80" stroke-linejoin="round"></path>
9 <path d="M12,7 L12,5" id="Path-81"></path>
10 <path d="M18,8.5 L19,7" id="Path-81"></path>
11 <path d="M21,12 L22.5,11" id="Path-81"></path>
12 <path d="M1.5,12 L3,11" id="Path-81" transform="translate(2.250000, 11.500000) scale(1, -1) translate(-2.250000, -11.500000) "></path>
13 <path d="M5,8.5 L6,7" id="Path-81" transform="translate(5.500000, 7.750000) scale(-1, 1) translate(-5.500000, -7.750000) "></path>
14 </g>
15 </g>
16 </g>
17 </g>
18</svg>
diff --git a/client/src/assets/images/video/like.svg b/client/src/assets/images/video/like-grey.svg
index 5ef6c7b31..5ef6c7b31 100644
--- a/client/src/assets/images/video/like.svg
+++ b/client/src/assets/images/video/like-grey.svg
diff --git a/client/src/assets/images/video/like-white.svg b/client/src/assets/images/video/like-white.svg
new file mode 100644
index 000000000..88e5f6a9a
--- /dev/null
+++ b/client/src/assets/images/video/like-white.svg
@@ -0,0 +1,15 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
4 <title>thumbs-up</title>
5 <desc>Created with Sketch.</desc>
6 <defs></defs>
7 <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
8 <g id="Artboard-4" transform="translate(-708.000000, -643.000000)" stroke="#ffffff" stroke-width="2">
9 <g id="256" transform="translate(708.000000, 643.000000)">
10 <path d="M6,14 C6,16.5 6.5,19 8,19 L16.9938335,19 C17.5495239,19 18.1819788,18.5956028 18.4072817,18.0949295 L20.8562951,12.6526776 C21.7640882,10.6353595 20.7154925,9 18.5092545,9 L15.5,9 C15.5,9 18.5,3 15,3 C12.5,3 11.5,9 8,9 C6.5,9 6,11.5 6,14 Z" id="Path-188" stroke-linejoin="round"></path>
11 <path d="M4,8.5 C4,8.5 3,11 3,14 C3,17 4,19.5 4,19.5" id="Path-189"></path>
12 </g>
13 </g>
14 </g>
15</svg>
diff --git a/client/src/sass/_mixins.scss b/client/src/sass/_mixins.scss
index 6a18f7a76..ddc9c6766 100644
--- a/client/src/sass/_mixins.scss
+++ b/client/src/sass/_mixins.scss
@@ -19,22 +19,34 @@
19 } 19 }
20} 20}
21 21
22@mixin orange-button {
23 color: #fff;
24 background-color: $orange-color;
25
26 &:hover {
27 background-color: $orange-hoover-color;
28 }
29}
30
31@mixin grey-button {
32 background-color: $grey-color;
33 color: #585858;
34
35 &:hover {
36 background-color: $grey-hoover-color;
37 }
38}
39
22@mixin peertube-button { 40@mixin peertube-button {
23 border: none; 41 border: none;
24 color: #fff;
25 font-weight: $font-semibold; 42 font-weight: $font-semibold;
26 font-size: 15px; 43 font-size: 15px;
27 height: $button-height; 44 height: $button-height;
28 line-height: $button-height; 45 line-height: $button-height;
29 border-radius: 3px; 46 border-radius: 3px;
30 text-align: center; 47 text-align: center;
31 background-color: $orange-color;
32 padding: 0 17px 0 13px; 48 padding: 0 17px 0 13px;
33 cursor: pointer; 49 cursor: pointer;
34
35 &:hover {
36 background-color: $orange-hoover-color;
37 }
38} 50}
39 51
40@mixin peertube-button-link { 52@mixin peertube-button-link {
diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index cc1cee75b..0d310409b 100644
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -2,7 +2,8 @@ $font-regular: 400;
2$font-semibold: 600; 2$font-semibold: 600;
3$font-bold: 700; 3$font-bold: 700;
4 4
5$grey-color: #555; 5$grey-color: #E5E5E5;
6$grey-hoover-color: #EFEFEF;;
6$orange-color: #F1680D; 7$orange-color: #F1680D;
7$orange-hoover-color: #F97D46; 8$orange-hoover-color: #F97D46;
8 9
@@ -17,7 +18,6 @@ $button-height: 30px;
17 18
18$header-height: 50px; 19$header-height: 50px;
19$header-border-color: #e9eff6; 20$header-border-color: #e9eff6;
20
21$search-input-width: 375px; 21$search-input-width: 375px;
22 22
23$menu-color: #fff; 23$menu-color: #fff;
@@ -27,11 +27,3 @@ $footer-height: 30px;
27$footer-margin: 30px; 27$footer-margin: 30px;
28 28
29$footer-border-color: $header-border-color; 29$footer-border-color: $header-border-color;
30
31$video-miniature-other-infos: #686767;
32
33$video-watch-border-color: #eceef4;
34$video-watch-title-height: 90px;
35$video-watch-info-color: #9da0ae;
36$video-watch-info-height: 120px;
37$video-watch-info-padding-left: 40px;
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index b860e1bf2..c81031021 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -138,3 +138,17 @@ p-datatable {
138 } 138 }
139 } 139 }
140} 140}
141
142.dropdown-menu {
143 border-radius: 3px;
144 box-shadow: 0 3px 6px;
145 font-size: 15px;
146
147 .dropdown-item {
148 padding: 3px 15px;
149 }
150
151 a {
152 color: #000 !important;
153 }
154}