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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	include/items.php
	util/messages.po
This commit is contained in:
redmatrix
2015-06-21 20:51:07 -07:00
parent 33c9d8e06b 0ad71b3efa
commit ae6612025d
29 changed files with 542 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1889,7 +1889,6 @@ nav .dropdown-menu {
color: #31708f;
background-color: #d9edf7;
margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center;
}
@@ -1898,7 +1897,6 @@ nav .dropdown-menu {
color: #8a6d3b;
background-color: #fcf8e3;
margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center;
}
@@ -1907,10 +1905,20 @@ nav .dropdown-menu {
color: #a94442;
background-color: #f2dede;
margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center;
}
.section-content-tools-wrapper .section-content-info-wrapper,
.section-content-wrapper .section-content-info-wrapper,
.section-content-tools-wrapper .section-content-warning-wrapper,
.section-content-wrapper .section-content-warning-wrapper,
.section-content-tools-wrapper .section-content-danger-wrapper,
.section-content-wrapper .section-content-danger-wrapper {
margin-bottom: 0px;
border-radius: $radiuspx;
}
.section-content-wrapper {
padding: 7px 10px;
background-color: $comment_item_colour;

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

@@ -84,8 +84,10 @@ function redbasic_form(&$a, $arr) {
if($files) {
foreach($files as $file) {
$f = basename($file, ".php");
$scheme_name = $f;
$scheme_choices[$f] = $scheme_name;
if($f != 'default') {
$scheme_name = $f;
$scheme_choices[$f] = $scheme_name;
}
}
}

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

@@ -70,6 +70,7 @@ if (($schema) && ($schema != '---')) {
// If we haven't got a schema, load the default. We shouldn't touch this - we
// should leave it for admins to define for themselves.
// default.php and default.css MUST be symlinks to existing schema files.
if (! $schema) {
if(file_exists('view/theme/redbasic/schema/default.php')) {