From 8e8cfc8b61486520ab9872214047baab6963f86f Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 16:34:50 +0800 Subject: [PATCH 01/31] ADD: link to item page on item img --- views/partials/itemCards.ejs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index 2658c29..a6f0bde 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -5,15 +5,15 @@ <%- fixture.toLowerCase() %> <% if (uuid) { %> -
+
<% } else { %>
<% } %>
<% if (picture === undefined || picture === '') { %> - + <% }else{ %> - + <%}%>
From 92b069ff90e7cc6eb54b3b86446aa4b981d81d2a Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 16:49:57 +0800 Subject: [PATCH 02/31] REMOVE: forced upper & lower styling for item card titles --- views/partials/itemCards.ejs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index a6f0bde..22801c8 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -18,11 +18,11 @@
<% if (uuid) { %> -

<%- fixture.toUpperCase().bold() %>

+

<%- fixture.bold() %>

<% } else { %> -

<%- fixture.toUpperCase().bold() %>

+

<%- fixture.bold() %>

<% } %> - <%- model.toLowerCase().italics() %> + <%- model.italics() %>
<% if (status === 'broken') { %> From e57e4c262d64e27a1b7a882853dcb689bce0fa3a Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 17:01:40 +0800 Subject: [PATCH 03/31] REMOVE: bootstrap nesting & extra margin around item cards --- public/main.css | 1 + views/search.ejs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public/main.css b/public/main.css index bb79e66..b66865c 100644 --- a/public/main.css +++ b/public/main.css @@ -42,6 +42,7 @@ .resultContainer { margin-top: 1em; overflow: hidden; + width: 100%; } .faded{ diff --git a/views/search.ejs b/views/search.ejs index 0542dd2..743a699 100644 --- a/views/search.ejs +++ b/views/search.ejs @@ -1,5 +1,5 @@ <% include ./partials/header %> -
+
<% matches.forEach(function(el) { %> <%- include('./partials/itemCards', el); %> <% }) %> From 5fc9303d93db47e1ed5a38e2ad77a75c2e25114c Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 17:06:05 +0800 Subject: [PATCH 04/31] ADD: conditional img link for item cards --- views/partials/itemCards.ejs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index 22801c8..ab40c8c 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -11,9 +11,17 @@ <% } %>
<% if (picture === undefined || picture === '') { %> - + <% if (uuid) { %> + + <% } else { %> + + <% } %> <% }else{ %> - + <% if (uuid) { %> + + <% } else { %> + + <% } %> <%}%>
From 3161d308134fd489d93add4f5ee52da5417419c3 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 17:09:56 +0800 Subject: [PATCH 05/31] REMOVE: bootstrap nesting & margin from item page divs --- views/item.ejs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/item.ejs b/views/item.ejs index c8807d2..8761768 100644 --- a/views/item.ejs +++ b/views/item.ejs @@ -1,6 +1,6 @@ <% include ./partials/header %> -
-
<% include ./partials/itemCards %>
-
<% include ./partials/itemImgInfo %>
+
+ <% include ./partials/itemCards %> + <% include ./partials/itemImgInfo %>
<% include ./partials/footer %> From 7bc3d809e07a928bea45cadfcea210e8959492f2 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 17:25:45 +0800 Subject: [PATCH 06/31] REMOVE: unused CSS rules --- public/main.css | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/public/main.css b/public/main.css index b66865c..8a8f683 100644 --- a/public/main.css +++ b/public/main.css @@ -40,13 +40,13 @@ } .resultContainer { - margin-top: 1em; - overflow: hidden; - width: 100%; + margin-top: 1em; + overflow: hidden; + width: 100%; } .faded{ - opacity: 0.5; + opacity: 0.5; } .itemImg { @@ -64,34 +64,23 @@ } .itemTitle { - text-align: center; -} - -.infoBox { - display: flex; - flex-wrap: wrap; - justify-content: space-between; + text-align: center; } article { - background-color: whitesmoke; + /*background-color: whitesmoke; border-radius: 3px; margin-bottom: 1em; - padding-bottom: 1em; - padding-top: 1em; + padding: 0;*/ } .miniSearchItem{ padding-bottom: 1em; padding-top: 1em; } + .miniItemImg{ width:100%; - -} -.searchResultList { - list-style: none; - padding: 0; } .stickers{ From 30987d514f1fb669a63f35ec9beccd2dd34026f5 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 18:13:08 +0800 Subject: [PATCH 07/31] REMOVE: more unused CSS rules --- public/main.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/public/main.css b/public/main.css index 8a8f683..7321a85 100644 --- a/public/main.css +++ b/public/main.css @@ -67,13 +67,6 @@ text-align: center; } -article { - /*background-color: whitesmoke; - border-radius: 3px; - margin-bottom: 1em; - padding: 0;*/ -} - .miniSearchItem{ padding-bottom: 1em; padding-top: 1em; From b28becc55434ea3dadc9868e7ac323137b009df8 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 18:33:09 +0800 Subject: [PATCH 08/31] TWEAK: title vertical centering --- public/main.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/main.css b/public/main.css index 7321a85..5f098eb 100644 --- a/public/main.css +++ b/public/main.css @@ -22,6 +22,8 @@ color: white; font-size: 3em; overflow: hidden; + height: 100%; + line-height: 1.5em; text-align: center; white-space: nowrap; } @@ -30,10 +32,10 @@ #appTitle { color: white; font-size: 1.5em; + line-height: 3em; margin-left: 0; overflow: hidden; padding-left: 0; - padding-top: 13px; text-align: left; white-space: nowrap; } From 14aa0a1abe77c0b22aa3aa8276ade80a110f9cd5 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 18:51:06 +0800 Subject: [PATCH 09/31] TWEAK: move inline styling to CSS file --- public/{emoji.png => frown.png} | Bin public/main.css | 3 +++ views/notFound.ejs | 6 ++---- 3 files changed, 5 insertions(+), 4 deletions(-) rename public/{emoji.png => frown.png} (100%) diff --git a/public/emoji.png b/public/frown.png similarity index 100% rename from public/emoji.png rename to public/frown.png diff --git a/public/main.css b/public/main.css index 5f098eb..d076fcc 100644 --- a/public/main.css +++ b/public/main.css @@ -84,3 +84,6 @@ padding-bottom: 1em; padding-top: 1em; } +.notFound{ + margin-top:2em; +} diff --git a/views/notFound.ejs b/views/notFound.ejs index 20dc903..3762adc 100644 --- a/views/notFound.ejs +++ b/views/notFound.ejs @@ -1,11 +1,9 @@ <% include ./partials/header %> - - -
+ +

Sorry, item not found with the id:

<%= id %>

- <% include ./partials/footer %> From 518c83037aec86647cbd5038903c4d387190232e Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 19:01:59 +0800 Subject: [PATCH 10/31] TWEAK: v-align title again --- public/main.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/main.css b/public/main.css index d076fcc..b6d19db 100644 --- a/public/main.css +++ b/public/main.css @@ -23,7 +23,7 @@ font-size: 3em; overflow: hidden; height: 100%; - line-height: 1.5em; + line-height: 1.6em; text-align: center; white-space: nowrap; } @@ -32,7 +32,7 @@ #appTitle { color: white; font-size: 1.5em; - line-height: 3em; + line-height: 3.25em; margin-left: 0; overflow: hidden; padding-left: 0; @@ -84,6 +84,7 @@ padding-bottom: 1em; padding-top: 1em; } + .notFound{ margin-top:2em; } From 42ee28ae09b07631af90983174f1c8ba5dc98256 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 19:03:48 +0800 Subject: [PATCH 11/31] REMOVE: unused img --- i_love_qr.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 i_love_qr.svg diff --git a/i_love_qr.svg b/i_love_qr.svg deleted file mode 100644 index d801ace..0000000 --- a/i_love_qr.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From e80ab30abcbd43dbb70e0cfc4ae12ee7e6bffc22 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 21:56:54 +0800 Subject: [PATCH 12/31] FIX: item img size increase, ADD: wrench.png for broken items --- public/main.css | 36 ++++++++++++++++++++++++++++------- public/wrench.png | Bin 0 -> 2881 bytes views/partials/itemCards.ejs | 16 ++++++++-------- 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 public/wrench.png diff --git a/public/main.css b/public/main.css index b6d19db..15a816b 100644 --- a/public/main.css +++ b/public/main.css @@ -46,21 +46,43 @@ overflow: hidden; width: 100%; } - +.card{ + background-color: #DCDCDC; + border-bottom: 1px solid #000; + border-radius: 10px; + margin-bottom: 1em; +} .faded{ opacity: 0.5; } - +.pic{ + /*border: 1px dotted blue;*/ + /*padding: 0.5em 0 0.5em 0;*/ +} +.tit{ + /*border: 1px dotted red;*/ +} +.sta{ + /*border: 1px dotted green;*/ + /*padding: 0.5em 0 0.5em 0;*/ +} +.status{ + margin: 0.5em 0 0.5em -6vw; + width: 150%; +} .itemImg { - font-size: 11vw; - margin-left: -3vw; - width: 300%; + border-radius: 10px; + margin: 0.5em 0 0.5em -6vw; + width: 150%; } @media screen and (min-width: 500px) { .itemImg { - font-size: 9vw; - margin-left: 0; + margin: 0.5em 0 0.5em -2vw; + width: 100%; + } + .status{ + margin: 0.5em 0 0.5em 0; width: 100%; } } diff --git a/public/wrench.png b/public/wrench.png new file mode 100644 index 0000000000000000000000000000000000000000..21d8a4ed4b4da8cd458205561e959e11773c6867 GIT binary patch literal 2881 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 literal 0 HcmV?d00001 diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index ab40c8c..a392354 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -5,11 +5,11 @@ <%- fixture.toLowerCase() %>
<% if (uuid) { %> -
+
<% } else { %> -
+
<% } %> -
+
<% if (picture === undefined || picture === '') { %> <% if (uuid) { %> @@ -22,9 +22,9 @@ <% } else { %> <% } %> - <%}%> + <% } %>
-
+
<% if (uuid) { %>

<%- fixture.bold() %>

<% } else { %> @@ -32,9 +32,9 @@ <% } %> <%- model.italics() %>
-
+
<% if (status === 'broken') { %> - - <%}%> + <%- status %> + <% } %>
From dea48996780b01c3369b939fd3d9364ac5e9041e Mon Sep 17 00:00:00 2001 From: Spazcool Date: Tue, 19 Dec 2017 22:20:44 +0800 Subject: [PATCH 13/31] REMOVE: temp CSS classes, TWEAK: img sizes --- public/main.css | 15 +++------------ views/partials/itemCards.ejs | 6 +++--- views/partials/itemImgInfo.ejs | 8 ++++---- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/public/main.css b/public/main.css index 15a816b..ca0a7c8 100644 --- a/public/main.css +++ b/public/main.css @@ -55,17 +55,7 @@ .faded{ opacity: 0.5; } -.pic{ - /*border: 1px dotted blue;*/ - /*padding: 0.5em 0 0.5em 0;*/ -} -.tit{ - /*border: 1px dotted red;*/ -} -.sta{ - /*border: 1px dotted green;*/ - /*padding: 0.5em 0 0.5em 0;*/ -} + .status{ margin: 0.5em 0 0.5em -6vw; width: 150%; @@ -97,7 +87,8 @@ } .miniItemImg{ - width:100%; + border-radius: 10px; + width: 100%; } .stickers{ diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index a392354..341a7b6 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -9,7 +9,7 @@ <% } else { %>
<% } %> -
+
<% if (picture === undefined || picture === '') { %> <% if (uuid) { %> @@ -24,7 +24,7 @@ <% } %> <% } %>
-
+
<% if (uuid) { %>

<%- fixture.bold() %>

<% } else { %> @@ -32,7 +32,7 @@ <% } %> <%- model.italics() %>
-
+
<% if (status === 'broken') { %> <%- status %> <% } %> diff --git a/views/partials/itemImgInfo.ejs b/views/partials/itemImgInfo.ejs index 6a28ee2..56abf1a 100644 --- a/views/partials/itemImgInfo.ejs +++ b/views/partials/itemImgInfo.ejs @@ -1,17 +1,17 @@ <% if (HOWTO) { %> -
+

How To

<%- HOWTO %>
<%}%> <% if (Troubleshooting) { %> -
+

Need Help

<%- Troubleshooting %>
<% } %> <% if ( similarItems.length > 0 ) { %> -
+

Similar Items

<% for(var i = 0; i < similarItems.length; i++){ %>
@@ -32,7 +32,7 @@ <% } %>
<%}%> -
+

Details

<%- details %>
    From 472ffc36dd464c6df7fdb2c1cee3c12be8aabdf7 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Wed, 20 Dec 2017 16:39:34 +0800 Subject: [PATCH 14/31] FIX: consistent padding & margins --- public/main.css | 27 ++++++++++++++------- views/partials/itemCards.ejs | 6 ++--- views/partials/itemImgInfo.ejs | 44 +++++++++++++++++----------------- 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/public/main.css b/public/main.css index ca0a7c8..fc0677d 100644 --- a/public/main.css +++ b/public/main.css @@ -46,49 +46,58 @@ overflow: hidden; width: 100%; } + .card{ - background-color: #DCDCDC; - border-bottom: 1px solid #000; + /*background-color: #DCDCDC;*/ + /*border-bottom: 1px solid #000;*/ border-radius: 10px; margin-bottom: 1em; + padding: 1em 0 1em 0; } + .faded{ opacity: 0.5; } .status{ - margin: 0.5em 0 0.5em -6vw; + margin: 0 0 0 -6vw; width: 150%; } .itemImg { border-radius: 10px; - margin: 0.5em 0 0.5em -6vw; + margin: 0 0 0 -4vw; width: 150%; } @media screen and (min-width: 500px) { .itemImg { - margin: 0.5em 0 0.5em -2vw; + margin: 0 0 0 -1.5vw; width: 100%; } .status{ - margin: 0.5em 0 0.5em 0; + margin: 0 0 0 2vw; width: 100%; } } .itemTitle { + font-size: 1.25em; text-align: center; } +.infoTitle{ + font-size: 2em; + line-height: 1em; + margin-bottom: 0.5em; +} + .miniSearchItem{ - padding-bottom: 1em; - padding-top: 1em; + text-align: center; } .miniItemImg{ border-radius: 10px; - width: 100%; + width: 32.5%; } .stickers{ diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index 341a7b6..69f756a 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -26,11 +26,11 @@
<% if (uuid) { %> -

<%- fixture.bold() %>

+ <%- fixture.bold() %> <% } else { %> -

<%- fixture.bold() %>

+ <%- fixture.bold() %> <% } %> - <%- model.italics() %> +
<%- model.italics() %>
<% if (status === 'broken') { %> diff --git a/views/partials/itemImgInfo.ejs b/views/partials/itemImgInfo.ejs index 56abf1a..9384a1f 100644 --- a/views/partials/itemImgInfo.ejs +++ b/views/partials/itemImgInfo.ejs @@ -1,39 +1,39 @@ <% if (HOWTO) { %>
-

How To

+
How To
<%- HOWTO %>
<%}%> <% if (Troubleshooting) { %>
-

Need Help

+
Need Help
<%- Troubleshooting %>
<% } %> <% if ( similarItems.length > 0 ) { %> -
-

Similar Items

- <% for(var i = 0; i < similarItems.length; i++){ %> -
- <% if (!similarItems[i].picture) { %> - <% if (!similarItems[i].uuid) { %> - - <% }else{ %> - - <%}%> - <% } else{ %> - <% if (!similarItems[i].uuid) { %> - - <% }else{ %> - - <%} %> +
+
Similar Items
+
+ <% for (var i = 0; i < similarItems.length; i++) { %> + <% if (!similarItems[i].picture) { %> + <% if (!similarItems[i].uuid) { %> + + <% }else{ %> + + <%}%> + <% } else{ %> + <% if (!similarItems[i].uuid) { %> + + <% }else{ %> + <% } %> -
+ <% } %> <% } %> -
-<%}%> +
+
+<% } %>
-

Details

+
Details
<%- details %>
  • model: <%- model %>
  • From 7fa19913c034101f34e7f2db23edaa0e396683b8 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Wed, 20 Dec 2017 16:50:19 +0800 Subject: [PATCH 15/31] ADD: background color --- public/main.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/main.css b/public/main.css index fc0677d..f78a110 100644 --- a/public/main.css +++ b/public/main.css @@ -48,8 +48,7 @@ } .card{ - /*background-color: #DCDCDC;*/ - /*border-bottom: 1px solid #000;*/ + background-color: #DCDCDC; border-radius: 10px; margin-bottom: 1em; padding: 1em 0 1em 0; From 2e27415c2317d01824d3afe4c78a25535d57c5b1 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Thu, 21 Dec 2017 16:58:23 +0800 Subject: [PATCH 16/31] FIX: shrunk & centered wrench icon --- public/main.css | 9 +++++---- views/partials/itemCards.ejs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/main.css b/public/main.css index f78a110..605d581 100644 --- a/public/main.css +++ b/public/main.css @@ -59,9 +59,10 @@ } .status{ - margin: 0 0 0 -6vw; - width: 150%; + margin: 2em 0 0 0; + width: 75%; } + .itemImg { border-radius: 10px; margin: 0 0 0 -4vw; @@ -74,8 +75,8 @@ width: 100%; } .status{ - margin: 0 0 0 2vw; - width: 100%; + margin: 4.5em 0 0 0; + width: 50%; } } diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index 69f756a..d876bf9 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -32,7 +32,7 @@ <% } %>
    <%- model.italics() %>
-
+
<% if (status === 'broken') { %> <%- status %> <% } %> From 0b97e5951194689977ba04fd3d14b3600cf9c1eb Mon Sep 17 00:00:00 2001 From: Spazcool Date: Thu, 21 Dec 2017 17:49:28 +0800 Subject: [PATCH 17/31] FIX: similar items imgs align left --- public/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/main.css b/public/main.css index 605d581..c4df0aa 100644 --- a/public/main.css +++ b/public/main.css @@ -92,7 +92,7 @@ } .miniSearchItem{ - text-align: center; + text-align: left; } .miniItemImg{ From 650d0608b6fed0e73e9f7f654c92f3ff11772e1a Mon Sep 17 00:00:00 2001 From: Spazcool Date: Thu, 21 Dec 2017 17:51:33 +0800 Subject: [PATCH 18/31] FIX: no more round edge on imgs --- public/main.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/main.css b/public/main.css index c4df0aa..d83bcba 100644 --- a/public/main.css +++ b/public/main.css @@ -64,7 +64,6 @@ } .itemImg { - border-radius: 10px; margin: 0 0 0 -4vw; width: 150%; } @@ -96,7 +95,6 @@ } .miniItemImg{ - border-radius: 10px; width: 32.5%; } From 8dbbadc307d4508d89e70fcf9a1eb015a02ae6fd Mon Sep 17 00:00:00 2001 From: Spazcool Date: Thu, 21 Dec 2017 17:53:48 +0800 Subject: [PATCH 19/31] FIX: lighter background color --- public/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/main.css b/public/main.css index d83bcba..bcad816 100644 --- a/public/main.css +++ b/public/main.css @@ -48,7 +48,7 @@ } .card{ - background-color: #DCDCDC; + background-color: #EEE; border-radius: 10px; margin-bottom: 1em; padding: 1em 0 1em 0; From 56d06f0320a7e2446670bb82bd27f886613d3992 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Thu, 21 Dec 2017 17:57:54 +0800 Subject: [PATCH 20/31] FIX: breadcrumb padding --- public/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/main.css b/public/main.css index bcad816..72191e1 100644 --- a/public/main.css +++ b/public/main.css @@ -50,7 +50,7 @@ .card{ background-color: #EEE; border-radius: 10px; - margin-bottom: 1em; + margin: 0.5em 0; padding: 1em 0 1em 0; } From 97bea3bc86597ed6e102dfa8d053c048450f0986 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Thu, 21 Dec 2017 22:35:10 +0800 Subject: [PATCH 21/31] FIX: similar items aligned better --- public/main.css | 18 ++++++++++++++---- views/partials/itemImgInfo.ejs | 10 +++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/public/main.css b/public/main.css index 72191e1..3af21a9 100644 --- a/public/main.css +++ b/public/main.css @@ -73,10 +73,15 @@ margin: 0 0 0 -1.5vw; width: 100%; } + .status{ margin: 4.5em 0 0 0; width: 50%; } + + #miniImg1{ + margin: 0 0 0 2em; + } } .itemTitle { @@ -90,12 +95,17 @@ margin-bottom: 0.5em; } -.miniSearchItem{ - text-align: left; +.miniItemImg{ + width: 30.5%; +} + +#miniImg1{ + margin: 0 0 0 0.83em; } -.miniItemImg{ - width: 32.5%; +#miniImg2{ + float: right; + margin-right: 0; } .stickers{ diff --git a/views/partials/itemImgInfo.ejs b/views/partials/itemImgInfo.ejs index 9384a1f..d594083 100644 --- a/views/partials/itemImgInfo.ejs +++ b/views/partials/itemImgInfo.ejs @@ -3,7 +3,7 @@
How To
<%- HOWTO %> -<%}%> +<% } %> <% if (Troubleshooting) { %>
Need Help
@@ -17,15 +17,15 @@ <% for (var i = 0; i < similarItems.length; i++) { %> <% if (!similarItems[i].picture) { %> <% if (!similarItems[i].uuid) { %> - + <% }else{ %> - + <%}%> <% } else{ %> <% if (!similarItems[i].uuid) { %> - + <% }else{ %> - + <% } %> <% } %> <% } %> From 212a39004916ac39358b68203bb8ac6d2c0f7b53 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sat, 23 Dec 2017 01:13:08 +0800 Subject: [PATCH 22/31] ADD: flex, REMOVE: bootstrap from itemCard --- public/main.css | 52 +++++++++++++++++++++++++----------- views/partials/itemCards.ejs | 19 +++++++------ 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/public/main.css b/public/main.css index 3af21a9..f02b2f4 100644 --- a/public/main.css +++ b/public/main.css @@ -47,44 +47,66 @@ width: 100%; } +.breadcrumbs{ + margin-left: 5px; +} + .card{ - background-color: #EEE; - border-radius: 10px; - margin: 0.5em 0; - padding: 1em 0 1em 0; + align-items: center; + background: #CCC; + display: flex; + justify-content: space-between; + margin: 2.5px 5px; } -.faded{ - opacity: 0.5; +.image { + flex: 1; + margin: 5px; +} + +.itemImg { + max-height: 150px; + max-width: 100%; +} + +.itemTitle { + flex: 2; +} + +.center { + padding: 20px; + text-align: center; +} + +.right { + text-align: right; } .status{ - margin: 2em 0 0 0; width: 75%; } -.itemImg { - margin: 0 0 0 -4vw; - width: 150%; +.faded{ + opacity: 0.5; } @media screen and (min-width: 500px) { - .itemImg { + /*.itemImg { margin: 0 0 0 -1.5vw; width: 100%; } - + .status{ margin: 4.5em 0 0 0; width: 50%; - } + }*/ #miniImg1{ margin: 0 0 0 2em; } } -.itemTitle { +/*.itemTitle { font-size: 1.25em; text-align: center; } @@ -93,7 +115,7 @@ font-size: 2em; line-height: 1em; margin-bottom: 0.5em; -} +}*/ .miniItemImg{ width: 30.5%; diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index d876bf9..413d3f7 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -1,15 +1,15 @@ -
+ <% if (uuid) { %> -
+
<% } else { %> -
+
<% } %> -
+
<% if (picture === undefined || picture === '') { %> <% if (uuid) { %> @@ -24,17 +24,20 @@ <% } %> <% } %>
-
+
<% if (uuid) { %> - <%- fixture.bold() %> +
+ <%- fixture.bold() %> <% } else { %> +
<%- fixture.bold() %> <% } %>
<%- model.italics() %>
+
-
+
<% if (status === 'broken') { %> - <%- status %> + <%- status %> <% } %>
From c0673423ca9a588476b8d49e75f755e58e8d92d8 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sat, 23 Dec 2017 01:18:23 +0800 Subject: [PATCH 23/31] REMOVE: JS style methods, ADD: CSS rules instead --- public/main.css | 7 +++++++ views/partials/itemCards.ejs | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/public/main.css b/public/main.css index f02b2f4..33e9fe8 100644 --- a/public/main.css +++ b/public/main.css @@ -74,10 +74,17 @@ } .center { + font-weight: bold; padding: 20px; text-align: center; } +.subTitle{ + font-size: 0.75em; + font-style: italic; + font-weight: normal; +} + .right { text-align: right; } diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index 413d3f7..4320b35 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -1,8 +1,8 @@ <% if (uuid) { %>
@@ -27,12 +27,12 @@
<% if (uuid) { %>
- <%- fixture.bold() %> + <%- fixture %> <% } else { %>
- <%- fixture.bold() %> + <%- fixture %> <% } %> -
<%- model.italics() %>
+
<%- model %>
From 7f13d77b5ab70d89544e5264192c79f5df95aabf Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sat, 23 Dec 2017 04:39:19 +0800 Subject: [PATCH 24/31] MODIFY: itemImgInfo styling to matche itemCard style --- public/main.css | 42 ++++++++++++++-------------------- views/partials/itemImgInfo.ejs | 8 +++---- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/public/main.css b/public/main.css index 33e9fe8..9fe1ead 100644 --- a/public/main.css +++ b/public/main.css @@ -39,6 +39,14 @@ text-align: left; white-space: nowrap; } + + #miniImg1{ + margin: 0 0 0 2em; + } + + .status{ + width: 35%; + } } .resultContainer { @@ -90,46 +98,30 @@ } .status{ - width: 75%; + width: 65%; } .faded{ opacity: 0.5; } -@media screen and (min-width: 500px) { - /*.itemImg { - margin: 0 0 0 -1.5vw; - width: 100%; - } - - .status{ - margin: 4.5em 0 0 0; - width: 50%; - }*/ - - #miniImg1{ - margin: 0 0 0 2em; - } -} - -/*.itemTitle { - font-size: 1.25em; - text-align: center; +.subCard{ + background: #CCC; + margin: 5px 5px; + padding: 5px; } .infoTitle{ font-size: 2em; - line-height: 1em; - margin-bottom: 0.5em; -}*/ + margin-top: -7.5px; +} .miniItemImg{ - width: 30.5%; + width: 32.5%; } #miniImg1{ - margin: 0 0 0 0.83em; + margin: 0 0 0 0.05em; } #miniImg2{ diff --git a/views/partials/itemImgInfo.ejs b/views/partials/itemImgInfo.ejs index d594083..bad2425 100644 --- a/views/partials/itemImgInfo.ejs +++ b/views/partials/itemImgInfo.ejs @@ -1,17 +1,17 @@ <% if (HOWTO) { %> -
+
How To
<%- HOWTO %>
<% } %> <% if (Troubleshooting) { %> -
+
Need Help
<%- Troubleshooting %>
<% } %> <% if ( similarItems.length > 0 ) { %> -
+
Similar Items
<% for (var i = 0; i < similarItems.length; i++) { %> @@ -32,7 +32,7 @@
<% } %> -
+
Details
<%- details %>
    From 5d0612b7bd47b41c47cc5b452c897d08b27df689 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sat, 23 Dec 2017 04:56:37 +0800 Subject: [PATCH 25/31] MODIFY: recent styling, matches itemCard --- public/main.css | 4 ++-- views/recent.ejs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/main.css b/public/main.css index 9fe1ead..d6a0bf7 100644 --- a/public/main.css +++ b/public/main.css @@ -61,7 +61,7 @@ .card{ align-items: center; - background: #CCC; + background: #DDD; display: flex; justify-content: space-between; margin: 2.5px 5px; @@ -106,7 +106,7 @@ } .subCard{ - background: #CCC; + background: #DDD; margin: 5px 5px; padding: 5px; } diff --git a/views/recent.ejs b/views/recent.ejs index 372cf57..15aac3c 100644 --- a/views/recent.ejs +++ b/views/recent.ejs @@ -1,7 +1,7 @@ <% include ./partials/header %> -
    -

    Recently scanned QR code

    -
    +
    +

    Recently scanned QR codes

    +
      <% for(var i = 0; i <% if(allScans[i].fixture) { %> From dba57cff713aa9a5529ec9c8d55df3063760ffa0 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sat, 23 Dec 2017 05:08:09 +0800 Subject: [PATCH 26/31] MODIFY: notFound styling matches itemCard --- public/main.css | 4 ---- views/notFound.ejs | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/public/main.css b/public/main.css index d6a0bf7..0a5dec8 100644 --- a/public/main.css +++ b/public/main.css @@ -135,7 +135,3 @@ padding-bottom: 1em; padding-top: 1em; } - -.notFound{ - margin-top:2em; -} diff --git a/views/notFound.ejs b/views/notFound.ejs index 3762adc..f5efa0b 100644 --- a/views/notFound.ejs +++ b/views/notFound.ejs @@ -1,9 +1,9 @@ <% include ./partials/header %> - -
      +
      + frown +
      +

      Sorry, item not found with the id:

      -

      - <%= id %> -

      + <%= id %>
      <% include ./partials/footer %> From a036d1a0f6b7882c4a509c43557c5bf2211ef90c Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sat, 23 Dec 2017 05:09:40 +0800 Subject: [PATCH 27/31] REMOVE: JS styling methods from qrList --- views/qrList.ejs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/qrList.ejs b/views/qrList.ejs index 2b6f3d7..fe07681 100644 --- a/views/qrList.ejs +++ b/views/qrList.ejs @@ -3,10 +3,10 @@ <% for ( var i = 0; i < matches.length; i++) {%>
      - <%- matches[i].floor.toLowerCase() %> > - <%- matches[i].room.toLowerCase() %> > - <%- matches[i].location.toLowerCase() %> > - <%- matches[i].fixture.toLowerCase() %> + <%- matches[i].floor %> > + <%- matches[i].room %> > + <%- matches[i].location %> > + <%- matches[i].fixture %>
      <%- matches[i].qr %> From b23af9d170c68f5736a76154ec13f046330654b6 Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sat, 23 Dec 2017 05:33:09 +0800 Subject: [PATCH 28/31] REMOVE: bootstrap and nesting from qrList --- public/main.css | 19 +++++++++++++++---- views/qrList.ejs | 30 +++++++++++++----------------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/public/main.css b/public/main.css index 0a5dec8..34014b1 100644 --- a/public/main.css +++ b/public/main.css @@ -47,6 +47,11 @@ .status{ width: 35%; } + + .sticker{ + font-size: 40%; + width: 19%; + } } .resultContainer { @@ -129,9 +134,15 @@ margin-right: 0; } -.stickers{ +.sticker{ border: 1px dotted black; - font-size: 30%; - padding-bottom: 1em; - padding-top: 1em; + display: inline-block; + font-size: 90%; + margin: 0; + padding: 1em 0; + width: 99%; +} + +.qrImg{ + /*width: 20%;*/ } diff --git a/views/qrList.ejs b/views/qrList.ejs index fe07681..76bdd2e 100644 --- a/views/qrList.ejs +++ b/views/qrList.ejs @@ -1,22 +1,18 @@ <% include ./partials/header %> -
      - <% for ( var i = 0; i < matches.length; i++) {%> -
      -
      - <%- matches[i].floor %> > - <%- matches[i].room %> > - <%- matches[i].location %> > - <%- matches[i].fixture %> -
      -
      +
      +
      + <% for ( var i = 0; i < matches.length; i++) {%> +
      + <%- matches[i].qr %> + <%- matches[i].uuid %>
      -
      -
      - <%- matches[i].uuid %> -
      -
      -
      - <% } %> + <% } %> +
      <% include ./partials/footer %> From 47aac90676e37a72ae690a37b6345e0a17c125ca Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sat, 23 Dec 2017 23:19:21 +0800 Subject: [PATCH 29/31] FIX: title style to match itemCard, REMOVE: dead code from itemCard --- public/main.css | 29 ++++++++--------------------- views/partials/header.ejs | 6 +++--- views/partials/itemCards.ejs | 2 +- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/public/main.css b/public/main.css index 34014b1..68f1f51 100644 --- a/public/main.css +++ b/public/main.css @@ -4,8 +4,8 @@ background-repeat: no-repeat; background-size: cover; height: 7em; - margin-bottom: 1em; - margin-top: 1em; + margin: 1em 0; + padding: 0 5px; position: relative; width: 100%; } @@ -20,24 +20,15 @@ #appTitle { color: white; - font-size: 3em; - overflow: hidden; - height: 100%; - line-height: 1.6em; - text-align: center; - white-space: nowrap; + font-size: 1.5em; + line-height: 3.2em; } -@media screen and (max-width: 500px) { +@media screen and (min-width: 500px) { #appTitle { - color: white; - font-size: 1.5em; - line-height: 3.25em; - margin-left: 0; - overflow: hidden; - padding-left: 0; - text-align: left; - white-space: nowrap; + font-size: 3em; + line-height: 1.5em; + text-align: center; } #miniImg1{ @@ -142,7 +133,3 @@ padding: 1em 0; width: 99%; } - -.qrImg{ - /*width: 20%;*/ -} diff --git a/views/partials/header.ejs b/views/partials/header.ejs index d9c57fd..f501e3c 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -11,6 +11,6 @@ - + diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index 4320b35..e4891a3 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -37,7 +37,7 @@
      <% if (status === 'broken') { %> - <%- status %> + <%- status %> <% } %>
      From c26294a878c5a496a6463e6047ac7c2f9ebb6a4a Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sun, 24 Dec 2017 18:14:36 +0800 Subject: [PATCH 30/31] FIX: CSS rules for card and titleCard classes --- public/main.css | 15 ++++++--------- views/partials/itemCards.ejs | 4 ++-- views/partials/itemImgInfo.ejs | 8 ++++---- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/public/main.css b/public/main.css index 68f1f51..ae138ab 100644 --- a/public/main.css +++ b/public/main.css @@ -56,16 +56,19 @@ } .card{ - align-items: center; background: #DDD; + margin: 5px; + padding: 5px; +} + +.titleCard{ + align-items: center; display: flex; justify-content: space-between; - margin: 2.5px 5px; } .image { flex: 1; - margin: 5px; } .itemImg { @@ -101,12 +104,6 @@ opacity: 0.5; } -.subCard{ - background: #DDD; - margin: 5px 5px; - padding: 5px; -} - .infoTitle{ font-size: 2em; margin-top: -7.5px; diff --git a/views/partials/itemCards.ejs b/views/partials/itemCards.ejs index e4891a3..8b84bb6 100644 --- a/views/partials/itemCards.ejs +++ b/views/partials/itemCards.ejs @@ -5,9 +5,9 @@ <%- fixture %>
      <% if (uuid) { %> -
      +
      <% } else { %> -
      +
      <% } %>
      <% if (picture === undefined || picture === '') { %> diff --git a/views/partials/itemImgInfo.ejs b/views/partials/itemImgInfo.ejs index bad2425..eaec51e 100644 --- a/views/partials/itemImgInfo.ejs +++ b/views/partials/itemImgInfo.ejs @@ -1,17 +1,17 @@ <% if (HOWTO) { %> -
      +
      How To
      <%- HOWTO %>
      <% } %> <% if (Troubleshooting) { %> -
      +
      Need Help
      <%- Troubleshooting %>
      <% } %> <% if ( similarItems.length > 0 ) { %> -
      +
      Similar Items
      <% for (var i = 0; i < similarItems.length; i++) { %> @@ -32,7 +32,7 @@
      <% } %> -
      +
      Details
      <%- details %>
        From 07ef078aca1d040a6ecf29e64a461233aee9a69a Mon Sep 17 00:00:00 2001 From: Spazcool Date: Sun, 24 Dec 2017 18:17:03 +0800 Subject: [PATCH 31/31] REMOVE: grey background from cards --- public/main.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/main.css b/public/main.css index ae138ab..93a2ad1 100644 --- a/public/main.css +++ b/public/main.css @@ -52,11 +52,10 @@ } .breadcrumbs{ - margin-left: 5px; + margin-left: 10px; } .card{ - background: #DDD; margin: 5px; padding: 5px; }