diff options
| -rw-r--r-- | include/bb2diaspora.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | view/theme/testbubble/style.css | 41 |
3 files changed, 43 insertions, 2 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 0721d27f6..2331865ae 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -40,7 +40,7 @@ function scale_diaspora_images($s,$include_link = true) { $new_height = $ph->getHeight(); logger('scale_diaspora_image: ' . $new_width . 'w ' . $new_height . 'h' . 'match: ' . $mtch[0], LOGGER_DEBUG); $s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]' - . "\n" . ((! $include_link) + . "\n" . (($include_link) ? '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n" : ''),$s); logger('scale_diaspora_image: new string: ' . $s, LOGGER_DEBUG); diff --git a/include/nav.php b/include/nav.php index 62a8a6d11..f7165fd0d 100644 --- a/include/nav.php +++ b/include/nav.php @@ -147,7 +147,7 @@ function nav(&$a) { $banner = get_config('system','banner'); if($banner === false) - $banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendica</a></span>'; + $banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>'; $tpl = get_markup_template('nav.tpl'); diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 91920e84d..4b66d16c5 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -2021,6 +2021,7 @@ margin-left: 0px; background-color:#b20202; } + #side-invite-link:active { background-color: #b20202; position:relative; @@ -2031,6 +2032,46 @@ margin-left: 0px; color: #efefef; } +#side-suggest-link { + width: 180px; + padding: 10px; + margin: auto; + margin-bottom: 20px; + -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; + -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; + box-shadow:inset 0px 1px 0px 0px #cfcfcf; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color:#bdbdbd; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + padding: 5px 10px 5px 10px; + color: #efefef; + font-size: 1.2em; + text-align: center; +} + +#side-suggest-link:hover { + color: #efefef; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) ); + background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808'); + background-color:#b20202; +} + + +#side-suggest-link:active { + background-color: #b20202; + position:relative; + top:1px; +} + +#side-suggest-link a { + color: #efefef; +} + #invite-message, #invite-recipients, #invite-recipient-text { padding: 10px; } |