From 2a7e444ca9ecc819806085e16c02e5a696976dfe Mon Sep 17 00:00:00 2001 From: ludger Date: Thu, 18 Oct 2018 12:35:40 +0200 Subject: [PATCH] Fixing layout finally --- .../postings/static/postings/css/style.css | 16 ++++++-- .../static/postings/css/style.css.map | 2 +- .../postings/static/postings/css/style.scss | 14 ++++++- .../templates/postings/frontend/entity.html | 38 +++++++++---------- .../templates/postings/frontend/results.html | 4 +- .../templates/postings/frontend/review.html | 2 +- 6 files changed, 47 insertions(+), 29 deletions(-) diff --git a/backend/postings/static/postings/css/style.css b/backend/postings/static/postings/css/style.css index ffa0608..09d4a62 100644 --- a/backend/postings/static/postings/css/style.css +++ b/backend/postings/static/postings/css/style.css @@ -30,7 +30,8 @@ background: white; border-radius: 15px; padding: 30px; - margin-top: 25px; } + margin-top: 25px; + margin-bottom: 25px; } .navbar-brand { cursor: pointer; } @@ -51,8 +52,7 @@ body { color: #FFF; } .rating-block { - background-color: #FAFAFA; - border: 1px solid #EFEFEF; + float: right; padding: 15px 15px 20px 15px; border-radius: 3px; } @@ -67,7 +67,8 @@ body { border: 1px solid #EFEFEF; padding: 15px; border-radius: 3px; - margin-bottom: 15px; } + margin-bottom: 15px; + float: right; } .review-block-name { font-size: 12px; @@ -98,6 +99,10 @@ body { font-size: 24px; color: #d17581; } +.selfcenter { + margin: 0 auto; + float: inherit; } + .hr-line-dashed { border-top: 1px dashed #E7EAEC; color: #ffffff; @@ -121,4 +126,7 @@ h2 { .box3 { background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; } +.box2 { + background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; } + /*# sourceMappingURL=style.css.map */ diff --git a/backend/postings/static/postings/css/style.css.map b/backend/postings/static/postings/css/style.css.map index d7b4014..fbab319 100644 --- a/backend/postings/static/postings/css/style.css.map +++ b/backend/postings/static/postings/css/style.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;;AAIjB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;;AAEpB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F", +"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAG5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;EACf,aAAa,EAAC,IAAI;;AAIpB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,KAAK,EAAC,KAAK;EACX,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;EAClB,KAAK,EAAE,KAAK;;AAEd,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,WAAW;EACT,MAAM,EAAE,MAAM;EACd,KAAK,EAAE,OAAO;;AAGhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F;;AAExG,KAAK;EACH,UAAU,EAAE,0FAA0F", "sources": ["style.scss"], "names": [], "file": "style.css" diff --git a/backend/postings/static/postings/css/style.scss b/backend/postings/static/postings/css/style.scss index aa8d346..5a205fa 100644 --- a/backend/postings/static/postings/css/style.scss +++ b/backend/postings/static/postings/css/style.scss @@ -15,6 +15,7 @@ height: -moz-calc(100vh - 50px); height: calc(100vh - 50px); } + .box3 .fullcontainer { display: flex; height: -webkit-calc(100vh - 50px); @@ -33,6 +34,7 @@ border-radius: 15px; padding: 30px; margin-top:25px; + margin-bottom:25px; } @@ -59,8 +61,7 @@ body { color:#FFF; } .rating-block{ - background-color:#FAFAFA; - border:1px solid #EFEFEF; + float:right; padding:15px 15px 20px 15px; border-radius:3px; } @@ -77,6 +78,7 @@ body { padding:15px; border-radius:3px; margin-bottom:15px; + float: right; } .review-block-name{ font-size:12px; @@ -115,6 +117,11 @@ body { } +.selfcenter{ + margin: 0 auto; + float: inherit; +} + .hr-line-dashed { border-top: 1px dashed #E7EAEC; color: #ffffff; @@ -141,4 +148,7 @@ h2 { .box3{ background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; +} +.box2{ + background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; } \ No newline at end of file diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html index 81e784d..85e4979 100644 --- a/backend/postings/templates/postings/frontend/entity.html +++ b/backend/postings/templates/postings/frontend/entity.html @@ -9,89 +9,89 @@ {% block content %} -
+
+
{% block entity_info %}
-
+

{{ entity.name }}

{% endblock %}
-
+
-

Average user rating

+

Average user rating

{{ entity.average_rating|floatformat:"-2" }} / 5

{# Rating Distribution Display #} -
+

Rating breakdown

5
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.4.0 }}
+
4
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.3.0 }}
+
3
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.2.0 }}
+
2
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.1.0 }}
+
1
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.0.0 }}
@@ -101,10 +101,10 @@
-
+