summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2017-08-02 12:06:30 +0200
committerRuben Pollan <meskio@sindominio.net>2017-08-02 12:06:30 +0200
commit18dab1953882aff09b446e5b5c5d3bcc16c8ad7b (patch)
tree9c2c6e651ab028de9cccb0dd88ff96164bc58d77
parentc49293b7f3eff7a478fc388768366e7b025f7da0 (diff)
[feat] use whisk icon for mixnetsHEADmaster
-rw-r--r--web-ui/app/fonts/whisk.ttfbin0 -> 2092 bytes
-rw-r--r--web-ui/app/fonts/whisk.woffbin0 -> 2168 bytes
-rw-r--r--web-ui/app/scss/base/_fonts.scss7
-rw-r--r--web-ui/app/scss/views/_compose-view.scss6
-rw-r--r--web-ui/app/scss/views/_security-labels.scss3
5 files changed, 12 insertions, 4 deletions
diff --git a/web-ui/app/fonts/whisk.ttf b/web-ui/app/fonts/whisk.ttf
new file mode 100644
index 00000000..39ec7e69
--- /dev/null
+++ b/web-ui/app/fonts/whisk.ttf
Binary files differ
diff --git a/web-ui/app/fonts/whisk.woff b/web-ui/app/fonts/whisk.woff
new file mode 100644
index 00000000..75c71702
--- /dev/null
+++ b/web-ui/app/fonts/whisk.woff
Binary files differ
diff --git a/web-ui/app/scss/base/_fonts.scss b/web-ui/app/scss/base/_fonts.scss
index 9a47b5ed..1f2db710 100644
--- a/web-ui/app/scss/base/_fonts.scss
+++ b/web-ui/app/scss/base/_fonts.scss
@@ -65,3 +65,10 @@
font-weight: 400;
src: url('/public/fonts/icomoon.woff') format('woff'), url('/public/fonts/icomoon.ttf') format('truetype'), ;
}
+
+@font-face {
+ font-family: 'whisk';
+ font-style: normal;
+ font-weight: 400;
+ src: url('/public/fonts/whisk.woff') format('woff'), url('/public/fonts/whisk.ttf') format('truetype'), ;
+}
diff --git a/web-ui/app/scss/views/_compose-view.scss b/web-ui/app/scss/views/_compose-view.scss
index be193186..994373d4 100644
--- a/web-ui/app/scss/views/_compose-view.scss
+++ b/web-ui/app/scss/views/_compose-view.scss
@@ -347,7 +347,7 @@
.recipient-mixnet {
&:before {
- font-family: FontAwesome;
+ font-family: "whisk";
padding-right: 6px;
font-size: 1.4em;
}
@@ -355,14 +355,14 @@
&.mixnet {
&:before {
color: $will_be_mixed;
- content: "\f135";
+ content: "\e010";
}
}
&.unsuported-mixnet {
&:before {
color: $unsuported_mixed;
- content: "\f135";
+ content: "\e010";
}
}
diff --git a/web-ui/app/scss/views/_security-labels.scss b/web-ui/app/scss/views/_security-labels.scss
index 5ccf613e..fe4d115b 100644
--- a/web-ui/app/scss/views/_security-labels.scss
+++ b/web-ui/app/scss/views/_security-labels.scss
@@ -74,7 +74,8 @@
&--mixnet {
&:before {
- content: "\f023";
+ font-family: "whisk";
+ content: "\e010";
}
}
}