From bef2d264842bf05e8b77d35dc3cb815d45ef3344 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Tue, 15 Apr 2014 21:29:03 +0200 Subject: Large update dark schema The new ACL and some minor things still needs to be done. Style.css and style.php will follow. --- view/theme/redbasic/schema/dark.php | 100 ++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 16 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 24ed4f418..27fbd26fc 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -1,34 +1,102 @@ Date: Tue, 15 Apr 2014 21:33:26 +0200 Subject: Needed for large update dark schema. --- view/theme/redbasic/php/style.php | 111 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 4 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 49852036b..8984df788 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -87,8 +87,22 @@ if(! $a->install) { $nav_icon_colour = "#999"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; + if (! $navtabs_borderc) + $navtabs_borderc = "#ddd"; + if (! $navtabs_fontcolour) + $navtabs_fontcolour = "#555"; + if (! $navtabs_bgcolour) + $navtabs_bgcolour = "#fff"; + if (! $navtabs_linkcolour) + $navtabs_linkcolour = ""; + if (! $navtabs_linkchover) + $navtabs_linkchover = ""; + if (! $navtabs_decohover) + $navtabs_decohover = "none"; + if (! $navtabs_bgchover) + $navtabs_bgchover = "#eee"; if (! $link_colour) - $link_colour = "#0080FF"; + $link_colour = "#0080ff"; if (! $banner_colour) $banner_colour = "#fff"; if (! $search_background) @@ -100,23 +114,77 @@ if(! $a->install) { if (! $item_colour) $item_colour = "#fdfdfd"; if (! $toolicon_colour) - $toolicon_colour = '#777777'; + $toolicon_colour = '#777'; if (! $toolicon_activecolour) $toolicon_activecolour = '#000'; if (! $item_opacity) $item_opacity = "1"; + if (! $item_bordercolour) + $item_bordercolour = "#f4f4f4"; if (! $font_size) $font_size = "1.0em"; if (! $body_font_size) $body_font_size = "11px"; if (! $font_colour) - $font_colour = "#4D4D4D"; + $font_colour = "#4d4d4d"; + if (! $selected_active_colour) + $selected_active_colour = "#444"; + if (! $selected_active_deco) + $selected_active_deco = "none"; + if (! $blockquote_colour) + $blockquote_colour = "#000"; + if (! $blockquote_bgcolour) + $blockquote_bgcolour = "#f4f8f9"; + if (! $blockquote_bordercolour) + $blockquote_bordercolour = "#dae4ee"; + if (! $notif_itemcolour) + $notif_itemcolour = "#000"; + if (! $notif_itemhovercolour) + $notif_itemhovercolour = "#000"; + if (! $editbuttons_bgcolour) + $editbuttons_bgcolour = "#fff"; + if (! $editbuttons_bordercolour) + $editbuttons_bordercolour = "#ccc"; + if (! $editbuttons_bghover) + $editbuttons_bghover = "#ebebeb"; + if (! $acpopup_bgcolour) + $acpopup_bgcolour = "#fff"; + if (! $acpopup_bordercolour) + $acpopup_bordercolour = "#ccc"; + if (! $acpopup_tgbl_bgcolour) + $acpopup_tgbl_bgcolour = "#ddddff"; + if (! $acpopup_hovercolour) + $acpopup_hovercolour = "#000"; + if (! $notify_bgcolour) + $notify_bgcolour = "#fff"; + if (! $notify_linkcolour) + $notify_linkcolour = "#333"; + if (! $notify_bghover) + $notify_bghover = "#e7e7e7"; + if (! $notifyseen_bgcolour) + $notifyseen_bgcolour = "#ddd"; + if (! $notifyseen_linkcolour) + $notifyseen_linkcolour = "#333"; + if (! $notifyseen_bghover) + $notifyseen_bghover = "#e7e7e7"; + if (! $notifyseen_linkhover) + $notifyseen_linkhover = "#333"; + if (! $input_bgsubmit) + $input_bgsubmit = "#F0F0F0"; + if (! $input_linksubmit) + $input_linksubmit = "#0080FF"; + if (! $input_border) + $input_border = "#666"; + if (! $input_colourhover) + $input_colourhover = "#333"; + if (! $input_decohover) + $input_decohover = "none"; if (! $radius) $radius = "0"; if (! $shadow) $shadow = "0"; if(! $active_colour) - $active_colour = '#FFFFFF'; + $active_colour = '#fff'; if (! $converse_width) { $converse_width="1024px"; } @@ -154,6 +222,13 @@ $options = array ( '$nav_bd' => $nav_bd, '$nav_icon_colour' => $nav_icon_colour, '$nav_active_icon_colour' => $nav_active_icon_colour, +'$navtabs_borderc' => $navtabs_borderc, +'$navtabs_fontcolour' => $navtabs_fontcolour, +'$navtabs_bgcolour' => $navtabs_bgcolour, +'$navtabs_linkcolour' => $navtabs_linkcolour, +'$navtabs_linkchover' => $navtabs_linkchover, +'$navtabs_bgchover' => $navtabs_bgchover, +'$navtabs_decohover' => $navtabs_decohover, '$link_colour' => $link_colour, '$banner_colour' => $banner_colour, '$search_background' => $search_background, @@ -161,11 +236,39 @@ $options = array ( '$background_image' => $background_image, '$item_colour' => $item_colour, '$item_opacity' => $item_opacity, +'$item_bordercolour' => $item_bordercolour, '$toolicon_colour' => $toolicon_colour, '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, +'$selected_active_colour' => $selected_active_colour, +'$selected_active_deco' => $selected_active_deco, '$body_font_size' => $body_font_size, +'$blockquote_colour' => $blockquote_colour, +'$blockquote_bgcolour' => $blockquote_bgcolour, +'$blockquote_bordercolour' => $blockquote_bordercolour, +'$blockquote_bgcolourhover' => $blockquote_bgcolourhover, +'$notif_itemcolour' => $notif_itemcolour, +'$notif_itemhovercolour' => $notif_itemhovercolour, +'$editbuttons_bgcolour' => $editbuttons_bgcolour, +'$editbuttons_bordercolour' => $editbuttons_bordercolour, +'$editbuttons_bghover' => $editbuttons_bghover, +'$acpopup_bgcolour' => $acpopup_bgcolour, +'$acpopup_bordercolour' => $acpopup_bordercolour, +'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour, +'$acpopup_hovercolour' => $acpopup_hovercolour, +'$notify_bgcolour' => $notify_bgcolour, +'$notify_linkcolour' => $notify_linkcolour, +'$notify_bghover' => $notify_bghover, +'$notifyseen_bgcolour' => $notifyseen_bgcolour, +'$notifyseen_linkcolour' => $notifyseen_linkcolour, +'$notifyseen_bghover' => $notifyseen_bghover, +'$notifyseen_linkhover' => $notifyseen_linkhover, +'$input_bgsubmit' => $input_bgsubmit, +'$input_linksubmit' => $input_linksubmit, +'$input_border' => $input_border, +'$input_colourhover' => $input_colourhover, +'$input_decohover' => $input_decohover, '$radius' => $radius, '$shadow' => $shadow, '$active_colour' => $active_colour, -- cgit v1.2.3 From 16db3934958f7fa2f8768ed631121bab518c84f4 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Tue, 15 Apr 2014 21:35:30 +0200 Subject: Needed for large update dark schema and minor fixes default. --- view/theme/redbasic/css/style.css | 116 ++++++++++++++++++++++++++++++++------ 1 file changed, 98 insertions(+), 18 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1bfbd711..8d91e0169 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -66,16 +66,16 @@ textarea { } input { - border: 1px solid #666666; + border: 1px solid $input_border; -moz-border-radius: $radiuspx; border-radius: $radiuspx; padding: 3px; } input[type="submit"] { - background-color: #F0F0F0; + background-color: $input_bgsubmit; font-weight: bold; - color: #0080FF; + color: $input_linksubmit; text-decoration: none; } @@ -101,10 +101,10 @@ code { } blockquote { - background-color: #f4f8f9; - border-left: 4px solid #dae4ee; + background-color: $blockquote_bgcolour; + border-left: 4px solid $blockquote_bordercolour; padding: 0.4em; - color: #000; + color: $blockquote_colour; margin-left: 20px; } @@ -230,7 +230,16 @@ footer { /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { - color: #444444 !important; + color: $selected_active_colour !important; + text-decoration: $selected_active_deco !important; +} + +.fileas-all { + text-decoration: none !important; +} + +.fileas-all:hover { + text-decoration: underline !important; } #sysmsg { @@ -1391,23 +1400,29 @@ brain is weird like that */ /* autocomplete popup */ .acpopup { max-height:150px; - background-color:#ffffff; + background-color:$acpopup_bgcolour; overflow:auto; z-index:100000; - border:1px solid #cccccc; + border:1px solid $acpopup_bordercolour; } .acpopupitem { - background-color:#ffffff; padding: 4px; + background-color:$acpopup_bgcolour; padding: 4px; clear:left; } .acpopupitem.taggable { - background-color: #ddddff; + background-color: $acpopup_tgbl_bgcolour; } .acpopupitem img { float: left; margin-right: 4px; } +.acpopupitem:hover { + text-decoration: underline; + color: $acpopup_hovercolour; + cursor:pointer; +} + .acpopupitem.selected { color: #FFFFFF; background: #3465A4; } @@ -1531,11 +1546,12 @@ header { } .notif-item a { - color: #000000; + color: $notif_itemcolour; } .notif-item a:hover { text-decoration: underline; + color: $notif_itemhovercolour; } .notif-image { @@ -1544,8 +1560,27 @@ header { padding: 7px 7px 0px 0px; } -.notify-seen { - background: #DDDDDD; + +#nav-notify-menu { + background: $notify_bgcolour; +} + +#nav-notify-menu a { + color: $notify_linkcolour; +} + +#nav-notify-menu a:hover { + background: $notify_bghover; +} + +.notify-seen a { + background: $notifyseen_bgcolour; + color: $notifyseen_linkcolour !important; +} + +.notify-seen a:hover { + background: $notifyseen_bghover; + color: $notifyseen_linkhover !important; } #page-spinner { @@ -1892,14 +1927,14 @@ img.mail-list-sender-photo { border-radius: $radiuspx; background-color: $item_colour; opacity: $item_opacity; - border-left: 2px solid #f4f4f4; - border-bottom: 1px solid #f4f4f4; + border-left: 2px solid $item_bordercolour; + border-bottom: 1px solid $item_bordercolour; } .wall-item-comment-wrapper { margin-top: 10px; - border-left: 2px solid #f4f4f4; - border-bottom: 1px solid #f4f4f4; + border-left: 2px solid $item_bordercolour; + border-bottom: 1px solid $item_bordercolour; } .wallwall .wwto { @@ -2138,6 +2173,8 @@ blockquote { border-radius: $radiuspx; } + + .dropdown-menu img { border-radius: $radiuspx; } @@ -2209,6 +2246,48 @@ blockquote { box-shadow: none; } +.nav-tabs{ + border-bottom:1px solid $navtabs_borderc !important; +} + +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{ + color: $navtabs_fontcolour !important; + background-color: $navtabs_bgcolour; +} + +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ + border:1px solid $navtabs_borderc !important; + border-bottom:1px solid transparent !important; + bottom: -1px !important; +} + +.nav-tabs.nav-justified > li > a { + border-bottom: none; + $navtabs_linkcolour +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: $navtabs_decohover; + background-color: $navtabs_bgchover; + border-bottom: 1px solid $navtabs_bgchover; + border-color: $navtabs_bgchover; + $navtabs_linkchover +} + +.btn-default { + background-color: $editbuttons_bgcolour; + border-color: $editbuttons_bordercolour; + 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_bordercolour; + color: $input_colourhover; + text-decoration: $input_decohover; +} + @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); @@ -2256,4 +2335,5 @@ blockquote { .acl-list-item { width: calc(100% - 10px); } + } -- cgit v1.2.3 From 68545ceeb61cd833f6560156cf2ced9c9ecd6c43 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Wed, 16 Apr 2014 21:51:13 +0000 Subject: Dark schema: fixed code view, ACL window and preview --- view/theme/redbasic/css/style.css | 23 +++++++++++------ ..._black_diagonal_stripes_background_seamless.gif | Bin 0 -> 4970 bytes view/theme/redbasic/php/style.php | 28 +++++++++++++++++++-- view/theme/redbasic/schema/dark.php | 16 ++++++++++++ 4 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8d91e0169..60d0f4bc6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -92,9 +92,9 @@ code { font-family: Courier, monospace; display: block; overflow: auto; - border: 1px solid #444; - background: #EEE; - color: #444; + border: 1px solid $code_borderc; + background: $code_bgcolour; + color: $code_txtcolour; padding: 10px; margin-top: 20px; max-width: 80%; @@ -216,7 +216,7 @@ footer { } .preview { - background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); + background: url('../img/$preview_backgroundimg'); } #theme-preview { @@ -1592,6 +1592,10 @@ header { clear: both; } +.modal-content { + background-color: $acl_bgcolour; +} + #acl-search { margin-top: 20px; padding: 8px; @@ -1609,7 +1613,7 @@ header { #acl-list { display: block; - border: 1px solid #cccccc; + border: 1px solid $acl_bordercolour; overflow: auto; clear: both; min-height: 62px; @@ -1622,7 +1626,7 @@ header { .acl-list-item { width: calc(50% - 10px); - border: 1px solid #cccccc; + border: 1px solid $acl_bordercolour; margin: 0px 0px 10px 10px; padding: 5px; float: left; @@ -1658,6 +1662,11 @@ header { .acl-button-hide { float: right; margin-left: 5px; + $aclbutton_linkcolour +} + +#acl-showall { + $aclbutton_linkcolour } .contact-block-content { @@ -2109,7 +2118,7 @@ img.mail-list-sender-photo { } .abook-self { - background-color: #ffdddd; + background-color: $abookself_bgcolour; } .online-now { diff --git a/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif new file mode 100644 index 000000000..615c986bd Binary files /dev/null and b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif differ diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 8984df788..f25d7228a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -137,6 +137,12 @@ if(! $a->install) { $blockquote_bgcolour = "#f4f8f9"; if (! $blockquote_bordercolour) $blockquote_bordercolour = "#dae4ee"; + if (! $code_borderc) + $code_borderc = "#444"; + if (! $code_bgcolour) + $code_bgcolour = "#EEE"; + if (! $code_txtcolour) + $code_txtcolour = "#444"; if (! $notif_itemcolour) $notif_itemcolour = "#000"; if (! $notif_itemhovercolour) @@ -147,6 +153,8 @@ if(! $a->install) { $editbuttons_bordercolour = "#ccc"; if (! $editbuttons_bghover) $editbuttons_bghover = "#ebebeb"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif"; if (! $acpopup_bgcolour) $acpopup_bgcolour = "#fff"; if (! $acpopup_bordercolour) @@ -184,10 +192,18 @@ if(! $a->install) { if (! $shadow) $shadow = "0"; if(! $active_colour) - $active_colour = '#fff'; + $active_colour = "#fff"; if (! $converse_width) { - $converse_width="1024px"; + $converse_width = "1024px"; } + if (! $acl_bgcolour) + $acl_bgcolour = "#fff"; + if (! $acl_bordercolour) + $acl_bordercolour = "#ccc"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = ""; + if (! $abookself_bgcolour) + $abookself_bgcolour = "#ffdddd"; if(! $top_photo) $top_photo = '48px'; $pmenu_top = intval($top_photo) - 16 . 'px'; @@ -248,11 +264,15 @@ $options = array ( '$blockquote_bgcolour' => $blockquote_bgcolour, '$blockquote_bordercolour' => $blockquote_bordercolour, '$blockquote_bgcolourhover' => $blockquote_bgcolourhover, +'$code_borderc' => $code_borderc, +'$code_bgcolour' => $code_bgcolour, +'$code_txtcolour' => $code_txtcolour, '$notif_itemcolour' => $notif_itemcolour, '$notif_itemhovercolour' => $notif_itemhovercolour, '$editbuttons_bgcolour' => $editbuttons_bgcolour, '$editbuttons_bordercolour' => $editbuttons_bordercolour, '$editbuttons_bghover' => $editbuttons_bghover, +'$preview_backgroundimg' => $preview_backgroundimg, '$acpopup_bgcolour' => $acpopup_bgcolour, '$acpopup_bordercolour' => $acpopup_bordercolour, '$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour, @@ -273,6 +293,10 @@ $options = array ( '$shadow' => $shadow, '$active_colour' => $active_colour, '$converse_width' => $converse_width, +'$acl_bgcolour' => $acl_bgcolour, +'$acl_bordercolour' => $acl_bordercolour, +'$aclbutton_linkcolour' => $aclbutton_linkcolour, +'$abookself_bgcolour' => $abookself_bgcolour, '$nav_float_min_opacity' => $nav_float_min_opacity, '$nav_percent_min_opacity' => $nav_percent_min_opacity, '$top_photo' => $top_photo, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 27fbd26fc..1572ea9b0 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -56,6 +56,12 @@ $blockquote_bgcolour = "#1e1e1e"; if (! $blockquote_bordercolour) $blockquote_bordercolour = "#666"; + if (! $code_borderc) + $code_borderc = "#090909"; + if (! $code_bgcolour) + $code_bgcolour = "#000"; + if (! $code_txtcolour) + $code_txtcolour = "#fff"; if (! $item_bordercolour) $item_bordercolour = "#333"; if (! $notif_itemcolour) @@ -76,6 +82,8 @@ $editbuttons_bordercolour = "#222"; if (! $editbuttons_bghover) $editbuttons_bghover = "#222"; + if (! $preview_backgroundimg) + $preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif"; if (! $notify_bgcolour) $notify_bgcolour = "#000"; if (! $notify_linkcolour) @@ -100,3 +108,11 @@ $input_colourhover = "#fff"; if (! $input_decohover) $input_decohover = "underline"; + if (! $acl_bgcolour) + $acl_bgcolour = "#111"; + if (! $acl_bordercolour) + $acl_bordercolour = "#333"; + if (! $aclbutton_linkcolour) + $aclbutton_linkcolour = "color: #fff;"; + if (! $abookself_bgcolour) + $abookself_bgcolour = "#251111"; -- cgit v1.2.3 From 1b0bf90d13a9db0976fa3bcddf50e56e57d0185a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 16:41:44 -0700 Subject: first cut - straighten out the margins --- view/theme/redbasic/css/style.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1bfbd711..7ccee2a32 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -228,6 +228,12 @@ footer { margin-bottom: 15px; } +aside ul { + list-style-type: none; + margin: 0; + padding: 0; +} + /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; @@ -2059,7 +2065,7 @@ img.mail-list-sender-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; } - +/* .categories-ul { list-style-type: none; } @@ -2067,6 +2073,7 @@ img.mail-list-sender-photo { #sidebar-group-list ul, #posted-date-selector { list-style-type: none; } +*/ .profile-thing-list img, .thing-show img, .thing-edit-links a { margin-top: 8px; -- cgit v1.2.3 From 558e283260f097c2a85ddc8e7bb907d878d046a1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 18:28:36 -0700 Subject: button cleanup directory page --- view/theme/redbasic/css/style.css | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1bfbd711..a03a1f2e3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -632,14 +632,6 @@ footer { margin-top: 20px; } -#side-peoplefind-url { - margin-top: 5px; -} - -#side-peoplefind-url { - font-size: 1em; -} - #side-peoplefind-url::-webkit-input-placeholder { font-family: FontAwesome; } @@ -648,9 +640,6 @@ footer { font-family: FontAwesome; } -#side-peoplefind-submit { - margin-top: 15px; -} #side-match-link { margin-top: 10px; -- cgit v1.2.3 From c7712d3b45289552ce460f4802ccf934a380c69d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 18:35:37 -0700 Subject: bug fixes after widget cleanup --- view/theme/redbasic/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a03a1f2e3..0f58b3194 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -632,11 +632,11 @@ footer { margin-top: 20px; } -#side-peoplefind-url::-webkit-input-placeholder { +#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder { font-family: FontAwesome; } -#side-peoplefind-url::-moz-placeholder { +#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder { font-family: FontAwesome; } -- cgit v1.2.3 From acc70b9deb36e7114d4738f6b29f4f780a45a1be Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 20:09:19 -0700 Subject: fixing widgets --- view/theme/redbasic/css/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7ccee2a32..26bfdb656 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -234,6 +234,10 @@ aside ul { padding: 0; } +aside li { + margin-top: 5px; +} + /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: #444444 !important; @@ -1730,10 +1734,6 @@ margin-right: 50px; list-style-type: none; } -.pmenu li { - margin-left: -20px; -} - .admin-icons { font-size: 1.2em; color: $toolicon_colour; -- cgit v1.2.3 From be498be840fd23bc6dc45d6fdef6291621635f02 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 21:08:43 -0700 Subject: a few more alignment issues --- view/theme/redbasic/css/style.css | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a7d99efb1..73893ec28 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -480,18 +480,6 @@ aside li { } -.settings-widget ul { - list-style-type: none; - padding: 0px; -} - -.settings-widget li { - margin-left: 24px; - margin-bottom: 8px; -} - - - #fsuggest-desc, #fsuggest-submit-wrapper { margin-top: 15px; margin-bottom: 15px; @@ -1235,6 +1223,10 @@ brain is weird like that */ } +.field input[type="checkbox"] { + width: 16px; +} + .field .onoff { float: left; width: 80px; -- cgit v1.2.3 From 962665b8b56491dc59a62f2cb5c05eb353abb79f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 21:46:06 -0700 Subject: saved search adjustments --- view/theme/redbasic/css/style.css | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 73893ec28..0618a3612 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -629,11 +629,6 @@ aside li { color: #0080FF; } -#netsearch-box { margin-bottom: 5px; } - -#search-save { - margin: 5px 0 0 5px; -} #side-follow-wrapper { margin-top: 20px; @@ -1108,14 +1103,6 @@ aside li { } -#netsearch-box { - margin-top: 20px; -} - -#netsearch-box #search-submit { - margin: 5px 0px 0px 0px; -} - .required { color: #FF0000; } -- cgit v1.2.3 From 8dcf9e78e179547f05f1eec40a9f93a2ed6a9d69 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 17 Apr 2014 01:33:44 -0700 Subject: This preserves the alignment work done earlier but provides a more aesthetically pleasing page. --- view/theme/redbasic/css/style.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0618a3612..e9620cadb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -236,6 +236,8 @@ aside ul { aside li { margin-top: 5px; + /* in order to achieve consistent indentation cross-browser, set margin-left on the li element e.g. */ + /* margin-left: 10px; */ } /*TODO: we should use one class for all this. */ -- cgit v1.2.3 From ca5f7ef446a230e53daeb1e6ca8c6ff5d69a6a18 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 17 Apr 2014 15:18:53 +0000 Subject: Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now). --- view/theme/redbasic/css/style.css | 21 ++++++++++++++++++--- view/theme/redbasic/php/style.php | 6 ++++++ view/theme/redbasic/schema/dark.php | 4 ++++ 3 files changed, 28 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 35cf66991..033be8564 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1541,15 +1541,15 @@ header { } -#nav-notify-menu { +#nav-notify-menu, #nav-network-menu, #nav-home-menu { background: $notify_bgcolour; } -#nav-notify-menu a { +#nav-notify-menu a, #nav-network-menu a, #nav-home-menu a { color: $notify_linkcolour; } -#nav-notify-menu a:hover { +#nav-notify-menu a:hover, #nav-network-menu a:hover, #nav-home-menu a:hover { background: $notify_bghover; } @@ -2139,6 +2139,21 @@ nav .dropdown-menu { border-top-left-radius: 0px; border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; + background-color: $notify_bgcolour; +} + +nav .dropdown-menu .divider{ + background-color: $navmenu_bgchover; +} + +nav .dropdown-menu>li>a{ + color: $notify_linkcolour; +} + +nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ + color: $notify_linkcolour; + background-color: $navmenu_bgchover; + $navmenu_bgimage } #usermenu-caret { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index f25d7228a..5546b134e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -87,6 +87,10 @@ if(! $a->install) { $nav_icon_colour = "#999"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; + if (! $navmenu_bgchover) + $navmenu_bgchover = "#f5f5f5"; + if (! $navmenu_bgimage) + $navmenu_bgimage = ""; if (! $navtabs_borderc) $navtabs_borderc = "#ddd"; if (! $navtabs_fontcolour) @@ -238,6 +242,8 @@ $options = array ( '$nav_bd' => $nav_bd, '$nav_icon_colour' => $nav_icon_colour, '$nav_active_icon_colour' => $nav_active_icon_colour, +'$navmenu_bgchover' => $navmenu_bgchover, +'$navmenu_bgimage' => $navmenu_bgimage, '$navtabs_borderc' => $navtabs_borderc, '$navtabs_fontcolour' => $navtabs_fontcolour, '$navtabs_bgcolour' => $navtabs_bgcolour, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 1572ea9b0..063df9210 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -16,6 +16,10 @@ $nav_icon_colour = "#999"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; + if (! $navmenu_bgchover) + $navmenu_bgchover = "#222"; + if (! $navmenu_bgimage) + $navmenu_bgimage = "background-image: none;"; if (! $navtabs_borderc) $navtabs_borderc = "#333"; if (! $navtabs_fontcolour) -- cgit v1.2.3 From c463eb932c821fc956a5edb11aac5ac6e1aa31e2 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 17 Apr 2014 20:46:14 +0000 Subject: tiny fix hover preview button --- 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 033be8564..39cfcaec3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2289,6 +2289,10 @@ blockquote { text-decoration: $input_decohover; } +.btn-primary { + z-index: 10; +} + @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); -- cgit v1.2.3 From 59eb3b3351ca38851248aa4b3b072e160dc9555b Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 18 Apr 2014 12:57:42 +0000 Subject: Little fix and previous fix on a different place --- view/theme/redbasic/css/style.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 39cfcaec3..c43ed5a7e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1386,7 +1386,7 @@ brain is weird like that */ border:1px solid $acpopup_bordercolour; } .acpopupitem { - background-color:$acpopup_bgcolour; padding: 4px; + background-color:$acpopup_bgcolour; clear:left; } .acpopupitem.taggable { @@ -2289,8 +2289,9 @@ blockquote { text-decoration: $input_decohover; } -.btn-primary { - z-index: 10; +.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { + text-decoration: none; + z-index: 0; } @media screen and (max-width: 767px) { -- cgit v1.2.3 From 2ac7fb49b6567f31644da99da5b43fabf09fe067 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 18 Apr 2014 15:08:16 +0000 Subject: This should fix the preview allignment permantly. --- view/theme/redbasic/css/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c43ed5a7e..74738c537 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2291,7 +2291,10 @@ blockquote { .btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { text-decoration: none; - z-index: 0; +} + +.btn-preview, .btn-preview:hover, .btn-preview:focus, .btn-preview:active { + margin-right: 1px; } @media screen and (max-width: 767px) { -- cgit v1.2.3 From ae1f9bf1c44cffa00b8aff566eef0f22bc26e720 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 18 Apr 2014 15:31:15 -0700 Subject: move create a new collection below the actual collection list again. failed experiment. --- view/theme/redbasic/css/style.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 39cfcaec3..c1bf257e1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -232,6 +232,9 @@ aside ul { list-style-type: none; margin: 0; padding: 0; + /* border-left: 1px solid #eee; This and a 5px left border on the li is "interesting" + to delineate the list from the surrounding bits + */ } aside li { -- cgit v1.2.3 From 2a336dbf7f43ef7f54122c2d9ce1d4dd5064209f Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sat, 19 Apr 2014 01:33:30 +0000 Subject: Workaround alignment notify menu's --- view/theme/redbasic/css/style.css | 6 +++++- view/theme/redbasic/php/style.php | 3 +++ view/theme/redbasic/schema/dark.php | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1846c023b..03c17e0a4 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1545,7 +1545,9 @@ header { #nav-notify-menu, #nav-network-menu, #nav-home-menu { - background: $notify_bgcolour; + background-color: $notify_bgcolour; + border-top: none; + margin-top: $notify_topmargin; } #nav-notify-menu a, #nav-network-menu a, #nav-home-menu a { @@ -2143,6 +2145,8 @@ nav .dropdown-menu { border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; background-color: $notify_bgcolour; + border-top: none; + margin-top: $notify_topmargin; } nav .dropdown-menu .divider{ diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 5546b134e..87e0b12bb 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -181,6 +181,8 @@ if(! $a->install) { $notifyseen_bghover = "#e7e7e7"; if (! $notifyseen_linkhover) $notifyseen_linkhover = "#333"; + if (! $notify_topmargin) + $notify_topmargin = "1px"; if (! $input_bgsubmit) $input_bgsubmit = "#F0F0F0"; if (! $input_linksubmit) @@ -290,6 +292,7 @@ $options = array ( '$notifyseen_linkcolour' => $notifyseen_linkcolour, '$notifyseen_bghover' => $notifyseen_bghover, '$notifyseen_linkhover' => $notifyseen_linkhover, +'$notify_topmargin' => $notify_topmargin, '$input_bgsubmit' => $input_bgsubmit, '$input_linksubmit' => $input_linksubmit, '$input_border' => $input_border, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 063df9210..be1777427 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -94,6 +94,9 @@ $notify_linkcolour = "#FFF"; if (! $notify_bghover) $notify_bghover = "#222"; + $notifyseen_linkhover = "#333"; + if (! $notify_topmargin) + $notify_topmargin = "-1px"; if (! $notifyseen_bgcolour) $notifyseen_bgcolour = "#111"; if (! $notifyseen_linkcolour) -- cgit v1.2.3 From 9da7da1cbd46fa7d1ee311d4615971012e1c21a5 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sat, 19 Apr 2014 12:11:58 +0000 Subject: Oeps --- view/theme/redbasic/schema/dark.php | 1 - 1 file changed, 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index be1777427..0aa81cef5 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -94,7 +94,6 @@ $notify_linkcolour = "#FFF"; if (! $notify_bghover) $notify_bghover = "#222"; - $notifyseen_linkhover = "#333"; if (! $notify_topmargin) $notify_topmargin = "-1px"; if (! $notifyseen_bgcolour) -- cgit v1.2.3