diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-09-08 09:22:36 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-09-08 09:22:36 +0200 |
| commit | 108bb7649bb61bee65d9923c9080c3af8e715bc4 (patch) | |
| tree | 4b96649d85d098de8e723df85b409cb0a43832d1 /view | |
| parent | 7b3aa92b5ad09c0820db2b20bc462c975f0d3aba (diff) | |
| parent | 1104e2652f15aaa405208b6dec9e439fb8c39537 (diff) | |
| download | volse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.tar.gz volse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.tar.bz2 volse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 4 | ||||
| -rw-r--r-- | view/css/conversation.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index a3a8ce0be..e0018989d 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -71,10 +71,6 @@ nav .dropdown-menu { min-width: auto; } -code { - white-space: normal; -} - label { font-weight: bold; } diff --git a/view/css/conversation.css b/view/css/conversation.css index dcabb5f3c..a5a847676 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -1,3 +1,4 @@ + /* jot */ .jothidden input[type="text"] { @@ -273,6 +274,7 @@ code { font-size: 1em; padding: 1em 1.5em; display: block; + white-space: pre-wrap; } code.inline-code { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 621fa2781..b508b2576 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -136,6 +136,8 @@ input, optgroup, select, textarea { pre code { border: none; + padding: 1em 1.5em; + border-radius: $radius; } code { |