aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-10-20 01:22:51 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-10-20 01:22:51 +0200
commit2db45695e8067e49eb4c8a6d8044cd9cac7f07e5 (patch)
tree7a1029e10578e99f0dbbef6e22c42eb784ddd9d1 /view/theme
parentc0789bdb4fc7412efd5e2fb1e15b63d359a74cfa (diff)
parent49fb6326e0e978f57b2f988935af6e8e3d2f4417 (diff)
downloadvolse-hubzilla-2db45695e8067e49eb4c8a6d8044cd9cac7f07e5.tar.gz
volse-hubzilla-2db45695e8067e49eb4c8a6d8044cd9cac7f07e5.tar.bz2
volse-hubzilla-2db45695e8067e49eb4c8a6d8044cd9cac7f07e5.zip
Merge upstream
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css42
-rw-r--r--view/theme/redbasic/php/config.php2
-rw-r--r--view/theme/redbasic/php/style.php11
3 files changed, 39 insertions, 16 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ce0c66af1..9bdd4e1e5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -371,7 +371,7 @@ footer {
margin-bottom: 10px;
}
-.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .active {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected, .active {
color: #444444 !important;
}
@@ -1484,12 +1484,6 @@ tr.mceLast {
box-shadow: 0 0 0 0;
}
-.settings-widget .selected {
- border-radius: $radiuspx;
- -moz-border-radius: $radiuspx;
- box-shadow: 4px 4px 3px 0 #444444;
-}
-
#sidebar-page-list .label {
margin-left: 5px;
}
@@ -3320,8 +3314,8 @@ ul.menu-popup {
#mail-list-wrapper {
-border-bottom: 1px solid #ccc;
-margin: 5px 5px 5px 5px;
+border-top: 1px solid #ccc;
+padding: 5px 5px 5px 5px;
}
span.mail-list {
@@ -3341,6 +3335,10 @@ width: 30px;
img.mail-list-sender-photo {
height: 24px;
width: 24px;
+float: left;
+margin-right: 30px;
+-moz-border-radius: $radiuspx;
+border-radius: $radiuspx;
}
.tag1 {
@@ -3450,3 +3448,29 @@ a .drop-icons {
.drop-icons:hover {
color: #FF0000;
}
+
+.permission-inherited {
+ float: left;
+ margin-right: 10px;
+ color: #FF0000;
+}
+
+.attachlink {
+ float: left;
+ border: 1px solid black;
+ padding: 5px;
+ margin-right: 8px;
+}
+
+.attach-icons {
+ font-size: 1.4em;
+}
+
+.attach-clip {
+ margin-right: 3px;
+ font-size: 1.8em;
+}
+
+.item-category {
+ margin-right: 10px;
+}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 4862bfe6a..053940219 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -41,7 +41,7 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image,
$scheme_choices = array();
$scheme_choices["---"] = t("Default");
- $files = glob('view/theme/' . current_theme() . '/schema/*');
+ $files = glob('view/theme/redbasic/schema/*.php');
if($files) {
foreach($files as $file) {
$f = basename($file, ".php");
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 0c17140a6..c4bd2e15a 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,5 +1,4 @@
<?php
-
// Get the UID of the channel owner
$uid = get_theme_uid();
@@ -30,14 +29,14 @@
// not --- like the mobile theme does instead.
if (($schema) && ($schema != '---')) {
- $schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php';
+ $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
require_once ($schemefile);
}
// If we haven't got a schema, load the default. We shouldn't touch this - we
// should leave it for admins to define for themselves.
if (! $schema) {
- if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
- $schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
+ if(file_exists('view/theme/redbasic/schema/default.php')) {
+ $schemefile = 'view/theme/redbasic/schema/' . 'default.php';
require_once ($schemefile);
}
}
@@ -100,8 +99,8 @@
// Apply the settings
- if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
- $x = file_get_contents('view/theme/' . current_theme() . '/css/style.css');
+ if(file_exists('view/theme/redbasic/css/style.css')) {
+ $x = file_get_contents('view/theme/redbasic/css/style.css');
$options = array (
'$nav_bg_1' => $nav_bg_1,