From be9848097e6dcaba798db9df4364d9f9cd79a451 Mon Sep 17 00:00:00 2001 From: sovanna Date: Wed, 22 Jan 2020 16:48:00 +0100 Subject: [PATCH] fix(issue17): Improves dynamic changes to fixed height --- content/experiment-control/resources.md | 26 ++++++++++++------------- sass/css/_layout.scss | 4 ---- templates/shortcodes/layout_card.html | 4 +++- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/content/experiment-control/resources.md b/content/experiment-control/resources.md index 0473e07..90d842e 100644 --- a/content/experiment-control/resources.md +++ b/content/experiment-control/resources.md @@ -10,33 +10,33 @@ template = "page.html"
-{% layout_card(title="ARTIQ manual") %} +{% layout_card(title="ARTIQ manual", sameheight=100) %} Stable version PDF | HTML {% end %} -{% layout_card(title="SiPyCo manual") %} +{% layout_card(title="SiPyCo manual", sameheight=100) %} Starting with ARTIQ-5, this library replaces artiq.protocols. PDF | HTML {% end %} -{% layout_card(title="ARTIQ manual") %} +{% layout_card(title="ARTIQ manual", sameheight=100) %} Beta (development) version PDF | HTML {% end %} -{% layout_card(title="Slideshow") %} +{% layout_card(title="Slideshow", sameheight=100) %} The ARTIQ experiment control system View slides {% end %} -{% layout_card(title="Slideshow") %} +{% layout_card(title="Slideshow", sameheight=100) %} Timing control in ARTIQ View slides @@ -120,51 +120,51 @@ We welcome inquiries from research groups of all sizes.
-{% layout_card(title="Entangler core") %} +{% layout_card(title="Entangler core", sameheight=120) %} A FPGA core written in Migen with ARTIQ interface, for controlling remote quantum entanglement of trapped ions. Repository | Paper {% end %} -{% layout_card(title="ndscan") %} +{% layout_card(title="ndscan", sameheight=120) %} N-dimensional scans for ARTIQ Repository {% end %} -{% layout_card(title="Oxford routines") %} +{% layout_card(title="Oxford routines", sameheight=120) %} Oxford Ion-Trap Group routines Repository {% end %} -{% layout_card(title="Terminal interface") %} +{% layout_card(title="Terminal interface", sameheight=120) %} A terminal interface for the Advanced Real-Time Infrastructure for Quantum physics (ARTIQ). Repository {% end %} -{% layout_card(title="ARTIQ-suservo") %} +{% layout_card(title="ARTIQ-suservo", sameheight=120) %} A set of scripts for the ARTIQ suservo device. Repository {% end %} -{% layout_card(title="nvOS") %} +{% layout_card(title="nvOS", sameheight=120) %} A quantum operating system built around ARTIQ and NV centers in diamond. Repository {% end %} -{% layout_card(title="Haeffner Lab routines") %} +{% layout_card(title="Haeffner Lab routines", sameheight=120) %} Haeffner Lab (Berkeley) routines Repository {% end %} -{% layout_card(title="WIPM routines") %} +{% layout_card(title="WIPM routines", sameheight=120) %} WIPM (CAS Wuhan) routines Repository diff --git a/sass/css/_layout.scss b/sass/css/_layout.scss index 45fa092..6086c94 100644 --- a/sass/css/_layout.scss +++ b/sass/css/_layout.scss @@ -113,10 +113,6 @@ img.kf25 { width: 310px; } -.card.shadow .card-title + p { - height: 50px; -} - // Small devices (landscape phones, 576px and up) @media (min-width: 576px) { diff --git a/templates/shortcodes/layout_card.html b/templates/shortcodes/layout_card.html index 86e0a42..5465d47 100644 --- a/templates/shortcodes/layout_card.html +++ b/templates/shortcodes/layout_card.html @@ -17,7 +17,9 @@
{% endif %} - {{ body | markdown | safe }} +
+ {{ body | markdown | safe }} +