Merge pull request #35 from Emkas/styles

Coverage matrix: change styles in schac and erasmus code
erasmus-without-paper · Jun 1, 2022 · 706ae43 · 706ae43
2 parents aefd792 + 8e1f2c2
commit 706ae43
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/src/main/java/eu/erasmuswithoutpaper/registry/cmatrix/CoverageMatrixRow.java b/src/main/java/eu/erasmuswithoutpaper/registry/cmatrix/CoverageMatrixRow.java
@@ -60,17 +60,15 @@ static void generateHtmlTableHeader(StringBuilder sb) {
 
     /* Institution */
 
-    row1.append(genRow("Institution", NAME_COLOR_CLASS, 2, 1, "ewpst__cell--institution"));
+    row1.append(genRow("Institution", NAME_COLOR_CLASS, 2, 1, "ewpst__cell-institution"));
 
     /* SCHAC */
 
-    row1.append(genRow("SCHAC", NAME_COLOR_CLASS, 2, 1,
-            "ewpst__cell-schac ewpst__cell--institution"));
+    row1.append(genRow("SCHAC", NAME_COLOR_CLASS, 2, 1, "ewpst__cell-schac"));
 
     /* Erasmus code */
 
-    row1.append(genRow("Erasmus code", NAME_COLOR_CLASS, 2, 1,
-            "ewpst__cell-schac ewpst__cell--institution"));
+    row1.append(genRow("Erasmus code", NAME_COLOR_CLASS, 2, 1, "ewpst__cell-erasmus"));
 
     /* Primary Network APIs */
 
@@ -187,7 +185,7 @@ static void generateHtmlTableHeader(StringBuilder sb) {
     /* Erasmus code */
 
     cell = new CoverageMatrixCell(NAME_COLOR_CLASS);
-    cell.addClass("ewpst__cell-schac");
+    cell.addClass("ewpst__cell-erasmus");
     this.cells.add(cell);
     Collection<String> erasmusCodes = hei.getOtherIds("erasmus");
     Optional<String> erasmusCode = erasmusCodes.stream().findFirst();

diff --git a/src/main/resources/style.css b/src/main/resources/style.css
@@ -328,7 +328,18 @@ a:hover {
     color: #000;
 }
 
+.ewpst__cell-institution {
+    min-width: 200px;
+}
+
 .ewpst__cell-schac {
+	min-width: 200px;
+    width: 200px;
+    word-break: break-all;
+}
+
+.ewpst__cell-erasmus {
+    min-width: 10em;
     width: 200px;
     word-break: break-all;
 }
@@ -355,9 +366,6 @@ a:hover {
     padding-left: 5px;
     padding-right: 5px;
 }
-.ewpst__cell.ewpst__cell--institution {
-    min-width: 200px;
-}
 .ewpst__row--header .ewpst__cell.ewpst__cell--cc1 {
     background: #b6d7a8;
     text-align: center;

diff --git a/src/main/resources/templates/heiFilter.pebble b/src/main/resources/templates/heiFilter.pebble
@@ -1,15 +1,17 @@
-<p>
-    You can search by HEI name, SCHAC, Erasmus code, PIC.
-    Please type a pattern and hit "Enter".
-    Example search patterns:
-</p>
+<div>
+    <p>
+        You can search by HEI name, SCHAC, Erasmus code, PIC.
+        Please type a pattern and hit "Enter".
+        Example search patterns:
+    </p>
 
-<ul>
-    <li>PL&lt;space&gt; - search for Polish HEIs (by Erasmus code)</li>
-    <li>Wien - search for HEIs that have "Wien" in their name</li>
-</ul>
+    <ul>
+        <li>PL&lt;space&gt; - search for Polish HEIs (by Erasmus code)</li>
+        <li>Wien - search for HEIs that have "Wien" in their name</li>
+    </ul>
 
-<form>
-    <label>Search for HEI: <input name="pattern" type="search" value="{{ pattern | default('') }}"
-                                  size="30" autofocus/></label>
-</form>
+    <form>
+        <label>Search for HEI: <input name="pattern" type="search" value="{{ pattern | default('') }}"
+                                      size="30" autofocus/></label>
+    </form>
+<div>
diff --git a/src/main/resources/templates/heiSearch.pebble b/src/main/resources/templates/heiSearch.pebble
@@ -31,7 +31,7 @@
                             {{ hei.id }}
                         </a>
                     </td>
-                    <td class="ewpst__cell ewpst__cell--cc1 ewpst__cell-schac">
+                    <td class="ewpst__cell ewpst__cell--cc1 ewpst__cell-erasmus">
                         {% if hei.otherIds('erasmus') is not empty %}
                         {{ hei.otherIds('erasmus') | first }}
                         {% endif %}