From 70e841cd85fe938ba4aec2b290fe583bf98b2e67 Mon Sep 17 00:00:00 2001 From: varun Date: Wed, 13 Oct 2021 15:31:04 +0530 Subject: [PATCH 1/5] [VK] Updated global header common component with some additional required css --- .../springernature-header/scss/50-components/core.scss | 4 ++-- .../springernature-header/scss/50-components/enhanced.scss | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/toolkits/springernature/packages/springernature-header/scss/50-components/core.scss b/toolkits/springernature/packages/springernature-header/scss/50-components/core.scss index af08cb5c2..7e79d7480 100644 --- a/toolkits/springernature/packages/springernature-header/scss/50-components/core.scss +++ b/toolkits/springernature/packages/springernature-header/scss/50-components/core.scss @@ -41,10 +41,10 @@ font-size: 2.7rem; } - font-family: $context--font-family-serif; + font-family: serif; // Font-family updated to serif line-height: 4.6rem; - font-size: 2rem; font-size: 1.5rem; + white-space: nowrap; // Added no-wrap for logo title color: color('black'); } diff --git a/toolkits/springernature/packages/springernature-header/scss/50-components/enhanced.scss b/toolkits/springernature/packages/springernature-header/scss/50-components/enhanced.scss index b4b1af693..e47683d78 100644 --- a/toolkits/springernature/packages/springernature-header/scss/50-components/enhanced.scss +++ b/toolkits/springernature/packages/springernature-header/scss/50-components/enhanced.scss @@ -1,5 +1,7 @@ .c-header__content { position: relative; + display: flex; + justify-content: space-between; @include media-query('sm') { display: flex; @@ -22,6 +24,7 @@ .c-header__site-logo { padding-right: 20px; + border-right: 2px solid #222; // For SNAPP logo border-right } .c-header__journal-logo { From cee5682714d8e07fbc114904e987d7c01e9ad724 Mon Sep 17 00:00:00 2001 From: varun Date: Thu, 14 Oct 2021 11:42:31 +0530 Subject: [PATCH 2/5] [VK] Updated global header as per PR review comments --- .../packages/springernature-header/README.md | 3 +++ .../scss/50-components/enhanced.scss | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/toolkits/springernature/packages/springernature-header/README.md b/toolkits/springernature/packages/springernature-header/README.md index 7c5345d83..5540598d5 100644 --- a/toolkits/springernature/packages/springernature-header/README.md +++ b/toolkits/springernature/packages/springernature-header/README.md @@ -54,6 +54,7 @@ Import the core styles into your main stylesheet @import '@springernature/springernature-header/scss/10-settings/layout'; @import '@springernature/springernature-user-details/scss/10-settings/typography'; // if including user-details data @import '@springernature/springernature-user-details/scss/50-components/core'; // if including user-details data +@import '@springernature/brand-context/springernature/scss/10-settings/typography'; @import '@springernature/springernature-header/scss/50-components/core'; ``` @@ -65,5 +66,7 @@ Import the enhanced settings and styles into your main stylesheet @import '@springernature/springernature-user-details/scss/10-settings/colours'; // if including user-details data @import '@springernature/springernature-user-details/scss/50-components/enhanced'; // if including user-details data +@import '@springernature/brand-context/default/scss/10-settings/breakpoints'; +@import '@springernature/brand-context/default/scss/30-mixins/media-query'; @import '@springernature/springernature-header/scss/50-components/enhanced'; ``` \ No newline at end of file diff --git a/toolkits/springernature/packages/springernature-header/scss/50-components/enhanced.scss b/toolkits/springernature/packages/springernature-header/scss/50-components/enhanced.scss index e47683d78..e93c75f5b 100644 --- a/toolkits/springernature/packages/springernature-header/scss/50-components/enhanced.scss +++ b/toolkits/springernature/packages/springernature-header/scss/50-components/enhanced.scss @@ -1,7 +1,5 @@ .c-header__content { position: relative; - display: flex; - justify-content: space-between; @include media-query('sm') { display: flex; @@ -24,7 +22,6 @@ .c-header__site-logo { padding-right: 20px; - border-right: 2px solid #222; // For SNAPP logo border-right } .c-header__journal-logo { @@ -64,3 +61,11 @@ } } } +// If we have multiple links as part of header navigation +.c-header__navigation { + display: flex; +} +.c-header__navigation__links { + display:inline-flex; + align-self: center; +} \ No newline at end of file From f788af2f80cd4d267971f5a57ed5060bbb5401ed Mon Sep 17 00:00:00 2001 From: varun Date: Thu, 14 Oct 2021 11:48:41 +0530 Subject: [PATCH 3/5] [VK] Updated global header core css as per PR review comments --- .../packages/springernature-header/scss/50-components/core.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkits/springernature/packages/springernature-header/scss/50-components/core.scss b/toolkits/springernature/packages/springernature-header/scss/50-components/core.scss index 7e79d7480..8dbe7018c 100644 --- a/toolkits/springernature/packages/springernature-header/scss/50-components/core.scss +++ b/toolkits/springernature/packages/springernature-header/scss/50-components/core.scss @@ -41,7 +41,7 @@ font-size: 2.7rem; } - font-family: serif; // Font-family updated to serif + font-family: $context--font-family-serif; line-height: 4.6rem; font-size: 1.5rem; white-space: nowrap; // Added no-wrap for logo title From 22082b527f489be71dfe6d32652eecb766f331fe Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 26 Oct 2021 16:37:17 +0530 Subject: [PATCH 4/5] [VK] Global Header Updated README file as per review comments --- .../springernature/packages/springernature-header/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkits/springernature/packages/springernature-header/README.md b/toolkits/springernature/packages/springernature-header/README.md index 5540598d5..827bb692c 100644 --- a/toolkits/springernature/packages/springernature-header/README.md +++ b/toolkits/springernature/packages/springernature-header/README.md @@ -52,9 +52,9 @@ Import the core styles into your main stylesheet @import '@springernature/brand-context/springernature/scss/core'; @import '@springernature/springernature-header/scss/10-settings/layout'; +@import '@springernature/brand-context/springernature/scss/10-settings/typography'; @import '@springernature/springernature-user-details/scss/10-settings/typography'; // if including user-details data @import '@springernature/springernature-user-details/scss/50-components/core'; // if including user-details data -@import '@springernature/brand-context/springernature/scss/10-settings/typography'; @import '@springernature/springernature-header/scss/50-components/core'; ``` @@ -65,8 +65,8 @@ Import the enhanced settings and styles into your main stylesheet @import '@springernature/brand-context/springernature/scss/enhanced'; @import '@springernature/springernature-user-details/scss/10-settings/colours'; // if including user-details data -@import '@springernature/springernature-user-details/scss/50-components/enhanced'; // if including user-details data @import '@springernature/brand-context/default/scss/10-settings/breakpoints'; +@import '@springernature/springernature-user-details/scss/50-components/enhanced'; // if including user-details data @import '@springernature/brand-context/default/scss/30-mixins/media-query'; @import '@springernature/springernature-header/scss/50-components/enhanced'; ``` \ No newline at end of file From f80625ef7a84f422f18496d3d5be13890d0e9e70 Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 26 Oct 2021 17:03:45 +0530 Subject: [PATCH 5/5] [VK] Global Header Updated README file as per review comments --- .../springernature/packages/springernature-header/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkits/springernature/packages/springernature-header/README.md b/toolkits/springernature/packages/springernature-header/README.md index 827bb692c..d34f68726 100644 --- a/toolkits/springernature/packages/springernature-header/README.md +++ b/toolkits/springernature/packages/springernature-header/README.md @@ -63,9 +63,10 @@ Import the enhanced settings and styles into your main stylesheet ```scss // enhanced.scss @import '@springernature/brand-context/springernature/scss/enhanced'; - @import '@springernature/springernature-user-details/scss/10-settings/colours'; // if including user-details data + @import '@springernature/brand-context/default/scss/10-settings/breakpoints'; + @import '@springernature/springernature-user-details/scss/50-components/enhanced'; // if including user-details data @import '@springernature/brand-context/default/scss/30-mixins/media-query'; @import '@springernature/springernature-header/scss/50-components/enhanced';