aboutsummaryrefslogtreecommitdiffstats
path: root/ctrack
diff options
context:
space:
mode:
authorMatthew Lemon <lemon@matthewlemon.com>2020-04-14 16:12:03 +0100
committerMatthew Lemon <lemon@matthewlemon.com>2020-04-14 16:12:03 +0100
commitefb2e28fc07a57e7309fe67e051f580317be7493 (patch)
tree44a9eed019ae1a49735f63045e4a5c31ead4249f /ctrack
parentd7297950ec5aa95a4c42eb8640ff1a37570432a5 (diff)
table-sm on caf_detail page now
Diffstat (limited to 'ctrack')
-rw-r--r--ctrack/caf/templates/caf/caf_detail.html39
-rw-r--r--ctrack/static/css/project.css4
-rw-r--r--ctrack/static/sass/project.css39
-rw-r--r--ctrack/static/sass/project.css.map2
-rw-r--r--ctrack/static/sass/project.scss4
5 files changed, 26 insertions, 62 deletions
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 @@
</div>
- <div class="row pt-3 text-info">
- <h4>CAF Basic Information</h4>
- </div>
+ {% comment %} <div class="row pt-3 text-info">
+ <h5>CAF Basic Information</h5>
+ </div> {% endcomment %}
<div class="row">
<div class="col-sm-12 p-2">
<div class="card bg-light">
<div class="card-body">
- <div class="card-title text-muted">Summary</div>
+ <div class="card-title text-muted">CAF Basic Information</div>
<div class="card-text">
- <div class="table-responsive">
- <table class="table">
+ <div>
+ <table class="table-sm table-responsive">
<tr>
<td><strong>Organisation</strong></td>
<td><a href="{% url 'organisations:detail' organisation.slug %}">{{ organisation }}</a></td>
@@ -63,18 +63,18 @@
</div>
</div>
- <div class="row pt-3 text-info">
+ {% comment %} <div class="row pt-3 text-info">
<h4>Applicable Systems</h4>
- </div>
+ </div> {% endcomment %}
<div class="row">
<div class="col-sm-12 p-2">
<div class="card bg-light">
<div class="card-body">
- <div class="card-title text-muted"></div>
+ <div class="card-title text-muted">Applicable Systems</div>
<div class="card-text">
<div>
- <table class="table table-responsive">
+ <table class="table-sm table-responsive">
{% for system in systems %}
<tr>
<td><strong>{{ system.name }}</strong></td>
@@ -89,20 +89,20 @@
</div>
</div>
- <div class="row pt-3 text-info">
- <h4>Assessments</h4>
- </div>
+ {% comment %} <div class="row pt-3 text-info">
+ <h5>Assessments</h5>
+ </div> {% endcomment %}
<div class="row">
<div class="col-sm-12 p-2">
<div class="card bg-light">
<div class="card-body">
- <div class="card-title text-muted"></div>
+ <div class="card-title text-muted">Assessments</div>
<div class="card-text">
- <div class="table-responsive">
+ <div>
<table class="table">
{% for ass in assessments_and_scores %}
- <table class="table-responsive p-2">
+ <table class="table-sm table-responsive">
<tr>
<td><strong>Assessment:</strong></td>
<td>{{ ass.0 }}</td>
@@ -116,7 +116,8 @@
<td>{{ ass.0.comments }}</td>
</tr>
</table>
- <table class="table">
+ <br>
+ <table class="table-sm table-bordered">
<tr>
<th>Designation</th>
<th>Title</th>
@@ -157,4 +158,6 @@
</div>
</div>
- {% endblock %} \ No newline at end of file
+ {% endblock %}
+
+{% comment %} <link rel="stylesheet" type="text/css" href="{% static 'css/project.css' %}"> {% 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;
}