From 6d6da8b5744caafa2557ec9105ebaf9f98a535e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=9F=AC?= Date: Tue, 11 Jun 2019 15:25:02 +0100 Subject: [PATCH 01/21] conflict --- notebook/static/notebook/less/renderedhtml.less | 2 +- notebook/templates/notebook.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notebook/static/notebook/less/renderedhtml.less b/notebook/static/notebook/less/renderedhtml.less index e254c8d067..5ad967dc4a 100644 --- a/notebook/static/notebook/less/renderedhtml.less +++ b/notebook/static/notebook/less/renderedhtml.less @@ -58,7 +58,7 @@ //issue #4010 change from #eff01f to #d4d4d4 code { - background-color: #d4d4d4; + background-color: #757474; } p code { diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html index e4c3b912a6..3e79de781f 100644 --- a/notebook/templates/notebook.html +++ b/notebook/templates/notebook.html @@ -77,7 +77,7 @@