diff options
author | jloup <jeanloup.jamet@gmail.com> | 2018-05-07 13:40:12 +0200 |
---|---|---|
committer | jloup <jeanloup.jamet@gmail.com> | 2018-05-07 17:41:18 +0200 |
commit | bf5deb87cef2b6f1370c808821dfb631d00590f6 (patch) | |
tree | e1be1105ae3bd38bc69b2a74ee912405d59eb4a0 /cmd/web | |
parent | 400ff25bc71d90dedf66b49cde459a6efe456cf8 (diff) | |
download | Front-bf5deb87cef2b6f1370c808821dfb631d00590f6.tar.gz Front-bf5deb87cef2b6f1370c808821dfb631d00590f6.tar.zst Front-bf5deb87cef2b6f1370c808821dfb631d00590f6.zip |
Add fontello icons.
Diffstat (limited to 'cmd/web')
-rw-r--r-- | cmd/web/.gitignore | 2 | ||||
-rw-r--r-- | cmd/web/Makefile | 41 | ||||
-rw-r--r-- | cmd/web/fontello_config.json | 34 | ||||
-rw-r--r-- | cmd/web/static/fontello.css | 6 | ||||
-rw-r--r-- | cmd/web/static/fonts/fontello.eot | bin | 0 -> 6168 bytes | |||
-rw-r--r-- | cmd/web/static/fonts/fontello.svg | 20 | ||||
-rw-r--r-- | cmd/web/static/fonts/fontello.ttf | bin | 0 -> 6000 bytes | |||
-rw-r--r-- | cmd/web/static/fonts/fontello.woff | bin | 0 -> 3592 bytes | |||
-rw-r--r-- | cmd/web/static/fonts/fontello.woff2 | bin | 0 -> 2940 bytes | |||
-rw-r--r-- | cmd/web/static/index.html | 2 | ||||
-rw-r--r-- | cmd/web/static/style.css | 47 |
11 files changed, 148 insertions, 4 deletions
diff --git a/cmd/web/.gitignore b/cmd/web/.gitignore index 7a7ecee..f233aa5 100644 --- a/cmd/web/.gitignore +++ b/cmd/web/.gitignore | |||
@@ -2,3 +2,5 @@ bower_components/ | |||
2 | node_modules/ | 2 | node_modules/ |
3 | build/ | 3 | build/ |
4 | npm-debug.log | 4 | npm-debug.log |
5 | .fontello | ||
6 | static/fontello \ No newline at end of file | ||
diff --git a/cmd/web/Makefile b/cmd/web/Makefile index 85bba5b..02ff826 100644 --- a/cmd/web/Makefile +++ b/cmd/web/Makefile | |||
@@ -6,15 +6,14 @@ SRC_DIR=js | |||
6 | BUILD_DIR=build/js | 6 | BUILD_DIR=build/js |
7 | JSX_SRC= header_footer.jsx main.jsx signup.jsx signin.jsx otp.jsx poloniex.jsx password_reset.jsx change_password.jsx | 7 | JSX_SRC= header_footer.jsx main.jsx signup.jsx signin.jsx otp.jsx poloniex.jsx password_reset.jsx change_password.jsx |
8 | JS_SRC= cookies.js app.js api.js | 8 | JS_SRC= cookies.js app.js api.js |
9 | STATIC_FILES= index.html style.css | 9 | STATIC_FILES= index.html style.css fontello.css |
10 | STATIC_FILES+=$(addprefix fonts/, fontello.eot fontello.svg fontello.ttf fontello.woff fontello.woff2) | ||
10 | JSX_OBJS=$(addprefix $(BUILD_DIR)/,$(JSX_SRC:.jsx=.js)) | 11 | JSX_OBJS=$(addprefix $(BUILD_DIR)/,$(JSX_SRC:.jsx=.js)) |
11 | JS_OBJS=$(addprefix $(BUILD_DIR)/,$(JS_SRC)) | 12 | JS_OBJS=$(addprefix $(BUILD_DIR)/,$(JS_SRC)) |
12 | ICONS=$(addprefix $(STATIC_BUILD_DIR)/icons/black/, $(notdir $(wildcard static/icons/black/*.svg))) | 13 | ICONS=$(addprefix $(STATIC_BUILD_DIR)/icons/black/, $(notdir $(wildcard static/icons/black/*.svg))) |
13 | ICONS+=$(addprefix $(STATIC_BUILD_DIR)/icons/color/, $(notdir $(wildcard static/icons/color/*.svg))) | 14 | ICONS+=$(addprefix $(STATIC_BUILD_DIR)/icons/color/, $(notdir $(wildcard static/icons/color/*.svg))) |
14 | STATIC_BUILD_DIR=build/static | 15 | STATIC_BUILD_DIR=build/static |
15 | 16 | ||
16 | $(info $(ICONS)) | ||
17 | |||
18 | install: | 17 | install: |
19 | node --version | 18 | node --version |
20 | npm --version | 19 | npm --version |
@@ -33,6 +32,7 @@ $(STATIC_BUILD_DIR): | |||
33 | mkdir -p $@ | 32 | mkdir -p $@ |
34 | mkdir -p $@/icons/black | 33 | mkdir -p $@/icons/black |
35 | mkdir -p $@/icons/color | 34 | mkdir -p $@/icons/color |
35 | mkdir -p $@/fonts | ||
36 | 36 | ||
37 | $(BUILD_DIR)/%.js: $(SRC_DIR)/%.jsx | 37 | $(BUILD_DIR)/%.js: $(SRC_DIR)/%.jsx |
38 | eslint --fix $< | 38 | eslint --fix $< |
@@ -59,3 +59,38 @@ release: $(STATIC_BUILD_DIR) build/webapp.tar.gz | |||
59 | clean: | 59 | clean: |
60 | rm -rf build | 60 | rm -rf build |
61 | rm -rf node_modules | 61 | rm -rf node_modules |
62 | |||
63 | |||
64 | FONT_DIR = ./static/fontello | ||
65 | FONTELLO_HOST ?= http://fontello.com | ||
66 | |||
67 | fontopen: | ||
68 | @if test ! `which curl` ; then \ | ||
69 | echo 'Install curl first.' >&2 ; \ | ||
70 | exit 128 ; \ | ||
71 | fi | ||
72 | curl --silent --show-error --fail --output .fontello \ | ||
73 | --form "config=@fontello_config.json" \ | ||
74 | ${FONTELLO_HOST} | ||
75 | x-www-browser ${FONTELLO_HOST}/`cat .fontello` | ||
76 | |||
77 | |||
78 | fontsave: | ||
79 | @if test ! `which unzip` ; then \ | ||
80 | echo 'Install unzip first.' >&2 ; \ | ||
81 | exit 128 ; \ | ||
82 | fi | ||
83 | @if test ! -e .fontello ; then \ | ||
84 | echo 'Run `make fontopen` first.' >&2 ; \ | ||
85 | exit 128 ; \ | ||
86 | fi | ||
87 | rm -rf .fontello.src .fontello.zip | ||
88 | curl --silent --show-error --fail --output .fontello.zip \ | ||
89 | ${FONTELLO_HOST}/`cat .fontello`/get | ||
90 | unzip .fontello.zip -d .fontello.src | ||
91 | rm -rf ${FONT_DIR} | ||
92 | mv `find ./.fontello.src -maxdepth 1 -name 'fontello-*'` ${FONT_DIR} | ||
93 | rm -rf .fontello.src .fontello.zip | ||
94 | cp ${FONT_DIR}/font/* static/fonts/ | ||
95 | cp ${FONT_DIR}/css/fontello-codes.css static/fontello.css | ||
96 | rm -rf ${FONT_DIR} \ No newline at end of file | ||
diff --git a/cmd/web/fontello_config.json b/cmd/web/fontello_config.json new file mode 100644 index 0000000..4ebb1f0 --- /dev/null +++ b/cmd/web/fontello_config.json | |||
@@ -0,0 +1,34 @@ | |||
1 | { | ||
2 | "name": "", | ||
3 | "css_prefix_text": "icon-", | ||
4 | "css_use_suffix": false, | ||
5 | "hinting": true, | ||
6 | "units_per_em": 1000, | ||
7 | "ascent": 850, | ||
8 | "glyphs": [ | ||
9 | { | ||
10 | "uid": "43ab845088317bd348dee1d975700c48", | ||
11 | "css": "ok-circled", | ||
12 | "code": 59392, | ||
13 | "src": "fontawesome" | ||
14 | }, | ||
15 | { | ||
16 | "uid": "0f4cae16f34ae243a6144c18a003f2d8", | ||
17 | "css": "cancel-circled", | ||
18 | "code": 59393, | ||
19 | "src": "fontawesome" | ||
20 | }, | ||
21 | { | ||
22 | "uid": "f2aa28a2548ed3d2be718d087b65ee21", | ||
23 | "css": "key", | ||
24 | "code": 59394, | ||
25 | "src": "fontawesome" | ||
26 | }, | ||
27 | { | ||
28 | "uid": "8b80d36d4ef43889db10bc1f0dc9a862", | ||
29 | "css": "user", | ||
30 | "code": 59395, | ||
31 | "src": "fontawesome" | ||
32 | } | ||
33 | ] | ||
34 | } \ No newline at end of file | ||
diff --git a/cmd/web/static/fontello.css b/cmd/web/static/fontello.css new file mode 100644 index 0000000..ba4e933 --- /dev/null +++ b/cmd/web/static/fontello.css | |||
@@ -0,0 +1,6 @@ | |||
1 | |||
2 | .icon-ok-circled:before { content: '\e800'; } /* '' */ | ||
3 | .icon-cancel-circled:before { content: '\e801'; } /* '' */ | ||
4 | .icon-key:before { content: '\e802'; } /* '' */ | ||
5 | .icon-user:before { content: '\e803'; } /* '' */ | ||
6 | .icon-hourglass-2:before { content: '\f252'; } /* '' */ \ No newline at end of file | ||
diff --git a/cmd/web/static/fonts/fontello.eot b/cmd/web/static/fonts/fontello.eot new file mode 100644 index 0000000..14932cc --- /dev/null +++ b/cmd/web/static/fonts/fontello.eot | |||
Binary files differ | |||
diff --git a/cmd/web/static/fonts/fontello.svg b/cmd/web/static/fonts/fontello.svg new file mode 100644 index 0000000..dce8334 --- /dev/null +++ b/cmd/web/static/fonts/fontello.svg | |||
@@ -0,0 +1,20 @@ | |||
1 | <?xml version="1.0" standalone="no"?> | ||
2 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | ||
3 | <svg xmlns="http://www.w3.org/2000/svg"> | ||
4 | <metadata>Copyright (C) 2018 by original authors @ fontello.com</metadata> | ||
5 | <defs> | ||
6 | <font id="fontello" horiz-adv-x="1000" > | ||
7 | <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" /> | ||
8 | <missing-glyph horiz-adv-x="1000" /> | ||
9 | <glyph glyph-name="ok-circled" unicode="" d="M717 440q0 16-10 26l-51 50q-11 11-25 11t-25-11l-228-227-126 126q-11 11-25 11t-25-11l-51-50q-10-10-10-26 0-15 10-25l202-202q10-10 25-10 15 0 26 10l303 303q10 10 10 25z m140-90q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> | ||
10 | |||
11 | <glyph glyph-name="cancel-circled" unicode="" d="M641 224q0 14-10 25l-101 101 101 101q10 11 10 25 0 15-10 26l-51 50q-10 11-25 11-15 0-25-11l-101-101-101 101q-11 11-25 11-16 0-26-11l-50-50q-11-11-11-26 0-14 11-25l101-101-101-101q-11-11-11-25 0-15 11-26l50-50q10-11 26-11 14 0 25 11l101 101 101-101q10-11 25-11 15 0 25 11l51 50q10 11 10 26z m216 126q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" /> | ||
12 | |||
13 | <glyph glyph-name="key" unicode="" d="M464 564q0 45-31 76t-76 31-76-31-31-76q0-23 11-46-23 11-47 11-44 0-76-32t-31-76 31-75 76-32 76 32 31 75q0 24-10 47 23-11 46-11 45 0 76 31t31 76z m475-393q0-9-27-36t-37-28q-5 0-16 9t-20 19-22 22-13 14l-54-53 123-123q15-16 15-38 0-23-21-45t-46-22q-22 0-37 16l-375 374q-98-73-204-73-91 0-148 57t-57 149q0 89 53 174t138 139 175 53q91 0 148-58t57-148q0-105-73-203l198-199 54 54q-2 2-14 14t-23 21-18 21-9 15q0 10 27 37t37 28q7 0 13-6 3-3 26-25t45-44 49-48 40-44 16-23z" horiz-adv-x="1000" /> | ||
14 | |||
15 | <glyph glyph-name="user" unicode="" d="M714 69q0-60-35-104t-84-44h-476q-49 0-84 44t-35 104q0 48 5 90t17 85 33 73 52 50 76 19q73-72 174-72t175 72q42 0 75-19t52-50 33-73 18-85 4-90z m-143 495q0-88-62-151t-152-63-151 63-63 151 63 152 151 63 152-63 62-152z" horiz-adv-x="714.3" /> | ||
16 | |||
17 | <glyph glyph-name="hourglass-2" unicode="" d="M786 779q0-146-60-258t-148-171q89-59 148-171t60-258h53q8 0 13-5t5-12v-36q0-8-5-13t-13-5h-821q-8 0-13 5t-5 13v36q0 7 5 12t13 5h53q0 146 60 258t149 171q-90 59-149 171t-60 258h-53q-8 0-13 5t-5 12v36q0 8 5 13t13 5h821q8 0 13-5t5-13v-36q0-7-5-12t-13-5h-53z m-72 0h-571q0-115 47-215h477q47 100 47 215z m-31-679q-31 79-82 135t-108 79h-129q-57-23-108-79t-81-135h508z" horiz-adv-x="857.1" /> | ||
18 | </font> | ||
19 | </defs> | ||
20 | </svg> \ No newline at end of file | ||
diff --git a/cmd/web/static/fonts/fontello.ttf b/cmd/web/static/fonts/fontello.ttf new file mode 100644 index 0000000..ab1efb3 --- /dev/null +++ b/cmd/web/static/fonts/fontello.ttf | |||
Binary files differ | |||
diff --git a/cmd/web/static/fonts/fontello.woff b/cmd/web/static/fonts/fontello.woff new file mode 100644 index 0000000..6faf045 --- /dev/null +++ b/cmd/web/static/fonts/fontello.woff | |||
Binary files differ | |||
diff --git a/cmd/web/static/fonts/fontello.woff2 b/cmd/web/static/fonts/fontello.woff2 new file mode 100644 index 0000000..8e41726 --- /dev/null +++ b/cmd/web/static/fonts/fontello.woff2 | |||
Binary files differ | |||
diff --git a/cmd/web/static/index.html b/cmd/web/static/index.html index bf3bd19..6e68a21 100644 --- a/cmd/web/static/index.html +++ b/cmd/web/static/index.html | |||
@@ -11,8 +11,8 @@ | |||
11 | <title>Cryptoportfolio</title> | 11 | <title>Cryptoportfolio</title> |
12 | <link href='https://fonts.googleapis.com/css?family=Fira+Mono' rel='stylesheet' type='text/css'> | 12 | <link href='https://fonts.googleapis.com/css?family=Fira+Mono' rel='stylesheet' type='text/css'> |
13 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> | 13 | <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> |
14 | <link rel="stylesheet" type="text/css" href="/public/cryptocoins.css"/> | ||
15 | <link rel="stylesheet" type="text/css" href="/public/style.css"/> | 14 | <link rel="stylesheet" type="text/css" href="/public/style.css"/> |
15 | <link rel="stylesheet" type="text/css" href="/public/fontello.css"/> | ||
16 | <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> | 16 | <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> |
17 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> | 17 | <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> |
18 | <!--[if lt IE 9]> | 18 | <!--[if lt IE 9]> |
diff --git a/cmd/web/static/style.css b/cmd/web/static/style.css index 589c0b0..5e49c55 100644 --- a/cmd/web/static/style.css +++ b/cmd/web/static/style.css | |||
@@ -124,3 +124,50 @@ h1 { | |||
124 | padding-top: 10px; | 124 | padding-top: 10px; |
125 | padding-bottom: 10px; | 125 | padding-bottom: 10px; |
126 | } | 126 | } |
127 | |||
128 | @font-face { | ||
129 | font-family: 'fontello'; | ||
130 | src: url('fonts/fontello.eot?12278570'); | ||
131 | src: url('fonts/fontello.eot?12278570#iefix') format('embedded-opentype'), | ||
132 | url('fonts/fontello.woff2?12278570') format('woff2'), | ||
133 | url('fonts/fontello.woff?12278570') format('woff'), | ||
134 | url('fonts/fontello.ttf?12278570') format('truetype'), | ||
135 | url('fonts/fontello.svg?12278570#fontello') format('svg'); | ||
136 | font-weight: normal; | ||
137 | font-style: normal; | ||
138 | } | ||
139 | |||
140 | [class^="icon-"]:before, [class*=" icon-"]:before { | ||
141 | font-family: "fontello"; | ||
142 | font-style: normal; | ||
143 | font-weight: normal; | ||
144 | speak: none; | ||
145 | |||
146 | display: inline-block; | ||
147 | text-decoration: inherit; | ||
148 | width: 1em; | ||
149 | margin-right: .2em; | ||
150 | text-align: center; | ||
151 | /* opacity: .8; */ | ||
152 | |||
153 | /* For safety - reset parent styles, that can break glyph codes*/ | ||
154 | font-variant: normal; | ||
155 | text-transform: none; | ||
156 | |||
157 | /* fix buttons height, for twitter bootstrap */ | ||
158 | line-height: 1em; | ||
159 | |||
160 | /* Animation center compensation - margins should be symmetric */ | ||
161 | /* remove if not needed */ | ||
162 | margin-left: .2em; | ||
163 | |||
164 | /* you can be more comfortable with increased icons size */ | ||
165 | /* font-size: 120%; */ | ||
166 | |||
167 | /* Font smoothing. That was taken from TWBS */ | ||
168 | -webkit-font-smoothing: antialiased; | ||
169 | -moz-osx-font-smoothing: grayscale; | ||
170 | |||
171 | /* Uncomment for 3D effect */ | ||
172 | /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ | ||
173 | } \ No newline at end of file | ||