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

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

Browse Source
This commit is contained in:
friendica 2014-03-03 14:39:42 -08:00
commit a36014f011
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -748,7 +748,7 @@ footer {
display: block; display: block;
color: #FFFFFF; color: #FFFFFF;
margin-top: 15px; margin-top: 15px;
background-color: $nav_bg_2; background-color: $nav_bg;
-webkit-border-radius: $radiuspx ; -webkit-border-radius: $radiuspx ;
-moz-border-radius: $radiuspx; -moz-border-radius: $radiuspx;
border-radius: $radiuspx; border-radius: $radiuspx;
@ -837,7 +837,7 @@ footer {
#nav-search-spinner { #nav-search-spinner {
float: left; float: left;
margin: 25px 0px 0px 25px; margin: 25px 0px 0px 25px;
color: #fff; color: $nav_active_icon_colour;
} }
#nav-search-text:hover, #nav-search-text:hover,
@ -1490,7 +1490,7 @@ div.jGrowl div.info {
#nav-search-text-ac .autocomplete { #nav-search-text-ac .autocomplete {
position: fixed; position: fixed;
top: 51px; top: 51px;
border: 1px solid #222; border: 1px solid $nav_bd;
border-top: none; border-top: none;
} }
@ -2262,5 +2262,11 @@ blockquote {
.navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:hover,
.navbar-inverse .navbar-nav > .active > a:focus { .navbar-inverse .navbar-nav > .active > a:focus {
color: $nav_active_icon_colour; color: $nav_active_icon_colour;
background-color: $nav_bg; }
.navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav > .open > a:focus {
background-color: $nav_bd;
color: $nav_active_icon_colour;
} }

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

@ -89,7 +89,9 @@ if(! $a->install) {
if (! $link_colour) if (! $link_colour)
$link_colour = "#0080FF"; $link_colour = "#0080FF";
if (! $banner_colour) if (! $banner_colour)
$banner_colour = "fff"; $banner_colour = "#fff";
if (! $search_background)
$search_background = "#eee";
if (! $bgcolour) if (! $bgcolour)
$bgcolour = "#fdfdfd"; $bgcolour = "#fdfdfd";
if (! $background_image) if (! $background_image)

2
view/theme/redbasic/schema/BS-Default.php
View File

@ -16,3 +16,5 @@
$nav_icon_colour = "#777"; $nav_icon_colour = "#777";
if (! $nav_active_icon_colour) if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#555"; $nav_active_icon_colour = "#555";
if (! $radius)
$radius = "4";