From 246f2822a602db6f5ccc8c3dc5f33d542af7a01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Flemstr=C3=B6m?= Date: Thu, 15 May 2014 00:47:12 +0200 Subject: [PATCH 1/3] Fix social links breaking over multiple lines like "(icon)\n@dflemstr" --- src/main/webapp/partial/about.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/partial/about.html b/src/main/webapp/partial/about.html index b2996a2..fbc573a 100644 --- a/src/main/webapp/partial/about.html +++ b/src/main/webapp/partial/about.html @@ -26,12 +26,10 @@

Contributors

{{contributor.name}}

- - @{{contributor.twitter}} +  @{{contributor.twitter}} - - {{contributor.github}} +  {{contributor.github}}
From 749e1ad46e3fbcdc1135b2e8269cd68f4787eb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Flemstr=C3=B6m?= Date: Thu, 15 May 2014 13:06:00 +0200 Subject: [PATCH 2/3] Instead use white-space CSS to force single line --- src/main/scss/style.scss | 4 ++++ src/main/webapp/partial/about.html | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/scss/style.scss b/src/main/scss/style.scss index 8f1ca9e..43697d3 100644 --- a/src/main/scss/style.scss +++ b/src/main/scss/style.scss @@ -73,6 +73,10 @@ text-decoration: line-through; } +.single-line { + white-space: nowrap; +} + .plain-panel { @include panel(#FAFAFA); } diff --git a/src/main/webapp/partial/about.html b/src/main/webapp/partial/about.html index fbc573a..6facddb 100644 --- a/src/main/webapp/partial/about.html +++ b/src/main/webapp/partial/about.html @@ -25,11 +25,11 @@

Contributors

{{contributor.name}}

- -  @{{contributor.twitter}} + + @{{contributor.twitter}} - -  {{contributor.github}} + + {{contributor.github}}
From 61c411e4c9eaa5c5d9b4688dc513fc526550038f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Flemstr=C3=B6m?= Date: Thu, 15 May 2014 13:07:59 +0200 Subject: [PATCH 3/3] Fix text wrapping for the rest of the about page --- src/main/webapp/partial/about.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/partial/about.html b/src/main/webapp/partial/about.html index 6facddb..1a70781 100644 --- a/src/main/webapp/partial/about.html +++ b/src/main/webapp/partial/about.html @@ -1,12 +1,14 @@

About

+

- Welcome to QWait [kuːˈwaɪt], the new open source, web based queueing manager developed for KTH CSC. Since the last millennium, - the mere mention of the queueing manager which must not be named has brought terror into the hearts of even the most - fearless students, but we say: no more. We have built QWait with a robust backend that will never give up on you, - and a lightweight web interface which can be used with your desktop, laptop, mobile device or toaster (given that it - supports HTML). Best of all: it makes queueing simple, just as it should be. + Welcome to QWait [kuːˈwaɪt], the new open source, web based queueing manager developed for KTH CSC. Since the last + millennium, the mere mention of the queueing manager which must not be named has brought terror into the hearts of + even the most fearless students, but we say: no more. We have built QWait with a robust backend that will never give + up on you, and a lightweight web interface which can be used with your desktop, laptop, mobile device or toaster + (given that it supports HTML). Best of all: it makes queueing simple, just as it should be.

+

QWait@GitHub