theme system updates; remove old-skool theme; add neutral theme

diff --git a/feedlist.js b/feedlist.js
index bb3f3bf75be4c0b814f2000d9eb2750287371267..8f623920ec89b7245539b17f08573b17b8757afa 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -555,12 +555,14 @@ function init_hidden_feedlist(theme) {
        }
 } */
 
-function init_collapsable_feedlist(theme) {
+function init_collapsable_feedlist() {
        try {
                debug("init_collapsable_feedlist");
 
-               if (theme != "" && theme != "compact" && theme != "graycube" &&
-                               theme != "compat") return;
+               var theme = getInitParam("theme");
+               var options = getInitParam("theme_options");
+
+               if (theme != "" && !options.match("collapse_feedlist")) return;
 
                var fbtn = $("collapse_feeds_btn");
 

diff --git a/themes/graycube/theme.ini b/themes/graycube/theme.ini
index 8c3863f595d6672b226ec351838e8804b2451315..3a07229ce78a6dc7ad32830cd0112bbd316c0fe0 100644 (file)
--- a/themes/graycube/theme.ini
+++ b/themes/graycube/theme.ini
@@ -1,4 +1,4 @@
 [theme]
 name=Graycube
 version=1.0
-options=hide_footer
+options=hide_footer,collapse_feedlist

diff --git a/themes/greentiny/theme.ini b/themes/greentiny/theme.ini
index 3faeb73c28e6d1f0d5e972e09e2232839a39a45a..239bdf24af5bbaaae17060feb372551128456c28 100644 (file)
--- a/themes/greentiny/theme.ini
+++ b/themes/greentiny/theme.ini
@@ -2,4 +2,4 @@
 name=Greentiny
 author=Lejla
 version=1.0
-options=no_highlights,hide_footer
+options=no_highlights,hide_footer,collapse_feedlist

diff --git a/themes/neon/theme.ini b/themes/neon/theme.ini
index af5ba1f9a4cb82f8a0a001ba175a5cfc8ffb3e70..36cb86a47a8981cedf3f5a495e1e0d676472240b 100644 (file)
--- a/themes/neon/theme.ini
+++ b/themes/neon/theme.ini
@@ -1,3 +1,4 @@
 [theme]
 name=Neon
 version=1.0
+options=hide_footer,collapse_feedlist

diff --git a/themes/neutral/images/button.png b/themes/neutral/images/button.png
new file mode 100644 (file)
index 0000000..525ab1e
Binary files /dev/null and b/themes/neutral/images/button.png differ

diff --git a/themes/neutral/images/button_pressed.png b/themes/neutral/images/button_pressed.png
new file mode 100644 (file)
index 0000000..212c778
Binary files /dev/null and b/themes/neutral/images/button_pressed.png differ

diff --git a/themes/neutral/images/prefs_tab.png b/themes/neutral/images/prefs_tab.png
new file mode 100644 (file)
index 0000000..f6c5387
Binary files /dev/null and b/themes/neutral/images/prefs_tab.png differ

diff --git a/themes/neutral/images/resize_handle_horiz.png b/themes/neutral/images/resize_handle_horiz.png
new file mode 100644 (file)
index 0000000..a2e347e
Binary files /dev/null and b/themes/neutral/images/resize_handle_horiz.png differ

diff --git a/themes/neutral/images/score_half_high.png b/themes/neutral/images/score_half_high.png
new file mode 100644 (file)
index 0000000..c0626a3
Binary files /dev/null and b/themes/neutral/images/score_half_high.png differ

diff --git a/themes/neutral/images/score_high.png b/themes/neutral/images/score_high.png
new file mode 100644 (file)
index 0000000..3b3d472
Binary files /dev/null and b/themes/neutral/images/score_high.png differ

diff --git a/themes/neutral/images/subtoolbar.png b/themes/neutral/images/subtoolbar.png
new file mode 100644 (file)
index 0000000..a3c02e0
Binary files /dev/null and b/themes/neutral/images/subtoolbar.png differ

diff --git a/themes/neutral/images/ttrss_logo.png b/themes/neutral/images/ttrss_logo.png
new file mode 100644 (file)
index 0000000..0a5ced3
Binary files /dev/null and b/themes/neutral/images/ttrss_logo.png differ

diff --git a/themes/neutral/images/ttrss_logo.svg b/themes/neutral/images/ttrss_logo.svg
new file mode 100644 (file)
index 0000000..84f8a6e
--- /dev/null
+++ b/themes/neutral/images/ttrss_logo.svg
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="155.00000pt"
+   height="25.000000pt"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="ttrss_logo.svg"
+   inkscape:export-filename="/Users/fox/Desktop/ttrss_logo.png"
+   inkscape:export-xdpi="109.68"
+   inkscape:export-ydpi="109.68"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3620">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3622" />
+      <stop
+         id="stop3624"
+         offset="0.20930232"
+         style="stop-color:#f7faff;stop-opacity:1;" />
+      <stop
+         id="stop3626"
+         offset="0.20930232"
+         style="stop-color:#e5eefc;stop-opacity:1;" />
+      <stop
+         style="stop-color:#88b0f0;stop-opacity:1;"
+         offset="1"
+         id="stop3628" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3610">
+      <stop
+         id="stop3612"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#f4f4f4;stop-opacity:1;"
+         offset="0.20930232"
+         id="stop3618" />
+      <stop
+         style="stop-color:#eaeaea;stop-opacity:1;"
+         offset="0.20930232"
+         id="stop3616" />
+      <stop
+         id="stop3614"
+         offset="1"
+         style="stop-color:#d5d5d5;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 15.625 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="193.75 : 15.625 : 1"
+       inkscape:persp3d-origin="96.875 : 10.416667 : 1"
+       id="perspective2836" />
+    <linearGradient
+       id="linearGradient3112">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3114" />
+      <stop
+         style="stop-color:#b5cdf6;stop-opacity:1;"
+         offset="1"
+         id="stop3116" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2800">
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2802" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2804" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2784" />
+      <stop
+         style="stop-color:#f6d6b5;stop-opacity:1;"
+         offset="1"
+         id="stop2786" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f0f0f0"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="112.18837"
+     inkscape:cy="0.20326988"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1596"
+     inkscape:window-height="1153"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#bcbcbc;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="3.2755625"
+       y="24.07143"
+       id="text1306"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan1308"
+         x="3.2755625"
+         y="24.07143"
+         style="fill:#ffffff;fill-opacity:1;stroke:#bcbcbc;stroke-width:0.50000000000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#88b0f0;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
+       x="143.44531"
+       y="24.129744"
+       id="text3120"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
+       inkscape:export-xdpi="180.00000"
+       inkscape:export-ydpi="180.00000"><tspan
+         sodipodi:role="line"
+         id="tspan3122"
+         x="143.44531"
+         y="24.129744"
+         style="fill:#ffffff;fill-opacity:1;stroke:#88b0f0;stroke-width:0.50000000000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text>
+  </g>
+</svg>

diff --git a/themes/neutral/theme.css b/themes/neutral/theme.css
new file mode 100644 (file)
index 0000000..870e967
--- /dev/null
+++ b/themes/neutral/theme.css
@@ -0,0 +1,136 @@
+body {
+       background : #f0f0f0;
+}
+
+#toolbar {
+       background : #f0f0f0;
+}
+
+#feeds-holder {
+       background : #fafafa;
+       border-color : #909090;
+       border-style : solid;
+}
+
+div.headlinesSubToolbar {
+       background : url("images/subtoolbar.png") top left;
+}
+
+div.headlines_normal {
+       border-color : #909090;
+       background : #f0f0f0;
+}
+
+div.headlines_cdm {
+       border-color : #909090;
+       background : #f0f0f0;
+}
+
+div#headlinesInnerContainer {
+       background : #fafafa;
+}
+
+#footer, #prefFooter {
+       background : #f0f0f0;
+       color : gray;
+       border-color : #909090;
+}
+
+div.postReply div.postHeader {
+       background : #fafafa;
+       border-color : #909090;
+}
+
+/*div.postReply a {
+       color : gray;
+}*/
+
+#resize-grabber {
+       border-color : #909090;
+       background : #f0f0f0;
+}
+
+#prefContentOuter {
+       background : #f0f0f0;
+       border-color : #909090;
+}
+
+#prefContent {
+       background : #fafafa;
+}
+
+div.prefsTab:hover {
+       border-color : #c0c0c0;
+}
+
+div.prefsTab {
+       border-color : #f0f0f0;
+}
+
+div.prefsTabSelected {
+       border-color : #909090;
+       background : url("images/prefs_tab.png");
+}
+
+tr.title td {
+       color : gray;
+       font-weight : bold;
+       border-color : #c0c0c0;
+}
+
+tr.title td a {
+       color : gray;
+}
+
+table.prefFeedList td.feedEditCat {
+       border-color : #c0c0c0;
+}
+
+h3 {
+       border-color : #c0c0c0;
+}
+
+table.prefFilterList td.filterEditCat {
+       border-color : #c0c0c0;
+}
+
+#content-frame {
+       border-color : #909090;
+}
+
+#content-insert {
+       background : #f0f0f0;
+}
+
+button[disabled], input[disabled], select[disabled], textarea[disabled] {
+       background : #404040;
+       color : gray;
+}
+
+input, select, button {
+       background : #f0f0f0;
+       border : 1px solid #c0c0c0;
+       color : #gray;
+       padding : 2px 4px 2px 4px;
+}
+
+button:active {
+       background : url("images/button_pressed.png") top left;
+       background-repeat : repeat-x;
+}
+
+button {
+       background : url("images/button.png") top left;
+       background-repeat : repeat-x;
+}
+
+textarea {
+       background : #f0f0f0;
+       border : 1px solid #c0c0c0;
+       color : #gray;
+}
+
+select {
+       padding : 2px 0px 2px 4px;
+}
+

diff --git a/themes/neutral/theme.ini b/themes/neutral/theme.ini
new file mode 100644 (file)
index 0000000..0ed8400
--- /dev/null
+++ b/themes/neutral/theme.ini
@@ -0,0 +1,4 @@
+[theme]
+name=Neutral
+version=1.0
+options=hide_footer,collapse_feedlist

diff --git a/themes/old-skool/images/button.png b/themes/old-skool/images/button.png
deleted file mode 100644 (file)
index 161606e..0000000
Binary files a/themes/old-skool/images/button.png and /dev/null differ

diff --git a/themes/old-skool/images/grad_1.png b/themes/old-skool/images/grad_1.png
deleted file mode 100644 (file)
index 1a25a78..0000000
Binary files a/themes/old-skool/images/grad_1.png and /dev/null differ

diff --git a/themes/old-skool/images/resize_handle_horiz.png b/themes/old-skool/images/resize_handle_horiz.png
deleted file mode 100644 (file)
index a2e347e..0000000
Binary files a/themes/old-skool/images/resize_handle_horiz.png and /dev/null differ

diff --git a/themes/old-skool/images/resize_horiz.png b/themes/old-skool/images/resize_horiz.png
deleted file mode 100644 (file)
index cbf1909..0000000
Binary files a/themes/old-skool/images/resize_horiz.png and /dev/null differ

diff --git a/themes/old-skool/images/ttrss_logo.png b/themes/old-skool/images/ttrss_logo.png
deleted file mode 100644 (file)
index a8206a3..0000000
Binary files a/themes/old-skool/images/ttrss_logo.png and /dev/null differ

diff --git a/themes/old-skool/images/ttrss_logo.svg b/themes/old-skool/images/ttrss_logo.svg
deleted file mode 100644 (file)
index f2dabbc..0000000
--- a/themes/old-skool/images/ttrss_logo.svg
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="155.00000pt"
-   height="25.000000pt"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   sodipodi:docbase="/home/fox/public_html/testbox/tt-rss/themes/graycube/images"
-   sodipodi:docname="ttrss_logo.svg"
-   inkscape:export-filename="/home/fox/public_html/testbox/tt-rss/themes/graycube/images/ttrss_logo.png"
-   inkscape:export-xdpi="109"
-   inkscape:export-ydpi="109">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3112">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3114" />
-      <stop
-         style="stop-color:#808080;stop-opacity:1;"
-         offset="1"
-         id="stop3116" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2800">
-      <stop
-         style="stop-color:#000000;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2802" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2804" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2782">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2784" />
-      <stop
-         style="stop-color:#f6b5ba;stop-opacity:1;"
-         offset="1"
-         id="stop2786" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="109.86875"
-     inkscape:cy="3.8105931"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1590"
-     inkscape:window-height="1124"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
-       x="3.2755625"
-       y="23.535715"
-       id="text1306"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
-       inkscape:export-xdpi="180.00000"
-       inkscape:export-ydpi="180.00000"><tspan
-         sodipodi:role="line"
-         id="tspan1308"
-         x="3.2755625"
-         y="23.535715"
-         style="fill:#f9f9f9;fill-opacity:1;stroke:#999999;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">tiny tiny</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Verdana"
-       x="143.44531"
-       y="23.594028"
-       id="text3120"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/fox/public_html/testbox/tt-rss-blue/images/ttrss_logo.png"
-       inkscape:export-xdpi="180.00000"
-       inkscape:export-ydpi="180.00000"><tspan
-         sodipodi:role="line"
-         id="tspan3122"
-         x="143.44531"
-         y="23.594028"
-         style="fill:#fdf5f5;fill-opacity:1;stroke:#ff7f7f;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">rss</tspan></text>
-  </g>
-</svg>

diff --git a/themes/old-skool/images/vgrad_light.png b/themes/old-skool/images/vgrad_light.png
deleted file mode 100644 (file)
index 31322e6..0000000
Binary files a/themes/old-skool/images/vgrad_light.png and /dev/null differ

diff --git a/themes/old-skool/images/vgrad_light_rev.png b/themes/old-skool/images/vgrad_light_rev.png
deleted file mode 100644 (file)
index 36f0b55..0000000
Binary files a/themes/old-skool/images/vgrad_light_rev.png and /dev/null differ

diff --git a/themes/old-skool/images/vgrad_light_rev2.png b/themes/old-skool/images/vgrad_light_rev2.png
deleted file mode 100644 (file)
index d69a31c..0000000
Binary files a/themes/old-skool/images/vgrad_light_rev2.png and /dev/null differ

diff --git a/themes/old-skool/theme.css b/themes/old-skool/theme.css
deleted file mode 100644 (file)
index 77c7324..0000000
--- a/themes/old-skool/theme.css
+++ /dev/null
@@ -1,917 +0,0 @@
-body {
-       background : white;
-       color : black;
-       margin : 0px;
-       padding : 0px;
-       font-family : sans-serif;
-}
-
-/* common styles */
-
-div.postReply {
-       background-image : url("images/vgrad_light_rev.png");
-       background-position : top left;
-       background-repeat : repeat-x;
-       height : 100%;
-       padding : 10px;
-       margin-left : 1px;
-}
-
-div.postReply a {
-       color : #5050aa;
-}
-
-div.postReply a:hover {
-       color : black;
-}
-
-div.postReply div.postHeader {
-       background : white;
-       border : 1px solid #c0c0c0;
-}
-
-div.postReply > div.postHeader {
-       padding : 5px;
-}
-
-div.postReply div.postContent {
-       padding : 10px;
-}
-
-div.postReply div.postIcon {
-       float : right;
-       border : 0px;
-       margin : 10px 0px 10px 10px;
-}
-
-ul.feedList {
-       list-style-type : none;
-       margin : 5px;
-       padding : 0px 0px 0px 10px;
-}
-
-ul.feedList li.feedCat {
-       margin : 0px;
-       padding : 3px 0px 3px 0px;
-       color : #707070;
-}
-
-ul.feedList li.feedCat span.catTitle {
-       color : #707070;
-}
-
-ul.feedList li.feedCat span.catTitle:hover {
-       color : #5050aa;
-}
-
-ul.feedCatList {
-       list-style-type : none;
-       margin : 0px 0px 0px 20px;
-       padding : 0px;  
-}
-
-ul.feedCatList li {
-       margin : 0px;
-       padding : 0px 0px 0px 0px;
-       color : black;
-}
-
-ul.feedList li {
-       margin : 0px;
-}
-
-ul.feedlist li.feedUnread, 
-ul.feedlist li.errorUnread, 
-ul.feedlist li.labelUnread, 
-ul.feedlist li.virtUnread,
-ul.feedlist li.tagUnread {
-       font-weight : bold;
-}
-
-ul.feedlist li.errorSelected a,
-ul.feedlist li.error a,
-ul.feedlist li.errorUnread a,
-ul.feedlist li.errorUnreadSelected a {
-       color : #f04040;
-}
-
-ul.feedlist li.feedSelected a,
-ul.feedlist li.labelSelected a,
-ul.feedlist li.virtSelected a,
-ul.feedlist li.tagSelected a {
-       color : #5050aa;
-}
-
-ul.feedlist li.feedUnreadSelected a,
-ul.feedlist li.labelUnreadSelected a,
-ul.feedlist li.virtUnreadSelected a,
-ul.feedlist li.tagUnreadSelected a {
-       color : #5050aa;
-}
-
-ul.feedlist li.feedUnreadSelected,
-ul.feedlist li.errorUnreadSelected,
-ul.feedlist li.labelUnreadSelected,
-ul.feedlist li.virtUnreadSelected,
-ul.feedlist li.tagUnreadSelected {
-       font-weight : bold;
-}
-
-ul.feedList li.feed {
-       display : block;
-}
-
-ul.feedList img, img.tinyFeedIcon {
-       margin : 0px 3px 0px 0px;
-       width : 16px;
-       height : 16px;
-       border-width : 0px;
-}
-
-h1 {
-       font-size : 16pt;       
-}
-
-h2 {
-       font-size : 14pt;
-       font-weight : bold;
-       border-width : 0px 0px 1px 0px;
-       border-style : solid;
-       border-color : #e0e0e0;
-}
-
-h3 {
-       font-size : 12pt;
-       font-weight : bold;
-       border-width : 0px 0px 1px 0px;
-       border-style : solid;
-       border-color : #e0e0e0;
-}
-
-hr {
-       border-width : 0px 0px 1px 0px;
-       border-style : dashed;
-       border-color : #e0e0e0;
-}
-
-a {
-       color : black;
-       text-decoration : none;
-}
-
-a:hover {
-       color : #5050aa;
-}
-
-#notify {
-       color : black;
-       font-weight : bold;
-       padding : 3px;
-}
-
-#dispSwitch {
-       padding : 5px 5px 5px 0px;
-       font-size : x-small;
-       text-align : right;
-}
-
-#dispSwitch a {
-       color : gray;
-}
-
-#dispSwitch a:hover {
-       color : #5050aa;
-}
-
-iframe {
-       border : 0px solid white;
-}
-
-iframe.feedsFrameWithActions {
-       width : 100%;
-       height : 90%;
-       margin : 0px;
-       padding : 0px;
-}
-
-iframe.feedsFrame {
-       width : 100%;
-       height : 100%;
-       margin : 0px;
-       padding : 0px;
-}
-
-iframe.contentFrame, iframe.headlinesFrame {
-       width : 100%;
-       padding : 0px;
-       margin : 0px;
-       height : 100%;
-}
-
-button {
-       border : 1px solid #d0d0d0;
-       background-image : url("images/button.png");
-       background-position : top;
-       background-repeat : repeat-x;
-       background-color : white;
-}
-
-button:hover {
-       background : white;
-       text-decoration : none;
-       color : black;
-}
-
-a.button {
-       padding : 2px 5px 2px 5px;
-       font-size : small;
-}
-
-.evenUnreadSelected, .evenSelectedUnread, .evenUnreadSelected td,
-       .evenSelectedUnread td {
-        background-color : #e0e0ff;
-        font-weight : bold;
-                 border-color : #778899;
-}
-
-.oddUnreadSelected, .oddSelectedUnread, .oddUnreadSelected td,
-       .oddSelectedUnread td {
-        background-color : #e0e0ff;
-        font-weight : bold;
-                 border-color : #778899;
-
-}
-
-.evenSelected, .evenSelected td {
-        background-color : #e0e0ff;
-                 border-color : #778899;
-}
-
-.oddSelected, .oddSelected td {
-        background-color : #e0e0ff;
-                 border-color : #778899;
-
-}
-
-
-.disabledButton {
-       border : 1px solid #c0c0c0;
-       background-color : white;
-       color : gray;   
-}
-
-
-.evenGrayed, .evenGrayed td {
-        background-color : #f0f0f0;
-        color : #909090;
-                 border-color : #88b0f0;
-}
-
-.oddGrayed {
-        color : #909090;
-}
-
-.even, .even td {
-                 border-color : #c0c0c0;
-        background-color : #f0f0f0;
-}
-
-.odd, .odd td {
-                 border-color : #c0c0c0;
-}
-
-.evenUnread, .evenUnread td {
-        background-color : #f0f0f0;
-        font-weight : bold;
-                 border-color : #c0c0c0;
-}
-
-.oddUnread, .oddUnread td {
-        font-weight : bold;
-        background-color : #f0f0f0;
-}
-
-td > input, div > input {
-       border : 1px solid #a0a0a0;
-}
-
-/* preferences */
-
-tr.title td {
-       border-width : 0px 0px 1px 0px;
-       border-color : #f0f0f0;
-       border-style : solid;
-       font-size : small;
-       color : gray;
-}
-
-tr.title td a {
-       color : gray;
-}
-
-tr.title td a:hover {
-       color : #5050aa;
-}
-
-div.prefFeedCatHolder {
-       border : 1px solid #c0c0c0;
-}
-
-table.prefFeedList td.feedEditCat {
-       font-size : large;
-       border-color : #c0c0c0;
-}
-
-table.prefFilterList td.filterEditCat {
-       font-size : large;
-       border-color : #c0c0c0;
-}
-
-table.prefFeedList td.feedIcon {
-       text-align : center;
-}
-
-table.prefFeedList td.feedSelect {
-       text-align : center;
-}
-
-a.helpLink {
-       color : #808080;
-}
-
-a.helpLink:hover {
-       color : #5050aa;
-}
-
-div.helpResponse {
-       margin : 10px;
-       background-image : url("images/vgrad_light_rev2.png");
-       background-position : top left;
-       background-repeat : repeat-x;
-       padding : 10px 20px 10px 20px;
-       border : 1px solid #f0f0f0;
-}
-
-#userDlgShadow {
-       z-index : 3;
-       position : absolute;
-       left : 30%;
-       top : 30%;
-       display : none;
-       background-image : url("images/shadow.png");
-}
-
-#userDlg {
-       padding : 15px;
-       border : 1px solid #c0c0c0;
-       font-size : small;
-       position : relative;
-       bottom : 2px;
-       right : 2px;
-       background-color : white;
-       background-image : url("images/vgrad_light_rev2.png");
-       background-position : top left;
-       background-repeat : repeat-x;
-}
-
-#qafInput {
-       width : 300px;
-}
-
-#infoBoxTitle {
-       border-color : #c0c0c0;
-       background-color : #c0c0c0;
-       color : white;
-}
-
-
-#infoBox {
-       border-color : #c0c0c0;
-       font-size : small;
-       background : white;
-}
-
-/*#infoBoxShadow {
-       background-image : url("images/shadow.png");
-       position : absolute;
-       width : 30%;
-       left : 35%;
-       top : 30%;
-       z-index : 3;
-       display : none;
-}*/
-
-div.infoBoxContents {
-       background-image : url("images/vgrad_light_rev2.png");
-       background-position : top left;
-       background-repeat : repeat-x;
-}
-
-div.helpResponse h1, div.infoBoxContents h1 {
-       border-width : 0px 0px 1px 0px;
-       border-style : solid;
-       border-color : #c0c0c0;
-       font-size : 16pt;
-}
-
-div.helpResponse h2, div.infoBoxContents h2 {
-       border-width : 0px 0px 0px 0px;
-       font-size : 12pt;
-}
-
-div.prefsTab {
-       border-width : 1px 1px 0px 1px;
-       border-color : #c0c0c0;
-       border-style : solid;
-       font-size : small;
-       position : relative;
-       bottom : 0px;
-       border-collapse : collapse;
-       -moz-border-radius : 3px;
-       min-width : 100px;
-       text-align : center;
-       background-image : url("images/vgrad_light_rev2.png");
-       background-position : top left;
-       background-repeat : repeat-x;
-
-}
-
-div.prefsTabSelected {
-       float : left;
-       border-width : 1px 1px 0px 1px;
-       border-color : #c0c0c0;
-       border-style : solid;
-       margin : 0px 0px 0px 5px;
-       padding : 3px 5px 3px 5px;
-       font-size : small;
-       position : relative;
-       bottom : 0px;
-       border-collapse : collapse;
-       -moz-border-radius : 3px;
-       font-weight : bold;
-       min-width : 100px;
-       text-align : center;
-       background : #f0f0f0;
-}
-
-input.prefsTab {
-       border-width : 1px 1px 0px 1px;
-       border-color : #c0c0c0; 
-       padding : 2px 7px 2px 7px;
-       margin : 0px 1px 0px 0px;
-       width : 130px;
-       background-image : url("images/vgrad_light_rev2.png");
-       background-position : top left;
-       background-repeat : repeat-x;
-       -moz-border-radius : 7px 7px 0px 0px;
-       font-size : small;
-}
-
-input.prefsTabSelected {
-       border-width : 1px 1px 0px 1px;
-       border-color : #c0c0c0; 
-       padding : 2px 7px 2px 7px;
-       margin : 0px 1px 0px 0px;
-       width : 130px;
-       background : white;
-       font-weight : bold;
-       background-position : top left;
-       background-repeat : repeat-x;
-       -moz-border-radius : 7px 7px 0px 0px;
-       font-size : small;
-       color : black;
-}
-
-input.prefsTab:hover {
-       background : white;
-}
-
-div.warning {
-       background : #fffff0;
-       border : 1px solid #c0c0c0;
-       padding : 5px;
-       margin : 5px;
-       font-size : small;
-}
-
-div.notice {
-       background : #ffffff;
-       border : 1px solid #c0c0c0;
-       padding : 5px;
-       margin : 5px;
-       font-size : small;
-}
-
-ul.nomarks {
-       list-style-type : none;
-       margin : 0px;
-       padding : 10px; 
-}
-
-div.bigErrorMsg {
-       border : 1px solid #c0c0c0;
-       background : #fff0f0;
-       padding : 30px;
-       margin : 20px;
-}
-
-div.prefHelp, td.prefHelp {
-       font-size : x-small;
-       color : gray;
-       padding : 5px;
-}
-
-table.loginForm {
-       background-image : url("images/vgrad_light_rev.png");
-       background-color : white;
-       background-position : top left;
-       background-repeat : repeat-x;
-}
-
-table.innerLoginForm {
-       border : 1px solid #f0f0f0;
-       padding : 50px;
-       background-color : white;
-}
-
-table.innerLoginForm td {
-       padding : 3px 3px 5px 3px;
-}
-
-span.insensitive {
-       color : gray;
-}
-
-.prefGenericAddBox {
-       margin : 5px;
-       font-size : small;
-}
-
-.prefGenericAddBox td {
-       font-size : small;
-}
-
-body.logoutBody {
-       background-color : #f0f0f0;
-       color : black;
-}
-
-span.logoutWarning {
-       color : red;
-       font-weight : bold;
-}
-
-div.logoutContent {
-       width : 600px;
-       border : 1px solid #c0c0c0;
-       background-color : white;
-       margin-left : auto;
-       margin-right : auto;
-       margin-top : 20px;
-       padding : 10px;
-}
-
-.small {
-       font-size : x-small;
-}
-
-table.innerFeedTable td {
-       margin : 0px;
-       padding : 0px;
-}
-
-td.selectPrompt {
-       font-size : x-small;
-       color : gray;
-}
-
-table.headlinesSubToolbar td {
-       color : gray;
-}
-
-span.contentPreview {
-       font-size : x-small;
-       color : gray;
-       font-weight : normal;
-}
-
-span.contentPreview:hover {
-       color : #5050aa;
-}
-
-table.headlinesList td.hlMarkedPic {
-       width : 25px;
-       text-align : center;
-}
-
-table.headlinesList td.hlfeed {
-       text-align : right;
-       font-size : small;
-}
-
-td.hlSelectRow, td.hlUpdatePic {
-       width : 25px;
-       text-align : center;
-}
-
-table.headlinesList td.hlUpdated {
-       font-size : small;
-       color : gray;
-       text-align : right;
-       width : 100px;
-}
-
-table.headlinesList tr td {
-       padding : 2px 0px 2px 0px;
-}
-
-div.postHeader td.postDate {
-       font-size : x-small;
-       text-align : right;
-       color : gray;
-}
-
-div.postHeader td.postDateRTL {
-       font-size : x-small;
-       text-align : left;
-       color : gray;
-}
-
-#feedUpdateErrors {
-       display : none;
-}
-
-#allEntryTags {
-       font-size : x-small;
-       border-width : 0px 0px 1px 0px;
-       border-style : solid;
-       border-color : #c0c0c0;
-       padding-bottom : 5px;
-       display : none;
-}
-
-/*td.hlContent {
-       overflow : hidden;
-       height : 1em;
-       display : block;
-} */
-
-td.hlMarkedPic, td.hlSelectRow, td.hlUpdated, td.hlFeed {
-       height : 1em;
-}
-
-div.cdmArticle {
-       border : 1px solid #f0f0f0;
-       background-color : #fafafa;
-       -moz-border-radius : 5px;
-       margin : 10px 10px 0px 10px;
-       padding : 10px;
-}
-
-div.cdmArticleUnread {
-       border : 1px solid #d5f1f4;
-       background-color : #fafeff;
-       -moz-border-radius : 5px;
-       margin : 10px 10px 0px 10px;
-       padding : 10px;
-}
-
-div.cdmArticleSelected, div.cdmArticleUnreadSelected {
-       border : 1px solid #d0d0f6;
-       background-color : #eaeaff;
-       -moz-border-radius : 5px;
-       margin : 10px 10px 0px 10px;
-       padding : 10px;
-}
-
-div.cdmArticleUnread div.cdmHeader a, div.cdmArticleUnreadSelected div.cdmHeader a {
-       font-weight : bold;
-}
-
-div.cdmHeader {
-       padding-bottom : 5px;
-}
-
-div.cdmFooter {
-       font-size : x-small;
-       color : gray;
-       padding-top : 5px;
-}
-
-div.cdmFooter input, div.cdmHeader input, div.cdmFooter img {
-       margin : 0px;
-}
-
-div.cdmHeader, div.cdmHeader a {
-       color : gray;
-       font-size : x-small;
-}
-
-div.cdmHeader a:hover {
-       color : #5050aa;
-}
-
-div.cdmContent {
-}
-
-a.warning {
-       color : #f04040;
-}
-
-img.closeButton {
-       border-width : 0px;
-       float : right;
-}
-
-span.groupPrompt {
-       font-size : x-small;
-       color : #505050;
-}
-
-ul.userFeedList {
-       height : 300px;
-       overflow : auto;
-       list-style-type : none;
-       border-color : #c0c0c0;
-}
-
-/* #browseBigFeedList li.oddSelected {
-       border : 1px solid #d0d0f6;
-       background-color : #eaeaff;
-       -moz-border-radius : 5px;
-} */
-
-ul.browseFeedList {
-       height : 300px;
-       overflow : auto;
-       list-style-type : none;
-       margin : 0px 0px 5px 0px;
-       padding : 0px;
-       border-color : #c0c0c0;
-}
-
-ul.browseFeedList li {
-       margin : 0px;
-       padding : 0px;
-}
-
-span.subscribers {
-       color : #808080;
-}
-
-div.subscribers {
-       color : #808080;
-       font-size : x-small;
-       float : right;
-}
-
-input.feedBrowseCB {
-       margin-right : 1em;
-}
-
-div.browserDetails {
-       margin : 5px 5px 5px 5px;
-       display : none;
-       padding : 5px;
-}
-
-ul.compact {
-       list-style-type : none;
-       margin : 0px;
-       padding : 0px;
-}
-
-ul.compact li {
-       margin : 0px;
-       padding : 0px;
-}
-
-div.browserFeedInfo {
-       font-size : x-small;
-       border-color : #c0c0c0;
-}
-
-div.browserFeedInfo div.detailsPart {
-       margin : 5px 0px 5px 5px;       
-}
-
-div.cdmContent a {
-       color : #5050aa;
-}
-
-div.cdmContent a:hover {
-       color : black;
-}
-
-/* layout */
-
-#header {
-       color : gray;
-}
-
-#feeds-holder {
-       border-color : #c0c0c0;
-}
-
-#toolbar {
-       background-image : url("images/vgrad_light.png");
-       background-position : bottom left;
-       background-repeat : repeat-x;
-}
-
-div.headlines_normal {
-       border-color : #c0c0c0;
-}
-
-div.headlines_cdm {
-       border-color : #c0c0c0;
-}
-
-#content-frame {
-       border-color : #c0c0c0;
-}
-
-#prefFooter {
-       display : none;
-}
-
-#footer {
-       position : absolute;
-       bottom : 0px;
-       height : 20px;
-       text-align : center;
-       color : gray;
-       font-size : x-small;
-       background-image : url("images/vgrad_light_rev2.png");
-       background-position : top left;
-       background-repeat : repeat-x; 
-       background-color : white;
-       border-color : #c0c0c0;
-       right : 0px;
-       left : 0px;
-       padding : 10px;
-}
-
-#headlinesContainer {
-       background-color : white;
-}
-
-/* preferences layout */
-
-#prefHeader {
-       position : static;
-       color : gray;
-       margin : 10px;
-}
-
-div.return a {
-       color : #5050aa;
-}
-
-div.return a:hover {
-       color : black;
-}
-
-#prefContentOuter {
-       background-image : url("images/vgrad_light_rev.png");
-       background-position : top left;
-       background-repeat : repeat-x;
-       border-color : #c0c0c0;
-}
-
-#prefContent {
-       background-image : url("images/vgrad_light_rev.png");
-       background-position : top left;
-       background-repeat : repeat-x;
-
-}
-
-div.topLinks a {
-       color : #5050aa;        
-}
-
-div.tagCloudContainer {
-       border : 1px solid #c0c0c0;
-}
-
-div.infoBoxContents a {
-       color : #5050aa;
-}
-
-a.visibleLink {
-       color : gray;
-}
-
-table.headlinesList tr.feedTitle td a, div.cdmFeedTitle a {
-       color : #5050aa;
-}
-
-table.headlinesList tr.feedTitle td , div.cdmFeedTitle {
-       background : white;
-}
-
-#resize-grabber {
-       border-color : #c0c0c0;
-       background : url("images/resize_horiz.png") top left;
-}
-

diff --git a/themes/old-skool/theme.ini b/themes/old-skool/theme.ini
deleted file mode 100644 (file)
index 38a8004..0000000
--- a/themes/old-skool/theme.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[theme]
-name=Old-Skool
-version=1.0

diff --git a/themes/triple-pane/images/resize_handle_vert.png b/themes/triple-pane/images/resize_handle_vert.png
deleted file mode 100644 (file)
index 18d0451..0000000
Binary files a/themes/triple-pane/images/resize_handle_vert.png and /dev/null differ

diff --git a/themes/triple-pane/images/resize_vert.png b/themes/triple-pane/images/resize_vert.png
deleted file mode 100644 (file)
index 763d42b..0000000
Binary files a/themes/triple-pane/images/resize_vert.png and /dev/null differ

diff --git a/themes/triple-pane/theme.css b/themes/triple-pane/theme.css
deleted file mode 100644 (file)
index 584e9ba..0000000
--- a/themes/triple-pane/theme.css
+++ /dev/null
@@ -1,51 +0,0 @@
-div.headlines_normal {
-       position : absolute;
-       border-width : 1px 1px 0px 0px;
-       right : 400px;
-       overflow : hidden;
-       bottom : 40px;
-       height : auto;
-}
-
-#content-frame {
-       width : 400px;
-       right : 0px;
-       top : 85px;
-       left : auto;
-       border-width : 1px 0px 0px 1px;
-}
-
-div.postHeader div.postDate {
-       text-align : left;
-       color : gray;
-       float : none;
-}
-
-div.postHeader div.postDateRTL {
-       text-align : left;
-       color : gray;
-       float : none;
-}
-
-span.headlineInnerTitle {
-       display : none;
-}
-
-#resize-grabber {
-       height : 100%;
-       width : 5px;
-       border-width : 0px 1px 0px 0px;
-       cursor : move;
-       text-align : center;
-       float : left;
-       background : url("images/resize_vert.png") top left;
-}
-
-#content-insert {
-       position : absolute;
-       left : 6px;
-       right : 0px;
-       bottom : 0px;
-       top : 0px; 
-
-}

diff --git a/themes/triple-pane/theme.ini b/themes/triple-pane/theme.ini
deleted file mode 100644 (file)
index a66e717..0000000
--- a/themes/triple-pane/theme.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[theme]
-name=Triple Pane
-version=1.0
-options=horiz_resize

diff --git a/tt-rss.css b/tt-rss.css
index 23ff92d117599f5df9aad3c10d7e02531ff1f0bf..a830537674bad59ba09b46c03b1270e2450e1b59 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -2033,9 +2033,8 @@ div#offlineModeDrop {
 }
 
 optgroup {
-       color : #5050aa;
+       color : #4684ff;
        font-style : normal;
-
 }
 
 option {

diff --git a/tt-rss.js b/tt-rss.js
index 8b04eae617f670b0752060f77f46c95a553a2ab0..b2de0bcdba1d3a35f19f66d5db0ab177adb74b46 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -888,8 +888,8 @@ function collapse_feedlist() {
                debug("collapse_feedlist");
                
                var theme = getInitParam("theme");
-               if (theme != "" && theme != "compact" && theme != "graycube" &&
-                               theme != "old-skool") return;
+               if (theme != "" && 
+                               !getInitParam("theme_options").match("collapse_feedlist")) return;
 
                var fl = $("feeds-holder");
                var fh = $("headlines-frame");