From 658c9639273038e380ba2f5c59b819dabc31e474 Mon Sep 17 00:00:00 2001 From: Felipe Bormann Date: Thu, 4 May 2017 15:05:40 -0300 Subject: [PATCH] fixed broken layout for reports --- analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc | Bin 16328 -> 0 bytes analytics/static/analytics/general.css | 23 +++++++++++------------ analytics/static/analytics/general.css.map | 2 +- analytics/static/analytics/general.sass | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------- analytics/templates/analytics/general.html | 73 +++++++++++++++++++++++++++++++++++++++---------------------------------- 5 files changed, 102 insertions(+), 100 deletions(-) diff --git a/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc b/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc index a120e66..e891b08 100644 Binary files a/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc and b/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc differ diff --git a/analytics/static/analytics/general.css b/analytics/static/analytics/general.css index f7d533f..edbadaa 100644 --- a/analytics/static/analytics/general.css +++ b/analytics/static/analytics/general.css @@ -1,7 +1,9 @@ .report-body { border: 1px solid #3ebeb4; border-radius: 20px; - padding: 10px; } + padding: 10px; + overflow: auto; + width: 100%; } #general-report-header { height: 10%; @@ -32,7 +34,11 @@ background: linear-gradient(to right, #0e8999, #6bf0ce); height: 40px; border-radius: 10px; - color: #ffffff; } + color: #ffffff; + padding-top: 1px; + margin-top: 10px; } + #most-used-tags-header h4 { + margin-left: 1%; } .data-container { width: 80px; @@ -48,19 +54,12 @@ font-size: 10px; } #left-data-selector { - background: linear-gradient(#0e8999, #6bf0ce); - width: 30%; } - -.middle-chart { - width: 30%; - float: left; } - .middle-chart h4 { - color: #009688; } + background: linear-gradient(#0e8999, #6bf0ce); } -.right-chart { +.chart { width: 30%; float: left; } - .right-chart h4 { + .chart h4 { color: #009688; } /*# sourceMappingURL=general.css.map */ diff --git a/analytics/static/analytics/general.css.map b/analytics/static/analytics/general.css.map index 106adbc..090e9c2 100644 --- a/analytics/static/analytics/general.css.map +++ b/analytics/static/analytics/general.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAEA,YAAY;EACX,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;;AAGd,sBAAsB;EACrB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACD,KAAK,EAZO,OAAO;EAcpB,yBAAE;IACD,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IAEX,4BAAE;MACD,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MAEZ,yCAAY;QACX,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;MAEpB,gCAAG;QACF,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;;AAIvB,sBAAsB;EACrB,UAAU,EAAE,2CAA2C;EACvD,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;;AAEf,eAAe;EACd,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;;AAEb,UAAU;EACT,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,KAAK,EAAE,IAAI;;AAIZ,SAAS;EACR,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,IAAI;;AAGhB,mBAAmB;EAClB,UAAU,EAAE,iCAAmC;EAC/C,KAAK,EAAE,GAAG;;AAGX,aAAa;EACZ,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,gBAAE;IACD,KAAK,EAtEO,OAAO;;AAwErB,YAAY;EACX,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,eAAE;IACD,KAAK,EA5EO,OAAO", +"mappings": "AAEA,YAAY;EACR,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,IAAI;EACd,KAAK,EAAE,IAAI;;AAEf,sBAAsB;EAClB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACE,KAAK,EAbC,OAAO;EAejB,yBAAE;IACE,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IAEX,4BAAE;MACE,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MAEZ,yCAAY;QACR,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;MAEvB,gCAAG;QACC,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;;AAInC,sBAAsB;EAClB,UAAU,EAAE,2CAA2C;EACvD,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,IAAI;EAEhB,yBAAE;IACE,WAAW,EAAE,EAAE;;AAEvB,eAAe;EACX,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;;AAEhB,UAAU;EACN,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,KAAK,EAAE,IAAI;;AAIf,SAAS;EACL,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,IAAI;;AAGnB,mBAAmB;EACf,UAAU,EAAE,iCAAmC;;AAEnD,MAAM;EACF,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,SAAE;IACE,KAAK,EA1EC,OAAO", "sources": ["general.sass"], "names": [], "file": "general.css" diff --git a/analytics/static/analytics/general.sass b/analytics/static/analytics/general.sass index 21f89dc..92f2460 100644 --- a/analytics/static/analytics/general.sass +++ b/analytics/static/analytics/general.sass @@ -1,77 +1,75 @@ $title-color: #009688 .report-body - border: 1px solid #3ebeb4 - border-radius: 20px - padding: 10px - + border: 1px solid #3ebeb4 + border-radius: 20px + padding: 10px + overflow: auto + width: 100% #general-report-header - height: 10% - display: block - h3 - color: $title-color + height: 10% + display: block + h3 + color: $title-color - ul - float: right - display: inline-flex - width: 50% - height: 15% + ul + float: right + display: inline-flex + width: 50% + height: 15% - li - margin-right: 2% - width: 50% - color: white + li + margin-right: 2% + width: 50% + color: white - div.selected - background-color: #4dcfbd - width: 100% - text-align: center - border-radius: 20px + div.selected + background-color: #4dcfbd + width: 100% + text-align: center + border-radius: 20px - div - background-color: #0f8a9a - width: 100% - text-align: center - border-radius: 20px + div + background-color: #0f8a9a + width: 100% + text-align: center + border-radius: 20px #most-used-tags-header - background: linear-gradient(to right, #0e8999, #6bf0ce) - height: 40px - border-radius: 10px - color: #ffffff + background: linear-gradient(to right, #0e8999, #6bf0ce) + height: 40px + border-radius: 10px + color: #ffffff + padding-top: 1px + margin-top: 10px + + h4 + margin-left: 1% .data-container - width: 80px - height: 40px + width: 80px + height: 40px .tag-cloud - border-radius: 25px - color: #ffffff - width: 80px + border-radius: 25px + color: #ffffff + width: 80px - + .tag-name - color: #ffffff - font-size: 10px + color: #ffffff + font-size: 10px #left-data-selector - background: linear-gradient( #0e8999, #6bf0ce ) - width: 30% - - -.middle-chart - width: 30% - float: left - h4 - color: $title-color + background: linear-gradient( #0e8999, #6bf0ce ) -.right-chart - width: 30% - float: left - h4 - color: $title-color \ No newline at end of file +.chart + width: 30% + float: left + h4 + color: $title-color \ No newline at end of file diff --git a/analytics/templates/analytics/general.html b/analytics/templates/analytics/general.html index cae075e..b669eb7 100644 --- a/analytics/templates/analytics/general.html +++ b/analytics/templates/analytics/general.html @@ -20,22 +20,24 @@ {% block content %} -
- -
- -
-
+
+ +
+ +
+

{% trans "Amadeus Report" %}

    @@ -46,27 +48,25 @@
    {% trans "Log" %}
-
+ -
+
-
-
+
+

{% trans "most used tags" %}

-
+
-
-
-
+ +
+
-

{% trans "Between" %}

-

20-20-17

-

{% trans "and" %}

-

20-20-17

+

{% trans "Between" %} 20-20-17 {% trans "and" %} + 20-20-17

@@ -85,14 +85,19 @@
-
-

{% trans "most active users" %}

+
+
+

{% trans "most active users" %}

+
+
+
+ +
-
-
+
-
-
+
+ -- libgit2 0.21.2