aboutsummaryrefslogtreecommitdiff
path: root/p
diff options
context:
space:
mode:
Diffstat (limited to 'p')
-rw-r--r--p/.htaccess1
-rw-r--r--p/api/greader.php2
-rw-r--r--p/themes/Ansum/_list-view.scss22
-rw-r--r--p/themes/Ansum/ansum.css21
-rw-r--r--p/themes/Flat/flat.css5
-rw-r--r--p/themes/Mapco/_list-view.scss21
-rw-r--r--p/themes/Mapco/mapco.css21
-rw-r--r--p/themes/Origine-compact/origine-compact.css5
-rw-r--r--p/themes/Origine/origine.css5
-rw-r--r--p/themes/Pafat/pafat.css5
-rw-r--r--p/themes/Swage/swage.css10
-rw-r--r--p/themes/Swage/swage.scss18
12 files changed, 71 insertions, 65 deletions
diff --git a/p/.htaccess b/p/.htaccess
index 74ba7ed11..909fb6cdc 100644
--- a/p/.htaccess
+++ b/p/.htaccess
@@ -37,4 +37,5 @@ AddDefaultCharset UTF-8
<FilesMatch "\.(css|gif|html|ico|js|png|svg|woff|woff2)$">
Header merge Cache-Control "public"
</FilesMatch>
+ Header edit Set-Cookie ^(.*)$ "$1; SameSite=Lax"
</IfModule>
diff --git a/p/api/greader.php b/p/api/greader.php
index 66888b0ef..9c28125e7 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -696,7 +696,7 @@ function streamContentsItemsIds($streamId, $start_time, $stop_time, $count, $ord
$itemRefs = array();
foreach ($ids as $id) {
$itemRefs[] = array(
- 'id' => $id, //64-bit decimal
+ 'id' => '' . $id, //64-bit decimal
);
}
diff --git a/p/themes/Ansum/_list-view.scss b/p/themes/Ansum/_list-view.scss
index 8b8398c6f..e5a1f575a 100644
--- a/p/themes/Ansum/_list-view.scss
+++ b/p/themes/Ansum/_list-view.scss
@@ -20,24 +20,19 @@
border-left-color: $main-first;
}
- &.not_read {
+ &.not_read:not(.current) {
background: $unread-bg; //--------------------
- // border-left-color: #FF5300;
- &:hover {
- background: $unread-bg-light; //--------------------
- }
-
- &:not(.current):hover .item.title {
- background: $unread-bg-light;
-
+ &:hover .item.title {
+ background: $unread-bg;
}
+ }
+ &.not_read {
.item.title {
a {
color: $unread-font-color; //--------------------
}
-
}
.item.website {
@@ -52,12 +47,15 @@
}
&.favorite {
- background: $fav-light;
border-left-color: $fav-bg;
@include transition(all, 0.15s, ease-in-out);
+ }
- &:not(.current):hover .item.title {
+ &.favorite:not(.current) {
+ background: $fav-light;
+
+ &:hover .item.title {
background: $fav-light;
}
}
diff --git a/p/themes/Ansum/ansum.css b/p/themes/Ansum/ansum.css
index 525e7e079..7b4281d2b 100644
--- a/p/themes/Ansum/ansum.css
+++ b/p/themes/Ansum/ansum.css
@@ -963,25 +963,24 @@ form th {
.flux.current {
background: #fff;
border-left-color: #ca7227; }
- .flux.not_read {
+ .flux.not_read:not(.current) {
background: #f2f6f8; }
- .flux.not_read:hover {
- background: #fdfdfe; }
.flux.not_read:not(.current):hover .item.title {
- background: #fdfdfe; }
- .flux.not_read .item.title a {
- color: #161a38; }
- .flux.not_read .item.website a {
- color: #161a38; }
- .flux.not_read .item.date {
- color: #161a3899; }
+ background: #f2f6f8; }
+ .flux.not_read .item.title a {
+ color: #161a38; }
+ .flux.not_read .item.website a {
+ color: #161a38; }
+ .flux.not_read .item.date {
+ color: #161a3899; }
.flux.favorite {
- background: #fff6da;
border-left-color: #ffc300;
-webkit-transition: all 0.15s ease-in-out;
-moz-transition: all 0.15s ease-in-out;
-o-transition: all 0.15s ease-in-out;
transition: all 0.15s ease-in-out; }
+ .flux.favorite:not(.current) {
+ background: #fff6da; }
.flux.favorite:not(.current):hover .item.title {
background: #fff6da; }
.flux .website a {
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index f7159b46f..0989321bf 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -803,10 +803,13 @@ a.btn {
}
.flux.favorite {
- background: #fff6da;
border-left-color: #ffc300;
}
+.flux.favorite:not(.current) {
+ background: #fff6da;
+}
+
.flux.favorite:not(.current):hover .item.title {
background: #fff6da;
}
diff --git a/p/themes/Mapco/_list-view.scss b/p/themes/Mapco/_list-view.scss
index ab3001ee4..760aea96c 100644
--- a/p/themes/Mapco/_list-view.scss
+++ b/p/themes/Mapco/_list-view.scss
@@ -20,19 +20,15 @@
border-left-color: $main-first;
}
- &.not_read {
+ &.not_read:not(.current) {
background: $unread-bg; //--------------------
- // border-left-color: #FF5300;
- &:hover {
- background: $unread-bg-light; //--------------------
- }
-
- &:not(.current):hover .item.title {
- background: $unread-bg-light;
-
+ &:hover .item.title {
+ background: $unread-bg;
}
+ }
+ &.not_read {
.item.title {
a {
color: $unread-font-color; //--------------------
@@ -52,12 +48,15 @@
}
&.favorite {
- background: $fav-light;
border-left-color: $fav-bg;
@include transition(all, 0.15s, ease-in-out);
+ }
- &:not(.current):hover .item.title {
+ &.favorite:not(.current) {
+ background: $fav-light;
+
+ &:hover .item.title {
background: $fav-light;
}
}
diff --git a/p/themes/Mapco/mapco.css b/p/themes/Mapco/mapco.css
index b144dca58..bbbad8560 100644
--- a/p/themes/Mapco/mapco.css
+++ b/p/themes/Mapco/mapco.css
@@ -970,26 +970,25 @@ form th {
.flux.current {
background: #f9fafb;
border-left-color: #36c; }
- .flux.not_read {
+ .flux.not_read:not(.current) {
background: #f2f6f8; }
- .flux.not_read:hover {
- background: #fdfdfe; }
.flux.not_read:not(.current):hover .item.title {
- background: #fdfdfe; }
- .flux.not_read .item.title a {
- color: #36c; }
- .flux.not_read .item.website a {
- color: #36c; }
- .flux.not_read .item.date {
- color: #36c99; }
+ background: #f2f6f8; }
+ .flux.not_read .item.title a {
+ color: #36c; }
+ .flux.not_read .item.website a {
+ color: #36c; }
+ .flux.not_read .item.date {
+ color: #36c99; }
.flux.favorite {
- background: #fff6da;
border-left-color: #ffc300;
-webkit-transition: all 0.15s ease-in-out;
-moz-transition: all 0.15s ease-in-out;
-o-transition: all 0.15s ease-in-out;
-ms-transition: all 0.15s ease-in-out;
transition: all 0.15s ease-in-out; }
+ .flux.favorite:not(.current) {
+ background: #fff6da; }
.flux.favorite:not(.current):hover .item.title {
background: #fff6da; }
.flux .website a {
diff --git a/p/themes/Origine-compact/origine-compact.css b/p/themes/Origine-compact/origine-compact.css
index af8e66d17..9ce0b5da0 100644
--- a/p/themes/Origine-compact/origine-compact.css
+++ b/p/themes/Origine-compact/origine-compact.css
@@ -837,10 +837,13 @@ a.btn,
}
.flux.favorite {
- background: #fff6da;
border-left: 2px solid #ffc300;
}
+.flux.favorite:not(.current) {
+ background: #fff6da;
+}
+
.flux.favorite:not(.current):hover .item.title {
background: #fff6da;
}
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7e826dd5f..4016ac5bd 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -794,10 +794,13 @@ a.btn {
}
.flux.favorite {
- background: #fff6da;
border-left: 2px solid #ffc300;
}
+.flux.favorite:not(.current) {
+ background: #fff6da;
+}
+
.flux.favorite:not(.current):hover .item.title {
background: #fff6da;
}
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 8b6bc5f62..2cbc539dc 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -798,10 +798,13 @@ a.btn {
}
.flux.favorite {
- background: #fff6da;
border-left: 2px solid #428bca;
}
+.flux.favorite:not(.current) {
+ background: #fff6da;
+}
+
.flux.favorite:not(.current):hover .item.title {
background: #fff6da;
}
diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css
index 6528d2305..3bf510099 100644
--- a/p/themes/Swage/swage.css
+++ b/p/themes/Swage/swage.css
@@ -585,14 +585,14 @@ form th {
.flux:hover:not(.current):hover .item.title,
.flux .current:not(.current):hover .item.title {
background: #fff; }
- .flux.not_read:not(.current) {
- background: #fff3ed; }
- .flux.not_read:not(.current):hover .item.title {
- background: #fff3ed; }
- .flux.favorite {
+ .flux.favorite:not(.current) {
background: #fff6da; }
.flux.favorite:not(.current):hover .item.title {
background: #fff6da; }
+ .flux.not_read:not(.current) {
+ background: #fff3ed; }
+ .flux.not_read:not(.current):hover .item.title {
+ background: #fff3ed; }
.flux .date {
color: #969696;
font-size: 0.7rem; }
diff --git a/p/themes/Swage/swage.scss b/p/themes/Swage/swage.scss
index 9c2702fc0..f37739d03 100644
--- a/p/themes/Swage/swage.scss
+++ b/p/themes/Swage/swage.scss
@@ -928,21 +928,19 @@ form {
}
}
- &.not_read {
- &:not(.current) {
- background: $color_unread;
- }
+ &.favorite:not(.current) {
+ background: $color_stared;
- &:not(.current):hover .item.title {
- background: $color_unread;
+ &:hover .item.title {
+ background: $color_stared;
}
}
- &.favorite, {
- background: $color_stared;
+ &.not_read:not(.current) {
+ background: $color_unread;
- &:not(.current):hover .item.title {
- background: $color_stared;
+ &:hover .item.title {
+ background: $color_unread;
}
}