diff --git a/web/app/static/css/material_design_icons.css b/web/app/static/css/material_icons.css similarity index 60% rename from web/app/static/css/material_design_icons.css rename to web/app/static/css/material_icons.css index becc223c..0e5303b5 100644 --- a/web/app/static/css/material_design_icons.css +++ b/web/app/static/css/material_icons.css @@ -4,14 +4,14 @@ font-family: 'Material Icons'; font-style: normal; font-weight: 400; - src: url(../fonts/material_design_icons/MaterialIcons-Regular.eot); /* For IE6-8 */ + src: url(../fonts/material_icons/MaterialIcons-Regular.eot); /* For IE6-8 */ src: local('Material Icons'), local('MaterialIcons-Regular'), - url(../fonts/material_design_icons/MaterialIcons-Regular.ttf) format('truetype'), - url(../fonts/material_design_icons/MaterialIconsOutlined-Regular.otf) format('opentype'), - url(../fonts/material_design_icons/MaterialIconsRound-Regular.otf) format('opentype'), - url(../fonts/material_design_icons/MaterialIconsSharp-Regular.otf) format('opentype'), - url(../fonts/material_design_icons/MaterialIconsTwoTone-Regular.otf) format('opentype'); + url(../fonts/material_icons/MaterialIcons-Regular.ttf) format('truetype'), + url(../fonts/material_icons/MaterialIconsOutlined-Regular.otf) format('opentype'), + url(../fonts/material_icons/MaterialIconsRound-Regular.otf) format('opentype'), + url(../fonts/material_icons/MaterialIconsSharp-Regular.otf) format('opentype'), + url(../fonts/material_icons/MaterialIconsTwoTone-Regular.otf) format('opentype'); } .material-icons { diff --git a/web/app/static/css/nopaque.css b/web/app/static/css/nopaque.css index 597701aa..c58a45ac 100644 --- a/web/app/static/css/nopaque.css +++ b/web/app/static/css/nopaque.css @@ -125,16 +125,16 @@ indicator will show up how the column is sorted right now.; */ content: "help"; } .service[data-service="corpus-analysis"]:before { - content: "search"; + content: "H"; } .service[data-service="file-setup"]:before { - content: "burst_mode"; + content: "E"; } .service[data-service="nlp"]:before { - content: "format_textdirection_l_to_r"; + content: "G"; } .service[data-service="ocr"]:before { - content: "find_in_page"; + content: "F"; } .status[data-status]:before { content: attr(data-status); diff --git a/web/app/static/css/nopaque_icons.css b/web/app/static/css/nopaque_icons.css new file mode 100644 index 00000000..395b8bc6 --- /dev/null +++ b/web/app/static/css/nopaque_icons.css @@ -0,0 +1,89 @@ +/* https://google.github.io/material-design-icons/#setup-method-2-self-hosting */ + +@font-face { + font-family: 'nopaque Icons'; + font-style: normal; + font-weight: 400; + src: local('nopaque Icons'), + local('nopaqueIcons-Regular'), + url(../fonts/nopaque_icons/nopaqueIcons-Regular.otf) format('opentype'); +} + +.nopaque-icons { + font-family: 'nopaque Icons'; + font-weight: normal; + font-style: normal; + font-size: 24px; /* Preferred icon size */ + display: inline-block; + line-height: 1; + text-transform: none; + letter-spacing: normal; + word-wrap: normal; + white-space: nowrap; + direction: ltr; + + /* Support for all WebKit browsers. */ + -webkit-font-smoothing: antialiased; + /* Support for Safari and Chrome. */ + text-rendering: optimizeLegibility; + + /* Support for Firefox. */ + -moz-osx-font-smoothing: grayscale; + + /* Support for IE. */ + font-feature-settings: 'liga'; +} + +.breadcrumb i.nopaque-icons { + display: inline-block; + float: left; + font-size: 24px; +} + +.nopaque-icons { + text-rendering: optimizeLegibility; + -webkit-font-feature-settings: 'liga'; + -moz-font-feature-settings: 'liga'; + font-feature-settings: 'liga'; +} + +nav i.nopaque-icons { + display: block; + font-size: 24px; + height: 56px; + line-height: 56px; +} + +nav .brand-logo i.nopaque-icons { + float: left; + margin-right: 15px; +} + +nav ul a.btn > .nopaque-icons, nav ul a.btn-large > .nopaque-icons, nav ul a.btn-small > .nopaque-icons, nav ul a.btn-large > .nopaque-icons, nav ul a.btn-flat > .nopaque-icons, nav ul a.btn-floating > .nopaque-icons { + height: inherit; + line-height: inherit; +} + +.input-field input[type=search]:focus:not(.browser-default) ~ .nopaque-icons { + color: #444; +} + +.input-field input[type=search] ~ .nopaque-icons { + position: absolute; + top: 0; + right: 1rem; + color: transparent; + cursor: pointer; + font-size: 2rem; + -webkit-transition: .3s color; + transition: .3s color; +} + +.sidenav li > a > i.nopaque-icons { + float: left; + height: 48px; + line-height: 48px; + margin: 0 32px 0 0; + width: 24px; + color: rgba(0, 0, 0, 0.54); +} diff --git a/web/app/static/fonts/material_design_icons/MaterialIcons-Regular.ttf b/web/app/static/fonts/material_icons/MaterialIcons-Regular.ttf similarity index 100% rename from web/app/static/fonts/material_design_icons/MaterialIcons-Regular.ttf rename to web/app/static/fonts/material_icons/MaterialIcons-Regular.ttf diff --git a/web/app/static/fonts/material_design_icons/MaterialIconsOutlined-Regular.otf b/web/app/static/fonts/material_icons/MaterialIconsOutlined-Regular.otf similarity index 100% rename from web/app/static/fonts/material_design_icons/MaterialIconsOutlined-Regular.otf rename to web/app/static/fonts/material_icons/MaterialIconsOutlined-Regular.otf diff --git a/web/app/static/fonts/material_design_icons/MaterialIconsRound-Regular.otf b/web/app/static/fonts/material_icons/MaterialIconsRound-Regular.otf similarity index 100% rename from web/app/static/fonts/material_design_icons/MaterialIconsRound-Regular.otf rename to web/app/static/fonts/material_icons/MaterialIconsRound-Regular.otf diff --git a/web/app/static/fonts/material_design_icons/MaterialIconsSharp-Regular.otf b/web/app/static/fonts/material_icons/MaterialIconsSharp-Regular.otf similarity index 100% rename from web/app/static/fonts/material_design_icons/MaterialIconsSharp-Regular.otf rename to web/app/static/fonts/material_icons/MaterialIconsSharp-Regular.otf diff --git a/web/app/static/fonts/material_design_icons/MaterialIconsTwoTone-Regular.otf b/web/app/static/fonts/material_icons/MaterialIconsTwoTone-Regular.otf similarity index 100% rename from web/app/static/fonts/material_design_icons/MaterialIconsTwoTone-Regular.otf rename to web/app/static/fonts/material_icons/MaterialIconsTwoTone-Regular.otf diff --git a/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.otf b/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.otf new file mode 100644 index 00000000..37d2b481 Binary files /dev/null and b/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.otf differ diff --git a/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff b/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff new file mode 100644 index 00000000..7dbe2a8b Binary files /dev/null and b/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff differ diff --git a/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff2 b/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff2 new file mode 100644 index 00000000..47d01275 Binary files /dev/null and b/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff2 differ diff --git a/web/app/static/js/nopaque/RessourceLists/JobList.js b/web/app/static/js/nopaque/RessourceLists/JobList.js index 08724a3c..08a75439 100644 --- a/web/app/static/js/nopaque/RessourceLists/JobList.js +++ b/web/app/static/js/nopaque/RessourceLists/JobList.js @@ -82,7 +82,7 @@ class JobList extends RessourceList { } JobList.options = { item: ` - +
diff --git a/web/app/templates/corpora/corpus.html.j2 b/web/app/templates/corpora/corpus.html.j2 index eabed2c1..91967fbb 100644 --- a/web/app/templates/corpora/corpus.html.j2 +++ b/web/app/templates/corpora/corpus.html.j2 @@ -71,7 +71,7 @@
searchAnalyze - buildBuild + KBuild import_exportExport deleteDelete
diff --git a/web/app/templates/main/dashboard.html.j2 b/web/app/templates/main/dashboard.html.j2 index 539d70c2..1352148d 100644 --- a/web/app/templates/main/dashboard.html.j2 +++ b/web/app/templates/main/dashboard.html.j2 @@ -131,7 +131,7 @@

- +

 

File setup

@@ -143,7 +143,7 @@

- +

 

Optical Character Recognition

@@ -155,7 +155,7 @@

- +

 

Natural Language Processing

diff --git a/web/app/templates/main/index.html.j2 b/web/app/templates/main/index.html.j2 index 0ded9824..0300b614 100644 --- a/web/app/templates/main/index.html.j2 +++ b/web/app/templates/main/index.html.j2 @@ -33,22 +33,22 @@
- flash_on + A

Speeds up your work

All tools provided by nopaque are carefully selected to provide a complete tool suite without being held up by compatibility issues.

- cloud + B

Cloud infrastructure

All computational work is processed within nopaque’s cloud infrastructure. You don't need to install any software. Great, right?

- group + C

User friendly

You can start right away without having to read mile-long manuals. All services come with default settings that make it easy for you to just get going. Also great, right?

- settings + D

Meshing processes

No matter where you step in, nopaque facilitates and accompanies your research. Its workflow perfectly ties in with your research process.

@@ -89,7 +89,7 @@
- +

 

File setup

@@ -97,7 +97,7 @@
- +

 

Optical Character Recognition

@@ -105,7 +105,7 @@
- +

 

Natural Language Processing

@@ -113,7 +113,7 @@
- +

 

Corpus analysis

diff --git a/web/app/templates/materialize/base.html.j2 b/web/app/templates/materialize/base.html.j2 index e7d585e7..28b03d45 100644 --- a/web/app/templates/materialize/base.html.j2 +++ b/web/app/templates/materialize/base.html.j2 @@ -11,7 +11,7 @@ {% endblock metas %} {% block styles %} - + {% endblock styles %} {% endblock head %} diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2 index aabdfa99..0d6e0499 100644 --- a/web/app/templates/nopaque.html.j2 +++ b/web/app/templates/nopaque.html.j2 @@ -21,6 +21,7 @@ {% endif %} +