From db949b69c14b38cd75185195bb5381473d21d280 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Tue, 14 May 2013 13:44:16 -0500 Subject: [PATCH 1/2] Issue 3941: Code preview dark doesn't display correctly with long lines Assigning the background color to the pre tag did not work correctly. Moved background color to the highlight class which fixes the problem. --- app/assets/stylesheets/highlight/dark.scss | 4 +++- app/assets/stylesheets/highlight/monokai.scss | 4 +++- app/assets/stylesheets/highlight/solarized_dark.scss | 4 +++- app/assets/stylesheets/highlight/white.scss | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index 4196ea7ad29..02c5d72621c 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -1,6 +1,8 @@ .black .highlight { + + background-color: #333; + pre { - background-color: #333; color: #eee; } diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss index 6d8f740fc09..4e039d94348 100644 --- a/app/assets/stylesheets/highlight/monokai.scss +++ b/app/assets/stylesheets/highlight/monokai.scss @@ -8,8 +8,10 @@ $monokai-dark: #3b3a32; $monokai-purple: #ae81ff; .monokai .highlight { + + background-color: #272822; + pre { - background-color: #272822; color: $monokai-fg; } diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss index 3f215b4e0fe..a58918519a3 100644 --- a/app/assets/stylesheets/highlight/solarized_dark.scss +++ b/app/assets/stylesheets/highlight/solarized_dark.scss @@ -1,6 +1,8 @@ .solarized-dark .highlight { + + background-color: #002B36; + pre { - background-color: #002B36; color: #eee; } diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index f200e1d7b60..04989f7dfb4 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -1,6 +1,8 @@ .white .highlight { + + background-color: #fff; + pre { - background-color: #fff; color: #333; } -- GitLab From c75da470c52cbf5ef10e2259f5e9be9b35bbe4aa Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Wed, 15 May 2013 06:37:16 -0500 Subject: [PATCH 2/2] Add background color to pre, too. --- app/assets/stylesheets/highlight/dark.scss | 1 + app/assets/stylesheets/highlight/monokai.scss | 1 + app/assets/stylesheets/highlight/solarized_dark.scss | 1 + app/assets/stylesheets/highlight/white.scss | 1 + 4 files changed, 4 insertions(+) diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index 02c5d72621c..a56c98cc5f1 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -3,6 +3,7 @@ background-color: #333; pre { + background-color: #333; color: #eee; } diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss index 4e039d94348..c9709fa7f12 100644 --- a/app/assets/stylesheets/highlight/monokai.scss +++ b/app/assets/stylesheets/highlight/monokai.scss @@ -12,6 +12,7 @@ $monokai-purple: #ae81ff; background-color: #272822; pre { + background-color: #272822; color: $monokai-fg; } diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss index a58918519a3..cc82f39ac93 100644 --- a/app/assets/stylesheets/highlight/solarized_dark.scss +++ b/app/assets/stylesheets/highlight/solarized_dark.scss @@ -3,6 +3,7 @@ background-color: #002B36; pre { + background-color: #002B36; color: #eee; } diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index 04989f7dfb4..df127a7c491 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -3,6 +3,7 @@ background-color: #fff; pre { + background-color: #fff; color: #333; } -- GitLab