aboutsummaryrefslogtreecommitdiff
path: root/p
diff options
context:
space:
mode:
Diffstat (limited to 'p')
-rw-r--r--p/api/greader.php8
-rw-r--r--p/themes/Dark/freshrss.css4
-rw-r--r--p/themes/Dark/global.css6
-rw-r--r--p/themes/Flat/freshrss.css4
-rw-r--r--p/themes/Flat/global.css6
-rw-r--r--p/themes/Flat/icons/rss.svg6
-rw-r--r--p/themes/Origine/freshrss.css4
-rw-r--r--p/themes/Origine/global.css6
-rw-r--r--p/themes/icons/rss.svg2
9 files changed, 23 insertions, 23 deletions
diff --git a/p/api/greader.php b/p/api/greader.php
index 741c4fbd4..8a8623966 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -353,10 +353,10 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex
switch ($exclude_target) {
case 'user/-/state/com.google/read':
- $state = 'not_read';
+ $state = FreshRSS_Entry::STATE_NOT_READ;
break;
default:
- $state = 'all';
+ $state = FreshRSS_Entry::STATE_ALL;
break;
}
@@ -451,10 +451,10 @@ function streamContentsItemsIds($streamId, $start_time, $count, $order, $exclude
switch ($exclude_target) {
case 'user/-/state/com.google/read':
- $state = 'not_read';
+ $state = FreshRSS_Entry::STATE_NOT_READ;
break;
default:
- $state = 'all';
+ $state = FreshRSS_Entry::STATE_ALL;
break;
}
diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css
index be8d6b86a..cd51b1a06 100644
--- a/p/themes/Dark/freshrss.css
+++ b/p/themes/Dark/freshrss.css
@@ -88,6 +88,10 @@
.nav_menu .search {
display:none;
}
+ .nav_menu .btn[aria-checked="true"]{
+ border-color: #2f2f2f;
+ box-shadow: 0 0 10px 3px #2f2f2f inset;
+ }
.favicon {
height: 16px;
diff --git a/p/themes/Dark/global.css b/p/themes/Dark/global.css
index e296f2188..0f1baa216 100644
--- a/p/themes/Dark/global.css
+++ b/p/themes/Dark/global.css
@@ -416,12 +416,6 @@ input, select, textarea {
background: #26303F;
color: #888;
}
- .dropdown-menu > .item[aria-checked="true"] > a:before {
- content: '✓ ';
- font-weight: bold;
- margin: 0 0 0 -1.2em;
- padding: 0 0.2em 0 0;
- }
.dropdown-menu > .item:hover > a {
color: #888;
text-decoration: none;
diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css
index 1f297309b..91da094be 100644
--- a/p/themes/Flat/freshrss.css
+++ b/p/themes/Flat/freshrss.css
@@ -87,6 +87,10 @@ body {
.nav_menu .search {
display:none;
}
+ .nav_menu .btn[aria-checked="true"]{
+ background-color: #2980B9;
+ border-bottom-color: #3498DB;
+ }
.favicon {
height: 16px;
diff --git a/p/themes/Flat/global.css b/p/themes/Flat/global.css
index 4044dd781..68e9fa359 100644
--- a/p/themes/Flat/global.css
+++ b/p/themes/Flat/global.css
@@ -412,12 +412,6 @@ input, select, textarea {
background: #2980b9;
color: #fff;
}
- .dropdown-menu > .item[aria-checked="true"] > a:before {
- content: '✓ ';
- font-weight: bold;
- margin: 0 0 0 -1.2em;
- padding: 0 0.2em 0 0;
- }
.dropdown-menu > .item:hover > a {
color: #fff;
text-decoration: none;
diff --git a/p/themes/Flat/icons/rss.svg b/p/themes/Flat/icons/rss.svg
new file mode 100644
index 000000000..4d4faf7ae
--- /dev/null
+++ b/p/themes/Flat/icons/rss.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
+<g fill-rule="nonzero" transform="translate(-561,-301.00012)" fill="#fff">
+<path style="enable-background:new;color:#000000;" d="m325.06,97.188c0,1.7872-0.89543,3.2361-2,3.2361s-2-1.4488-2-3.2361c0-1.7872,0.89543-3.2361,2-3.2361s2,1.4488,2,3.2361z" transform="matrix(1.0000007,0,0,0.61803426,241.93747,252.93479)"/>
+<path style="enable-background:new;color:#000000;" d="m563,303,0,1c0,0.55016,0.45347,1,1,1,4.9706,0,9,4.0294,9,9,0,0.55016,0.45347,1,1,1h1v-1c0-6.0751-4.9249-11-11-11h-1zm0,4,0,1c0,0.55016,0.45347,1,1,1,2.7614,0,5,2.2386,5,5,0,0.55016,0.45347,1,1,1h1v-1c0-3.866-3.134-7-7-7h-1z"/>
+</g>
+</svg> \ No newline at end of file
diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css
index 662e085d6..9cf1a7cba 100644
--- a/p/themes/Origine/freshrss.css
+++ b/p/themes/Origine/freshrss.css
@@ -89,6 +89,10 @@
.nav_menu .search {
display:none;
}
+ .nav_menu .btn[aria-checked="true"]{
+ border-color: #aaa #ddd #ddd #aaa;
+ box-shadow: 0 0 10px 3px #ddd inset;
+ }
.favicon {
height: 16px;
diff --git a/p/themes/Origine/global.css b/p/themes/Origine/global.css
index 5792c9e4d..7fb3a8f95 100644
--- a/p/themes/Origine/global.css
+++ b/p/themes/Origine/global.css
@@ -428,12 +428,6 @@ input, select, textarea {
background: #0062BE;
color: #fff;
}
- .dropdown-menu > .item[aria-checked="true"] > a:before {
- content: '✓ ';
- font-weight: bold;
- margin: 0 0 0 -1.2em;
- padding: 0 0.2em 0 0;
- }
.dropdown-menu > .item:hover > a {
color: #fff;
text-decoration: none;
diff --git a/p/themes/icons/rss.svg b/p/themes/icons/rss.svg
index 6db5b3eae..2a8713be3 100644
--- a/p/themes/icons/rss.svg
+++ b/p/themes/icons/rss.svg
@@ -1,5 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g fill-rule="nonzero" transform="translate(-561,-301.00012)" fill="#FFF">
+<g fill-rule="nonzero" transform="translate(-561,-301.00012)" fill="#666">
<path style="enable-background:new;color:#000000;" d="m325.06,97.188c0,1.7872-0.89543,3.2361-2,3.2361s-2-1.4488-2-3.2361c0-1.7872,0.89543-3.2361,2-3.2361s2,1.4488,2,3.2361z" transform="matrix(1.0000007,0,0,0.61803426,241.93747,252.93479)"/>
<path style="enable-background:new;color:#000000;" d="m563,303,0,1c0,0.55016,0.45347,1,1,1,4.9706,0,9,4.0294,9,9,0,0.55016,0.45347,1,1,1h1v-1c0-6.0751-4.9249-11-11-11h-1zm0,4,0,1c0,0.55016,0.45347,1,1,1,2.7614,0,5,2.2386,5,5,0,0.55016,0.45347,1,1,1h1v-1c0-3.866-3.134-7-7-7h-1z"/>
</g>