diff options
-rwxr-xr-x | classes/feeds.php | 8 | ||||
-rwxr-xr-x | classes/handler/public.php | 2 | ||||
-rwxr-xr-x | classes/pref/feeds.php | 4 | ||||
-rwxr-xr-x | classes/pref/filters.php | 2 | ||||
-rw-r--r-- | classes/pref/prefs.php | 6 | ||||
-rw-r--r-- | css/default.css | 4 | ||||
-rwxr-xr-x | css/tt-rss.less | 2 | ||||
-rw-r--r-- | js/PrefFeedTree.js | 4 | ||||
-rw-r--r-- | plugins/af_psql_trgm/init.php | 2 | ||||
-rw-r--r-- | prefs.php | 4 | ||||
-rw-r--r-- | themes/night.css | 6 | ||||
-rw-r--r-- | themes/night_base.less | 12 | ||||
-rw-r--r-- | themes/night_blue.css | 6 |
13 files changed, 31 insertions, 31 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index f7a6aea7b..07677a8cd 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -408,7 +408,7 @@ class Feeds extends Handler_Protected { if (!$offset && $message) { $reply['content'] = "<div class='whiteBox'>$message"; - $reply['content'] .= "<p><span class=\"insensitive\">"; + $reply['content'] .= "<p><span class=\"text-muted\">"; $sth = $this->pdo->prepare("SELECT " . SUBSTRING_FOR_DATE . "(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds WHERE owner_uid = ?"); @@ -428,7 +428,7 @@ class Feeds extends Handler_Protected { if ($num_errors > 0) { $reply['content'] .= "<br/>"; - $reply['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">" . + $reply['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">" . __('Some feeds have update errors (click for details)') . "</a>"; } $reply['content'] .= "</span></p></div>"; @@ -585,7 +585,7 @@ class Feeds extends Handler_Protected { $reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.'); - $reply['headlines']['content'] .= "<p><span class=\"insensitive\">"; + $reply['headlines']['content'] .= "<p><span class=\"text-muted\">"; $sth = $this->pdo->prepare("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds WHERE owner_uid = ?"); @@ -605,7 +605,7 @@ class Feeds extends Handler_Protected { if ($num_errors > 0) { $reply['headlines']['content'] .= "<br/>"; - $reply['headlines']['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">". + $reply['headlines']['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">". __('Some feeds have update errors (click for details)')."</a>"; } $reply['headlines']['content'] .= "</span></p>"; diff --git a/classes/handler/public.php b/classes/handler/public.php index a8f72e21c..9c6a94c12 100755 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -613,7 +613,7 @@ class Handler_Public extends Handler { <fieldset> <button dojoType='dijit.form.Button' class="alt-primary" type="submit"><?php echo __('Share') ?></button> <button dojoType='dijit.form.Button' onclick="return window.close()"><?php echo __('Cancel') ?></button> - <span class="insensitive small"><?php echo __("Shared article will appear in the Published feed.") ?></span> + <span class="text-muted small"><?php echo __("Shared article will appear in the Published feed.") ?></span> </fieldset> </form> diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index f9ba853f8..b7d4c3890 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1487,7 +1487,7 @@ class Pref_Feeds extends Handler_Protected { "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". htmlspecialchars($line["title"])."</a>"; - print "</td><td class='insensitive' align='right'>"; + print "</td><td class='text-muted' align='right'>"; print make_local_datetime($line['last_article'], false); print "</td>"; print "</tr>"; @@ -1544,7 +1544,7 @@ class Pref_Feeds extends Handler_Protected { "onclick=\"CommonDialogs.editFeed(".$line["id"].")\">". htmlspecialchars($line["title"])."</a>: "; - print "<span class=\"insensitive\">"; + print "<span class=\"text-muted\">"; print htmlspecialchars($line["last_error"]); print "</span>"; diff --git a/classes/pref/filters.php b/classes/pref/filters.php index f5a580e78..37a7236ee 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -148,7 +148,7 @@ class Pref_Filters extends Handler_Protected { $tmp = "<li><span class='title'>" . $line["title"] . "</span><br/>" . "<span class='feed'>" . $line['feed_title'] . "</span>, <span class='date'>" . mb_substr($line["date_entered"], 0, 16) . "</span>" . - "<div class='preview insensitive'>" . $content_preview . "</div>" . + "<div class='preview text-muted'>" . $content_preview . "</div>" . "</li>"; array_push($rv, $tmp); diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index b611646a9..cb10e2322 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -685,7 +685,7 @@ class Pref_Prefs extends Handler_Protected { } if ($item['help_text']) - print "<div class='help-text insensitive'><label for='CB_$pref_name'>".$item['help_text']."</label></div>"; + print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>"; print "</fieldset>"; } @@ -785,7 +785,7 @@ class Pref_Prefs extends Handler_Protected { print "<fieldset class='prefs plugin'> <label>$name:</label> - <label class='checkbox description insensitive' id='PLABEL-$name'> + <label class='checkbox description text-muted' id='PLABEL-$name'> <input disabled='1' dojoType='dijit.form.CheckBox' $checked type='checkbox'> ".htmlspecialchars($about[1]). "</label>"; @@ -824,7 +824,7 @@ class Pref_Prefs extends Handler_Protected { print "<fieldset class='prefs plugin'> <label>$name:</label> - <label class='checkbox description insensitive' id='PLABEL-$name'> + <label class='checkbox description text-muted' id='PLABEL-$name'> <input name='plugins[]' value='$name' dojoType='dijit.form.CheckBox' $checked $disabled type='checkbox'> ".htmlspecialchars($about[1])."</label>"; diff --git a/css/default.css b/css/default.css index b971a19cc..e29b66382 100644 --- a/css/default.css +++ b/css/default.css @@ -1014,8 +1014,8 @@ body.ttrss_utility hr { border: 0px solid #ccc; border-bottom-width: 1px; } -body.ttrss_main .insensitive, -body.ttrss_utility .insensitive { +body.ttrss_main .text-muted, +body.ttrss_utility .text-muted { color: #555; } body.ttrss_main .small, diff --git a/css/tt-rss.less b/css/tt-rss.less index 30e8025e1..097e12860 100755 --- a/css/tt-rss.less +++ b/css/tt-rss.less @@ -1192,7 +1192,7 @@ body.ttrss_main, body.ttrss_utility { border-bottom-width: 1px; } - .insensitive { + .text-muted { color : @default-text; } diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index c2c7751bf..3a5e33b2b 100644 --- a/js/PrefFeedTree.js +++ b/js/PrefFeedTree.js @@ -275,9 +275,9 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio if ($(label)) if (checkbox.checked) - $(label).removeClassName('insensitive'); + $(label).removeClassName('text-muted'); else - $(label).addClassName('insensitive'); + $(label).addClassName('text-muted'); }, execute: function () { diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 697fbb9c6..dbc99cfe4 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -98,7 +98,7 @@ class Af_Psql_Trgm extends Plugin { print "</div>"; - print "<div style='text-align : right' class='insensitive'>" . smart_date_time(strtotime($line["updated"])) . "</div>"; + print "<div style='text-align : right' class='text-muted'>" . smart_date_time(strtotime($line["updated"])) . "</div>"; print "</li>"; } @@ -153,13 +153,13 @@ ?> </div> <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom"> - <a class="insensitive" target="_blank" href="http://tt-rss.org/"> + <a class="text-muted" target="_blank" href="http://tt-rss.org/"> Tiny Tiny RSS</a> <?php if (!defined('HIDE_VERSION')) { ?> v<?php echo VERSION ?> <?php } ?> © 2005-<?php echo date('Y') ?> - <a class="insensitive" target="_blank" + <a class="text-muted" target="_blank" href="http://fakecake.org/">Andrew Dolgov</a> </div> <!-- footer --> </div> diff --git a/themes/night.css b/themes/night.css index c60abd55f..b8ab9df2f 100644 --- a/themes/night.css +++ b/themes/night.css @@ -1015,8 +1015,8 @@ body.ttrss_utility hr { border: 0px solid #ccc; border-bottom-width: 1px; } -body.ttrss_main .insensitive, -body.ttrss_utility .insensitive { +body.ttrss_main .text-muted, +body.ttrss_utility .text-muted { color: #ccc; } body.ttrss_main .small, @@ -1973,7 +1973,7 @@ body.flat.ttrss_main .dijitCheckBox:not(.dijitChecked)::before { color: #999999; background: #222; } -body.flat.ttrss_main .insensitive { +body.flat.ttrss_main .text-muted { color: #999999; } body.flat.ttrss_main .dijitAccordionInnerContainerSelected .dijitAccordionTitle { diff --git a/themes/night_base.less b/themes/night_base.less index 9e664fcd9..8e6755b64 100644 --- a/themes/night_base.less +++ b/themes/night_base.less @@ -12,7 +12,7 @@ @default-text: #ccc; -@fg-insensitive: darken(@default-text, 20%); +@fg-text-muted: darken(@default-text, 20%); @fg-light : lighten(@default-text, 10%); body.flat.ttrss_main.ttrss_prefs { @@ -26,7 +26,7 @@ body.flat.ttrss_main.ttrss_prefs { td.filename, div.prefHelp { - color : @fg-insensitive; + color : @fg-text-muted; } } @@ -157,7 +157,7 @@ body.flat.ttrss_main { } .author { - color : @fg-insensitive; + color : @fg-text-muted; } .updated, .content { @@ -198,12 +198,12 @@ body.flat.ttrss_main { } .dijitCheckBox:not(.dijitChecked)::before { - color : @fg-insensitive; + color : @fg-text-muted; background: @color-panel-bg; } - .insensitive { - color : @fg-insensitive; + .text-muted { + color : @fg-text-muted; } .dijitAccordionInnerContainerSelected .dijitAccordionTitle { diff --git a/themes/night_blue.css b/themes/night_blue.css index f7e3f1549..89b8e9f01 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -1015,8 +1015,8 @@ body.ttrss_utility hr { border: 0px solid #ccc; border-bottom-width: 1px; } -body.ttrss_main .insensitive, -body.ttrss_utility .insensitive { +body.ttrss_main .text-muted, +body.ttrss_utility .text-muted { color: #ccc; } body.ttrss_main .small, @@ -1973,7 +1973,7 @@ body.flat.ttrss_main .dijitCheckBox:not(.dijitChecked)::before { color: #999999; background: #222; } -body.flat.ttrss_main .insensitive { +body.flat.ttrss_main .text-muted { color: #999999; } body.flat.ttrss_main .dijitAccordionInnerContainerSelected .dijitAccordionTitle { |