From c636dc1fdd8b148c28269bde105b209fb32c6097 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 21 Mar 2017 12:16:43 -0400 Subject: better layout on bigger screens --- Makefile | 2 +- index.html.gen | 10 +++++++++- jarmon-style/style.scss | 2 -- jarmon.html.in | 25 +++++++++++++++++++++++++ jarmon.html.part | 46 ---------------------------------------------- style.scss | 19 +++++++++++++------ 6 files changed, 48 insertions(+), 56 deletions(-) create mode 100644 jarmon.html.in delete mode 100644 jarmon.html.part diff --git a/Makefile b/Makefile index d175cc3..3ce825e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all: index.html style.css jarmon-style/jquerytools.tabs.tabs-no-images.css jarmo %: %.go util $(wildcard util/*.go) go build $< -index.html: tls.html.part crtsh.html.part diff.html.part jarmon.html.part +index.html: tls.html.part crtsh.html.part diff.html.part jarmon.html.in crtsh.pem: crtsh-getcerts config-domains.txt NET-crtsh ./crtsh-getcerts $$(sed 's/#.*//' config-domains.txt) > $@ diff --git a/index.html.gen b/index.html.gen index b6fd603..69377fb 100755 --- a/index.html.gen +++ b/index.html.gen @@ -1,5 +1,11 @@ #!/bin/sh +col() { + echo '
' + eval "$*" + echo '
' +} + echo ' @@ -19,6 +25,8 @@ echo ' ' -cat jarmon.html.part tls.html.part crtsh.html.part diff.html.part +col sed 's/@name@/proton/' jarmon.html.in +col sed 's/@name@/winston/' jarmon.html.in +col cat tls.html.part crtsh.html.part diff.html.part echo ' ' diff --git a/jarmon-style/style.scss b/jarmon-style/style.scss index 0ca3d13..2aa3c5f 100644 --- a/jarmon-style/style.scss +++ b/jarmon-style/style.scss @@ -1,7 +1,5 @@ .jarmon { - width: 32%; border: solid 1px black; - padding: -1px; border-radius: 4px; .chartRangeControl { diff --git a/jarmon.html.in b/jarmon.html.in new file mode 100644 index 0000000..9d521f5 --- /dev/null +++ b/jarmon.html.in @@ -0,0 +1,25 @@ +
+
+
+

+
+
+
+
+
+
+
+ + + + + +
+
+
+
+
+
+
diff --git a/jarmon.html.part b/jarmon.html.part deleted file mode 100644 index 65ddede..0000000 --- a/jarmon.html.part +++ /dev/null @@ -1,46 +0,0 @@ -
-
-

-
-
-
-
-
-
-
- - - - - -
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
- - - - - -
-
-
-
-
-
diff --git a/style.scss b/style.scss index ef61e18..70747bd 100644 --- a/style.scss +++ b/style.scss @@ -9,12 +9,16 @@ body { margin: 0; display: flex; - flex-direction: column; - flex-wrap: wrap; + flex-direction: row; align-items: center; -} -body > * { - margin: auto; + & > * { + flex-direction: column; + align-items: center; + margin: auto; + & > * { + margin: auto; + } + } } * { box-sizing: border-box; @@ -63,7 +67,10 @@ table { color: black; } } -/* generic time formatting */ +/* generic time formatting - for datetimes that we want to render as + just a date, but still want to be sortable, we a construct like + ``, then use this to + hide the TIME part of it. */ time .time { display: none } -- cgit v1.2.3