diff options
author | Peter Wu <peter@lekensteyn.nl> | 2015-03-25 15:53:49 +0100 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2015-03-25 15:53:49 +0100 |
commit | 4dd4ae8952f4484b79eaf95928fbe40ad67397d3 (patch) | |
tree | 6602f73fd6aa47faab917ed52fae80b80ab3dbea | |
parent | cdf71f78179ab54558cb60385980e6d401d79fca (diff) | |
download | site-4dd4ae8952f4484b79eaf95928fbe40ad67397d3.tar.gz |
Curriculum: fix display in FF, ellipsis overflow
-rw-r--r-- | js/curriculum.js | 2 | ||||
-rw-r--r-- | style/curriculum.less | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/js/curriculum.js b/js/curriculum.js index 4594f41..d434c67 100644 --- a/js/curriculum.js +++ b/js/curriculum.js @@ -40,7 +40,7 @@ define(['courses'], function(courses) { // types: bc, major, bep course_item.dataset.type = course.type || 'major'; - course_item.textContent = course.id + ' ' + course.name; + course_item.textContent = /*course.id + ' ' +*/ course.name; })); }; }); diff --git a/style/curriculum.less b/style/curriculum.less index 5f02380..1ae44ba 100644 --- a/style/curriculum.less +++ b/style/curriculum.less @@ -17,11 +17,11 @@ body[data-page="curriculum"] #curriculum-menu { } .quartile { background: @color-complement-1; - display: flex; & > li { - flex: 1; - width: 100%; + display: inline-block; + box-sizing: border-box; + width: 25%; } } .courses { @@ -29,9 +29,11 @@ body[data-page="curriculum"] #curriculum-menu { & > li { background: @color-complement-3; - margin: 2px inherit; + margin-top: 2px; + margin-bottom: 2px; white-space: nowrap; overflow: hidden; + text-overflow: ellipsis; &[data-type="bc"] { background-color: #FFC000; |