diff --git a/bulletin/static/css/estilo.css b/bulletin/static/css/estilo.css
index e88ea2f..6fc5c91 100644
--- a/bulletin/static/css/estilo.css
+++ b/bulletin/static/css/estilo.css
@@ -2,7 +2,7 @@ body,html{
margin: 0;
padding: 0;
font-family: "Roboto", sans-serif;
- font-size: 0.95em;
+ /*font-size: 0.95em;*/
}
.axis path,
@@ -25,11 +25,24 @@ body,html{
display: none;
min-width: 20px;
height: 105px;
- background: none repeat scroll 0 0 #000;
- border: 2px solid #ccc;
- border-radius:10px;
+ background: none repeat scroll 0 0 #525252;
+ border: 2px solid #f5f5f5;
+ border-radius:5px;
padding: 10px;
text-align: center;
color: #fff;
- opacity: 0.8;
+ opacity: 0.95;
+ font-size: 14px;
+}
+
+.grey-tooltip + .tooltip > .tooltip-inner {
+ background-color: #666666;
+ border: 2px solid #f5f5f5;
+ border-radius:5px;
+ opacity: 0.95;
+ color:#f9f9f9;
+ padding: 10px;
+ font-size: 14px;
+ margin-top: -9px;
+ min-width: 190px;
}
diff --git a/bulletin/templates/bulletin/view.html b/bulletin/templates/bulletin/view.html
index 3048bf0..b6ddd5b 100644
--- a/bulletin/templates/bulletin/view.html
+++ b/bulletin/templates/bulletin/view.html
@@ -9,7 +9,7 @@
{% endblock%}
{% block style %}
-
+
{% endblock %}
{% block breadcrumbs %}
@@ -105,24 +105,36 @@
{% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida %}
-
{{ meta.alcancada }}% |
+
+ {{ meta.alcancada }}% |
{% endif %}
{% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida %}
- {{ meta.alcancada }}% |
+
+ {{ meta.alcancada }}% |
{% endif %}
{% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == 100 %}
- {{ meta.alcancada }}% |
+
+ {{ meta.alcancada }}% |
{% endif %}
{% if meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %}
- {{ meta.alcancada }}% |
+
+ {{ meta.alcancada }}% |
{% endif %}
diff --git a/bulletin/templates/bulletin/window_view.html b/bulletin/templates/bulletin/window_view.html
index 58bde75..32adfad 100644
--- a/bulletin/templates/bulletin/window_view.html
+++ b/bulletin/templates/bulletin/window_view.html
@@ -47,7 +47,7 @@
-
+
@@ -55,13 +55,14 @@
+
{% with 'css/themes/'|add:theme.css_style|add:'.css' as theme_selected %}
{% endwith %}
-
+
@@ -115,28 +116,40 @@
- {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida %}
- {{ meta.alcancada }}% |
- {% endif %}
+ {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida %}
+
+ {{ meta.alcancada }}% |
+ {% endif %}
- {% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida %}
- {{ meta.alcancada }}% |
+ {% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida %}
+
+ {{ meta.alcancada }}% |
- {% endif %}
-
+ {% endif %}
+
{% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == 100 %}
- {{ meta.alcancada }}% |
+
+ {{ meta.alcancada }}% |
{% endif %}
-
- {% if meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %}
- {{ meta.alcancada }}% |
+
+ {% if meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %}
+
+ {{ meta.alcancada }}% |
- {% endif %}
-
+ {% endif %}
+
@@ -245,6 +258,9 @@