diff --git a/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor b/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor index 6fd9366..ab48048 100644 --- a/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor +++ b/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor @@ -1,39 +1,40 @@ @using RBLFeederCommon.Enums @using RBLNews.Shared.Models - +
+ + @(this.Count) +
@code { private bool _filter = true; - - [Parameter] - public RssFeedSources Source { get; set; } - - [Parameter] - public string Text { get; set; } = ""; - - [Parameter] - public bool ShowCount { get; set; } - - [Parameter] - public int Count { get; set; } - - [Parameter] - public EventCallback OnFilterChanged { get; set; } - + + [Parameter] public RssFeedSources Source { get; set; } + + [Parameter] public string Text { get; set; } = ""; + + [Parameter] public bool ShowCount { get; set; } + + [Parameter] public int Count { get; set; } + + [Parameter] public EventCallback OnFilterChanged { get; set; } + + Task SwitchChanged(bool value) { this._filter = value; - - OnFilterChanged.InvokeAsync(new FilterFeedEventArg - { - Source = this.Source, - Value = value - }); - + + OnFilterChanged.InvokeAsync( + new FilterFeedEventArg + { + Source = this.Source, + Value = value + }); + return Task.CompletedTask; } + } \ No newline at end of file diff --git a/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor.css b/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor.css new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/RBLNews.Shared/Components/Controls/SwitchWithBadge.razor.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/RBLNews.Shared/Components/Pages/Feeds.razor b/RBLNews.Shared/Components/Pages/Feeds.razor index 111cd97..2e763dc 100644 --- a/RBLNews.Shared/Components/Pages/Feeds.razor +++ b/RBLNews.Shared/Components/Pages/Feeds.razor @@ -37,9 +37,9 @@ else
@foreach (FeedGroupVM feedGrp in FeedGroups) { -

+

@feedGrp.PublishDate.ToLocalTime().ToString("dd.MM.yyyy") -

+ @foreach (FeedVM feed in feedGrp.Feeds) {
diff --git a/RBLNews.Shared/wwwroot/css/app.css b/RBLNews.Shared/wwwroot/css/app.css index 472d329..dbed1f9 100644 --- a/RBLNews.Shared/wwwroot/css/app.css +++ b/RBLNews.Shared/wwwroot/css/app.css @@ -3,6 +3,10 @@ rot: #DD0741 schrift: #4b4b4b */ +body { + color: #4b4b4b; +} + @font-face { font-family: "Nanum Myeongjo", serif !important; font-weight: 400; @@ -13,6 +17,13 @@ schrift: #4b4b4b #feeds-page { color: #4b4b4b; } +#feeds-list { + margin-top: 15px; +} + +#filter { + margin-top: 15px; +} .card { color: #4b4b4b; @@ -31,20 +42,21 @@ schrift: #4b4b4b font-size: 0.8em; } -nav .container-fluid { +.container-fluid { padding-right: 0 !important; padding-left: 0 !important; } + nav .top-row { height: 1.8rem; background-color: rgb(221, 7, 65); color: #eee; } - /*nav .top-row h1, h2, h3, h4, h5 {*/ - /* color: #eee;*/ - /*}*/ +/*nav .top-row h1, h2, h3, h4, h5 {*/ +/* color: #eee;*/ +/*}*/ #filter button { @@ -59,21 +71,20 @@ nav .top-row { /*}*/ .btn-primary { - color: #fff; + color: #eee; background-color: #f75581; border-color: #DD0741; } .btn-primary:hover { - color: inherit; background-color: inherit; - border-color: inherit; + border-color: #4b4b4b; } .btn-outline-primary { - color: #f75581; + color: #4b4b4b; background-color: #fff; - border-color: #DD0741; + border-color: #4b4b4b; } .btn-outline-primary:hover { @@ -102,10 +113,9 @@ nav .top-row { background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); } - .navbar-toggler:checked { - background-color: rgba(255, 255, 255, 0.5); - } - +.navbar-toggler:checked { + background-color: rgba(255, 255, 255, 0.5); +} .navbar-brand { @@ -139,32 +149,32 @@ nav .top-row { padding-bottom: 0.6rem; } - .nav-item:first-of-type { - padding-top: 1rem; - } +.nav-item:first-of-type { + padding-top: 1rem; +} - .nav-item:last-of-type { - padding-bottom: 1rem; - } +.nav-item:last-of-type { + padding-bottom: 1rem; +} - .nav-item ::deep a { - color: #d7d7d7; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - } +.nav-item ::deep a { + color: #d7d7d7; + border-radius: 4px; + height: 3rem; + display: flex; + align-items: center; + line-height: 3rem; +} - .nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; - } +.nav-item ::deep a.active { + background-color: rgba(255, 255, 255, 0.37); + color: white; +} - .nav-item ::deep a:hover { - background-color: rgba(255,255,255,0.1); - color: white; - } +.nav-item ::deep a:hover { + background-color: rgba(255, 255, 255, 0.1); + color: white; +} .nav-scrollable { display: none; @@ -189,8 +199,6 @@ nav .top-row { } - - .loading { position: absolute; top: 45%; @@ -226,12 +234,12 @@ nav .top-row { z-index: 1000; } - #blazor-error-ui .dismiss { - cursor: pointer; - position: absolute; - right: 0.75rem; - top: 0.5rem; - } +#blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; +} .blazor-error-boundary { background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121; @@ -239,9 +247,9 @@ nav .top-row { color: white; } - .blazor-error-boundary::after { - content: "An error has occurred." - } +.blazor-error-boundary::after { + content: "An error has occurred." +} .status-bar-safe-area { display: none; @@ -263,6 +271,26 @@ nav .top-row { } } +.swb-container { + position: relative; + padding-top: 10px; +} + +.swb-badge { + position: absolute; + top: -5px; + /*height:20px;*/ + min-width: 20px; + z-index: 999; + background-color: #DD0741; + display: inline-block; + margin: 8px 2px; + border-radius: 18px; + text-align: center; + font-size: 0.7em; + color: #eee; +} + /*html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;