From 90014063466514530e5cf5ec8a7cceeab059a92b Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 24 Jul 2014 13:51:06 +0200 Subject: update to bootstrap-3.2 and minor css adjustments --- view/theme/redbasic/css/style.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 26bb4ef92..7e45a167b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -101,7 +101,6 @@ code { color: $code_txtcolour; padding: 10px; margin-top: 20px; - max-width: 80%; } pre { @@ -1908,11 +1907,11 @@ img.mail-list-sender-photo { } #profile-jot-text::-webkit-input-placeholder { - font-size:18px; + font-size:16px; } #profile-jot-text::-moz-placeholder { - font-size:18px; + font-size:16px; } #profile-jot-text:focus::-webkit-input-placeholder { -- cgit v1.2.3 From 18f5890cb14e7c40909fdb92bffefee3415ba411 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 24 Jul 2014 22:29:03 -0700 Subject: make profile edit pencil stand out a bit on darker backgrounds --- view/theme/redbasic/css/style.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7e45a167b..13510b55c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -433,6 +433,7 @@ aside li { opacity: 0.3; filter:alpha(opacity=30); float: right; + margin-top: -3px; } .profile-edit-side-link:hover { opacity: 1.0; -- cgit v1.2.3 From 075fc6727762d4e45ddcae5843eec0100ad3ab72 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sun, 27 Jul 2014 21:44:34 +0000 Subject: Improved photo view page. Added a delete button, stylized other button and rearangend divs a but. I even made a javascript function (copied is the right word). I changed the application (non-posts) font size (temporary) to 14px, same as button (btn) font size. I like to change all font sizes to 1.0rem (posts) and 0.8rem (application) in the near future, but I will test that first on my hub. --- view/theme/redbasic/css/style.css | 29 ++++++++++++++++++++--------- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 13510b55c..fb064ba88 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -81,13 +81,17 @@ input[type="submit"] { font-weight: bold; color: $input_linksubmit; text-decoration: none; + padding: 6px 12px; +} + +input[type="submit"]:hover { + text-decoration: underline; } button, input, optgroup, select, textarea { color: #000; } - pre code { border: none; } @@ -637,12 +641,12 @@ aside li { .photo-album-image-wrapper .caption { - background-color: rgba(245, 245, 255, 0.8); - border-bottom: 2px solid #CCC; + background-color: $acpopup_bgcolour; + border-bottom: 2px solid $acpopup_bordercolour; } .photo-top-album-name { - background-color: rgb(255, 255, 255); + background-color: $acpopup_bgcolour; } #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { @@ -1236,7 +1240,6 @@ brain is weird like that */ padding:5px; } - /** * Plugins settings */ @@ -2347,19 +2350,27 @@ blockquote { } } +.btn { + font-size: $body_font_size; +} + +.btn-xs { + font-size: 12px; +} + .btn-default { background-color: $editbuttons_bgcolour; border-color: $editbuttons_bordercolour; - color: $editbuttons_colour; + color: $editbuttons_colour; text-shadow: none; box-shadow: none; } .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { background-color: $editbuttons_bghover; - border-color: $editbuttons_bordercolourhover; - color: $input_colourhover; - text-decoration: $input_decohover; + border-color: $editbuttons_bordercolourhover; + color: $input_colourhover; + text-decoration: $input_decohover; } .btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 23d9c695f..9d42bbf69 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -132,7 +132,7 @@ if(! $a->install) { if (! $font_size) $font_size = "1.0em"; if (! $body_font_size) - $body_font_size = "11px"; + $body_font_size = "14px"; if (! $font_colour) $font_colour = "#4d4d4d"; if (! $selected_active_colour) -- cgit v1.2.3 From 34d0490732746e2b1013810cd6b097f99765c71f Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 27 Jul 2014 17:34:54 -0700 Subject: re-align the "remember me" button on login page after bootstrap update --- view/theme/redbasic/css/style.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fb064ba88..92ec48b77 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -289,6 +289,7 @@ aside li { padding: 0; margin-top: 15px; margin-bottom: 0; + margin-left: 0; width: 20px; } @@ -297,6 +298,7 @@ aside li { margin-bottom: 0; float: left; width: 100px; + padding-left: 0; } #main-login .field_end { -- cgit v1.2.3 From 2e6dd91599c5b1790d1e994797ef90b98d5a78b3 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Mon, 28 Jul 2014 12:42:43 +0000 Subject: 14px>12pt as agreed on https://github.com/friendica/red/commit/075fc6727762d4e45ddcae5843eec0100ad3ab72 - Also fixed empty delete button showing up for channels without edit photo rights. --- view/theme/redbasic/php/style.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9d42bbf69..f55b29d5e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -132,7 +132,7 @@ if(! $a->install) { if (! $font_size) $font_size = "1.0em"; if (! $body_font_size) - $body_font_size = "14px"; + $body_font_size = "12pt"; if (! $font_colour) $font_colour = "#4d4d4d"; if (! $selected_active_colour) -- cgit v1.2.3 From 994b6b5258856a97cf6863de74e5a8baddf59b49 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Tue, 29 Jul 2014 19:09:07 +0000 Subject: As talked about earlier: set body font size to 0.8rem and post/comment font size to 1.0rem. This respects the user's browser font settings. Please comment if this changes the font sizes to much. There are some other font sizes that need to be changed to a scalable size (like btn-xs), but they don't have a priority. First see if this works. - Also made it possible for users to zoom on smart devices. - Small update to Redable. Aside is now disabled on almost all tablets in portrait mode. --- view/theme/redbasic/php/style.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index f55b29d5e..e47d65690 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -130,9 +130,9 @@ if(! $a->install) { if (! $item_opacity) $item_opacity = "1"; if (! $font_size) - $font_size = "1.0em"; + $font_size = "1.0rem"; if (! $body_font_size) - $body_font_size = "12pt"; + $body_font_size = "0.8rem"; if (! $font_colour) $font_colour = "#4d4d4d"; if (! $selected_active_colour) -- cgit v1.2.3 From 0e57b6cc8c8ad02c06457f96abae3227805c37ef Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 31 Jul 2014 02:33:34 -0700 Subject: convert application strings to en-US --- view/theme/redbasic/php/config.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index f02e2ad3d..b58305959 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -102,27 +102,27 @@ if(feature_enabled(local_user(),'expert')) '$title' => t("Theme settings"), '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), '$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']), - '$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background colour'), $arr['nav_bg']), - '$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top colour'), $arr['nav_gradient_top']), - '$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom colour'), $arr['nav_gradient_bottom']), - '$nav_active_gradient_top' => array('redbasic_nav_active_gradient_top', t('Navigation active button gradient top colour'), $arr['nav_active_gradient_top']), - '$nav_active_gradient_bottom' => array('redbasic_nav_active_gradient_bottom', t('Navigation active button gradient bottom colour'), $arr['nav_active_gradient_bottom']), - '$nav_bd' => array('redbasic_nav_bd', t('Navigation bar border colour '), $arr['nav_bd']), - '$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon colour '), $arr['nav_icon_colour']), - '$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon colour '), $arr['nav_active_icon_colour']), + '$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), + '$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top color'), $arr['nav_gradient_top']), + '$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom color'), $arr['nav_gradient_bottom']), + '$nav_active_gradient_top' => array('redbasic_nav_active_gradient_top', t('Navigation active button gradient top color'), $arr['nav_active_gradient_top']), + '$nav_active_gradient_bottom' => array('redbasic_nav_active_gradient_bottom', t('Navigation active button gradient bottom color'), $arr['nav_active_gradient_bottom']), + '$nav_bd' => array('redbasic_nav_bd', t('Navigation bar border color '), $arr['nav_bd']), + '$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), + '$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), '$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours), - '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), - '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), + '$banner_colour' => array('redbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']), + '$bgcolour' => array('redbasic_background_colour', t('Set the background color'), $arr['bgcolour']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), - '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']), - '$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background colour of comments'), $arr['comment_item_colour']), - '$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border colour of comments'), $arr['comment_border_colour']), + '$item_colour' => array('redbasic_item_colour', t('Set the background color of items'), $arr['item_colour']), + '$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']), + '$comment_border_colour' => array('redbasic_comment_border_colour', t('Set the border color of comments'), $arr['comment_border_colour']), '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), - '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']), - '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']), + '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']), + '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']), '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']), '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), - '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $arr['font_colour']), + '$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']), -- cgit v1.2.3 From c4e82772c04926696d0ca8d5a7e75476f77cb904 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 31 Jul 2014 12:46:43 +0000 Subject: Font sizes (temporary?) scaled down a bit. See https://github.com/friendica/red/commit/994b6b5258856a97cf6863de74e5a8baddf59b49 --- view/theme/redbasic/php/style.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e47d65690..ee9c6d4d0 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -130,9 +130,9 @@ if(! $a->install) { if (! $item_opacity) $item_opacity = "1"; if (! $font_size) - $font_size = "1.0rem"; + $font_size = "0.9rem"; if (! $body_font_size) - $body_font_size = "0.8rem"; + $body_font_size = "0.75rem"; if (! $font_colour) $font_colour = "#4d4d4d"; if (! $selected_active_colour) -- cgit v1.2.3 From 1f415d983081170ec707e0f72d99efc12e7cde4a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Aug 2014 20:09:01 -0700 Subject: add en-gb and en-au ('en-us' aka 'en' is the default language now so watch out for words like colour and centralise and please use the US variants in translatable strings) --- 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 b58305959..bfef8216c 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -110,7 +110,7 @@ if(feature_enabled(local_user(),'expert')) '$nav_bd' => array('redbasic_nav_bd', t('Navigation bar border color '), $arr['nav_bd']), '$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), '$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), - '$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours), + '$link_colour' => array('redbasic_link_colour', t('link color'), $arr['link_colour'], '', $link_colours), '$banner_colour' => array('redbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']), '$bgcolour' => array('redbasic_background_colour', t('Set the background color'), $arr['bgcolour']), '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), -- cgit v1.2.3 From d2a7b5babef88fc92212ad071daaf73461b35c90 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Wed, 6 Aug 2014 21:49:30 +0000 Subject: Reworked the options on the profile edit page. In one words: buttons. Hope you liked it. Revert or fix if not. Also reworked the channels manage page a bit, because channel names where not readable with larger fonts. Not perfect yet, but now readable and I think better aligned. Also revert/fix if not good. --- view/theme/redbasic/css/style.css | 28 ++++++++++++++++++++++++---- 1 file changed, 24 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 92ec48b77..15c0ae8a5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -368,13 +368,33 @@ aside li { clear: both; } +#profile-edit-links { + width: $converse_width; + padding-top: 15px; + padding-bottom: 15px; +} -#profile-edit-links ul { - list-style-type: none; +#profile-edit-links .btn { + margin: 0 10px 15px 0; } -#profile-edit-links li { - margin-top: 10px; +.profile-import { + vertical-align: top; + text-align: left; +} + +.profile-import b { + color: $link_colour; +} + +.profile-import input { + color: $font_colour; + border: none; +} + +#profile-edit-drop-link { + color: #FFF; + font-weight: normal; } #profile-like { -- cgit v1.2.3 From 1fcb4d88a40b71ebcf123e7ff7eedea0cc52de57 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Wed, 6 Aug 2014 23:03:14 +0000 Subject: max-width for small screens --- 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 15c0ae8a5..8aecd484c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -369,7 +369,7 @@ aside li { } #profile-edit-links { - width: $converse_width; + max-width: $converse_width; padding-top: 15px; padding-bottom: 15px; } -- cgit v1.2.3 From 92e5f31428107910a6c9faae556b930a1de3ebf0 Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 13 Aug 2014 16:56:31 +0200 Subject: tweak .comment-edit-text-empty to correlate with the new default app font-size --- 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 8aecd484c..df9485dee 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2087,7 +2087,7 @@ img.mail-list-sender-photo { .comment-edit-text-empty { color: gray; - font-size: 11px; + font-size: 12px; } .comment-edit-text-full { -- cgit v1.2.3 From c1b89b413aea94ca81912437e8789f4cd719886e Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 14 Aug 2014 20:02:05 +0000 Subject: Added some missing translation strings. Fixed to scalable for a few font sizes. --- view/theme/redbasic/css/style.css | 5 +++-- 1 file changed, 3 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 df9485dee..704c2c944 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -98,6 +98,7 @@ pre code { code { font-family: Courier, monospace; + font-size: 1em; display: block; overflow: auto; border: 1px solid $code_borderc; @@ -2240,7 +2241,7 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ /* bootstrap overrides */ blockquote { - font-size: $body_font_size; + font-size: 1em; } .dropdown-menu { @@ -2377,7 +2378,7 @@ blockquote { } .btn-xs { - font-size: 12px; + font-size: 0.65rem; } .btn-default { -- cgit v1.2.3 From c96b18359f89070838d87ac1d8eeb363c32b0e00 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 15 Aug 2014 13:17:38 +0200 Subject: .btn-xs 0.65 > 0.7rem --- 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 704c2c944..5a0e583d2 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2378,7 +2378,7 @@ blockquote { } .btn-xs { - font-size: 0.65rem; + font-size: 0.7rem; } .btn-default { -- cgit v1.2.3 From b88e1e98624510ceb5cc63a12d9f229213f2d5a1 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 15 Aug 2014 14:00:51 +0200 Subject: .btn.xs > 0.75rem (let's keep that as the min. scalable font size) --- 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 5a0e583d2..889988d48 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2378,7 +2378,7 @@ blockquote { } .btn-xs { - font-size: 0.7rem; + font-size: 0.75rem; } .btn-default { -- cgit v1.2.3