From cdfb6ec59ab2497f155bde1d99fc10d4821deb42 Mon Sep 17 00:00:00 2001 From: Crystal-RainSlide <16851802+Crystal-RainSlide@users.noreply.github.com> Date: Wed, 8 Apr 2020 03:26:53 +0800 Subject: [PATCH 1/5] See mozilla/code-coverage/issues/488 See https://github.com/mozilla/code-coverage/issues/488 --- frontend/src/style.scss | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/frontend/src/style.scss b/frontend/src/style.scss index 038dcf25f..02835ca03 100644 --- a/frontend/src/style.scss +++ b/frontend/src/style.scss @@ -42,12 +42,19 @@ header { border-bottom: 1px solid darkgray; min-height: $header_height; + $horizontal_margin: 10px; + div.logo { display: inline-block; + height: $header_height; + line-height: $header_height; + margin-left: $horizontal_margin; + img { margin: $header_height * 0.1; max-height: $header_height * 0.8; } + a { color: $default_color; line-height: $header_height; @@ -70,7 +77,7 @@ header { float: right; height: $header_height; line-height: $header_height; - margin-right: 10px; + margin-right: $horizontal_margin; } input.revision { @@ -135,12 +142,9 @@ nav { // Directory navigation #browser { - margin: 1em 20%; - - // On smaller screens, display table on full width - @media only screen and (max-width: $small_screen) { - margin: 0.5em; - } + max-width: 56ch; + margin: 0 auto; + padding: .5em; .table { display: table; From 0c20c3e096e0a8db20963e8bf1c0c865f5f580e0 Mon Sep 17 00:00:00 2001 From: Crystal-RainSlide <16851802+Crystal-RainSlide@users.noreply.github.com> Date: Sun, 19 Apr 2020 14:25:15 +0800 Subject: [PATCH 2/5] Widen the max-width of #browser --- frontend/src/style.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/style.scss b/frontend/src/style.scss index 02835ca03..6076083c5 100644 --- a/frontend/src/style.scss +++ b/frontend/src/style.scss @@ -9,7 +9,7 @@ $coverage_low: #d91a47; $coverage_warn: #ff9a36; $coverage_good: #438718; $highlighted: #f7f448; -$small_screen: 1900px; +$small_screen: 1280px; body { // Setup base typography @@ -142,7 +142,7 @@ nav { // Directory navigation #browser { - max-width: 56ch; + max-width: $small_screen; margin: 0 auto; padding: .5em; From d9a6d56aab33f79c08ade259bf1bbb12f8592c24 Mon Sep 17 00:00:00 2001 From: Crystal-RainSlide <16851802+Crystal-RainSlide@users.noreply.github.com> Date: Tue, 28 Apr 2020 21:32:42 +0800 Subject: [PATCH 3/5] Partly rollback style.scss for splitted PR match the style of the logo with the menu --- frontend/src/style.scss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/style.scss b/frontend/src/style.scss index 6076083c5..93d3b267e 100644 --- a/frontend/src/style.scss +++ b/frontend/src/style.scss @@ -9,7 +9,7 @@ $coverage_low: #d91a47; $coverage_warn: #ff9a36; $coverage_good: #438718; $highlighted: #f7f448; -$small_screen: 1280px; +$small_screen: 1900px; body { // Setup base typography @@ -42,8 +42,6 @@ header { border-bottom: 1px solid darkgray; min-height: $header_height; - $horizontal_margin: 10px; - div.logo { display: inline-block; height: $header_height; @@ -54,7 +52,6 @@ header { margin: $header_height * 0.1; max-height: $header_height * 0.8; } - a { color: $default_color; line-height: $header_height; @@ -77,7 +74,7 @@ header { float: right; height: $header_height; line-height: $header_height; - margin-right: $horizontal_margin; + margin-right: 10px; } input.revision { @@ -142,9 +139,12 @@ nav { // Directory navigation #browser { - max-width: $small_screen; - margin: 0 auto; - padding: .5em; + margin: 1em 20%; + + // On smaller screens, display table on full width + @media only screen and (max-width: $small_screen) { + margin: 0.5em; + } .table { display: table; From 8cd6768b83f6509918f8d4d021e89998214c3cea Mon Sep 17 00:00:00 2001 From: Crystal-RainSlide <16851802+Crystal-RainSlide@users.noreply.github.com> Date: Tue, 28 Apr 2020 21:41:39 +0800 Subject: [PATCH 4/5] redo the width & margin of #browser --- frontend/src/style.scss | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/frontend/src/style.scss b/frontend/src/style.scss index 93d3b267e..4ae44070d 100644 --- a/frontend/src/style.scss +++ b/frontend/src/style.scss @@ -9,7 +9,7 @@ $coverage_low: #d91a47; $coverage_warn: #ff9a36; $coverage_good: #438718; $highlighted: #f7f448; -$small_screen: 1900px; +$small_screen: 1280px; body { // Setup base typography @@ -42,16 +42,15 @@ header { border-bottom: 1px solid darkgray; min-height: $header_height; + $horizontal_margin: 10px; + div.logo { display: inline-block; - height: $header_height; - line-height: $header_height; - margin-left: $horizontal_margin; - img { margin: $header_height * 0.1; max-height: $header_height * 0.8; } + a { color: $default_color; line-height: $header_height; @@ -74,7 +73,7 @@ header { float: right; height: $header_height; line-height: $header_height; - margin-right: 10px; + margin-right: $horizontal_margin; } input.revision { @@ -139,12 +138,9 @@ nav { // Directory navigation #browser { - margin: 1em 20%; - - // On smaller screens, display table on full width - @media only screen and (max-width: $small_screen) { - margin: 0.5em; - } + max-width: $small_screen; + margin: 0 auto; + padding: .5em; .table { display: table; From 9a58f988e2a753e5bb8f5164225a6e6f3ad655fb Mon Sep 17 00:00:00 2001 From: Crystal-RainSlide <16851802+Crystal-RainSlide@users.noreply.github.com> Date: Tue, 28 Apr 2020 21:52:45 +0800 Subject: [PATCH 5/5] redo the width & margin of #browser --- frontend/src/style.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/style.scss b/frontend/src/style.scss index 4ae44070d..a22a8ce8d 100644 --- a/frontend/src/style.scss +++ b/frontend/src/style.scss @@ -42,15 +42,12 @@ header { border-bottom: 1px solid darkgray; min-height: $header_height; - $horizontal_margin: 10px; - div.logo { display: inline-block; img { margin: $header_height * 0.1; max-height: $header_height * 0.8; } - a { color: $default_color; line-height: $header_height; @@ -73,7 +70,7 @@ header { float: right; height: $header_height; line-height: $header_height; - margin-right: $horizontal_margin; + margin-right: 10px; } input.revision {