diff --git a/app/db.sqlite3 b/app/db.sqlite3 index 63659666..d3163c70 100644 Binary files a/app/db.sqlite3 and b/app/db.sqlite3 differ diff --git a/app/server/static/css/annotation.css b/app/server/static/css/annotation.css index 183ec434..fb927567 100644 --- a/app/server/static/css/annotation.css +++ b/app/server/static/css/annotation.css @@ -97,7 +97,7 @@ body { } .aside .main .item.active { - background-color: #F1F1F1; + background-color: #5a5e5f; margin: 0 -50px; padding-left: 50px; } diff --git a/app/server/static/forum.css b/app/server/static/forum.css index 76109885..41372fce 100644 --- a/app/server/static/forum.css +++ b/app/server/static/forum.css @@ -5,6 +5,12 @@ html,body { footer { background-color: #F2F6FA !important; } +.navbar { + background-color: #2a2e2f; +} +.navbar.has-shadow { + box-shadow: 0 1px 4px rgba(0, 0, 0, .3); +} .topNav { border-top: 5px solid #3498DB; } diff --git a/app/server/templates/annotation/annotation_base.html b/app/server/templates/annotation/annotation_base.html index c20151f7..274ac074 100644 --- a/app/server/templates/annotation/annotation_base.html +++ b/app/server/templates/annotation/annotation_base.html @@ -1,103 +1,60 @@ - - +{% extends "base.html" %} +{% load static %} +{% block header %} + +{% endblock %} - - - - - Inbox - Free Bulma template - - - - - - - - - -
- +
+ +
+ 30% +
- \ No newline at end of file + {% block annotation-area %} + {% endblock %} + +
+ + + + + Prev + + + + Next + + + + +
+ +
+
+{% endblock %} \ No newline at end of file diff --git a/app/server/templates/annotation/sequence_labeling.html b/app/server/templates/annotation/sequence_labeling.html index 1bdd5bf7..d426c815 100644 --- a/app/server/templates/annotation/sequence_labeling.html +++ b/app/server/templates/annotation/sequence_labeling.html @@ -1,102 +1,26 @@ -{% extends "base.html" %} {% load static %} {% block header %} - {% endblock %} {% block content %} -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
-
-

[[ msg.text.slice(0, 100) ]]

-
-
-
-
-
-
-
-
- - - - - - -
-
-
-
- [[ label.text ]] -
-
+ +
+
+{% endblock %} + +{% block footer %} {% endblock %} \ No newline at end of file diff --git a/app/server/templates/base.html b/app/server/templates/base.html index a8c67e3d..8b27892e 100644 --- a/app/server/templates/base.html +++ b/app/server/templates/base.html @@ -70,8 +70,7 @@ {% block content %} {% endblock %} - - + {% block footer %}{% endblock %} \ No newline at end of file