Merge pull request #70 from matthieume/feature/Icon_-_Fontawesome

Feature/icon - fontawesome
ondras · Jan 2, 2018 · 3a4c0d9 · 3a4c0d9
2 parents fe7a43d + f5fd3bb
commit 3a4c0d9
Show file tree

Hide file tree

Showing 14 changed files with 1,163 additions and 214 deletions.
diff --git a/Makefile b/Makefile
@@ -39,6 +39,7 @@ SOURCES =	src/mm.js \
 			src/ui.value.js \
 			src/ui.status.js \
 			src/ui.color.js \
+			src/ui.icon.js \
 			src/ui.help.js \
 			src/ui.io.js \
 			src/ui.backend.js \

diff --git a/css/shape.css b/css/shape.css
@@ -36,3 +36,8 @@
 	border-width: 2px;
 	font-size: 120%;
 }
+
+.item .icon {
+	margin: 0 0.5em 0 0;
+	font-size: x-large;
+}
diff --git a/css/ui.css b/css/ui.css
@@ -191,3 +191,9 @@ button:not(:disabled) {
 .ui#io button:nth-child(even) {
 	float: right;
 }
+
+.ui select.fa-select ,
+.ui select.fa-select option {
+	font-family: fontAwesome;
+	font-size: x-large;
+}