diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
| commit | a6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch) | |
| tree | 24d116fb5fe6b1e2687f833cee9685d6480a95eb /view/theme/redbasic | |
| parent | b467dc4f0055452b65fac842d1294ec9cc978445 (diff) | |
| parent | 51b89f0ed8833004cf695de90791d8d0eec550b5 (diff) | |
| download | volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2 volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip | |
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
Diffstat (limited to 'view/theme/redbasic')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme.php | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a5e5dffdb..83b10b527 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -790,7 +790,7 @@ a.rateme, div.rateme { } nav .acpopup { - top: 49px !important; + top: 50px !important; margin-left: -35px; width: 290px; } @@ -1231,7 +1231,7 @@ div.jGrowl div.jGrowl-notification { #nav-search-text-ac .autocomplete { position: fixed; - top: 50px; + top: 51px; border: 1px solid $nav_bd; border-top: none; } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 8ab31efc0..2603fb267 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -79,7 +79,7 @@ function theme_post(&$a) { function redbasic_form(&$a, $arr) { $scheme_choices = array(); - $scheme_choices["---"] = t("Light (Red Matrix default)"); + $scheme_choices["---"] = t("Light (Hubzilla default)"); $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 2d17e6d08..2133331c6 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -311,8 +311,9 @@ echo str_replace(array_keys($options), array_values($options), $x); if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); } + if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) { - echo str_replace(array_keys($options), array_values($options), $x); + echo file_get_contents('view/theme/redbasic/css/converse_center.css'); } if($schemecss) { diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index e68533bb4..f0679a532 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -2,7 +2,7 @@ /** * * Name: Redbasic - * * Description: RedMatrix standard theme + * * Description: Hubzilla standard theme * * Version: 1.0 * * Author: Fabrixxm * * Maintainer: Mike Macgirvin |