This commit is contained in:
Sonny Bakker 2021-03-06 18:21:29 +01:00
parent 18dbf2d312
commit 6d09629c8e
9 changed files with 89 additions and 60 deletions

View file

@ -1,5 +1,11 @@
# Changelog # Changelog
## 0.3.12
- Update light theme
- Sticky navbar
- Sticky post modal header
## 0.3.11 ## 0.3.11
- Add saved posts section - Add saved posts section

View file

@ -1,6 +1,6 @@
{ {
"name": "newsreader", "name": "newsreader",
"version": "0.3.11", "version": "0.3.12",
"description": "Application for viewing RSS feeds", "description": "Application for viewing RSS feeds",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

View file

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "newsreader" name = "newsreader"
version = "0.3.11" version = "0.3.12"
description = "Webapplication for reading RSS feeds" description = "Webapplication for reading RSS feeds"
authors = ["Sonny <sonnyba871@gmail.com>"] authors = ["Sonny <sonnyba871@gmail.com>"]
license = "GPL-3.0" license = "GPL-3.0"

View file

@ -73,10 +73,14 @@ class PostModal extends React.Component {
return ( return (
<div className="modal post-modal"> <div className="modal post-modal">
<div className="post"> <div className="post">
<div className="post__header">
<div className="post__actions"> <div className="post__actions">
<button <button
className={`button read-button ${readButtonDisabled && 'button--disabled'}`} className={`button read-button ${readButtonDisabled &&
onClick={() => !readButtonDisabled && this.props.markPostRead(post, token)} 'button--disabled'}`}
onClick={() =>
!readButtonDisabled && this.props.markPostRead(post, token)
}
> >
<i className="fas fa-check" /> Mark as read <i className="fas fa-check" /> Mark as read
</button> </button>
@ -87,7 +91,7 @@ class PostModal extends React.Component {
<i className="fas fa-times"></i> Close <i className="fas fa-times"></i> Close
</button> </button>
</div> </div>
<div className="post__header"> <div className="post__heading">
<h2 className={titleClassName}>{`${post.title} `}</h2> <h2 className={titleClassName}>{`${post.title} `}</h2>
<div className="post__meta-info"> <div className="post__meta-info">
<span className="post__date"> <span className="post__date">
@ -124,6 +128,7 @@ class PostModal extends React.Component {
/> />
</div> </div>
</div> </div>
</div>
{/* HTML is sanitized by the collectors */} {/* HTML is sanitized by the collectors */}
<div className="post__body" dangerouslySetInnerHTML={{ __html: post.body }} /> <div className="post__body" dangerouslySetInnerHTML={{ __html: post.body }} />

View file

@ -3,10 +3,14 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin: 0 0 5px 0;
padding: 10px 0; padding: 10px 0;
width: 100%; width: 100%;
position: sticky;
top: 0;
background-color: var(--lightest-accent-color);
ol { ol {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
@ -28,5 +32,7 @@
&__item:last-child { &__item:last-child {
margin: 0 10px 0 auto; margin: 0 10px 0 auto;
border-right: 2px solid var(--lighter-accent-color);
} }
} }

View file

@ -15,6 +15,17 @@
cursor: initial; cursor: initial;
&__header {
display: flex;
flex-direction: column;
align-items: center;
position: sticky;
top: 0;
width: 100%;
}
&__actions { &__actions {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@ -24,10 +35,11 @@
gap: 20px; gap: 20px;
} }
&__header { &__heading {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 20px 0 10px 0; padding: 20px 0 10px 0;
width: 75%; width: 75%;
} }
@ -51,7 +63,7 @@
background-color: var(--lightest-accent-color) !important; background-color: var(--lightest-accent-color) !important;
& a { & a {
color: $black; color: var(--font-color);
} }
} }

View file

@ -10,8 +10,8 @@
} }
& .badge { & .badge {
& a { & .link {
color: $black; color: var(--font-color);
} }
} }
} }

View file

@ -5,7 +5,7 @@
align-self: start; align-self: start;
position: sticky; position: sticky;
top: 5%; top: 50px;
width: 20%; width: 20%;

View file

@ -25,18 +25,18 @@ $focus-blue: darken($azureish-white, +10%);
$checkbox-blue: rgba(34, 170, 253, 1); $checkbox-blue: rgba(34, 170, 253, 1);
// White theme // White theme
$background-color: $white; $background-color: rgba(255, 249, 176, 1);
$font-color: rgba(83, 87, 91, 1); $font-color: rgba(83, 87, 91, 1);
$link-color: darken($azureish-white, 30%); $link-color: rgba(45, 142, 202, 1);
$read-color: darken($gainsboro, 10%); $read-color: darken($gainsboro, 10%);
$confirm-button-font-color: rgba(255, 255, 255, 1); $confirm-button-font-color: rgba(255, 255, 255, 1);
$accent-color: $gainsboro; $accent-color: rgba(255, 171, 115, 1);
$lighter-accent-color: $gainsboro; $lighter-accent-color: rgba(255, 211, 132, 1);
$lightest-accent-color: $orange; $lightest-accent-color: rgba(255, 174, 192, 1);
$confirm-color: rgba(89, 181, 128, 1); $confirm-color: rgba(117, 207, 184, 1);
$danger-color: rgba(237, 118, 105, 1); $danger-color: rgba(237, 118, 105, 1);
$warning-color: rgba(255, 218, 119, 1); $warning-color: rgba(255, 218, 119, 1);
$info-color: rgba(162, 213, 242, 1); $info-color: rgba(162, 213, 242, 1);
@ -51,7 +51,7 @@ $dark-confirm-button-font-color: $dark-font-color;
$dark-accent-color: rgba(19, 59, 92, 1); $dark-accent-color: rgba(19, 59, 92, 1);
$dark-lighter-accent-color: rgba(30, 95, 116, 1); $dark-lighter-accent-color: rgba(30, 95, 116, 1);
$dark-lightest-accent-color: rgba(252, 218, 183, 1); $dark-lightest-accent-color: rgba(88, 61, 114, 1);
$dark-confirm-color: rgba(0, 121, 101, 1); $dark-confirm-color: rgba(0, 121, 101, 1);
$dark-danger-color: rgba(175, 45, 45, 1); $dark-danger-color: rgba(175, 45, 45, 1);