friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6052 from rabuzarus/20181030_-_frio_fix_link_highlight 

Frio - on mobiles the links in the thread will always have the link color (disabling thread hover effect)
pull/6054/head
Hypolite Petovan 2018-10-31 09:04:17 -04:00 committed by GitHub
parent 11a1c80877 d02f940811
commit f8ef92f84a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
view/theme/frio/css/style.css
View File

@ -1538,11 +1538,11 @@ aside .panel-body {
} }
/* Thread hover effects */ /* Thread hover effects */
.wall-item-container .wall-item-content a, .desktop-view .wall-item-container .wall-item-content a,
.wall-item-container a, .desktop-view .wall-item-container a,
.wall-item-container .fakelink, .desktop-view .wall-item-container .fakelink,
.toplevel_item .fakelink, .desktop-view .toplevel_item .fakelink,
.toplevel_item .wall-item-container .wall-item-responses a { .desktop-view .toplevel_item .wall-item-container .wall-item-responses a {
color: #555; color: #555;
-webkit-transition: all 0.25s ease-in-out; -webkit-transition: all 0.25s ease-in-out;
-moz-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out;

19
view/theme/frio/php/default.php
View File

@ -18,6 +18,12 @@ require_once 'view/theme/frio/php/frio_boot.php';
if (!isset($minimal)) { if (!isset($minimal)) {
$minimal = false; $minimal = false;
} }
$basepath = $a->getURLPath() ? "/" . $a->getURLPath() . "/" : "/";
$frio = "view/theme/frio";
$view_mode_class = ($a->is_mobile || $a->is_tablet) ? 'mobile-view' : 'desktop-view';
$is_singleuser = Config::get('system', 'singleuser');
$is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
?> ?>
<html> <html>
<head> <head>
@ -26,9 +32,6 @@ if (!isset($minimal)) {
<script type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script> <script type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script>
<script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script> <script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script>
<?php <?php
$basepath = $a->getURLPath() ? "/" . $a->getURLPath() . "/" : "/";
$frio = "view/theme/frio";
// Because we use minimal for modals the header and the included js stuff should be only loaded // Because we use minimal for modals the header and the included js stuff should be only loaded
// if the page is an standard page (so we don't have it twice for modals) // if the page is an standard page (so we don't have it twice for modals)
// //
@ -52,18 +55,16 @@ if (!isset($minimal)) {
} else { } else {
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
} }
if (empty($nav_bg)) { if (empty($nav_bg)) {
$nav_bg = "#708fa0"; $nav_bg = "#708fa0";
} }
echo '
<meta name="theme-color" content="' . $nav_bg . '" />';
$is_singleuser = Config::get('system','singleuser'); echo '<meta name="theme-color" content="' . $nav_bg . '" />';
$is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
?> ?>
</head> </head>
<body id="top" class="mod-<?php echo $a->module." ".$is_singleuser_class;?>"> <body id="top" class="mod-<?php echo $a->module . " " . $is_singleuser_class . " " . $view_mode_class;?>">
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a> <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
<?php <?php
if (x($page, 'nav') && !$minimal) { if (x($page, 'nav') && !$minimal) {
@ -81,7 +82,7 @@ if (!isset($minimal)) {
// special minimal style for modal dialogs // special minimal style for modal dialogs
if ($minimal) { if ($minimal) {
?> ?>
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"> <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important; display:block!important;">
<?php if (x($page, 'content')) echo $page['content']; ?> <?php if (x($page, 'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>