Reorganise code editor prefs
Fixes visual bugs Update dashboard icon Restyle flash messages
This commit is contained in:
Samuel Georges
parent
d6a7fdc74c
commit
1608d80127
|
|
@ -665,7 +665,7 @@ body.slim-container .layout.layout-container,body.slim-container .layout .layout
|
|||
.flex-layout-item.width-300{width:300px}
|
||||
body.mainmenu-open{overflow:hidden}
|
||||
.mainmenu-tooltip .tooltip-inner{font-size:13px;padding:6px 16px;border-radius:0}
|
||||
nav#layout-mainmenu{background-color:#111111;padding:0 0 0 20px;line-height:0;white-space:nowrap;vertical-align:top}
|
||||
nav#layout-mainmenu{background-color:#000000;padding:0 0 0 20px;line-height:0;white-space:nowrap;vertical-align:top}
|
||||
nav#layout-mainmenu a{text-decoration:none}
|
||||
nav#layout-mainmenu a:focus{background:transparent}
|
||||
nav#layout-mainmenu ul{margin:0;padding:0;list-style:none;float:left;white-space:nowrap;overflow:hidden}
|
||||
|
|
@ -710,6 +710,7 @@ nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon i,nav#layo
|
|||
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-label{line-height:30px}
|
||||
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:first-child{margin-left:-13px}
|
||||
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child{margin-right:0}
|
||||
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li.active{background:#262626;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25)}
|
||||
nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li.active:first-child{margin-left:0}
|
||||
nav#layout-mainmenu.navbar-mode-tile{height:78px}
|
||||
nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-preview a{height:78px;line-height:78px}
|
||||
|
|
@ -722,6 +723,7 @@ nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a .nav-label{display:blo
|
|||
nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li{padding:0 15px;margin:7px 0 0}
|
||||
nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:first-child{margin-left:-7px}
|
||||
nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;z-index:2}
|
||||
nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li.active{background:#262626;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25)}
|
||||
nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li.active:first-child{margin-left:0}
|
||||
nav#layout-mainmenu .menu-toggle{height:45px;line-height:45px;font-size:16px;display:none}
|
||||
nav#layout-mainmenu .menu-toggle .menu-toggle-icon{background:#333;display:inline-block;height:45px;line-height:45px;width:45px;text-align:center}
|
||||
|
|
@ -744,7 +746,7 @@ nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after{right:13px}
|
|||
nav#layout-mainmenu.navbar ul.nav{display:none}
|
||||
nav#layout-mainmenu.navbar .menu-toggle{display:inline-block;color:#ffffff !important}
|
||||
}
|
||||
.mainmenu-collapsed{position:absolute;height:100%;top:0;left:0;margin:0;background:#111111}
|
||||
.mainmenu-collapsed{position:absolute;height:100%;top:0;left:0;margin:0;background:#000000}
|
||||
.mainmenu-collapsed > div{display:block;height:100%}
|
||||
.mainmenu-collapsed > div ul.mainmenu-nav li a{position:relative;width:65px;height:65px}
|
||||
.mainmenu-collapsed > div ul.mainmenu-nav li a .nav-icon{text-align:center;display:block;position:absolute;top:50%;left:50%;margin-left:-15px;margin-top:-26.5px;width:30px;height:30px}
|
||||
|
|
@ -753,6 +755,7 @@ nav#layout-mainmenu.navbar .menu-toggle{display:inline-block;color:#ffffff !impo
|
|||
.mainmenu-collapsed > div ul.mainmenu-nav li{padding:0 15px;margin:7px 0 0}
|
||||
.mainmenu-collapsed > div ul.mainmenu-nav li:first-child{margin-left:-7px}
|
||||
.mainmenu-collapsed > div ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;z-index:2}
|
||||
.mainmenu-collapsed > div ul.mainmenu-nav li.active{background:#262626;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.25)}
|
||||
.mainmenu-collapsed > div ul.mainmenu-nav li.active:first-child{margin-left:0}
|
||||
.mainmenu-collapsed > div ul.mainmenu-nav li:first-child{margin-left:0}
|
||||
.mainmenu-collapsed > div ul{margin:0;padding:5px 0 15px 15px;overflow:hidden}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,13 @@
|
|||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="home" sketch:type="MSLayerGroup">
|
||||
<path d="M38,35 L2,35 L2,19 L20,2 L38,19 L38,35 Z" id="Shape" fill="#E8EAF6" sketch:type="MSShapeGroup"></path>
|
||||
<g id="Group" transform="translate(2.000000, 5.000000)" fill="#C5CAE9" sketch:type="MSShapeGroup">
|
||||
<path d="M33,12 L28,7 L28,0 L33,0 L33,12 Z" id="Shape"></path>
|
||||
<rect id="Rectangle-path" x="0" y="30" width="36" height="5"></rect>
|
||||
</g>
|
||||
<path d="M20,0.3 L0,18.9 L2,21.1 L20,4.4 L38,21.1 L40,18.9 L20,0.3 Z" id="Shape" fill="#B71C1C" sketch:type="MSShapeGroup"></path>
|
||||
<rect id="Rectangle-path" fill="#D84315" sketch:type="MSShapeGroup" x="14" y="24" width="12" height="16"></rect>
|
||||
<rect id="Rectangle-path" fill="#01579B" sketch:type="MSShapeGroup" x="17" y="13" width="6" height="6"></rect>
|
||||
<path d="M23.5,31.5 C23.2,31.5 23,31.7 23,32 L23,34 C23,34.3 23.2,34.5 23.5,34.5 C23.8,34.5 24,34.3 24,34 L24,32 C24,31.7 23.8,31.5 23.5,31.5 L23.5,31.5 Z" id="Shape" fill="#FF8A65" sketch:type="MSShapeGroup"></path>
|
||||
<g id="speed" sketch:type="MSLayerGroup">
|
||||
<path fill="#7986CB" d="M20 3.542C9.14 3.542.336 12.347.336 23.207c0 4.713 1.66 9.032 4.424 12.42l1.552-3.105H33.69l1.55 3.104c2.763-3.387 4.425-7.706 4.425-12.42 0-10.86-8.806-19.664-19.665-19.664z"/>
|
||||
<path fill="#ECEFF1" d="M36.56 23.206c0-9.145-7.415-16.56-16.56-16.56-9.144 0-16.56 7.415-16.56 16.56 0 3.454 1.062 6.66 2.872 9.314L4.76 35.625h30.48l-1.55-3.104c1.807-2.654 2.87-5.86 2.87-9.314z"/>
|
||||
<path fill="#455A64" d="M3.473 22.17c-.02.345-.032.687-.032 1.036 0 .35.012.69.033 1.035h4.16c-.028-.34-.053-.686-.053-1.034 0-.35.024-.694.052-1.036h-4.16zm6.402 8.192c-.407-.557-.768-1.145-1.08-1.766l-3.55 2.157c.325.614.67 1.2 1.067 1.767l3.563-2.158zm2.823-17.187c.557-.405 1.146-.765 1.77-1.075l-2.114-3.585c-.615.322-1.226.69-1.792 1.083l2.136 3.577zM8.75 17.97c.293-.63.63-1.233 1.02-1.8l-3.567-2.125c-.378.576-.77 1.247-1.075 1.87L8.75 17.97zm12.286-7.13V6.68c-.346-.023-.687-.033-1.036-.033s-.69-.022-1.035 0v4.193c.343-.03.687-.054 1.035-.054s.692.025 1.036.053zm9.074 19.626l3.6 2.055c.378-.574.76-1.215 1.064-1.836l-3.646-2.018c-.293.628-.63 1.232-1.018 1.8zm6.417-6.226c.02-.344.032-.686.032-1.034 0-.35-.012-.69-.033-1.036h-4.16c.027.342.052.687.052 1.036 0 .35-.025.693-.053 1.035h4.16zm-7.41-14.858c-.573-.38-1.205-.74-1.827-1.047l-2.055 3.622c.63.293 1.235.63 1.802 1.02l2.08-3.595z"/>
|
||||
<path fill="#90A4AE" d="M15.86 28.38h8.28v2.07h-8.28v-2.07z"/>
|
||||
<path fill="none" stroke="#FF1744" stroke-miterlimit="10" d="M20 23.206l12.42-7.245"/>
|
||||
<path fill="#FF1744" d="M19.883 20.002c1.683 0 3.047 1.365 3.047 3.045 0 1.685-1.363 3.048-3.047 3.048-1.682 0-3.045-1.363-3.045-3.048 0-1.68 1.363-3.045 3.045-3.045z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.3 KiB |
|
|
@ -23,6 +23,19 @@ $(document).ready(function(){
|
|||
session.setFoldStyle($(this).val())
|
||||
})
|
||||
|
||||
$('#Form-field-Preferences-editor_autocompletion').on('change', function(){
|
||||
editor.setOption('enableBasicAutocompletion', false)
|
||||
editor.setOption('enableLiveAutocompletion', false)
|
||||
|
||||
var val = $(this).val()
|
||||
if (val == 'basic') {
|
||||
editor.setOption('enableBasicAutocompletion', true)
|
||||
}
|
||||
else if (val == 'live') {
|
||||
editor.setOption('enableLiveAutocompletion', true)
|
||||
}
|
||||
})
|
||||
|
||||
$('#Form-field-Preferences-editor_tab_size').on('change', function(){
|
||||
session.setTabSize($(this).val())
|
||||
})
|
||||
|
|
@ -31,18 +44,10 @@ $(document).ready(function(){
|
|||
editor.setShowInvisibles($(this).is(':checked'))
|
||||
})
|
||||
|
||||
$('#Form-field-Preferences-editor_enable_basic_autocompletion').on('change', function(){
|
||||
editor.setOption('enableBasicAutocompletion', $(this).is(':checked'))
|
||||
})
|
||||
|
||||
$('#Form-field-Preferences-editor_enable_snippets').on('change', function(){
|
||||
editor.setOption('enableSnippets', $(this).is(':checked'))
|
||||
})
|
||||
|
||||
$('#Form-field-Preferences-editor_enable_live_autocompletion').on('change', function(){
|
||||
editor.setOption('enableLiveAutocompletion', $(this).is(':checked'))
|
||||
})
|
||||
|
||||
$('#Form-field-Preferences-editor_display_indent_guides').on('change', function(){
|
||||
editor.setDisplayIndentGuides($(this).is(':checked'))
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
@color-border: #cccccc;
|
||||
@color-border-light: #e1e1e1;
|
||||
|
||||
@color-mainmenu: #111111;
|
||||
@color-mainmenu: #000000;
|
||||
@color-mainmenu-inactive: rgba(255,255,255,.6);
|
||||
@color-mainmenu-active: #ffffff;
|
||||
@color-mainmenu-active-bg: #262626;
|
||||
@color-mainmenu-collapsed: #111111;
|
||||
@color-mainmenu-collapsed: #000000;
|
||||
|
||||
@color-accountmenu-bg: #2b3e50;
|
||||
@color-accountmenu-divider: #4b6372;
|
||||
|
|
|
|||
|
|
@ -39,8 +39,9 @@ body.mainmenu-open {
|
|||
}
|
||||
|
||||
.mainmenu-item-link-active() {
|
||||
// background: @color-mainmenu-active-bg;
|
||||
// .border-radius(5px);
|
||||
background: @color-mainmenu-active-bg;
|
||||
.border-radius(3px);
|
||||
.box-shadow(inset 0 -2px 0 rgba(0,0,0,.25));
|
||||
}
|
||||
|
||||
.mainmenu-set-height(@height) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<?php namespace Backend\Controllers;
|
||||
|
||||
use Lang;
|
||||
use Flash;
|
||||
use Backend;
|
||||
use BackendMenu;
|
||||
use Backend\Classes\Controller;
|
||||
|
|
@ -64,6 +66,8 @@ class Preferences extends Controller
|
|||
$model = $this->formFindModelObject();
|
||||
$model->resetDefault();
|
||||
|
||||
Flash::success(Lang::get('backend::lang.form.reset_success'));
|
||||
|
||||
return Backend::redirect('backend/preferences');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@
|
|||
data-show-invisibles="<?= $model->editor_show_invisibles ?>"
|
||||
data-highlight-active-line="<?= $model->editor_highlight_active_line ?>"
|
||||
data-use-soft-tabs="<?= !$model->editor_use_hard_tabs ?>"
|
||||
data-enable-basic-autocompletion="<?= $model->editor_enable_basic_autocompletion ?>"
|
||||
data-enable-live-autocompletion="<?= $model->editor_enable_live_autocompletion ?>"
|
||||
data-autocompletion="<?= $model->editor_autocompletion ?>"
|
||||
data-enable-snippets="<?= $model->editor_enable_snippets ?>"
|
||||
data-display-indent-guides="<?= $model->editor_display_indent_guides ?>"
|
||||
data-show-print-margin="<?= $model->editor_show_print_margin ?>"
|
||||
|
|
|
|||
|
|
@ -73,20 +73,15 @@ class CodeEditor extends FormWidgetBase
|
|||
public $readOnly = false;
|
||||
|
||||
/**
|
||||
* @var boolean If true, the editor activate Basic Autocompletion if press Ctrl+Space
|
||||
* @var string Autocomplete mode: manual, basic, live.
|
||||
*/
|
||||
public $enableBasicAutocompletion = true;
|
||||
public $autocompletion = 'manual';
|
||||
|
||||
/**
|
||||
* @var boolean If true, the editor activate use Snippets
|
||||
*/
|
||||
public $enableSnippets = true;
|
||||
|
||||
/**
|
||||
* @var boolean If true, the editor activate Live Autocompletion mode
|
||||
*/
|
||||
public $enableLiveAutocompletion = true;
|
||||
|
||||
/**
|
||||
* @var boolean If true, the editor show Indent Guides
|
||||
*/
|
||||
|
|
@ -125,9 +120,8 @@ class CodeEditor extends FormWidgetBase
|
|||
'margin',
|
||||
'theme',
|
||||
'readOnly',
|
||||
'enableBasicAutocompletion',
|
||||
'autocompletion',
|
||||
'enableSnippets',
|
||||
'enableLiveAutocompletion',
|
||||
'displayIndentGuides',
|
||||
'showPrintMargin'
|
||||
]);
|
||||
|
|
@ -163,9 +157,8 @@ class CodeEditor extends FormWidgetBase
|
|||
$this->vars['size'] = $this->formField->size;
|
||||
$this->vars['name'] = $this->formField->getName();
|
||||
$this->vars['readOnly'] = $this->readOnly;
|
||||
$this->vars['enableBasicAutocompletion'] = $this->enableBasicAutocompletion;
|
||||
$this->vars['autocompletion'] = $this->autocompletion;
|
||||
$this->vars['enableSnippets'] = $this->enableSnippets;
|
||||
$this->vars['enableLiveAutocompletion'] = $this->enableLiveAutocompletion;
|
||||
$this->vars['displayIndentGuides'] = $this->displayIndentGuides;
|
||||
$this->vars['showPrintMargin'] = $this->showPrintMargin;
|
||||
|
||||
|
|
@ -201,9 +194,8 @@ class CodeEditor extends FormWidgetBase
|
|||
$this->highlightActiveLine = $preferences->editor_highlight_active_line;
|
||||
$this->useSoftTabs = !$preferences->editor_use_hard_tabs;
|
||||
$this->showGutter = $preferences->editor_show_gutter;
|
||||
$this->enableBasicAutocompletion = $preferences->editor_enable_basic_autocompletion;
|
||||
$this->autocompletion = $preferences->editor_autocompletion;
|
||||
$this->enableSnippets = $preferences->editor_enable_snippets;
|
||||
$this->enableLiveAutocompletion = $preferences->editor_enable_live_autocompletion;
|
||||
$this->displayIndentGuides = $preferences->editor_display_indent_guides;
|
||||
$this->showPrintMargin = $preferences->editor_show_print_margin;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ class RecordFinder extends FormWidgetBase
|
|||
$config->alias = $this->alias . 'List';
|
||||
$config->showSetup = false;
|
||||
$config->showCheckboxes = false;
|
||||
$config->recordsPerPage = 20;
|
||||
$config->recordsPerPage = 10;
|
||||
$config->recordOnClick = sprintf("$('#%s').recordFinder('updateRecord', this, ':" . $this->keyFrom . "')", $this->getId());
|
||||
$widget = $this->makeWidget('Backend\Widgets\Lists', $config);
|
||||
|
||||
|
|
|
|||
|
|
@ -4605,7 +4605,7 @@ $.oc.foundation.controlUtils.markDisposable(element)
|
|||
this.init();this.$el.trigger('oc.codeEditorReady')}
|
||||
CodeEditor.prototype=Object.create(BaseProto)
|
||||
CodeEditor.prototype.constructor=CodeEditor
|
||||
CodeEditor.DEFAULTS={fontSize:12,wordWrap:'off',codeFolding:'manual',tabSize:4,theme:'textmate',showInvisibles:true,highlightActiveLine:true,useSoftTabs:true,autoCloseTags:true,showGutter:true,enableEmmet:true,language:'php',margin:0,vendorPath:'/',showPrintMargin:false,highlightSelectedWord:false,hScrollBarAlwaysVisible:false,readOnly:false}
|
||||
CodeEditor.DEFAULTS={fontSize:12,wordWrap:'off',codeFolding:'manual',autocompletion:'manual',tabSize:4,theme:'textmate',showInvisibles:true,highlightActiveLine:true,useSoftTabs:true,autoCloseTags:true,showGutter:true,enableEmmet:true,language:'php',margin:0,vendorPath:'/',showPrintMargin:false,highlightSelectedWord:false,hScrollBarAlwaysVisible:false,readOnly:false}
|
||||
CodeEditor.prototype.init=function(){var self=this;if(!this.$el.attr('id')){this.$el.attr('id','element-'+Math.random().toString(36).substring(7))}
|
||||
this.$code=$('<div />').addClass('editor-code').attr('id',this.$el.attr('id')+'-code').css({position:'absolute',top:0,right:0,bottom:0,left:0}).appendTo(this.$el)
|
||||
var editor=this.editor=ace.edit(this.$code.attr('id')),options=this.options,$form=this.$el.closest('form');editor.$blockScrolling=Infinity
|
||||
|
|
@ -4627,7 +4627,6 @@ editor.renderer.setShowGutter(options.showGutter)
|
|||
editor.renderer.setShowPrintMargin(options.showPrintMargin)
|
||||
editor.setHighlightSelectedWord(options.highlightSelectedWord)
|
||||
editor.renderer.setHScrollBarAlwaysVisible(options.hScrollBarAlwaysVisible)
|
||||
editor.setOptions({enableEmmet:options.enableEmmet,enableBasicAutocompletion:options.enableBasicAutocompletion,enableSnippets:options.enableSnippets,enableLiveAutocompletion:options.enableLiveAutocompletion})
|
||||
editor.setDisplayIndentGuides(options.displayIndentGuides)
|
||||
editor.getSession().setUseSoftTabs(options.useSoftTabs)
|
||||
editor.getSession().setTabSize(options.tabSize)
|
||||
|
|
@ -4638,6 +4637,7 @@ editor.on('blur',this.proxy(this.onBlur))
|
|||
editor.on('focus',this.proxy(this.onFocus))
|
||||
this.setWordWrap(options.wordWrap)
|
||||
ace.require('ace/config').set('basePath',this.options.vendorPath)
|
||||
editor.setOptions({enableEmmet:options.enableEmmet,enableBasicAutocompletion:options.autocompletion==='basic',enableSnippets:options.enableSnippets,enableLiveAutocompletion:options.autocompletion==='live'})
|
||||
editor.renderer.setScrollMargin(options.margin,options.margin,0,0)
|
||||
editor.renderer.setPadding(options.margin)
|
||||
this.$toolbar.find('>ul>li>a').each(function(){var abbr=$(this).find('>abbr'),label=abbr.text(),help=abbr.attr('title'),title=label+' (<strong>'+help+'</strong>)';$(this).attr('title',title)}).tooltip({delay:500,placement:'bottom',html:true});this.$fullscreenDisable.hide()
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
fontSize: 12,
|
||||
wordWrap: 'off',
|
||||
codeFolding: 'manual',
|
||||
autocompletion: 'manual',
|
||||
tabSize: 4,
|
||||
theme: 'textmate',
|
||||
showInvisibles: true,
|
||||
|
|
@ -147,12 +148,6 @@
|
|||
editor.renderer.setShowPrintMargin(options.showPrintMargin)
|
||||
editor.setHighlightSelectedWord(options.highlightSelectedWord)
|
||||
editor.renderer.setHScrollBarAlwaysVisible(options.hScrollBarAlwaysVisible)
|
||||
editor.setOptions({
|
||||
enableEmmet: options.enableEmmet,
|
||||
enableBasicAutocompletion: options.enableBasicAutocompletion,
|
||||
enableSnippets: options.enableSnippets,
|
||||
enableLiveAutocompletion: options.enableLiveAutocompletion
|
||||
})
|
||||
editor.setDisplayIndentGuides(options.displayIndentGuides)
|
||||
editor.getSession().setUseSoftTabs(options.useSoftTabs)
|
||||
editor.getSession().setTabSize(options.tabSize)
|
||||
|
|
@ -166,6 +161,13 @@
|
|||
// Set the vendor path for Ace's require path
|
||||
ace.require('ace/config').set('basePath', this.options.vendorPath)
|
||||
|
||||
editor.setOptions({
|
||||
enableEmmet: options.enableEmmet,
|
||||
enableBasicAutocompletion: options.autocompletion === 'basic',
|
||||
enableSnippets: options.enableSnippets,
|
||||
enableLiveAutocompletion: options.autocompletion === 'live'
|
||||
})
|
||||
|
||||
editor.renderer.setScrollMargin(options.margin, options.margin, 0, 0)
|
||||
editor.renderer.setPadding(options.margin)
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,10 @@
|
|||
data-tab-size="<?= $tabSize ?>"
|
||||
data-theme="<?= $theme ?>"
|
||||
data-show-invisibles="<?= $showInvisibles ?>"
|
||||
data-enable-basic-autocompletion="<?= $enableBasicAutocompletion ?>"
|
||||
data-enable-snippets="<?= $enableSnippets ?>"
|
||||
data-enable-live-autocompletion="<?= $enableLiveAutocompletion ?>"
|
||||
data-display-indent-guides="<?= $displayIndentGuides ?>"
|
||||
data-show-print-margin="<?= $showPrintMargin ?>"
|
||||
data-autocompletion="<?= $autocompletion ?>"
|
||||
data-enable-snippets="<?= $enableSnippets ?>"
|
||||
data-display-indent-guides="<?= $displayIndentGuides ?>"
|
||||
data-show-print-margin="<?= $showPrintMargin ?>"
|
||||
data-highlight-active-line="<?= $highlightActiveLine ?>"
|
||||
data-use-soft-tabs="<?= $useSoftTabs ?>"
|
||||
data-show-gutter="<?= $showGutter ? 'true' : 'false' ?>"
|
||||
|
|
@ -49,8 +48,8 @@
|
|||
<i class="icon-random"></i>
|
||||
<abbr title="ctrl+h or esc"><?= e(trans('cms::lang.editor.close_replacebox')) ?></abbr>
|
||||
</a>
|
||||
</li>
|
||||
<li class="fullscreen-enable">
|
||||
</li>
|
||||
<li class="fullscreen-enable">
|
||||
<a href="javascript:;">
|
||||
<i class="icon-desktop"></i>
|
||||
<abbr title="ctrl+shift+f"><?= e(trans('cms::lang.editor.enter_fullscreen')) ?></abbr>
|
||||
|
|
@ -61,7 +60,7 @@
|
|||
<i class="icon-desktop"></i>
|
||||
<abbr title="ctrl+shift+f or esc"><?= e(trans('cms::lang.editor.exit_fullscreen')) ?></abbr>
|
||||
</a>
|
||||
</li>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<textarea name="<?= $name ?>" id="<?= $this->getId('textarea') ?>"><?= e($value) ?></textarea>
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
.field-fileupload .upload-object .icon-container i{color:#95a5a6;display:inline-block}
|
||||
.field-fileupload .upload-object .icon-container div{display:table-cell;text-align:center;vertical-align:middle}
|
||||
.field-fileupload .upload-object .icon-container.image > div.icon-wrapper{display:none}
|
||||
.field-fileupload .upload-object h4{font-size:15px;color:#2A3E51;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:150%;margin:15px 0 5px 0;padding-right:0;-webkit-transition:padding 0.1s;transition:padding 0.1s;position:relative}
|
||||
.field-fileupload .upload-object h4{font-size:13px;color:#2A3E51;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;line-height:150%;margin:15px 0 5px 0;padding-right:0;-webkit-transition:padding 0.1s;transition:padding 0.1s;position:relative}
|
||||
.field-fileupload .upload-object h4 a{position:absolute;right:0;top:0;display:none;font-weight:400}
|
||||
.field-fileupload .upload-object p.size{font-size:12px;color:#95a5a6}
|
||||
.field-fileupload .upload-object p.size strong{font-weight:400}
|
||||
.field-fileupload .upload-object .meta .drag-handle{position:absolute;bottom:0;right:0;cursor:move;display:block}
|
||||
.field-fileupload .upload-object .info h4 a,.field-fileupload .upload-object .meta a.upload-remove-button,.field-fileupload .upload-object .meta a.drag-handle{color:#2b3e50;display:none;font-size:15px;text-decoration:none}
|
||||
.field-fileupload .upload-object .info h4 a,.field-fileupload .upload-object .meta a.upload-remove-button,.field-fileupload .upload-object .meta a.drag-handle{color:#2b3e50;display:none;font-size:13px;text-decoration:none}
|
||||
.field-fileupload .upload-object .icon-container{position:relative}
|
||||
.field-fileupload .upload-object .icon-container:after{background-image:url('../../../../../system/assets/ui/images/loader-transparent.svg');position:absolute;content:' ';width:40px;height:40px;left:50%;top:50%;margin-top:-20px;margin-left:-20px;display:block;background-size:40px 40px;background-position:50% 50%;-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}
|
||||
.field-fileupload .upload-object.is-success .icon-container{opacity:1}
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@
|
|||
}
|
||||
|
||||
h4 {
|
||||
font-size: 15px;
|
||||
font-size: 13px;
|
||||
color: #2A3E51;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
.meta a.drag-handle {
|
||||
color: #2b3e50;
|
||||
display: none;
|
||||
font-size: 15px;
|
||||
font-size: 13px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<?php foreach (Flash::all() as $type => $message): ?>
|
||||
<p data-control="flash-message" class="flash-message <?= $type ?>" data-interval="5"><?= e($message) ?></p>
|
||||
<p data-control="flash-message" class="flash-message fade <?= $type ?>" data-interval="5"><?= e($message) ?></p>
|
||||
<?php endforeach ?>
|
||||
|
|
@ -44,16 +44,15 @@ class Preferences extends Model
|
|||
$this->editor_code_folding = $config->get('editor.code_folding', 'manual');
|
||||
$this->editor_tab_size = $config->get('editor.tab_size', 4);
|
||||
$this->editor_theme = $config->get('editor.theme', static::DEFAULT_THEME);
|
||||
$this->editor_show_invisibles = $config->get('editor.show_invisibles', true);
|
||||
$this->editor_show_invisibles = $config->get('editor.show_invisibles', false);
|
||||
$this->editor_highlight_active_line = $config->get('editor.highlight_active_line', true);
|
||||
$this->editor_use_hard_tabs = $config->get('editor.use_hard_tabs', false);
|
||||
$this->editor_show_gutter = $config->get('editor.show_gutter', true);
|
||||
$this->editor_auto_closing = $config->get('editor.auto_closing', true);
|
||||
$this->editor_enable_basic_autocompletion = $config->get('editor.enable_basic_autocompletion', true);
|
||||
$this->editor_enable_live_autocompletion = $config->get('editor.enable_live_autocompletion', true);
|
||||
$this->editor_enable_snippets = $config->get('editor.enable_snippets', true);
|
||||
$this->editor_display_indent_guides = $config->get('editor.display_indent_guides', true);
|
||||
$this->editor_show_print_margin = $config->get('editor.show_print_margin', true);
|
||||
$this->editor_auto_closing = $config->get('editor.auto_closing', false);
|
||||
$this->editor_autocompletion = $config->get('editor.editor_autocompletion', 'manual');
|
||||
$this->editor_enable_snippets = $config->get('editor.enable_snippets', false);
|
||||
$this->editor_display_indent_guides = $config->get('editor.display_indent_guides', false);
|
||||
$this->editor_show_print_margin = $config->get('editor.show_print_margin', false);
|
||||
}
|
||||
|
||||
public static function setAppLocale()
|
||||
|
|
|
|||
|
|
@ -24,18 +24,11 @@ tabs:
|
|||
tab: backend::lang.backend_preferences.code_editor
|
||||
path: field_editor_preview
|
||||
|
||||
editor_font_size:
|
||||
label: backend::lang.editor.font_size
|
||||
editor_theme:
|
||||
label: backend::lang.editor.theme
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
span: auto
|
||||
type: dropdown
|
||||
options:
|
||||
11: 11px
|
||||
12: 12px
|
||||
13: 13px
|
||||
14: 14px
|
||||
15: 15px
|
||||
16: 16px
|
||||
|
||||
editor_word_wrap:
|
||||
label: backend::lang.editor.word_wrap
|
||||
|
|
@ -48,15 +41,18 @@ tabs:
|
|||
80: 80 Characters
|
||||
fluid: Fluid
|
||||
|
||||
editor_code_folding:
|
||||
label: backend::lang.editor.code_folding
|
||||
editor_font_size:
|
||||
label: backend::lang.editor.font_size
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: dropdown
|
||||
span: auto
|
||||
type: dropdown
|
||||
options:
|
||||
manual: Off
|
||||
markbegin: Mark begin
|
||||
markbeginend: Mark begin and end
|
||||
11: 11px
|
||||
12: 12px
|
||||
13: 13px
|
||||
14: 14px
|
||||
15: 15px
|
||||
16: 16px
|
||||
|
||||
editor_tab_size:
|
||||
label: backend::lang.editor.tab_size
|
||||
|
|
@ -72,19 +68,28 @@ tabs:
|
|||
7: 7
|
||||
8: 8
|
||||
|
||||
editor_theme:
|
||||
label: backend::lang.editor.theme
|
||||
editor_code_folding:
|
||||
label: backend::lang.editor.code_folding
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: dropdown
|
||||
|
||||
editor_auto_closing:
|
||||
label: backend::lang.editor.auto_closing
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
options:
|
||||
manual: backend::lang.editor.mode_off
|
||||
markbegin: backend::lang.editor.code_folding_begin
|
||||
markbeginend: backend::lang.editor.code_folding_begin_end
|
||||
|
||||
editor_show_invisibles:
|
||||
label: backend::lang.editor.show_invisibles
|
||||
editor_autocompletion:
|
||||
label: backend::lang.editor.autocompletion
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: dropdown
|
||||
span: auto
|
||||
options:
|
||||
manual: backend::lang.editor.mode_off
|
||||
basic: backend::lang.editor.basic_autocompletion
|
||||
live: backend::lang.editor.live_autocompletion
|
||||
|
||||
editor_show_gutter:
|
||||
label: backend::lang.editor.show_gutter
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
|
@ -101,38 +106,32 @@ tabs:
|
|||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_show_gutter:
|
||||
label: backend::lang.editor.show_gutter
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_enable_basic_autocompletion:
|
||||
label: backend::lang.editor.enable_basic_autocompletion
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_enable_snippets:
|
||||
label: backend::lang.editor.enable_snippets
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_enable_live_autocompletion:
|
||||
label: backend::lang.editor.enable_live_autocompletion
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_display_indent_guides:
|
||||
label: backend::lang.editor.display_indent_guides
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_show_invisibles:
|
||||
label: backend::lang.editor.show_invisibles
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_show_print_margin:
|
||||
label: backend::lang.editor.show_print_margin
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_auto_closing:
|
||||
label: backend::lang.editor.auto_closing
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
||||
editor_enable_snippets:
|
||||
label: backend::lang.editor.enable_snippets
|
||||
tab: backend::lang.backend_preferences.code_editor
|
||||
type: checkbox
|
||||
span: auto
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<button
|
||||
type="submit"
|
||||
disabled
|
||||
class="btn btn-disabled">
|
||||
class="btn btn-secondary btn-disabled">
|
||||
<i class="icon-star"></i>
|
||||
<?= e(trans('cms::lang.theme.active_button')) ?>
|
||||
</button>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<?php if ($theme->hasCustomData()): ?>
|
||||
<a
|
||||
href="<?= Backend::url('cms/themes/update/'.$theme->getDirName()) ?>"
|
||||
class="btn btn-default">
|
||||
class="btn btn-secondary">
|
||||
<i class="icon-paint-brush"></i>
|
||||
<?= e(trans('cms::lang.theme.customize_button')) ?>
|
||||
</a>
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
<div class="dropdown">
|
||||
<button
|
||||
data-toggle="dropdown"
|
||||
class="btn btn-default">
|
||||
class="btn btn-secondary">
|
||||
<i class="icon-wrench"></i>
|
||||
<?= e(trans('cms::lang.theme.manage_button')) ?>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class AssetList extends WidgetBase
|
|||
/**
|
||||
* @var string Message to display when the Delete button is clicked.
|
||||
*/
|
||||
public $deleteConfirmation = 'Do you really want to delete selected files or directories?';
|
||||
public $deleteConfirmation = 'Delete selected files or directories?';
|
||||
|
||||
public function __construct($controller, $alias)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class TemplateList extends WidgetBase
|
|||
/**
|
||||
* @var string Message to display when the Delete button is clicked.
|
||||
*/
|
||||
public $deleteConfirmation = 'Do you really want to delete selected templates?';
|
||||
public $deleteConfirmation = 'Delete selected templates?';
|
||||
|
||||
/**
|
||||
* @var string Specifies the item type.
|
||||
|
|
|
|||
|
|
@ -9,9 +9,12 @@
|
|||
|
||||
<h3 class="section"><?= e(trans('cms::lang.media.order_by')) ?></h3>
|
||||
|
||||
<select name="sorting" class="form-control custom-select" data-control="sorting">
|
||||
<select
|
||||
name="sorting"
|
||||
class="form-control custom-select select-no-search"
|
||||
data-control="sorting">
|
||||
<?php foreach ($sortModes as $code=>$title): ?>
|
||||
<option
|
||||
<option
|
||||
<?= $code == $sortBy ? 'selected="selected"' : '' ?>
|
||||
value="<?= $code ?>"
|
||||
><?= e($title) ?></option>
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
|
||||
@color-breadcrumb-text: #FFFFFF;
|
||||
@color-breadcrumb-active-text: #2A3E51;
|
||||
@color-breadcrumb-background: #D3D9DA;
|
||||
@color-breadcrumb-inactive-background: #9DA4A5;
|
||||
@color-breadcrumb-background: #d0d9dd;
|
||||
@color-breadcrumb-inactive-background: #9098a2;
|
||||
@color-breadcrumb-active-background: #1F99DC;
|
||||
|
||||
.control-breadcrumb {
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@
|
|||
padding: 10px 30px 10px 15px;
|
||||
z-index: 10000;
|
||||
word-wrap: break-word;
|
||||
font-weight: bold;
|
||||
text-shadow: 0 -1px 0px rgba(0,0,0,.35);
|
||||
text-align: center;
|
||||
.box-shadow(inset 0 -2px 0 rgba(0,0,0,.15));
|
||||
|
||||
.border-radius(@border-radius-base);
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
@color-inspector-bg: #f2f2f2;
|
||||
@color-inspector-active-bg: #ffffff;
|
||||
@color-inspector-text: #333333;
|
||||
@color-inspector-input-text: #385487;
|
||||
@color-inspector-grid: #c8cccd;
|
||||
@color-inspector-changed: #c03f31;
|
||||
|
||||
|
|
@ -43,13 +44,20 @@
|
|||
|
||||
td, th {
|
||||
padding: 5px 12px;
|
||||
color: @color-inspector-text;
|
||||
font-size: 12px;
|
||||
width: 50%;
|
||||
border-bottom: 1px solid @color-inspector-grid;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
th {
|
||||
color: @color-inspector-text;
|
||||
}
|
||||
|
||||
td {
|
||||
color: @color-inspector-input-text;
|
||||
}
|
||||
|
||||
tr:last-child {
|
||||
td, th { border-bottom: none; }
|
||||
|
||||
|
|
@ -376,9 +384,10 @@
|
|||
height: 29px;
|
||||
line-height: 29px;
|
||||
padding: 0 3px 0 12px;
|
||||
.border-radius(0) !important;
|
||||
border: none !important;
|
||||
font-size: 12px;
|
||||
.border-radius(0) !important;
|
||||
.box-shadow(none) !important;
|
||||
|
||||
&.select2-default {
|
||||
font-weight: normal !important;
|
||||
|
|
@ -402,6 +411,7 @@
|
|||
|
||||
.select2-selection__rendered {
|
||||
padding: 0 22px 0 0;
|
||||
color: @color-inspector-input-text;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -516,7 +526,7 @@ div.inspector-dictionary-container {
|
|||
}
|
||||
}
|
||||
|
||||
table.inspector-dictionary-table{
|
||||
table.inspector-dictionary-table {
|
||||
width: 100%;
|
||||
border: none;
|
||||
|
||||
|
|
@ -541,6 +551,7 @@ div.inspector-dictionary-container {
|
|||
outline: none;
|
||||
border: none;
|
||||
padding: 7px 5px;
|
||||
.box-shadow(none);
|
||||
|
||||
&:focus {
|
||||
border: none;
|
||||
|
|
|
|||
|
|
@ -1372,14 +1372,14 @@ body.popover-open .control-popover > div:before,body.popover-open .control-popov
|
|||
body.popover-open .control-popover div.popover-fixed-height{height:100%;min-height:100%}
|
||||
body.popover-open .control-popover .popover-head:before{display:none}
|
||||
}
|
||||
.control-breadcrumb{margin:-20px -20px 20px -20px;background-color:#d3d9da;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.05);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.05)}
|
||||
.control-breadcrumb{margin:-20px -20px 20px -20px;background-color:#d0d9dd;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.05);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.05)}
|
||||
.control-breadcrumb ul{padding:0;margin:0;font-size:0}
|
||||
.control-breadcrumb li{font-size:15px;list-style:none;margin:0;padding:12px 10px 13px 30px;display:inline-block;position:relative;color:#ffffff;background-color:#9da4a5}
|
||||
.control-breadcrumb li{font-size:15px;list-style:none;margin:0;padding:12px 10px 13px 30px;display:inline-block;position:relative;color:#ffffff;background-color:#9098a2}
|
||||
.control-breadcrumb li a{display:inline-block;color:#ffffff;text-decoration:none;text-shadow:0 1px 0 rgba(0,0,0,0.2)}
|
||||
.control-breadcrumb li a:hover{color:#ffffff}
|
||||
.control-breadcrumb li:before,.control-breadcrumb li:after{top:0;right:-15px;position:absolute;z-index:10}
|
||||
.control-breadcrumb li:after{content:'';display:block;width:0;height:0;border-top:23px solid transparent;border-bottom:23px solid transparent;border-left:15px solid #9da4a5}
|
||||
.control-breadcrumb li:before{right:-16px;z-index:9;content:'';display:block;width:0;height:0;border-top:23px solid transparent;border-bottom:23px solid transparent;border-left:15px solid #d3d9da}
|
||||
.control-breadcrumb li:after{content:'';display:block;width:0;height:0;border-top:23px solid transparent;border-bottom:23px solid transparent;border-left:15px solid #9098a2}
|
||||
.control-breadcrumb li:before{right:-16px;z-index:9;content:'';display:block;width:0;height:0;border-top:23px solid transparent;border-bottom:23px solid transparent;border-left:15px solid #d0d9dd}
|
||||
.control-breadcrumb li:first-child{padding-left:20px}
|
||||
.control-breadcrumb li:last-child:after{content:''}
|
||||
.control-breadcrumb li:last-child{background-color:transparent;color:#2a3e51;text-shadow:0 1px 0 rgba(255,255,255,0.7)}
|
||||
|
|
@ -1726,7 +1726,7 @@ div.scoreboard .control-chart .canvas + ul{margin-left:0}
|
|||
div.scoreboard .scoreboard-offset{padding-left:20px}
|
||||
body.slim-container div.scoreboard{padding:0 20px}
|
||||
#layout-canvas .flash-message{display:none}
|
||||
.flash-message{position:fixed;width:500px;left:50%;top:13px;margin-left:-250px;color:#ffffff;font-size:14px;padding:10px 30px 10px 15px;z-index:10000;word-wrap:break-word;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
|
||||
.flash-message{position:fixed;width:500px;left:50%;top:13px;margin-left:-250px;color:#ffffff;font-size:14px;padding:10px 30px 10px 15px;z-index:10000;word-wrap:break-word;font-weight:bold;text-shadow:0 -1px 0px rgba(0,0,0,0.35);text-align:center;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
|
||||
.flash-message.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:opacity .15s linear;transition:opacity .15s linear}
|
||||
.flash-message.fade.in{opacity:1;filter:alpha(opacity=100);-webkit-animation:flashmessage-fade-in 1s cubic-bezier(0.2,0.7,0.5,1);animation:flashmessage-fade-in 1s cubic-bezier(0.2,0.7,0.5,1)}
|
||||
.flash-message.success{background:#8da85e}
|
||||
|
|
@ -2627,7 +2627,9 @@ table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:125px}
|
|||
.list-scrollable-container:after{right:0}
|
||||
.list-scrollable-container > .list-scrollable{overflow:hidden}
|
||||
.inspector-fields{min-width:220px;border-collapse:collapse;width:100%;table-layout:fixed;border-bottom-right-radius:2px;border-bottom-left-radius:2px}
|
||||
.inspector-fields td,.inspector-fields th{padding:5px 12px;color:#333333;font-size:12px;width:50%;border-bottom:1px solid #c8cccd;text-align:left}
|
||||
.inspector-fields td,.inspector-fields th{padding:5px 12px;font-size:12px;width:50%;border-bottom:1px solid #c8cccd;text-align:left}
|
||||
.inspector-fields th{color:#333333}
|
||||
.inspector-fields td{color:#385487}
|
||||
.inspector-fields tr:last-child td,.inspector-fields tr:last-child th{border-bottom:none}
|
||||
.inspector-fields tr:last-child td,.inspector-fields tr:last-child td input[type=text]{-webkit-border-radius:0 0 2px 0;-moz-border-radius:0 0 2px 0;border-radius:0 0 2px 0}
|
||||
.inspector-fields tr.group{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
|
||||
|
|
@ -2682,12 +2684,12 @@ table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:125px}
|
|||
.inspector-fields div.custom-checkbox{margin-top:0;margin-bottom:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
|
||||
.inspector-fields div.custom-checkbox label:before{top:-12px}
|
||||
.inspector-fields .select2-container{width:100% !important}
|
||||
.inspector-fields .select2-container .select2-selection{background:transparent;height:29px;line-height:29px;padding:0 3px 0 12px;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;border:none !important;font-size:12px}
|
||||
.inspector-fields .select2-container .select2-selection{background:transparent;height:29px;line-height:29px;padding:0 3px 0 12px;border:none !important;font-size:12px;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;-webkit-box-shadow:none !important;box-shadow:none !important}
|
||||
.inspector-fields .select2-container .select2-selection.select2-default{font-weight:normal !important}
|
||||
.inspector-fields .select2-container .loading-indicator > span{top:15px}
|
||||
.inspector-fields .select2-container.select2-container--open{-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;border:none !important}
|
||||
.inspector-fields .select2-container.select2-container--open .select2-selection{background:white}
|
||||
.inspector-fields .select2-container .select2-selection__rendered{padding:0 22px 0 0}
|
||||
.inspector-fields .select2-container .select2-selection__rendered{padding:0 22px 0 0;color:#385487}
|
||||
.inspector-fields tr.changed td{font-weight:600}
|
||||
.inspector-fields tr.changed td input[type=text]{font-weight:600}
|
||||
.inspector-fields tr.changed td .select2-container .select2-selection{font-weight:600}
|
||||
|
|
@ -2712,7 +2714,7 @@ div.inspector-dictionary-container table.inspector-dictionary-table{width:100%;b
|
|||
div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td{width:50%;padding:0 !important;border-bottom:1px solid #e0e0e0}
|
||||
div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td div{border:1px solid #fff}
|
||||
div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td.active div{border-color:#5fb6f5}
|
||||
div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td input{width:100%;height:100%;display:block;outline:none;border:none;padding:7px 5px}
|
||||
div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td input{width:100%;height:100%;display:block;outline:none;border:none;padding:7px 5px;-webkit-box-shadow:none;box-shadow:none}
|
||||
div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td input:focus{border:none;outline:none}
|
||||
div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td:first-child{border-right:1px solid #e0e0e0}
|
||||
div.inspector-dictionary-container table.inspector-dictionary-table tbody tr:last-child td{border-bottom:none}
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ class UpdateManager
|
|||
$firstUp = !Schema::hasTable('migrations');
|
||||
if ($firstUp) {
|
||||
$this->repository->createRepository();
|
||||
$this->note('Migration table created successfully.');
|
||||
$this->note('Migration table created');
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class ThemeUse extends Command
|
|||
*/
|
||||
public function fire()
|
||||
{
|
||||
if (!$this->confirmToProceed('Do you really want to change the active theme?')) {
|
||||
if (!$this->confirmToProceed('Change the active theme?')) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -117,6 +117,8 @@ class Settings extends Controller
|
|||
$model = $this->createModel($item);
|
||||
$model->resetDefault();
|
||||
|
||||
Flash::success(Lang::get('backend::lang.form.reset_success'));
|
||||
|
||||
return Backend::redirect('system/settings/update/'.$author.'/'.$plugin.'/'.$code);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue