From 0316746cae18a2b6857785da0a583bf3ce5acec6 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Tue, 29 May 2018 15:00:29 -0500 Subject: [PATCH] Fixed .gitignore not ignoring db/kb symlinks, word-breaking causing weird spacing in pre, and non-fixed column sizing on new/edit doc page --- .gitignore | 4 ++-- comps/MngDoc.js | 4 ++-- comps/PaddedRow.js | 2 +- styles/style.sass | 10 ++++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index f4bd9e9..0823ca3 100644 --- a/.gitignore +++ b/.gitignore @@ -115,5 +115,5 @@ $RECYCLE.BIN/ # Others lib/ -db/ -kb/ +db +kb diff --git a/comps/MngDoc.js b/comps/MngDoc.js index 0926fa5..9c4df7e 100644 --- a/comps/MngDoc.js +++ b/comps/MngDoc.js @@ -103,10 +103,10 @@ export default class MngDoc extends Component { return(
-
+
-
+
{ amount = amount || 20; const PadItem = () => ( -
+
); let rowProps = {className: 'row'}; if(vCenter) rowProps = {className: 'row v-center'}; diff --git a/styles/style.sass b/styles/style.sass index 9c6ce27..32fbae5 100644 --- a/styles/style.sass +++ b/styles/style.sass @@ -17,7 +17,6 @@ body, code, pre pre, code font-size: 1.5rem; - word-break: break-all; input, textarea, select, button, .button, .cm-s-monokai.CodeMirror @@ -89,14 +88,13 @@ a padding: 10px; p, pre word-wrap: break-word; - word-break: break-all; .v-center min-height: calc(100vh - 55px - 50px - 20px); flex-direction: row; align-items: center; -.no-mob +.nomob display: none !important; .inline @@ -116,6 +114,10 @@ a pre margin-bottom: 2.5rem +@media screen and (max-width: 639px) + .row .column.column-50 + max-width: 100% + @media screen and (min-width: 640px) - .no-mob + .nomob display: block !important; \ No newline at end of file