From 2d23fcfe5a150987a7ac079df0b2113b082f1fca Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 13 Oct 2013 22:24:33 +0200 Subject: reorder items in private-mail - the delete button is on the right side everywhere else... --- view/theme/redbasic/css/style.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e91e4dc5a..8116495a7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3318,8 +3318,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 { @@ -3339,6 +3339,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 { -- cgit v1.2.3 From 1354702d690add3c6ff0c331a190ef3004f7d48c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 13 Oct 2013 15:42:30 -0700 Subject: remove the disabled flag on individual permissions and improve the text to show that settings may be inherited. The reason for this change is that we want the individual settings to be stored regardless of the inherited settings, because if somebody changes the higher precedence privacy settings it could leave all their existing contacts with no permissions and this could be a support nightmare. So this way if somebody starts off with "anybody on the network can send me their stream and posts" and later changes it to "only specific connections can send me their stream and posts", the individual setting will already be set for all their connections. The previous behaviour is that this setting would have been disabled so none of their existing connections will have this specific permission. Old-timers who were here and made lots of connections before this commit - will have to edit all their connections if they change their privacy settings from lesser restrictive to be more restrictive. --- view/theme/redbasic/css/style.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e91e4dc5a..0770bd160 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3448,3 +3448,10 @@ a .drop-icons { .drop-icons:hover { color: #FF0000; } + +.permission-inherited { + float: left; + margin-right: 10px; + color: #FF0000; +} + \ No newline at end of file -- cgit v1.2.3 From db42e4d2f92dacb02662dc298871300dfea75651 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 13 Oct 2013 21:14:04 -0700 Subject: attachment icons revisited --- view/theme/redbasic/css/style.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fc84cbf57..0c5c916ae 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3459,3 +3459,18 @@ a .drop-icons { 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; +} \ No newline at end of file -- cgit v1.2.3 From 4f2c056d6d00257fccae356f4fdf6c0c971c9b60 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 14 Oct 2013 04:49:28 -0700 Subject: template and icons for categories and "file as" --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0c5c916ae..860578368 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3473,4 +3473,8 @@ a .drop-icons { .attach-clip { margin-right: 3px; font-size: 1.8em; +} + +.item-category { + margin-right: 10px; } \ No newline at end of file -- cgit v1.2.3 From 43289103ee99018f2c57391f6851970d7b7b4b39 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 14 Oct 2013 18:13:02 +0200 Subject: i guess we should use .active class for all selected links. --- view/theme/redbasic/css/style.css | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 860578368..d6c1b3511 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -369,7 +369,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; } @@ -1482,12 +1482,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; } @@ -3477,4 +3471,4 @@ a .drop-icons { .item-category { margin-right: 10px; -} \ No newline at end of file +} -- cgit v1.2.3 From 30e4a360847762bfc8afce6704261ea5cc38650c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 16 Oct 2013 17:08:19 +0100 Subject: Don't break themes by using functions we don't need. If you've got a theme that started off copying Redbasic (ie, all of you) need to do this too. --- view/theme/redbasic/php/config.php | 2 +- view/theme/redbasic/php/style.php | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index faf6c6f35..44ddb78b9 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -39,7 +39,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/*'); 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 b5d020937..1f3e46d9d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,4 +1,5 @@ $nav_bg_1, -- cgit v1.2.3 From b860a21fdce3c4b99b7cecc8ac8d1f776e788197 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 16 Oct 2013 19:05:40 +0100 Subject: Check only for php in schema globs. --- view/theme/redbasic/php/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 44ddb78b9..90bd109ad 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -39,7 +39,7 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $scheme_choices = array(); $scheme_choices["---"] = t("Default"); - $files = glob('view/theme/redbasic/schema/*'); + $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { $f = basename($file, ".php"); -- cgit v1.2.3 From 90fc3c1caf647214a079bfa12f92373e514276cd Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 17 Oct 2013 02:16:47 +0100 Subject: Errant logging. --- view/theme/redbasic/php/style.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 1f3e46d9d..3344fcb3a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,6 +1,4 @@