diff --git a/frontend/src/_common.sass b/frontend/src/_common.sass index cf4fab2cf..00bf18dfe 100644 --- a/frontend/src/_common.sass +++ b/frontend/src/_common.sass @@ -5,5 +5,5 @@ @use "~@fortawesome/fontawesome-pro/scss/solid" @use "~typeface-roboto" as roboto - @use "~typeface-source-sans-pro" as source-sans-pro +@use "~typeface-source-code-pro" as source-code-pro diff --git a/frontend/src/app.sass b/frontend/src/app.sass index ae859585b..56f4d7028 100644 --- a/frontend/src/app.sass +++ b/frontend/src/app.sass @@ -22,6 +22,7 @@ // FONTS --font-base: "Source Sans Pro", "Trebuchet MS", sans-serif --font-logo: "Roboto", var(--font-base) + --font-monospace: "Source Code Pro", monospace // DIMENSIONS --header-height: 100px @@ -585,9 +586,6 @@ section border-bottom: none padding-bottom: 0px -.pseudonym - font-family: monospace - .headline-one margin-bottom: 10px @@ -717,8 +715,13 @@ section background-color: hsla($hue, 75%, 50%, $opacity) !important -.uuid - font-family: monospace +.uuid, .pseudonym, .ldap-primary-key, .email, .file-path, .metric-value, .metric-label + font-family: var(--font-monospace) + +.token + font-family: var(--font-monospace) + white-space: pre-wrap + word-break: break-all .form--inline display: inline-block @@ -832,7 +835,7 @@ section .comment, .literal-error white-space: pre-wrap - font-family: monospace + font-family: var(--font-monospace) th vertical-align: top @@ -1099,12 +1102,12 @@ th, td #changelog font-size: 14px white-space: pre-wrap - font-family: monospace + font-family: var(--font-monospace) #gitrev font-size: 12px white-space: pre-wrap - font-family: monospace + font-family: var(--font-monospace) .breadcrumbs__container position: relative @@ -1225,12 +1228,12 @@ a.breadcrumbs__home top: 5px .table__td--csv, .table__th--csv - font-family: monospace + font-family: var(--font-monospace) .confirmationText white-space: pre-wrap font-size: 14px - font-family: monospace + font-family: var(--font-monospace) .func-field__wrapper, .allocation-missing-prios, .allocation-users__accept, .corrections-overview__section max-height: 75vh @@ -1295,7 +1298,7 @@ a.breadcrumbs__home .csv-parse-error white-space: pre-wrap - font-family: monospace + font-family: var(--font-monospace) overflow: auto max-height: 75vh diff --git a/frontend/src/utils/form/datepicker.css b/frontend/src/utils/form/datepicker.css index 7c1172da1..b052a1e7c 100644 --- a/frontend/src/utils/form/datepicker.css +++ b/frontend/src/utils/form/datepicker.css @@ -29,7 +29,7 @@ visibility: hidden; direction: ltr; border-collapse: separate; - font-family: "Open Sans", Calibri, Arial, sans-serif; + /* font-family: "Open Sans", Calibri, Arial, sans-serif; */ background-color: white; border-width: 0; border-style: solid; @@ -724,4 +724,4 @@ } /* @end RTL */ -/*# sourceMappingURL=tail.datetime-default-green.map */ \ No newline at end of file +/*# sourceMappingURL=tail.datetime-default-green.map */ diff --git a/frontend/src/utils/inputs/inputs.sass b/frontend/src/utils/inputs/inputs.sass index 374d37189..022efa71d 100644 --- a/frontend/src/utils/inputs/inputs.sass +++ b/frontend/src/utils/inputs/inputs.sass @@ -235,7 +235,7 @@ option padding-bottom: 0 .file-input__list-item - font-family: monospace + font-family: var(--font-monospace) font-size: 15px // PREVIOUSLY UPLOADED FILES diff --git a/package-lock.json b/package-lock.json index 220155f3f..ed5bc0fea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20773,6 +20773,11 @@ "integrity": "sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg==", "dev": true }, + "typeface-source-code-pro": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/typeface-source-code-pro/-/typeface-source-code-pro-1.1.3.tgz", + "integrity": "sha512-BAQ8I7Xy5zS5+KuG+gjRPNYCdfwL8vSF9jT8q9wzCRiiOG4h7id5zt8wcQx59riGRbRsgycRfs/ubyAm2z/FJQ==" + }, "typeface-source-sans-pro": { "version": "0.0.75", "resolved": "https://registry.npmjs.org/typeface-source-sans-pro/-/typeface-source-sans-pro-0.0.75.tgz", diff --git a/package.json b/package.json index 06e071f99..8fc0589ff 100644 --- a/package.json +++ b/package.json @@ -109,6 +109,7 @@ "tmp": "^0.1.0", "typeface-roboto": "0.0.75", "typeface-source-sans-pro": "0.0.75", + "typeface-source-code-pro": "^1.1.3", "webpack": "^4.44.1", "webpack-cli": "^3.3.12", "webpack-manifest-plugin": "^2.2.0", diff --git a/src/Foundation/Yesod/ErrorHandler.hs b/src/Foundation/Yesod/ErrorHandler.hs index 025b4098d..f24a7ea85 100644 --- a/src/Foundation/Yesod/ErrorHandler.hs +++ b/src/Foundation/Yesod/ErrorHandler.hs @@ -44,29 +44,24 @@ errorHandler err = do [whamlet|

_{MsgErrorResponseEncrypted} -

+                  
                     #{ciphertext}
                 |]
             | otherwise -> plaintext
 
         errPage = case err of
           NotFound -> [whamlet|

_{MsgErrorResponseNotFound}|] - InternalError err' -> encrypted err' [whamlet|

#{err'}|] + InternalError err' -> encrypted err' [whamlet|

#{err'}|] InvalidArgs errs -> [whamlet|