diff options
author | Phil <phil.buschmann@tum.de> | 2018-06-09 12:16:34 +0200 |
---|---|---|
committer | Phil <phil.buschmann@tum.de> | 2018-06-09 12:16:34 +0200 |
commit | dedf1f9f6e2f74cc1b36cbfc566d05c3a50d163b (patch) | |
tree | ec62c2a35460bd3d191e73463d6cbc6d35731ace /src/scss/components | |
parent | 4e29a546ba125186f43c6a7bd280ae7857ad4131 (diff) | |
download | gnunet-webui-dedf1f9f6e2f74cc1b36cbfc566d05c3a50d163b.tar.gz gnunet-webui-dedf1f9f6e2f74cc1b36cbfc566d05c3a50d163b.zip |
Implemented GNS and fixed UI issuesfeature/services
Diffstat (limited to 'src/scss/components')
-rw-r--r-- | src/scss/components/_alert.scss | 31 | ||||
-rw-r--r-- | src/scss/components/_badge.scss | 11 | ||||
-rw-r--r-- | src/scss/components/_button.scss | 30 | ||||
-rw-r--r-- | src/scss/components/_error.scss | 9 | ||||
-rw-r--r-- | src/scss/components/_footer.scss | 6 | ||||
-rw-r--r-- | src/scss/components/_header.scss | 7 | ||||
-rw-r--r-- | src/scss/components/_input.scss | 27 | ||||
-rw-r--r-- | src/scss/components/_link.scss | 2 | ||||
-rw-r--r-- | src/scss/components/_progressbar.scss | 0 | ||||
-rw-r--r-- | src/scss/components/_spinner.scss | 15 | ||||
-rw-r--r-- | src/scss/components/_table.scss | 6 |
11 files changed, 111 insertions, 33 deletions
diff --git a/src/scss/components/_alert.scss b/src/scss/components/_alert.scss new file mode 100644 index 0000000..b2b222e --- /dev/null +++ b/src/scss/components/_alert.scss | |||
@@ -0,0 +1,31 @@ | |||
1 | |||
2 | .c-alert { | ||
3 | padding: $baseline-x2; | ||
4 | border-width: 1px; | ||
5 | border-style: solid; | ||
6 | border-radius: .25rem; | ||
7 | } | ||
8 | |||
9 | .c-alert--error{ | ||
10 | color: $error-color; | ||
11 | background-color: $error-bgcolor; | ||
12 | border-color: $error-border-color; | ||
13 | } | ||
14 | |||
15 | .c-alert--warning{ | ||
16 | color: $warning-color; | ||
17 | background-color: $warning-bgcolor; | ||
18 | border-color: $warning-border-color; | ||
19 | } | ||
20 | |||
21 | .c-alert--success{ | ||
22 | color: $success-color; | ||
23 | background-color: $success-bgcolor; | ||
24 | border-color: $success-border-color; | ||
25 | } | ||
26 | |||
27 | .c-alert--information{ | ||
28 | color: $info-color; | ||
29 | background-color: $info-bgcolor; | ||
30 | border-color: $info-border-color; | ||
31 | } | ||
diff --git a/src/scss/components/_badge.scss b/src/scss/components/_badge.scss new file mode 100644 index 0000000..615425f --- /dev/null +++ b/src/scss/components/_badge.scss | |||
@@ -0,0 +1,11 @@ | |||
1 | .c-badge { | ||
2 | display: inline-block; | ||
3 | padding: .25em .4em; | ||
4 | font-size: 75%; | ||
5 | font-weight: 700; | ||
6 | line-height: 1; | ||
7 | text-align: center; | ||
8 | white-space: nowrap; | ||
9 | vertical-align: baseline; | ||
10 | border-radius: .25rem; | ||
11 | } | ||
diff --git a/src/scss/components/_button.scss b/src/scss/components/_button.scss index a16d5e4..9f7b70b 100644 --- a/src/scss/components/_button.scss +++ b/src/scss/components/_button.scss | |||
@@ -1,13 +1,13 @@ | |||
1 | $button-padding : $baseline-x2 $baseline-x4; | 1 | $button-padding : $baseline-x2 $baseline-x4; |
2 | $button-bgcolor : $color-blue; | 2 | $button-bgcolor : $color-secondary; |
3 | $button-bgcolor-hover : darken($color-blue, 10%); | 3 | $button-bgcolor-hover : darken($color-secondary, 10%); |
4 | $button-color : $color-white; | 4 | $button-color : $color-white; |
5 | $button-radius : 3px; | 5 | $button-radius : 3px; |
6 | 6 | ||
7 | $button-outline-padding : ( $baseline-x2 - 2 )( $baseline-x3 - 2 ); | 7 | $button-outline-padding : ( $baseline-x2 - 2 )( $baseline-x3 - 2 ); |
8 | $button-outline-bgcolor: transparent; | 8 | $button-outline-bgcolor: transparent; |
9 | $button-outline-color: $color-blue; | 9 | $button-outline-color: $color-secondary; |
10 | $button-outline-color-hover: darken( $color-blue, 10% ); | 10 | $button-outline-color-hover: darken( $color-secondary, 10% ); |
11 | 11 | ||
12 | .c-button { | 12 | .c-button { |
13 | padding: $button-padding; | 13 | padding: $button-padding; |
@@ -33,6 +33,28 @@ $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--danger { | ||
37 | padding: $button-outline-padding; | ||
38 | color: $error-color; | ||
39 | border: 1px solid $error-border-color; | ||
40 | background-color: $error-bgcolor; | ||
41 | } | ||
42 | |||
43 | .c-button--danger:hover { | ||
44 | background-color: darken($error-bgcolor, 10%); | ||
45 | } | ||
46 | |||
47 | .c-button--rename { | ||
48 | padding: $button-outline-padding; | ||
49 | color: $info-color; | ||
50 | border: 1px solid $info-border-color; | ||
51 | background-color: $info-bgcolor; | ||
52 | } | ||
53 | |||
54 | .c-button--rename:hover { | ||
55 | background-color: darken($info-bgcolor, 10%); | ||
56 | } | ||
57 | |||
36 | .c-button--disabled { | 58 | .c-button--disabled { |
37 | padding: $button-outline-padding; | 59 | padding: $button-outline-padding; |
38 | color: $color-grey; | 60 | color: $color-grey; |
diff --git a/src/scss/components/_error.scss b/src/scss/components/_error.scss deleted file mode 100644 index eaf6e51..0000000 --- a/src/scss/components/_error.scss +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
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/_footer.scss b/src/scss/components/_footer.scss new file mode 100644 index 0000000..8bd8664 --- /dev/null +++ b/src/scss/components/_footer.scss | |||
@@ -0,0 +1,6 @@ | |||
1 | .c-footer{ | ||
2 | bottom: 0px; | ||
3 | width: 100%; | ||
4 | background-color: $color-primary; | ||
5 | color: $color-contrary; | ||
6 | } | ||
diff --git a/src/scss/components/_header.scss b/src/scss/components/_header.scss new file mode 100644 index 0000000..0bf8635 --- /dev/null +++ b/src/scss/components/_header.scss | |||
@@ -0,0 +1,7 @@ | |||
1 | .c-header{ | ||
2 | top:0px; | ||
3 | position: sticky; | ||
4 | width: 100%; | ||
5 | background-color: $color-primary; | ||
6 | color: $color-contrary; | ||
7 | } | ||
diff --git a/src/scss/components/_input.scss b/src/scss/components/_input.scss index e2d7338..347e98c 100644 --- a/src/scss/components/_input.scss +++ b/src/scss/components/_input.scss | |||
@@ -1,14 +1,8 @@ | |||
1 | $input-padding : $baseline-x2 $baseline-x2; | 1 | $input-padding : $baseline-x2 $baseline-x4 $baseline-x2 $baseline; |
2 | $button-bgcolor : $color-blue; | 2 | $input-bgcolor-hover : darken($color-blue, 10%); |
3 | $button-bgcolor-hover : darken($color-blue, 10%); | 3 | $input-bgcolor : $color-white; |
4 | $button-color : $color-white; | 4 | $input-radius : 3px; |
5 | $input-bgcolor : darken($color-white, 5%); | 5 | $input-border-color: darken($color-grey-light, 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 | 6 | ||
13 | .c-input { | 7 | .c-input { |
14 | padding: $input-padding; | 8 | padding: $input-padding; |
@@ -17,13 +11,14 @@ $button-outline-color-hover: darken( $color-blue, 10% ); | |||
17 | white-space: nowrap; | 11 | white-space: nowrap; |
18 | vertical-align: middle; | 12 | vertical-align: middle; |
19 | text-decoration: none; | 13 | text-decoration: none; |
20 | background-color: $color-grey-light; | 14 | background-color: $input-bgcolor; |
21 | color: $color-black; | 15 | color: $color-black; |
22 | border-style: none; | 16 | border-style: solid; |
23 | border-color: grey; | 17 | border-width: 1px; |
24 | border-radius: $button-radius; | 18 | border-color: $color-grey; |
19 | border-radius: $input-radius; | ||
25 | } | 20 | } |
26 | 21 | ||
27 | .c-input:focus { | 22 | .c-input:focus { |
28 | box-shadow: 0 0 2px 2px $button-bgcolor-hover; | 23 | box-shadow: 0 0 2px 2px $input-bgcolor-hover; |
29 | } | 24 | } |
diff --git a/src/scss/components/_link.scss b/src/scss/components/_link.scss index a51e9ed..73f6e00 100644 --- a/src/scss/components/_link.scss +++ b/src/scss/components/_link.scss | |||
@@ -1,8 +1,8 @@ | |||
1 | .c-link { | 1 | .c-link { |
2 | text-decoration: none; | 2 | text-decoration: none; |
3 | color: $color-white; | ||
4 | font-weight: bold; | 3 | font-weight: bold; |
5 | cursor: pointer; | 4 | cursor: pointer; |
5 | color: inherit; | ||
6 | } | 6 | } |
7 | 7 | ||
8 | .c-link:hover { | 8 | .c-link:hover { |
diff --git a/src/scss/components/_progressbar.scss b/src/scss/components/_progressbar.scss new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/scss/components/_progressbar.scss | |||
diff --git a/src/scss/components/_spinner.scss b/src/scss/components/_spinner.scss new file mode 100644 index 0000000..b05af1c --- /dev/null +++ b/src/scss/components/_spinner.scss | |||
@@ -0,0 +1,15 @@ | |||
1 | .c-spinner { | ||
2 | border: 5px solid $color-grey-light; /* Light grey */ | ||
3 | border-top: 5px solid $color-secondary; | ||
4 | border-radius: 50%; | ||
5 | width: 40px; | ||
6 | height: 40px; | ||
7 | animation: spin 1s linear infinite; | ||
8 | top: 1000px; | ||
9 | display: inline-block; | ||
10 | } | ||
11 | |||
12 | @keyframes spin { | ||
13 | 0% { transform: rotate(0deg); } | ||
14 | 100% { transform: rotate(360deg); } | ||
15 | } | ||
diff --git a/src/scss/components/_table.scss b/src/scss/components/_table.scss index ce5e3fb..40d1b43 100644 --- a/src/scss/components/_table.scss +++ b/src/scss/components/_table.scss | |||
@@ -9,12 +9,12 @@ | |||
9 | 9 | ||
10 | .c-table tr:nth-child(even){background-color: $color-grey-light;} | 10 | .c-table tr:nth-child(even){background-color: $color-grey-light;} |
11 | 11 | ||
12 | .c-table tr:hover {background-color: #ddd;} | 12 | .c-table tr:hover {background-color: $color-white;} |
13 | 13 | ||
14 | .c-table th { | 14 | .c-table th { |
15 | padding-top: 12px; | 15 | padding-top: 12px; |
16 | padding-bottom: 12px; | 16 | padding-bottom: 12px; |
17 | text-align: left; | 17 | text-align: left; |
18 | background-color: $color-purple; | 18 | background-color: $color-primary; |
19 | color: white; | 19 | color: $color-contrary; |
20 | } | 20 | } |