From 9d1e1d73344b89b2222c965274b3cdc92af8d192 Mon Sep 17 00:00:00 2001
From: carmenliao <30969508+carmenliao@users.noreply.github.com>
Date: Fri, 19 Jan 2018 11:00:23 +1300
Subject: Improvements to Annotations listing design (#12476)
* Improvements to Annotations listing design
:# Please enter the commit message for your changes. Lines starting
* fixed create a new annotation
Please enter the commit message for your changes. Lines starting
* fixed the delete feature so it's not a button
---
plugins/Annotations/stylesheets/annotations.less | 79 ++++++++++++++++------
plugins/Annotations/templates/_annotation.twig | 45 ++++++++----
plugins/Annotations/templates/_annotationList.twig | 8 ++-
.../templates/getAnnotationManager.twig | 9 ++-
4 files changed, 102 insertions(+), 39 deletions(-)
(limited to 'plugins')
diff --git a/plugins/Annotations/stylesheets/annotations.less b/plugins/Annotations/stylesheets/annotations.less
index eef8f9c478..6270ebbe05 100755
--- a/plugins/Annotations/stylesheets/annotations.less
+++ b/plugins/Annotations/stylesheets/annotations.less
@@ -15,7 +15,7 @@
.annotation-manager {
text-align: left;
- margin-top: 5px;
+ margin-top: 30px;
.new-annotation-row {
height: 145px;
@@ -39,10 +39,19 @@
}
}
+span.annotation {
+ display: block;
+ font-size: 20px;
+ color: black;
+ font-style: normal;
+ text-align: left;
+ padding-left: 10px;
+}
+
.annotations-header {
display: inline-block;
width: 128px;
- text-align: right;
+ text-align: left;
font-size: 12px;
font-style: italic;
margin-bottom: 8px;
@@ -52,16 +61,24 @@
.annotation-controls {
display: inline-block;
- margin-left: 132px;
+ margin:0;
+ padding: 50px 0px 10px 10px;
+ color: transparent;
+}
+
+.annotation-controls a:hover {
+ text-decoration: underline;
}
+
.annotation-controls>a {
- font-size: 11px;
- font-style: italic;
- color: @theme-color-text-lighter;
+ font-size:14px;
+ font-style: normal;
+ color: black;
cursor: pointer;
padding: 3px 0 6px 0;
display: inline-block;
+ margin:0;
}
.annotation-controls>a:hover {
@@ -74,15 +91,17 @@
.annotation-list table {
width: 100%;
+
}
.annotation-list-range {
- display: inline-block;
- font-size: 12px;
+ display: block;
+ font-size: 15px;
font-style: italic;
color: @theme-color-text-lighter;
vertical-align: top;
margin: 0 0 8px 8px;
+ padding-bottom: 20px;
}
.empty-annotation-list, .annotation-list .loadingPiwik {
@@ -94,15 +113,16 @@
}
.annotation-meta {
- width: 128px;
- text-align: right;
+ width: 159px;
+ text-align: left;
vertical-align: top;
font-size: 14px;
+ padding-top: 10px;
}
.annotation-user {
- font-style: italic;
- font-size: 11px;
+ font-style: normal;
+ font-size: 13px;
color: @theme-color-text-light;
}
@@ -113,7 +133,7 @@
.annotation-period {
display: inline-block;
- font-style: italic;
+ font-style: normal;
margin: 0 8px 8px 8px;
vertical-align: top;
}
@@ -127,6 +147,7 @@
.annotation-enter-edit-mode {
cursor: pointer;
+ font-size: 15px;
}
.annotation-edit, .new-annotation-edit {
@@ -147,15 +168,15 @@
}
.delete-annotation {
- font-size: 12px;
- font-style: italic;
- color: red;
+ font-size: 15px;
+ color: #666666;
text-decoration: none;
- display: inline-block;
+ display: NONE;
}
.delete-annotation:hover {
- text-decoration: underline;
+ color: #cc3300;
+ text-decoration: none;
}
.annotation-manager .submit {
@@ -163,9 +184,11 @@
}
.edit-annotation {
- font-size: 10px;
- color: @theme-color-text-lighter;
+ font-size: 13px;
+ color: black;
font-style: italic;
+ padding: 6px 5px;
+ margin-top: -5px;
}
.edit-annotation:hover {
@@ -202,3 +225,19 @@
border: 1px solid #e4e5e4;
border-radius: 4px;
}
+
+a.add-annotation {
+ margin: 0;
+}
+
+td.padding {
+ padding: 1px 5px 6px 5px;
+}
+
+td.wider {
+ width: 80px;
+}
+
+a.font {
+ font-size: 14px;
+}
diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig
index ab0a8a2ca6..c90e99a428 100755
--- a/plugins/Annotations/templates/_annotation.twig
+++ b/plugins/Annotations/templates/_annotation.twig
@@ -8,23 +8,32 @@
{% endif %}
-