From 0de6b752ef45cb6d798c5d73409a7a89a56bae88 Mon Sep 17 00:00:00 2001 From: MadelaineS Date: Tue, 14 Apr 2020 20:38:09 +0300 Subject: [PATCH 1/4] glossary and homepage design --- .../pastanaga/collections/menu.overrides | 22 +++++- theme/themes/pastanaga/globals/site.overrides | 74 ++++++++++++++----- theme/themes/pastanaga/globals/site.variables | 31 ++++++-- .../themes/pastanaga/modules/search.overrides | 24 ++++-- 4 files changed, 121 insertions(+), 30 deletions(-) diff --git a/theme/themes/pastanaga/collections/menu.overrides b/theme/themes/pastanaga/collections/menu.overrides index 1806fd4..ab8220c 100644 --- a/theme/themes/pastanaga/collections/menu.overrides +++ b/theme/themes/pastanaga/collections/menu.overrides @@ -116,11 +116,29 @@ margin-left: 0; } + a { + &:hover { + color: rgba(white, .5); + border-color: transparent; + } + } + .item { + font-weight: 300; + font-size: 14px; + text-transform: uppercase; + color: rgba(white, .8); padding-top: @relativeBig; margin: 0; - text-transform: uppercase; - color: white; + + &.active { + font-weight: 700; + color: white; + border-color: transparent; + &:hover { + color: rgba(white, .8); + } + } @media only screen and (min-width: @largestTabletScreen) { padding: 1.7em 0 @relativeBig; diff --git a/theme/themes/pastanaga/globals/site.overrides b/theme/themes/pastanaga/globals/site.overrides index 412a8d5..81abb3e 100644 --- a/theme/themes/pastanaga/globals/site.overrides +++ b/theme/themes/pastanaga/globals/site.overrides @@ -2,7 +2,6 @@ Global Overrides *******************************/ - .footerWrapper { background-color: @primaryColor !important; color : white; @@ -19,20 +18,29 @@ text-decoration: underline; font-weight : bold; } + + p { + color: white !important; + } } +#page-document.ui.container{ + width: 80% !important; + margin: 4rem auto !important; +} .widthSidebar { display: flex; #page-document.hasSidebar { width: 70%; - background-color: #f6f6f6; + background-color: @lightPrimaryColor; padding: 3rem; + text-align: left; } .page-document-sidebar { width: 30%; - background-color: #7c7c7c; + background-color: @lightSecondaryColor; display: flex; min-height: 100vh; .tabs { @@ -40,24 +48,44 @@ margin-left: auto; display: inline-flex; position: relative; - margin-right: 1rem; - margin-top: 2rem; + margin-right: 2rem; + margin-top: 4rem; + width: 58%; a { - color: white; - font-size: 1.2rem; + color: @bodyColor; + font-size: 1rem; + &.tabs__item { + padding-bottom: 2rem; + &.tabs__item_active { + font-weight: 700; + color: @linkColor; + } + } } } } + .hasSidebar{ + padding-right: 10rem !important; + h1.documentFirstHeading { + text-align: left; + } + } } .tabs.section-tabs { - display: flex; - justify-content: center; + width: 78%; + margin: 0 auto; a { - color: #3f3f3f; - font-size: 1.2rem; + color: @bodyColor; + font-size: 18px; margin-right: 4rem; line-height: 3; + padding-bottom: 1rem; + &.tabs__item_active { + font-weight: 700; + color: @primaryColor; + border-bottom: 1rem solid @primaryColor; + } } } @@ -66,28 +94,40 @@ margin: 0; } -h1.documentFirstHeading { +h1.documentFirstHeading{ + text-align: center; +} + +h1.documentFirstHeading, h2, h3{ font-size: 36px; + color: @primaryColor; + font-weight: 700; border-bottom: none!important; &:before { display: none!important; } } +p { + + color: @bodyColor; + font-weight: 300; + &.documentDescription{ + color: @fullBlack; + } +} + .breadcrumbs { display: none; } - - - .detailed-link-block { display: flex; flex-wrap: wrap; max-width: 800px; margin: 0 auto; flex-direction: column; -} +} .detailed-link-block-item-title { @@ -118,4 +158,4 @@ h1.documentFirstHeading { font-size: 16px; position: relative; } -} \ No newline at end of file +} diff --git a/theme/themes/pastanaga/globals/site.variables b/theme/themes/pastanaga/globals/site.variables index 5cb1bba..0924b2e 100755 --- a/theme/themes/pastanaga/globals/site.variables +++ b/theme/themes/pastanaga/globals/site.variables @@ -6,7 +6,7 @@ Fonts --------------------*/ -@fontName : 'Poppins'; +@fontName : 'Source Sans Pro'; @googleFontSizes : '300,400,500,700,400italic,700italic'; @@ -24,11 +24,19 @@ /*------------------- Brand Colors --------------------*/ -@primaryColor : @darkBlue; +@primaryColor : @lightblue; -@secondaryColor : @brown; +@secondaryColor : @darkBlue; -@lightSecondaryColor : @lightGrey; +@bodyColor : @bodyGrey; + +@darkPrimaryColor : @darkOrange; + +@lightPrimaryColor : @lightBodyGrey; + +@lightSecondaryColor : @lightOrange; + +/* @lightSecondaryColor : @lightGrey; */ /*-------------- @@ -84,7 +92,7 @@ Links --------------------*/ -@linkColor : @blue; +@linkColor : @lighterOrange; /*------------------- @@ -132,11 +140,20 @@ @brown : #826A6A; // Palette: reddishGrey @grey : #68778D; // Palette: blueishGrey @black : #252525; // Palette: darkishGrey -@darkBlue : #005384; +@darkBlue : #32536B; +@darkOrange : #D63D27; +@darkGreen : #009590; /*--- Light Colors ---*/ @lightOlive : #C9EAB1; // Palette: lightSage @lightGrey : #878F93; +@lightblue : #4296B2; +@lightOrange : #F3EFEE; +@lighterOrange : #EC776A; +@lightBodyGrey : #F6F6F6; +@greyBlue : #6C8BA2; + + /*--- Neutrals ---*/ @fullBlack : #000000; @@ -144,6 +161,8 @@ @darkWhite : #F3F4F5; @midWhite : #DCDDDE; @white : #FFFFFF; +@bodyGrey : #333333; + /*--- Colored Backgrounds ---*/ @redBackground : #F5C1C1; // Palette: alertError diff --git a/theme/themes/pastanaga/modules/search.overrides b/theme/themes/pastanaga/modules/search.overrides index d5a76ff..6370d3c 100644 --- a/theme/themes/pastanaga/modules/search.overrides +++ b/theme/themes/pastanaga/modules/search.overrides @@ -2,7 +2,8 @@ Theme Overrides *******************************/ .glossary-search { - max-width: 964px; + //max-width: 964px; + width: 80%; margin : 2rem auto; .searchbox { @@ -12,15 +13,28 @@ .input { border-radius: 30px; height : 50px; - background : #F6F6F6; - padding-left : 1rem; + background : #EDEDED; + padding-left : 1.5rem; + font-weight: 300; + font-size: 18px; + color: @bodyColor; + /* + &:before{ + font-family: "Font Awesome 5 Free"; + font-weight: 700; + content: "\f007"; + margin: auto 1rem; + color: @secondaryColor; + } + */ } button { - background: #008173!important; + background: @secondaryColor !important; border-radius: 30px; padding: 0 2rem!important; color: white!important; + font-weight: 700; margin-left: 1rem; } -} \ No newline at end of file +} From c4e02b5cb2afbdcb129fd1688dec6efb64f1b0c6 Mon Sep 17 00:00:00 2001 From: MadelaineS Date: Tue, 14 Apr 2020 20:46:15 +0300 Subject: [PATCH 2/4] Revert "glossary and homepage design" This reverts commit 0de6b752ef45cb6d798c5d73409a7a89a56bae88. --- .../pastanaga/collections/menu.overrides | 22 +----- theme/themes/pastanaga/globals/site.overrides | 74 +++++-------------- theme/themes/pastanaga/globals/site.variables | 31 ++------ .../themes/pastanaga/modules/search.overrides | 24 ++---- 4 files changed, 30 insertions(+), 121 deletions(-) diff --git a/theme/themes/pastanaga/collections/menu.overrides b/theme/themes/pastanaga/collections/menu.overrides index ab8220c..1806fd4 100644 --- a/theme/themes/pastanaga/collections/menu.overrides +++ b/theme/themes/pastanaga/collections/menu.overrides @@ -116,29 +116,11 @@ margin-left: 0; } - a { - &:hover { - color: rgba(white, .5); - border-color: transparent; - } - } - .item { - font-weight: 300; - font-size: 14px; - text-transform: uppercase; - color: rgba(white, .8); padding-top: @relativeBig; margin: 0; - - &.active { - font-weight: 700; - color: white; - border-color: transparent; - &:hover { - color: rgba(white, .8); - } - } + text-transform: uppercase; + color: white; @media only screen and (min-width: @largestTabletScreen) { padding: 1.7em 0 @relativeBig; diff --git a/theme/themes/pastanaga/globals/site.overrides b/theme/themes/pastanaga/globals/site.overrides index 81abb3e..412a8d5 100644 --- a/theme/themes/pastanaga/globals/site.overrides +++ b/theme/themes/pastanaga/globals/site.overrides @@ -2,6 +2,7 @@ Global Overrides *******************************/ + .footerWrapper { background-color: @primaryColor !important; color : white; @@ -18,29 +19,20 @@ text-decoration: underline; font-weight : bold; } - - p { - color: white !important; - } } -#page-document.ui.container{ - width: 80% !important; - margin: 4rem auto !important; -} .widthSidebar { display: flex; #page-document.hasSidebar { width: 70%; - background-color: @lightPrimaryColor; + background-color: #f6f6f6; padding: 3rem; - text-align: left; } .page-document-sidebar { width: 30%; - background-color: @lightSecondaryColor; + background-color: #7c7c7c; display: flex; min-height: 100vh; .tabs { @@ -48,44 +40,24 @@ margin-left: auto; display: inline-flex; position: relative; - margin-right: 2rem; - margin-top: 4rem; - width: 58%; + margin-right: 1rem; + margin-top: 2rem; a { - color: @bodyColor; - font-size: 1rem; - &.tabs__item { - padding-bottom: 2rem; - &.tabs__item_active { - font-weight: 700; - color: @linkColor; - } - } + color: white; + font-size: 1.2rem; } } } - .hasSidebar{ - padding-right: 10rem !important; - h1.documentFirstHeading { - text-align: left; - } - } } .tabs.section-tabs { - width: 78%; - margin: 0 auto; + display: flex; + justify-content: center; a { - color: @bodyColor; - font-size: 18px; + color: #3f3f3f; + font-size: 1.2rem; margin-right: 4rem; line-height: 3; - padding-bottom: 1rem; - &.tabs__item_active { - font-weight: 700; - color: @primaryColor; - border-bottom: 1rem solid @primaryColor; - } } } @@ -94,40 +66,28 @@ margin: 0; } -h1.documentFirstHeading{ - text-align: center; -} - -h1.documentFirstHeading, h2, h3{ +h1.documentFirstHeading { font-size: 36px; - color: @primaryColor; - font-weight: 700; border-bottom: none!important; &:before { display: none!important; } } -p { - - color: @bodyColor; - font-weight: 300; - &.documentDescription{ - color: @fullBlack; - } -} - .breadcrumbs { display: none; } + + + .detailed-link-block { display: flex; flex-wrap: wrap; max-width: 800px; margin: 0 auto; flex-direction: column; -} +} .detailed-link-block-item-title { @@ -158,4 +118,4 @@ p { font-size: 16px; position: relative; } -} +} \ No newline at end of file diff --git a/theme/themes/pastanaga/globals/site.variables b/theme/themes/pastanaga/globals/site.variables index 0924b2e..5cb1bba 100755 --- a/theme/themes/pastanaga/globals/site.variables +++ b/theme/themes/pastanaga/globals/site.variables @@ -6,7 +6,7 @@ Fonts --------------------*/ -@fontName : 'Source Sans Pro'; +@fontName : 'Poppins'; @googleFontSizes : '300,400,500,700,400italic,700italic'; @@ -24,19 +24,11 @@ /*------------------- Brand Colors --------------------*/ -@primaryColor : @lightblue; +@primaryColor : @darkBlue; -@secondaryColor : @darkBlue; +@secondaryColor : @brown; -@bodyColor : @bodyGrey; - -@darkPrimaryColor : @darkOrange; - -@lightPrimaryColor : @lightBodyGrey; - -@lightSecondaryColor : @lightOrange; - -/* @lightSecondaryColor : @lightGrey; */ +@lightSecondaryColor : @lightGrey; /*-------------- @@ -92,7 +84,7 @@ Links --------------------*/ -@linkColor : @lighterOrange; +@linkColor : @blue; /*------------------- @@ -140,20 +132,11 @@ @brown : #826A6A; // Palette: reddishGrey @grey : #68778D; // Palette: blueishGrey @black : #252525; // Palette: darkishGrey -@darkBlue : #32536B; -@darkOrange : #D63D27; -@darkGreen : #009590; +@darkBlue : #005384; /*--- Light Colors ---*/ @lightOlive : #C9EAB1; // Palette: lightSage @lightGrey : #878F93; -@lightblue : #4296B2; -@lightOrange : #F3EFEE; -@lighterOrange : #EC776A; -@lightBodyGrey : #F6F6F6; -@greyBlue : #6C8BA2; - - /*--- Neutrals ---*/ @fullBlack : #000000; @@ -161,8 +144,6 @@ @darkWhite : #F3F4F5; @midWhite : #DCDDDE; @white : #FFFFFF; -@bodyGrey : #333333; - /*--- Colored Backgrounds ---*/ @redBackground : #F5C1C1; // Palette: alertError diff --git a/theme/themes/pastanaga/modules/search.overrides b/theme/themes/pastanaga/modules/search.overrides index 6370d3c..d5a76ff 100644 --- a/theme/themes/pastanaga/modules/search.overrides +++ b/theme/themes/pastanaga/modules/search.overrides @@ -2,8 +2,7 @@ Theme Overrides *******************************/ .glossary-search { - //max-width: 964px; - width: 80%; + max-width: 964px; margin : 2rem auto; .searchbox { @@ -13,28 +12,15 @@ .input { border-radius: 30px; height : 50px; - background : #EDEDED; - padding-left : 1.5rem; - font-weight: 300; - font-size: 18px; - color: @bodyColor; - /* - &:before{ - font-family: "Font Awesome 5 Free"; - font-weight: 700; - content: "\f007"; - margin: auto 1rem; - color: @secondaryColor; - } - */ + background : #F6F6F6; + padding-left : 1rem; } button { - background: @secondaryColor !important; + background: #008173!important; border-radius: 30px; padding: 0 2rem!important; color: white!important; - font-weight: 700; margin-left: 1rem; } -} +} \ No newline at end of file From 48ae41832d6648eef05ff9298a77c267d6810f10 Mon Sep 17 00:00:00 2001 From: MadelaineS Date: Tue, 14 Apr 2020 20:38:09 +0300 Subject: [PATCH 3/4] glossary and homepage design --- .../pastanaga/collections/menu.overrides | 22 +++++- theme/themes/pastanaga/globals/site.overrides | 74 ++++++++++++++----- theme/themes/pastanaga/globals/site.variables | 31 ++++++-- .../themes/pastanaga/modules/search.overrides | 24 ++++-- 4 files changed, 121 insertions(+), 30 deletions(-) diff --git a/theme/themes/pastanaga/collections/menu.overrides b/theme/themes/pastanaga/collections/menu.overrides index 1806fd4..ab8220c 100644 --- a/theme/themes/pastanaga/collections/menu.overrides +++ b/theme/themes/pastanaga/collections/menu.overrides @@ -116,11 +116,29 @@ margin-left: 0; } + a { + &:hover { + color: rgba(white, .5); + border-color: transparent; + } + } + .item { + font-weight: 300; + font-size: 14px; + text-transform: uppercase; + color: rgba(white, .8); padding-top: @relativeBig; margin: 0; - text-transform: uppercase; - color: white; + + &.active { + font-weight: 700; + color: white; + border-color: transparent; + &:hover { + color: rgba(white, .8); + } + } @media only screen and (min-width: @largestTabletScreen) { padding: 1.7em 0 @relativeBig; diff --git a/theme/themes/pastanaga/globals/site.overrides b/theme/themes/pastanaga/globals/site.overrides index 412a8d5..81abb3e 100644 --- a/theme/themes/pastanaga/globals/site.overrides +++ b/theme/themes/pastanaga/globals/site.overrides @@ -2,7 +2,6 @@ Global Overrides *******************************/ - .footerWrapper { background-color: @primaryColor !important; color : white; @@ -19,20 +18,29 @@ text-decoration: underline; font-weight : bold; } + + p { + color: white !important; + } } +#page-document.ui.container{ + width: 80% !important; + margin: 4rem auto !important; +} .widthSidebar { display: flex; #page-document.hasSidebar { width: 70%; - background-color: #f6f6f6; + background-color: @lightPrimaryColor; padding: 3rem; + text-align: left; } .page-document-sidebar { width: 30%; - background-color: #7c7c7c; + background-color: @lightSecondaryColor; display: flex; min-height: 100vh; .tabs { @@ -40,24 +48,44 @@ margin-left: auto; display: inline-flex; position: relative; - margin-right: 1rem; - margin-top: 2rem; + margin-right: 2rem; + margin-top: 4rem; + width: 58%; a { - color: white; - font-size: 1.2rem; + color: @bodyColor; + font-size: 1rem; + &.tabs__item { + padding-bottom: 2rem; + &.tabs__item_active { + font-weight: 700; + color: @linkColor; + } + } } } } + .hasSidebar{ + padding-right: 10rem !important; + h1.documentFirstHeading { + text-align: left; + } + } } .tabs.section-tabs { - display: flex; - justify-content: center; + width: 78%; + margin: 0 auto; a { - color: #3f3f3f; - font-size: 1.2rem; + color: @bodyColor; + font-size: 18px; margin-right: 4rem; line-height: 3; + padding-bottom: 1rem; + &.tabs__item_active { + font-weight: 700; + color: @primaryColor; + border-bottom: 1rem solid @primaryColor; + } } } @@ -66,28 +94,40 @@ margin: 0; } -h1.documentFirstHeading { +h1.documentFirstHeading{ + text-align: center; +} + +h1.documentFirstHeading, h2, h3{ font-size: 36px; + color: @primaryColor; + font-weight: 700; border-bottom: none!important; &:before { display: none!important; } } +p { + + color: @bodyColor; + font-weight: 300; + &.documentDescription{ + color: @fullBlack; + } +} + .breadcrumbs { display: none; } - - - .detailed-link-block { display: flex; flex-wrap: wrap; max-width: 800px; margin: 0 auto; flex-direction: column; -} +} .detailed-link-block-item-title { @@ -118,4 +158,4 @@ h1.documentFirstHeading { font-size: 16px; position: relative; } -} \ No newline at end of file +} diff --git a/theme/themes/pastanaga/globals/site.variables b/theme/themes/pastanaga/globals/site.variables index 5cb1bba..0924b2e 100755 --- a/theme/themes/pastanaga/globals/site.variables +++ b/theme/themes/pastanaga/globals/site.variables @@ -6,7 +6,7 @@ Fonts --------------------*/ -@fontName : 'Poppins'; +@fontName : 'Source Sans Pro'; @googleFontSizes : '300,400,500,700,400italic,700italic'; @@ -24,11 +24,19 @@ /*------------------- Brand Colors --------------------*/ -@primaryColor : @darkBlue; +@primaryColor : @lightblue; -@secondaryColor : @brown; +@secondaryColor : @darkBlue; -@lightSecondaryColor : @lightGrey; +@bodyColor : @bodyGrey; + +@darkPrimaryColor : @darkOrange; + +@lightPrimaryColor : @lightBodyGrey; + +@lightSecondaryColor : @lightOrange; + +/* @lightSecondaryColor : @lightGrey; */ /*-------------- @@ -84,7 +92,7 @@ Links --------------------*/ -@linkColor : @blue; +@linkColor : @lighterOrange; /*------------------- @@ -132,11 +140,20 @@ @brown : #826A6A; // Palette: reddishGrey @grey : #68778D; // Palette: blueishGrey @black : #252525; // Palette: darkishGrey -@darkBlue : #005384; +@darkBlue : #32536B; +@darkOrange : #D63D27; +@darkGreen : #009590; /*--- Light Colors ---*/ @lightOlive : #C9EAB1; // Palette: lightSage @lightGrey : #878F93; +@lightblue : #4296B2; +@lightOrange : #F3EFEE; +@lighterOrange : #EC776A; +@lightBodyGrey : #F6F6F6; +@greyBlue : #6C8BA2; + + /*--- Neutrals ---*/ @fullBlack : #000000; @@ -144,6 +161,8 @@ @darkWhite : #F3F4F5; @midWhite : #DCDDDE; @white : #FFFFFF; +@bodyGrey : #333333; + /*--- Colored Backgrounds ---*/ @redBackground : #F5C1C1; // Palette: alertError diff --git a/theme/themes/pastanaga/modules/search.overrides b/theme/themes/pastanaga/modules/search.overrides index d5a76ff..6370d3c 100644 --- a/theme/themes/pastanaga/modules/search.overrides +++ b/theme/themes/pastanaga/modules/search.overrides @@ -2,7 +2,8 @@ Theme Overrides *******************************/ .glossary-search { - max-width: 964px; + //max-width: 964px; + width: 80%; margin : 2rem auto; .searchbox { @@ -12,15 +13,28 @@ .input { border-radius: 30px; height : 50px; - background : #F6F6F6; - padding-left : 1rem; + background : #EDEDED; + padding-left : 1.5rem; + font-weight: 300; + font-size: 18px; + color: @bodyColor; + /* + &:before{ + font-family: "Font Awesome 5 Free"; + font-weight: 700; + content: "\f007"; + margin: auto 1rem; + color: @secondaryColor; + } + */ } button { - background: #008173!important; + background: @secondaryColor !important; border-radius: 30px; padding: 0 2rem!important; color: white!important; + font-weight: 700; margin-left: 1rem; } -} \ No newline at end of file +} From fbf5958b4408423952022094fb43bd4b1d6ff1c0 Mon Sep 17 00:00:00 2001 From: MadelaineS Date: Wed, 15 Apr 2020 23:22:14 +0300 Subject: [PATCH 4/4] added responsive rules --- .../pastanaga/collections/menu.overrides | 43 +++++---- .../pastanaga/elements/header.overrides | 52 +++++++---- theme/themes/pastanaga/globals/site.overrides | 92 ++++++++++++++----- theme/themes/pastanaga/globals/site.variables | 17 +++- .../themes/pastanaga/modules/search.overrides | 48 +++++----- 5 files changed, 167 insertions(+), 85 deletions(-) diff --git a/theme/themes/pastanaga/collections/menu.overrides b/theme/themes/pastanaga/collections/menu.overrides index ab8220c..fcce7fb 100644 --- a/theme/themes/pastanaga/collections/menu.overrides +++ b/theme/themes/pastanaga/collections/menu.overrides @@ -1,7 +1,6 @@ /******************************* Theme Overrides *******************************/ - .ui.menu .item.personal-bar { position: fixed; bottom: 68px; @@ -37,8 +36,7 @@ margin: 4px -14px 0; background-repeat: no-repeat; background-size: 64px 18px; - transition: width 0.3s cubic-bezier(0.6, -0.28, 0.735, 0.045), - margin 0.3s cubic-bezier(0.6, -0.28, 0.735, 0.045); + transition: width 0.3s cubic-bezier(0.6, -0.28, 0.735, 0.045), margin 0.3s cubic-bezier(0.6, -0.28, 0.735, 0.045); } .ui.menu.collapsed .item.logo > .image { @@ -104,13 +102,20 @@ .navigation, .tools { - .menu { - margin-top: 0; + margin-left: 40px; + @media only screen and (max-width: @largestTabletScreen) { + margin-left: 0; + margin-top: 0.5rem; + } + + .ui.pointing.secondary.stackable.computer.large.screen.widescreen.only.menu { + @media only screen and (max-width: 1071px) and (min-width:992px) { + display: flex !important; + } } - margin: 0 0 0 40px; - .ui.secondary.pointing.menu { - border: 0; + .ui.secondary.pointing.menu { + border: 0; @media only screen and (max-width: @largestTabletScreen) { margin-bottom: 20px; margin-left: 0; @@ -118,8 +123,8 @@ a { &:hover { - color: rgba(white, .5); - border-color: transparent; + color: rgba(white, .5); + border-color: transparent; } } @@ -128,22 +133,22 @@ font-size: 14px; text-transform: uppercase; color: rgba(white, .8); - padding-top: @relativeBig; + //padding-top: @relativeBig; margin: 0; &.active { font-weight: 700; color: white; border-color: transparent; + &:hover { color: rgba(white, .8); } } - - @media only screen and (min-width: @largestTabletScreen) { - padding: 1.7em 0 @relativeBig; - margin: 0 unit(@relativeLarge * 2, em) 0 0; - } + /*@media only screen and (min-width: @largestTabletScreen) { + padding: 1.7em 0 @relativeBig; + margin: 0 unit(@relativeLarge * 2, em) 0 0; + }*/ } } } @@ -177,14 +182,12 @@ color: @black; } } - @media only screen and (max-width: 767px) { .ui.menu.stackable > .menu, .ui.menu.stackable > .menu.right { display: block; } } - /* Pagination */ .pagination-wrapper { text-align: center; @@ -204,6 +207,8 @@ .active.item { background: none; - color: @textColor; + color: @linkColor; + font-weight: 700; + border-bottom: 2px solid @linkColor; } } diff --git a/theme/themes/pastanaga/elements/header.overrides b/theme/themes/pastanaga/elements/header.overrides index 7aab72e..4ec2182 100644 --- a/theme/themes/pastanaga/elements/header.overrides +++ b/theme/themes/pastanaga/elements/header.overrides @@ -1,7 +1,6 @@ /******************************* Theme Overrides *******************************/ - .ui.basic.segment.header-wrapper { margin-bottom: 0; background-color: @primaryColor; @@ -15,39 +14,49 @@ .logo-nav-wrapper { display: flex; flex-grow: 2; + @media only screen and (max-width: @largestTabletScreen) { + align-items: initial; + justify-content: start; + flex-direction: row-reverse; + flex-grow: 0; + } .logo { flex: 0 0 auto; + @media only screen and (max-width: @largestTabletScreen) { + margin-left: 2rem; + } } .navigation { + .hamburger-inner { + background: white; + + &:after, + &:before { + background: white; + } + } // -ms-overflow-style: none; /* IE 10+ */ // overflow-x: auto; - &::-webkit-scrollbar { - height: 0; /* remove scrollbar space */ - background: transparent; /* optional: just make scrollbar invisible */ + height: 0; + /* remove scrollbar space */ + background: transparent; + /* optional: just make scrollbar invisible */ } - /* optional: show position indicator in red */ &::-webkit-scrollbar-thumb { background: #f00; } - @media only screen and (max-width: @largestTabletScreen) { overflow-x: initial; } } } - @media only screen and (max-width: @largestTabletScreen) { - flex-direction: column; + //flex-direction: initial; align-items: initial; - - .logo-nav-wrapper { - align-items: initial; - justify-content: space-between; - } } .tools-search-wrapper { @@ -58,6 +67,15 @@ align-items: center; justify-content: flex-end; margin-left: @huge; + width: 20%; + /* @media only screen and (max-width: 560px){ + + } */ + @media only screen and (max-width: @largestTabletScreen) { + width: 20%; + height: 20%; + justify-content: end; + } & > * { display: flex; @@ -73,9 +91,11 @@ } } - .header-container { width: 80%; margin: 0 auto; - max-width: 1600px; -} \ No newline at end of file + //max-width: 1600px; + @media only screen and (max-width: 982px) { + width: auto; + } +} diff --git a/theme/themes/pastanaga/globals/site.overrides b/theme/themes/pastanaga/globals/site.overrides index c2a20e5..0589d4f 100644 --- a/theme/themes/pastanaga/globals/site.overrides +++ b/theme/themes/pastanaga/globals/site.overrides @@ -1,12 +1,52 @@ /******************************* Global Overrides *******************************/ +.ui.vertical.padded.segment.footerWrapper > .ui.container { + width: 80% !important; + @media only screen and (max-width: @largestTabletScreen) { + margin: 0 2rem !important; + width: auto !important; + } +} .footerWrapper { - background-color: @primaryColor !important; - color: white; + background-color: @primaryColor !important; + + .ui.container { + padding-top: 2rem; + + .six.wide.column { + flex: 2 0 auto; + } + @media only screen and (min-width: 425px) and (max-width: @largestTabletScreen) { + .row { + /*.three.wide.column, .six.wide.column { + width: 100% !important; + }*/ + .three.wide.column:last-child { + width: 100% !important; + } + } + } + @media only screen and (max-width: 600px) { + .row { + flex-direction: column; + + .six.wide.column, + .three.wide.column { + width: 100% !important; + } + + .six.wide.column { + margin-top: .5rem; + flex-direction: row; + } + } + } + } .unlist { + padding-left: 0; margin: 0; list-style-type: none; text-decoration: underline; @@ -20,13 +60,18 @@ } p { - color: white !important; + color: white; } } -#page-document.ui.container{ - width: 80% !important; - margin: 4rem auto !important; +#page-document.ui.container { + @media only screen and (min-width: 982px) { + width: 80% !important; + margin-top: 4rem !important; + } + @media only screen and (max-width: @largestTabletScreen) { + margin: 2rem !important; + } } .widthSidebar { @@ -53,11 +98,14 @@ margin-right: 2rem; margin-top: 4rem; width: 58%; + a { color: @bodyColor; font-size: 1rem; + &.tabs__item { - padding-bottom: 2rem; + padding-bottom: 2rem; + &.tabs__item_active { font-weight: 700; color: @linkColor; @@ -66,10 +114,12 @@ } } } - .hasSidebar{ + + .hasSidebar { padding-right: 10rem !important; + h1.documentFirstHeading { - text-align: left; + text-align: center; } } } @@ -77,12 +127,14 @@ .tabs.section-tabs { width: 80%; margin: 0 auto; + a { color: @bodyColor; font-size: 18px; margin-right: 4rem; line-height: 3; padding-bottom: 1rem; + &.tabs__item_active { font-weight: 700; color: @primaryColor; @@ -96,25 +148,28 @@ margin: 0; } -h1.documentFirstHeading{ +h1.documentFirstHeading { text-align: center; } -h1.documentFirstHeading, h2, h3{ +h1.documentFirstHeading, +h2, +h3 { font-size: 36px; color: @primaryColor; font-weight: 700; border-bottom: none!important; + &:before { display: none !important; } } p { - color: @bodyColor; font-weight: 300; - &.documentDescription{ + + &.documentDescription { color: @fullBlack; } } @@ -131,9 +186,7 @@ p { flex-direction: column; } - .detailed-link-block-item-title { - // font-family: 'Roboto Condensed'; font-size: 28px; font-weight: 500; margin-bottom: 1.5rem; @@ -166,27 +219,22 @@ p { .article-list-row { display: flex; margin-bottom: 20px; - @media only screen and (max-width: 500px) { flex-wrap: wrap; - margin-bottom: 40px + margin-bottom: 40px; } - .article-img { width: 200px; border-radius: 20px; margin-right: 25px; - @media only screen and (max-width: 500px) { width: 90%; } } - - .article-title { - color: #ED776A; + color: @linkColor; font-weight: 500; font-size: 20px; margin-top: 10px; diff --git a/theme/themes/pastanaga/globals/site.variables b/theme/themes/pastanaga/globals/site.variables index 0924b2e..03c5477 100755 --- a/theme/themes/pastanaga/globals/site.variables +++ b/theme/themes/pastanaga/globals/site.variables @@ -16,6 +16,7 @@ --------------------*/ + /*------------------- Border Radius --------------------*/ @@ -24,6 +25,7 @@ /*------------------- Brand Colors --------------------*/ + @primaryColor : @lightblue; @secondaryColor : @darkBlue; @@ -36,8 +38,6 @@ @lightSecondaryColor : @lightOrange; -/* @lightSecondaryColor : @lightGrey; */ - /*-------------- Page Heading @@ -125,6 +125,11 @@ Breakpoints --------------------*/ +@mobileBreakpoint : 320px; +@tabletBreakpoint : 903px; +@computerBreakpoint : 992px; +@largeMonitorBreakpoint : 1200px; +@widescreenMonitorBreakpoint : 1920px; /*------------------- Site Colors @@ -144,17 +149,17 @@ @darkOrange : #D63D27; @darkGreen : #009590; + /*--- Light Colors ---*/ @lightOlive : #C9EAB1; // Palette: lightSage @lightGrey : #878F93; @lightblue : #4296B2; @lightOrange : #F3EFEE; -@lighterOrange : #EC776A; +@lighterOrange : #ED776A; @lightBodyGrey : #F6F6F6; @greyBlue : #6C8BA2; - /*--- Neutrals ---*/ @fullBlack : #000000; @offWhite : #F9FAFB; @@ -273,6 +278,10 @@ /* Responsive */ +@largestMobileScreen : (@tabletBreakpoint - 1px); +@largestTabletScreen : (@computerBreakpoint - 1px); +@largestSmallMonitor : (@largeMonitorBreakpoint - 1px); +@largestLargeMonitor : (@widescreenMonitorBreakpoint - 1px); /*------------------- diff --git a/theme/themes/pastanaga/modules/search.overrides b/theme/themes/pastanaga/modules/search.overrides index 6370d3c..28d11da 100644 --- a/theme/themes/pastanaga/modules/search.overrides +++ b/theme/themes/pastanaga/modules/search.overrides @@ -2,23 +2,23 @@ Theme Overrides *******************************/ .glossary-search { - //max-width: 964px; - width: 80%; - margin : 2rem auto; + //max-width: 964px; + width: 80%; + margin: 2rem auto; - .searchbox { - border-left: none!important; - } + .searchbox { + border-left: none!important; + } - .input { - border-radius: 30px; - height : 50px; - background : #EDEDED; - padding-left : 1.5rem; - font-weight: 300; - font-size: 18px; - color: @bodyColor; - /* + .input { + border-radius: 30px; + height: 50px; + background: #EDEDED; + padding-left: 1.5rem; + font-weight: 300; + font-size: 18px; + color: @bodyColor; + /* &:before{ font-family: "Font Awesome 5 Free"; font-weight: 700; @@ -27,14 +27,14 @@ color: @secondaryColor; } */ - } + } - button { - background: @secondaryColor !important; - border-radius: 30px; - padding: 0 2rem!important; - color: white!important; - font-weight: 700; - margin-left: 1rem; - } + button { + background: @secondaryColor !important; + border-radius: 30px; + padding: 0 2rem !important; + color: white!important; + font-weight: 700; + margin-left: 1rem; + } }