aboutsummaryrefslogtreecommitdiff
path: root/src/scss
diff options
context:
space:
mode:
authorPhil <phil.buschmann@tum.de>2018-06-04 20:48:54 +0200
committerPhil <phil.buschmann@tum.de>2018-06-04 20:48:54 +0200
commit4e29a546ba125186f43c6a7bd280ae7857ad4131 (patch)
tree1fb64e75666dda167126efbc7eafd20b1bbac6d0 /src/scss
parent4c01dd54cc3c68ddfd700d586fad000df075506f (diff)
downloadgnunet-webui-4e29a546ba125186f43c6a7bd280ae7857ad4131.tar.gz
gnunet-webui-4e29a546ba125186f43c6a7bd280ae7857ad4131.zip
Updated identity interface
Diffstat (limited to 'src/scss')
-rw-r--r--src/scss/components/_button.scss11
-rw-r--r--src/scss/components/_card.scss4
-rw-r--r--src/scss/components/_error.scss9
-rw-r--r--src/scss/components/_input.scss29
-rw-r--r--src/scss/components/_link.scss1
-rw-r--r--src/scss/components/_table.scss20
-rw-r--r--src/scss/components/_user.scss6
-rw-r--r--src/scss/objects/_container.scss2
-rw-r--r--src/scss/settings/_core.scss2
-rw-r--r--src/scss/settings/_spacing.scss1
10 files changed, 83 insertions, 2 deletions
diff --git a/src/scss/components/_button.scss b/src/scss/components/_button.scss
index 5bd66d9..a16d5e4 100644
--- a/src/scss/components/_button.scss
+++ b/src/scss/components/_button.scss
@@ -33,6 +33,17 @@ $button-outline-color-hover: darken( $color-blue, 10% );
33 background-color: $button-outline-bgcolor; 33 background-color: $button-outline-bgcolor;
34} 34}
35 35
36.c-button--disabled {
37 padding: $button-outline-padding;
38 color: $color-grey;
39 border: 1px solid $color-grey;
40 background-color: $button-outline-bgcolor;
41}
42
43.c-button--disabled:hover {
44 background-color: $button-outline-bgcolor;
45}
46
36.c-button--outline:hover { 47.c-button--outline:hover {
37 color: #1893E0; 48 color: #1893E0;
38 border-color: $button-outline-color-hover; 49 border-color: $button-outline-color-hover;
diff --git a/src/scss/components/_card.scss b/src/scss/components/_card.scss
index 2370918..43480d1 100644
--- a/src/scss/components/_card.scss
+++ b/src/scss/components/_card.scss
@@ -5,4 +5,8 @@
5 box-shadow: 0 1px 2px 0 rgba(28,45,157,0.28); 5 box-shadow: 0 1px 2px 0 rgba(28,45,157,0.28);
6} 6}
7 7
8.c-card--no-padding {
9 padding: 0;
10}
11
8.c-card--light { background: rgba($color-white, 0.5)} 12.c-card--light { background: rgba($color-white, 0.5)}
diff --git a/src/scss/components/_error.scss b/src/scss/components/_error.scss
new file mode 100644
index 0000000..eaf6e51
--- /dev/null
+++ b/src/scss/components/_error.scss
@@ -0,0 +1,9 @@
1$error-bgcolor: #f79191;
2$error-color: #9e0c0c;
3
4.c-error {
5 padding: $baseline-x3;
6 color: $error-color;
7 background-color: $error-bgcolor;
8 border-radius: 2px;
9}
diff --git a/src/scss/components/_input.scss b/src/scss/components/_input.scss
new file mode 100644
index 0000000..e2d7338
--- /dev/null
+++ b/src/scss/components/_input.scss
@@ -0,0 +1,29 @@
1$input-padding : $baseline-x2 $baseline-x2;
2$button-bgcolor : $color-blue;
3$button-bgcolor-hover : darken($color-blue, 10%);
4$button-color : $color-white;
5$input-bgcolor : darken($color-white, 5%);
6$button-radius : 3px;
7
8$button-outline-padding : ( $baseline-x2 - 2 )( $baseline-x3 - 2 );
9$button-outline-bgcolor: transparent;
10$button-outline-color: $color-blue;
11$button-outline-color-hover: darken( $color-blue, 10% );
12
13.c-input {
14 padding: $input-padding;
15 display: inline-block;
16 font: inherit;
17 white-space: nowrap;
18 vertical-align: middle;
19 text-decoration: none;
20 background-color: $color-grey-light;
21 color: $color-black;
22 border-style: none;
23 border-color: grey;
24 border-radius: $button-radius;
25}
26
27.c-input:focus {
28 box-shadow: 0 0 2px 2px $button-bgcolor-hover;
29}
diff --git a/src/scss/components/_link.scss b/src/scss/components/_link.scss
index ec9fa4e..a51e9ed 100644
--- a/src/scss/components/_link.scss
+++ b/src/scss/components/_link.scss
@@ -2,6 +2,7 @@
2 text-decoration: none; 2 text-decoration: none;
3 color: $color-white; 3 color: $color-white;
4 font-weight: bold; 4 font-weight: bold;
5 cursor: pointer;
5} 6}
6 7
7.c-link:hover { 8.c-link:hover {
diff --git a/src/scss/components/_table.scss b/src/scss/components/_table.scss
new file mode 100644
index 0000000..ce5e3fb
--- /dev/null
+++ b/src/scss/components/_table.scss
@@ -0,0 +1,20 @@
1.c-table {
2 border-collapse: collapse;
3}
4
5.c-table td, th {
6 border: 1px solid #ddd;
7 padding: $baseline;
8}
9
10.c-table tr:nth-child(even){background-color: $color-grey-light;}
11
12.c-table tr:hover {background-color: #ddd;}
13
14.c-table th {
15 padding-top: 12px;
16 padding-bottom: 12px;
17 text-align: left;
18 background-color: $color-purple;
19 color: white;
20}
diff --git a/src/scss/components/_user.scss b/src/scss/components/_user.scss
new file mode 100644
index 0000000..c7a2fb7
--- /dev/null
+++ b/src/scss/components/_user.scss
@@ -0,0 +1,6 @@
1.c-user {
2 padding: $baseline-x2;
3 background: rgba($color-white, 0.8);
4 border-radius: 2px;
5 box-shadow: 0 1px 2px 0 rgba(28,45,157,0.28);
6}
diff --git a/src/scss/objects/_container.scss b/src/scss/objects/_container.scss
index 24d02c4..37e634d 100644
--- a/src/scss/objects/_container.scss
+++ b/src/scss/objects/_container.scss
@@ -41,7 +41,7 @@ $iota-objs-container-gutter-extra: (
41 * Type: String / Map 41 * Type: String / Map
42 */ 42 */
43 43
44$iota-objs-container-size-default: 1000px; 44$iota-objs-container-size-default: 1600px;
45 45
46 46
47/** 47/**
diff --git a/src/scss/settings/_core.scss b/src/scss/settings/_core.scss
index 3959f7d..f034f1a 100644
--- a/src/scss/settings/_core.scss
+++ b/src/scss/settings/_core.scss
@@ -7,7 +7,7 @@
7 * Type: Unitless Number / List 7 * Type: Unitless Number / List
8 */ 8 */
9 9
10$iota-global-columns: 2, 3, 6, 12; 10$iota-global-columns: 2, 3, 4, 6, 12;
11 11
12 12
13/** 13/**
diff --git a/src/scss/settings/_spacing.scss b/src/scss/settings/_spacing.scss
index 76a173d..bd14ac4 100644
--- a/src/scss/settings/_spacing.scss
+++ b/src/scss/settings/_spacing.scss
@@ -1,6 +1,7 @@
1$spacing-default: $baseline; 1$spacing-default: $baseline;
2 2
3$spacing-extra: ( 3$spacing-extra: (
4 -x1 : $baseline,
4 -x2 : $baseline-x2, 5 -x2 : $baseline-x2,
5 -x3 : $baseline-x3, 6 -x3 : $baseline-x3,
6 -x4 : $baseline-x4, 7 -x4 : $baseline-x4,