diff options
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 70 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 34 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 4 |
3 files changed, 71 insertions, 37 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 26bb4ef92..889988d48 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -81,19 +81,24 @@ 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; } code { font-family: Courier, monospace; + font-size: 1em; display: block; overflow: auto; border: 1px solid $code_borderc; @@ -101,7 +106,6 @@ code { color: $code_txtcolour; padding: 10px; margin-top: 20px; - max-width: 80%; } pre { @@ -286,6 +290,7 @@ aside li { padding: 0; margin-top: 15px; margin-bottom: 0; + margin-left: 0; width: 20px; } @@ -294,6 +299,7 @@ aside li { margin-bottom: 0; float: left; width: 100px; + padding-left: 0; } #main-login .field_end { @@ -363,13 +369,33 @@ aside li { clear: both; } +#profile-edit-links { + max-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 { @@ -434,6 +460,7 @@ aside li { opacity: 0.3; filter:alpha(opacity=30); float: right; + margin-top: -3px; } .profile-edit-side-link:hover { opacity: 1.0; @@ -637,12 +664,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 +1263,6 @@ brain is weird like that */ padding:5px; } - /** * Plugins settings */ @@ -1908,11 +1934,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 { @@ -2062,7 +2088,7 @@ img.mail-list-sender-photo { .comment-edit-text-empty { color: gray; - font-size: 11px; + font-size: 12px; } .comment-edit-text-full { @@ -2215,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 { @@ -2347,19 +2373,27 @@ blockquote { } } +.btn { + font-size: $body_font_size; +} + +.btn-xs { + font-size: 0.75rem; +} + .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/config.php b/view/theme/redbasic/php/config.php index f02e2ad3d..bfef8216c 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']), - '$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']), + '$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 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']), - '$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']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 23d9c695f..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.0em"; + $font_size = "0.9rem"; if (! $body_font_size) - $body_font_size = "11px"; + $body_font_size = "0.75rem"; if (! $font_colour) $font_colour = "#4d4d4d"; if (! $selected_active_colour) |