From efb2e28fc07a57e7309fe67e051f580317be7493 Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Tue, 14 Apr 2020 16:12:03 +0100 Subject: table-sm on caf_detail page now --- ctrack/caf/templates/caf/caf_detail.html | 39 +++++++++++++++++--------------- ctrack/static/css/project.css | 4 ++-- ctrack/static/sass/project.css | 39 -------------------------------- ctrack/static/sass/project.css.map | 2 +- ctrack/static/sass/project.scss | 4 ++-- 5 files changed, 26 insertions(+), 62 deletions(-) delete mode 100644 ctrack/static/sass/project.css (limited to 'ctrack') diff --git a/ctrack/caf/templates/caf/caf_detail.html b/ctrack/caf/templates/caf/caf_detail.html index 7bd4ebe..fcde571 100644 --- a/ctrack/caf/templates/caf/caf_detail.html +++ b/ctrack/caf/templates/caf/caf_detail.html @@ -11,18 +11,18 @@ -
-

CAF Basic Information

-
+ {% comment %}
+
CAF Basic Information
+
{% endcomment %}
-
Summary
+
CAF Basic Information
-
- +
+
@@ -63,18 +63,18 @@ -
+ {% comment %}

Applicable Systems

-
+
{% endcomment %}
-
+
Applicable Systems
-
Organisation {{ organisation }}
+
{% for system in systems %} @@ -89,20 +89,20 @@ -
-

Assessments

-
+ {% comment %}
+
Assessments
+
{% endcomment %}
-
+
Assessments
-
+
{{ system.name }}
{% for ass in assessments_and_scores %} -
+
@@ -116,7 +116,8 @@
Assessment: {{ ass.0 }}{{ ass.0.comments }}
- +
+
@@ -157,4 +158,6 @@ - {% endblock %} \ No newline at end of file + {% endblock %} + +{% comment %} {% endcomment %} \ No newline at end of file diff --git a/ctrack/static/css/project.css b/ctrack/static/css/project.css index ed9d90d..33c1c4f 100644 --- a/ctrack/static/css/project.css +++ b/ctrack/static/css/project.css @@ -24,8 +24,8 @@ text-align: center; } .table-sm tr { - font-size: 0.75rem; - line-height: 12px; + font-size: 0.85rem; + line-height: 15px; min-height: 10px; } .textinput { diff --git a/ctrack/static/sass/project.css b/ctrack/static/sass/project.css deleted file mode 100644 index ed9d90d..0000000 --- a/ctrack/static/sass/project.css +++ /dev/null @@ -1,39 +0,0 @@ -.alert-debug { - background-color: #fff; - border-color: #d6e9c6; - color: #000; } - -.alert-error { - background-color: #f2dede; - border-color: #eed3d7; - color: #b94a48; } - -.bg-light { - background-color: green; } - -.btn:hover { - background-color: red; - border-color: orange; } - -#chunky { - border: 8px dashed yellowgreen; - border-radius: 10px; - box-shadow: 3px 10px 12px lightgray; } - -.tabaligncenter { - text-align: center; } - -.table-sm tr { - font-size: 0.75rem; - line-height: 12px; - min-height: 10px; } - -.textinput { - background-color: lightgoldenrodyellow; - box-shadow: 2px 10px 15px lightgray; - height: 49px; } - -#_title { - color: orangered; } - -/*# sourceMappingURL=project.css.map */ diff --git a/ctrack/static/sass/project.css.map b/ctrack/static/sass/project.css.map index cf71574..a014d64 100644 --- a/ctrack/static/sass/project.css.map +++ b/ctrack/static/sass/project.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AA2BA,YAAa;EACX,gBAAgB,EAhBV,IAAI;EAiBV,YAAY,EAhBD,OAAO;EAiBlB,KAAK,EAhBC,IAAI;;AAmBZ,YAAa;EACX,gBAAgB,EAnBX,OAAO;EAoBZ,YAAY,EAnBF,OAAO;EAoBjB,KAAK,EAnBD,OAAO;;AAsBb,SAAU;EACR,gBAAgB,EAAE,KAAK;;AAGzB,UAAW;EACT,gBAAgB,EAAE,GAAG;EACrB,YAAY,EAAE,MAAM;;AAStB,OAAQ;EACN,MAAM,EAAE,sBAAsB;EAC9B,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,uBAAuB;;AAGrC,eAAgB;EACd,UAAU,EAAE,MAAM;;AAGpB,YAAa;EACX,SAAS,EAAE,OAAO;EAClB,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,IAAI;;AAGlB,UAAW;EACT,gBAAgB,EAAE,oBAAoB;EACtC,UAAU,EAAE,uBAAuB;EACnC,MAAM,EAvDO,IAAI;;AA0DnB,OAAQ;EACN,KAAK,EAAE,SAAS", +"mappings": "AA2BA,YAAa;EACX,gBAAgB,EAhBV,IAAI;EAiBV,YAAY,EAhBD,OAAO;EAiBlB,KAAK,EAhBC,IAAI;;AAmBZ,YAAa;EACX,gBAAgB,EAnBX,OAAO;EAoBZ,YAAY,EAnBF,OAAO;EAoBjB,KAAK,EAnBD,OAAO;;AAsBb,SAAU;EACR,gBAAgB,EAAE,KAAK;;AAGzB,UAAW;EACT,gBAAgB,EAAE,GAAG;EACrB,YAAY,EAAE,MAAM;;AAStB,OAAQ;EACN,MAAM,EAAE,sBAAsB;EAC9B,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,uBAAuB;;AAGrC,eAAgB;EACd,UAAU,EAAE,MAAM;;AAGpB,YAAa;EACX,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,IAAI;;AAGlB,UAAW;EACT,gBAAgB,EAAE,oBAAoB;EACtC,UAAU,EAAE,uBAAuB;EACnC,MAAM,EAvDO,IAAI;;AA0DnB,OAAQ;EACN,KAAK,EAAE,SAAS", "sources": ["project.scss"], "names": [], "file": "project.css" diff --git a/ctrack/static/sass/project.scss b/ctrack/static/sass/project.scss index 093d1fc..3370ee8 100644 --- a/ctrack/static/sass/project.scss +++ b/ctrack/static/sass/project.scss @@ -63,8 +63,8 @@ $input-height: 49px; } .table-sm tr { - font-size: 0.75rem; - line-height: 12px; + font-size: 0.85rem; + line-height: 15px; min-height: 10px; } -- cgit v1.2.3
Designation Title