From 6c70e9a618f5716eff7fb17d162e4ba3ea36c6a3 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Sun, 24 May 2020 15:23:22 +0300 Subject: [PATCH] Fixed language switch Updated blog CSS --- .../MyWebsite/Controllers/HomeController.cs | 2 +- MyWebsite/MyWebsite/wwwroot/css/Blog.css | 22 ++++++++++++++++++- MyWebsite/MyWebsite/wwwroot/css/Style.css | 4 ++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/MyWebsite/MyWebsite/Controllers/HomeController.cs b/MyWebsite/MyWebsite/Controllers/HomeController.cs index 3499852..69d49f1 100644 --- a/MyWebsite/MyWebsite/Controllers/HomeController.cs +++ b/MyWebsite/MyWebsite/Controllers/HomeController.cs @@ -44,7 +44,7 @@ namespace MyWebsite.Controllers CookieRequestCultureProvider.DefaultCookieName, CookieRequestCultureProvider.MakeCookieValue(new RequestCulture( CultureInfo.CurrentCulture.TwoLetterISOLanguageName.ToUpperInvariant() == "RU" ? - "en" : "ru" + "en-US" : "ru" )), new CookieOptions { Expires = DateTimeOffset.UtcNow.AddYears(1) }); diff --git a/MyWebsite/MyWebsite/wwwroot/css/Blog.css b/MyWebsite/MyWebsite/wwwroot/css/Blog.css index a7fcd7a..728652b 100644 --- a/MyWebsite/MyWebsite/wwwroot/css/Blog.css +++ b/MyWebsite/MyWebsite/wwwroot/css/Blog.css @@ -3,6 +3,7 @@ display: grid; grid-template-columns: 1fr 300px; grid-column-gap: 50px; + grid-row-gap: 25px; max-width: 1100px; margin: 0px auto; padding: 0px 30px; @@ -28,7 +29,6 @@ body header { align-self: center; - height: 100px; } header a:link @@ -265,6 +265,14 @@ main > form border-radius: 999px; } +@media only screen and (max-width: 1000px) +{ + main + { + grid-column-gap: 25px; + } +} + @media only screen and (max-width: 800px) { main > aside, main > form @@ -276,4 +284,16 @@ main > form { display: block; } + header + { + margin-bottom: 25px; + } } + +@media only screen and (max-width: 500px) +{ + main + { + padding: 10px !important; + } +} \ No newline at end of file diff --git a/MyWebsite/MyWebsite/wwwroot/css/Style.css b/MyWebsite/MyWebsite/wwwroot/css/Style.css index ccb4699..9ebcafe 100644 --- a/MyWebsite/MyWebsite/wwwroot/css/Style.css +++ b/MyWebsite/MyWebsite/wwwroot/css/Style.css @@ -1,5 +1,5 @@ /* - This file contains main layout styles which applies to every View. In some views this rules are overrided in separate CSS files + This file contains main layout styles which applies to every View. In some views this rules are overridden in separate CSS files */ /* Header styles */ @@ -130,7 +130,7 @@ header } /* Adaptive code */ -@media only screen and (min-width: 1070px) +@media only screen and (min-width: 1080px) { menu {