aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/sass
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-01 17:38:26 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-12-01 17:38:26 +0100
commitc30745f342480b59fb0856a059c8c2fbffbcfc6a (patch)
tree06209d7831131120b097b538c0ed851f8e40a280 /client/src/sass
parent2bbb34127fccd187ed690949b6791e49fdd77194 (diff)
downloadPeerTube-c30745f342480b59fb0856a059c8c2fbffbcfc6a.tar.gz
PeerTube-c30745f342480b59fb0856a059c8c2fbffbcfc6a.tar.zst
PeerTube-c30745f342480b59fb0856a059c8c2fbffbcfc6a.zip
Add account settings new design
Diffstat (limited to 'client/src/sass')
-rw-r--r--client/src/sass/_mixins.scss35
-rw-r--r--client/src/sass/_variables.scss2
-rw-r--r--client/src/sass/application.scss44
-rw-r--r--client/src/sass/pre-customizations.scss1
4 files changed, 78 insertions, 4 deletions
diff --git a/client/src/sass/_mixins.scss b/client/src/sass/_mixins.scss
index 681657d90..5798b8f6e 100644
--- a/client/src/sass/_mixins.scss
+++ b/client/src/sass/_mixins.scss
@@ -4,3 +4,38 @@
4 outline: none !important; 4 outline: none !important;
5 } 5 }
6} 6}
7
8@mixin peertube-input-text($width) {
9 display: inline-block;
10 height: $button-height;
11 width: $width;
12 background: #fff;
13 border: 1px solid #C6C6C6;
14 border-radius: 3px;
15 padding-left: 15px;
16
17 &::placeholder {
18 color: #585858;
19 }
20}
21
22@mixin peertube-button {
23 border: none;
24 color: #fff;
25 font-weight: $font-semibold;
26 font-size: 15px;
27 height: $button-height;
28 line-height: $button-height;
29 border-radius: 3px;
30 text-align: center;
31 background-color: $orange-color;
32 padding: 0 17px 0 13px;
33 cursor: pointer;
34}
35
36@mixin peertube-button-link {
37 display: inline-block;
38
39 @include peertube-button;
40 @include disable-default-a-behaviour;
41}
diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index e32b37462..d05452367 100644
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -8,6 +8,8 @@ $orange-color: #F1680D;
8$black-background: #000; 8$black-background: #000;
9$grey-background: #f6f2f2; 9$grey-background: #f6f2f2;
10 10
11$expanded-horizontal-margins: 150px;
12
11$button-height: 30px; 13$button-height: 30px;
12 14
13$header-height: 50px; 15$header-height: 50px;
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index fc61a22da..db63db5f5 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -33,14 +33,50 @@ input.readonly {
33} 33}
34 34
35.main-col { 35.main-col {
36 padding: 30px; 36 margin-left: $menu-width;
37 37
38 .title-page { 38 .title-page {
39 color: #000;
39 font-size: 16px; 40 font-size: 16px;
40 font-weight: $font-bold;
41 display: inline-block; 41 display: inline-block;
42 border-bottom: 2px solid $orange-color; 42 margin-right: 55px;
43 margin-bottom: 25px; 43 font-weight: $font-semibold;
44 @include disable-default-a-behaviour;
45
46 &.active, &.title-page-single {
47 border-bottom: 2px solid $orange-color;
48 font-weight: $font-bold;
49 margin-top: 30px;
50 margin-bottom: 25px;
51 }
52 }
53
54 .margin-content {
55 margin-left: 10px;
56 margin-right: 10px;
57 }
58
59 .sub-menu {
60 background-color: #F7F7F7;
61 width: 100%;
62 height: 81px;
63 margin-bottom: 30px;
64 display: flex;
65 align-items: center;
66 }
67
68 // Override some properties if the main content is expanded (no menu on the left)
69 &.expanded {
70 margin-left: 0;
71
72 .margin-content {
73 margin-left: $expanded-horizontal-margins;
74 margin-right: $expanded-horizontal-margins;
75 }
76
77 .sub-menu {
78 padding-left: $expanded-horizontal-margins;
79 }
44 } 80 }
45} 81}
46 82
diff --git a/client/src/sass/pre-customizations.scss b/client/src/sass/pre-customizations.scss
index 693489828..52eef50f2 100644
--- a/client/src/sass/pre-customizations.scss
+++ b/client/src/sass/pre-customizations.scss
@@ -1,4 +1,5 @@
1@import '_variables.scss'; 1@import '_variables.scss';
2@import '_mixins.scss';
2 3
3$bootstrap-sass-asset-helper: false !default; 4$bootstrap-sass-asset-helper: false !default;
4// 5//