causefx 8 роки тому
батько
коміт
07608ce417
2 змінених файлів з 34 додано та 23 видалено
  1. 33 22
      api/functions/organizr-functions.php
  2. 1 1
      js/functions.js

+ 33 - 22
api/functions/organizr-functions.php

@@ -579,23 +579,32 @@ function getCustomizeAppearance()
 					'value' => $GLOBALS['alternateHomepageHeaders']
 				)
 			),
-			'custom' => '
-            <div class="row">
-                <div class="col-lg-12">
-                    <div class="panel panel-info">
-                        <div class="panel-heading">
-                            <span lang="en">Notice</span>
-                        </div>
-                        <div class="panel-wrapper collapse in" aria-expanded="true">
-                            <div class="panel-body">
-                                <span lang="en">The value of #987654 is just a placeholder, you can change to any value you like.</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            ',
 			'Colors & Themes' => array(
+				array(
+					'type' => 'html',
+					'override' => 12,
+					'label' => 'Custom CSS [Can replace colors from above]',
+					'html' => '
+					<div class="row">
+					    <div class="col-lg-12">
+					        <div class="panel panel-info">
+					            <div class="panel-heading">
+					                <span lang="en">Notice</span>
+					            </div>
+					            <div class="panel-wrapper collapse in" aria-expanded="true">
+					                <div class="panel-body">
+					                    <span lang="en">The value of #987654 is just a placeholder, you can change to any value you like.</span>
+					                </div>
+					            </div>
+					        </div>
+					    </div>
+					</div>
+					',
+				),
+				array(
+					'type' => 'blank',
+					'label' => ''
+				),
 				array(
 					'type' => 'input',
 					'name' => 'headerColor',
@@ -704,6 +713,14 @@ function getCustomizeAppearance()
 							'value' => 'horizontal'
 						)
 					)
+				)
+			),
+			'Custom CSS' => array(
+				array(
+					'type' => 'html',
+					'override' => 12,
+					'label' => 'Custom CSS [Can replace colors from above]',
+					'html' => '<button type="button" class="hidden saveCss btn btn-info btn-circle pull-right m-r-5 m-l-10"><i class="fa fa-save"></i> </button><div id="customCSSEditor" style="height:300px">' . $GLOBALS['customCss'] . '</div>'
 				),
 				array(
 					'type' => 'textbox',
@@ -714,12 +731,6 @@ function getCustomizeAppearance()
 					'placeholder' => 'No <style> tags needed',
 					'attr' => 'rows="10"',
 				),
-				array(
-					'type' => 'html',
-					'override' => 12,
-					'label' => 'Custom CSS [Can replace colors from above]',
-					'html' => '<button type="button" class="hidden saveCss btn btn-info btn-circle pull-right m-r-5 m-l-10"><i class="fa fa-save"></i> </button><div id="customCSSEditor" style="height:300px">' . $GLOBALS['customCss'] . '</div>'
-				),
 			)
 		);
 	}

+ 1 - 1
js/functions.js

@@ -681,7 +681,7 @@ function buildPluginsItem(array){
 						</div>
 					</div>
 					<div class="el-card-content">
-						<h3 class="box-title">`+v.name+`</h3>
+						<h3 class="box-title elip">`+v.name+`</h3>
 						<small class="elip text-uppercase p-b-10">`+v.category+`</small>
 					</div>
 				</div>