harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-04-17 20:07:02 -07:00
commit ac07b1b0ae
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
view/theme/redbasic/css/style.css
View File

@ -1541,15 +1541,15 @@ header {
} }
#nav-notify-menu { #nav-notify-menu, #nav-network-menu, #nav-home-menu {
background: $notify_bgcolour; background: $notify_bgcolour;
} }
#nav-notify-menu a { #nav-notify-menu a, #nav-network-menu a, #nav-home-menu a {
color: $notify_linkcolour; 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; background: $notify_bghover;
} }
@ -2139,6 +2139,21 @@ nav .dropdown-menu {
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-bottom-right-radius: $radiuspx; border-bottom-right-radius: $radiuspx;
border-bottom-left-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 { #usermenu-caret {
@ -2274,6 +2289,10 @@ blockquote {
text-decoration: $input_decohover; text-decoration: $input_decohover;
} }
.btn-primary {
z-index: 10;
}
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
aside#region_1 { aside#region_1 {
background: rgba(0, 0, 0, .1); background: rgba(0, 0, 0, .1);

6
view/theme/redbasic/php/style.php
View File

@ -87,6 +87,10 @@ if(! $a->install) {
$nav_icon_colour = "#999"; $nav_icon_colour = "#999";
if (! $nav_active_icon_colour) if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff"; $nav_active_icon_colour = "#fff";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#f5f5f5";
if (! $navmenu_bgimage)
$navmenu_bgimage = "";
if (! $navtabs_borderc) if (! $navtabs_borderc)
$navtabs_borderc = "#ddd"; $navtabs_borderc = "#ddd";
if (! $navtabs_fontcolour) if (! $navtabs_fontcolour)
@ -238,6 +242,8 @@ $options = array (
'$nav_bd' => $nav_bd, '$nav_bd' => $nav_bd,
'$nav_icon_colour' => $nav_icon_colour, '$nav_icon_colour' => $nav_icon_colour,
'$nav_active_icon_colour' => $nav_active_icon_colour, '$nav_active_icon_colour' => $nav_active_icon_colour,
'$navmenu_bgchover' => $navmenu_bgchover,
'$navmenu_bgimage' => $navmenu_bgimage,
'$navtabs_borderc' => $navtabs_borderc, '$navtabs_borderc' => $navtabs_borderc,
'$navtabs_fontcolour' => $navtabs_fontcolour, '$navtabs_fontcolour' => $navtabs_fontcolour,
'$navtabs_bgcolour' => $navtabs_bgcolour, '$navtabs_bgcolour' => $navtabs_bgcolour,

4
view/theme/redbasic/schema/dark.php
View File

@ -16,6 +16,10 @@
$nav_icon_colour = "#999"; $nav_icon_colour = "#999";
if (! $nav_active_icon_colour) if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff"; $nav_active_icon_colour = "#fff";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#222";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc) if (! $navtabs_borderc)
$navtabs_borderc = "#333"; $navtabs_borderc = "#333";
if (! $navtabs_fontcolour) if (! $navtabs_fontcolour)