From 54ad3a74d4dbcf1e46135d94be3670ef621c22f7 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 11 Oct 2013 17:25:52 +0100 Subject: Typo --- view/theme/redbasic/php/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index be021e85c..faf6c6f35 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -5,7 +5,7 @@ function theme_content(&$a) { $schema = get_pconfig(local_user(),'redbasic', 'schema' ); $nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' ); - $bgcolour = get_pconfig(local_user(),'redbasic', 'bgcolour' ); + $bgcolour = get_pconfig(local_user(),'redbasic', 'background_colour' ); $background_image = get_pconfig(local_user(),'redbasic', 'background_image' ); $item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' ); $item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' ); -- cgit v1.2.3 From 033b1ed430962195cdb329b5bc532f31bf8c4af5 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 11 Oct 2013 17:36:02 +0100 Subject: Dark schema, and associated fixes. --- view/theme/redbasic/css/style.css | 1 + view/theme/redbasic/php/style.php | 43 +++++++++++++++++++++---------------- view/theme/redbasic/schema/dark.php | 10 +++++++++ 3 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 view/theme/redbasic/schema/dark.php (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1f58cc44..467c2c59d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -74,6 +74,7 @@ blockquote { background-color: #f4f8f9; border-left: 4px solid #dae4ee; padding: 0.4em; + color: #000; } .ccollapse-wrapper { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index b80a3e764..b5d020937 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -11,25 +11,6 @@ // A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme // wants to implement that $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); - if ($nav_colour == "red") { - $nav_bg_1 = "#f88"; - $nav_bg_2 = "#b00"; - $nav_bg_3 = "#f00"; - $nav_bg_4 = "#b00"; - $search_background = '#FFDDDD'; - $active_colour = '#444444'; - } - - if ($nav_colour == "black") { - $nav_bg_1 = $nav_bg_3 = "#000"; - $nav_bg_2 = $nav_bg_4 = "#222"; - $search_background = '#EEEEEE'; - $active_colour = '#AAAAAA'; - } - if ($nav_colour == "silver") { - $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; - $search_background = '#EEEEEE'; - } // Load the owners pconfig $schema = get_pconfig($uid,'redbasic','schema'); @@ -90,7 +71,31 @@ if(! $active_colour) $active_colour = '#FFFFFF'; + +// Nav colours have nested values, so we have to define the actual variables +// used in the CSS from the higher level "red", "black", etc here + if ($nav_colour == "red") { + $nav_bg_1 = "#f88"; + $nav_bg_2 = "#b00"; + $nav_bg_3 = "#f00"; + $nav_bg_4 = "#b00"; + $search_background = '#FFDDDD'; + $active_colour = '#444444'; + } + + if ($nav_colour == "black") { + $nav_bg_1 = $nav_bg_3 = "#000"; + $nav_bg_2 = $nav_bg_4 = "#222"; + $search_background = '#EEEEEE'; + $active_colour = '#AAAAAA'; + } + if ($nav_colour == "silver") { + $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; + $search_background = '#EEEEEE'; + } + + // Apply the settings if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { $x = file_get_contents('view/theme/' . current_theme() . '/css/style.css'); diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php new file mode 100644 index 000000000..bd3642914 --- /dev/null +++ b/view/theme/redbasic/schema/dark.php @@ -0,0 +1,10 @@ + Date: Fri, 11 Oct 2013 22:30:11 -0700 Subject: more icons --- view/theme/redbasic/css/style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 467c2c59d..38174a004 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3312,9 +3312,8 @@ ul.menu-popup { #mail-list-wrapper { - border-bottom: 1px solid #ccc; -padding: 20px; +margin: 5px 5px 5px 5px; } span.mail-list { -- cgit v1.2.3 From 1c8a36f9ca1f1cfd4cab47b47c855b530467593d Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 11 Oct 2013 23:12:10 -0700 Subject: mail recall --- view/theme/redbasic/css/style.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 38174a004..e91e4dc5a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1827,6 +1827,12 @@ a.mail-list-link { margin-right: 30px; margin-top: 15px; } +.mail-conv-recall-wrapper { + float: right; + margin-right: 10px; + margin-top: 15px; +} + .mail-conv-break { clear: both; } @@ -3321,6 +3327,10 @@ float: left; width: 20%; } +.mail-list-remove { +width: 5% !important; +} + span.mail-delete { float: left; width: 30px; -- cgit v1.2.3 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/redbasic') 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/redbasic') 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/redbasic') 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/redbasic') 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/redbasic') 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/redbasic') 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/redbasic') 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/redbasic') 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 @@ Date: Sun, 20 Oct 2013 01:19:04 +0200 Subject: redbasic: set width of main section --- view/theme/redbasic/css/style.css | 2 ++ view/theme/redbasic/php/config.php | 7 +++++-- view/theme/redbasic/php/style.php | 6 +++++- view/theme/redbasic/tpl/theme_settings.tpl | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e91e4dc5a..ce0c66af1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -125,6 +125,8 @@ nav {background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); } +section {width: $section_width; +} nav:hover {background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index faf6c6f35..4862bfe6a 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -13,8 +13,9 @@ function theme_content(&$a) { $font_colour = get_pconfig(local_user(),'redbasic', 'font_colour' ); $radius = get_pconfig(local_user(),'redbasic', 'radius' ); $shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); + $section_width=get_pconfig(local_user(),"redbasic","section_width"); return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow); + $font_size, $font_colour, $radius, $shadow, $section_width); } function theme_post(&$a) { @@ -31,11 +32,12 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); + set_pconfig(local_user(), 'redbasic', 'section_width', $_POST['redbasic_section_width']); } } function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, - $font_size, $font_colour, $radius, $shadow) { + $font_size, $font_colour, $radius, $shadow, $section_width) { $scheme_choices = array(); $scheme_choices["---"] = t("Default"); @@ -75,6 +77,7 @@ if(feature_enabled(local_user(),'expert')) '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $font_colour), '$radius' => array('redbasic_radius', t('Set radius of corners'), $radius), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow), + '$section_width' => array('redbasic_section_width',t('Set width of main section'),$section_width), )); return $o; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index b5d020937..0c17140a6 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -22,6 +22,7 @@ $font_colour = get_pconfig($uid, "redbasic", "font_colour"); $radius = get_pconfig($uid, "redbasic", "radius"); $shadow = get_pconfig($uid,"redbasic","photo_shadow"); + $section_width=get_pconfig($uid,"redbasic","section_width"); // Now load the scheme. If a value is changed above, we'll keep the settings // If not, we'll keep those defined by the schema @@ -70,6 +71,8 @@ $shadow = "0"; if(! $active_colour) $active_colour = '#FFFFFF'; + if (! $section_width) + $section_width="72%"; @@ -114,7 +117,8 @@ $options = array ( '$font_colour' => $font_colour, '$radius' => $radius, '$shadow' => $shadow, -'$active_colour' => $active_colour +'$active_colour' => $active_colour, +'$section_width' => $section_width ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 45dd529fa..4e4b6002c 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -13,7 +13,7 @@ {{include file="field_input.tpl" field=$font_colour}} {{include file="field_input.tpl" field=$radius}} {{include file="field_input.tpl" field=$shadow}} - +{{include file="field_input.tpl" field=$section_width}}
-- cgit v1.2.3 From 3f629c817d1d56ed05f6d6fec20ac9da3314f607 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 23 Oct 2013 14:14:34 +0200 Subject: might be some style enhancement --- view/theme/redbasic/css/style.css | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9bdd4e1e5..edb1434dd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -929,7 +929,7 @@ footer { } .wall-item-ago { - color: #888888; + color: #777; font-size: 0.8em; } @@ -950,6 +950,11 @@ footer { margin-right: 8px; font-size: 1.2em; cursor: pointer; + color: #777; +} + +.item-tool:hover { + color: #000; } .like-rotator { @@ -3432,9 +3437,17 @@ margin-right: 50px; margin-left: -20px; } -.comment-icon, .jot-icons { +.comment-icon, +.jot-icons { font-size: 1.2em; + color: #777; } + +.comment-icon:hover, +.jot-icons:hover { + color: #000; +} + .nav-icon { font-size: 1.4em; margin-right: 15px; -- cgit v1.2.3 From 7b7ef56b54a98f3d860b9b0c7dc4a7ce0657fede Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 23 Oct 2013 19:35:51 -0700 Subject: replace text links with icons on design pages --- view/theme/redbasic/css/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index edb1434dd..4f41cf923 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3487,3 +3487,11 @@ a .drop-icons { .item-category { margin-right: 10px; } + +.design-icons { + margin-right: 10px; +} + +#menulist { + list-style-type: none; +} \ No newline at end of file -- cgit v1.2.3 From c3d04139560b81cd1645b0ae8a5316519a9cad0d Mon Sep 17 00:00:00 2001 From: 23n Date: Thu, 24 Oct 2013 05:59:08 +0200 Subject: no underlines for hovered icons --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4f41cf923..7a8e87dc5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3492,6 +3492,10 @@ a .drop-icons { margin-right: 10px; } +.design-icons:hover { +text-decoration: none; +} + #menulist { list-style-type: none; } \ No newline at end of file -- cgit v1.2.3 From cb84485f7c9c57d96aaa03fe793e7d8d6f971aec Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 24 Oct 2013 00:51:02 -0700 Subject: now that the icons have been softened, the drop-icons stick out like a sore thumb. Soften them as well --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7a8e87dc5..669f73f42 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3454,7 +3454,7 @@ margin-right: 50px; } a .drop-icons { - color: #000000; + color: #777; font-size: 1.2em; } -- cgit v1.2.3