diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-05-31 10:59:11 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-05-31 10:59:11 +0200 |
| commit | 316fee93f7f7df92db514de961b74a71556fdb63 (patch) | |
| tree | 896fd1d53ccb3863380653d1b065c7fc4ef7a641 /view | |
| parent | 1523e116b91824394244c4f76a9e105a3cecd5b6 (diff) | |
| parent | 670e83b30050201e3ac069c9dfa86a92aff2431d (diff) | |
| download | volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.tar.gz volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.tar.bz2 volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 20 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 9b99efba4..328f9df02 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -1,11 +1,3 @@ -/* common */ - -code { - font-family: Courier, monospace; - display: block; - overflow: auto; -} - /* jot */ .jothidden input { @@ -305,6 +297,18 @@ a.wall-item-name-link { /* bb-code */ +code { + font-family: Courier, monospace; + font-size: 1em; + padding: 1em 1.5em; + display: block; +} + +code.inline-code { + padding: 0px 4px; + display: inline; +} + .overline { text-decoration: overline; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1c2e8cdb2..ae2826516 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -113,13 +113,12 @@ pre code { } code { - font-size: 1em; - padding: 1em 1.5em; - border: 1px solid #ccc; background: #ccc; color: #000; } + + pre { background: #F5F5F5; color: #333; |