TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI update

This commit is contained in:
alekseybobkov 2016-02-28 19:52:21 -08:00
parent 46e70385e2
commit 00ced6c79f
45 changed files with 1370 additions and 4862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/backend/ServiceProvider.php
View File

@ -66,13 +66,13 @@ class ServiceProvider extends ModuleServiceProvider
protected function registerAssetBundles()
{
CombineAssets::registerCallback(function($combiner) {
// $combiner->registerBundle('~/modules/backend/assets/less/october.less');
$combiner->registerBundle('~/modules/backend/assets/less/october.less');
$combiner->registerBundle('~/modules/backend/assets/js/october.js');
$combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js');
// $combiner->registerBundle('~/modules/backend/formwidgets/datepicker/assets/js/build.js');
// $combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/less/richeditor.less');
$combiner->registerBundle('~/modules/backend/formwidgets/datepicker/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/less/richeditor.less');
$combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build.js');
// $combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less');
$combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less');
$combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/formwidgets/fileupload/assets/less/fileupload.less');
});

5547
modules/backend/assets/css/october.css
View File

File diff suppressed because it is too large Load Diff

16
modules/backend/assets/less/controls/filelist.less
View File

@ -18,10 +18,10 @@
.listPaddings (0, 27px) {}
p.no-data {
padding: 18px 0;
padding: 22px 0;
margin: 0;
color: @color-filelist-norecords-text;
font-size: 12px;
font-size: 14px;
text-align: center;
font-weight: normal;
.border-radius(@border-radius-base);
@ -208,8 +208,8 @@
.checkbox {
position: absolute;
top: -3px;
right: 3px;
top: -5px;
right: -5px;
label {
margin-right: 0;
@ -261,6 +261,10 @@
color: @color-filelist-title-hero;
}
span.description {
font-size: 14px;
}
.list-icon {
position: absolute;
left: 14px;
@ -275,8 +279,8 @@
}
.checkbox {
top: 17px;
right: 17px;
top: 0;
right: 0;
}
&.active {

18
modules/backend/assets/less/controls/treeview.less
View File

@ -20,8 +20,8 @@
.transition(width 1s);
> div {
font-size: 13px;
font-weight: 600;
font-size: 15px;
font-weight: normal;
background: @color-treeview-item-bg;
border-bottom: 1px solid @color-panel-light;
position: relative;
@ -53,7 +53,7 @@
display: block;
font-weight: 400;
color: @color-treeview-item-comment;
font-size: 12px;
font-size: 14px;
margin-top: 2px;
overflow: hidden;
text-overflow: ellipsis;
@ -88,17 +88,17 @@
.transition(opacity 0.4s);
position: absolute;
right: 24px;
right: 18px;
bottom: 5px;
width: 14px;
height: 14px;
width: 18px;
height: 19px;
cursor: move;
color: @color-treeview-control;
.opacity(0);
&:before {
.icon(@bars);
font-size: 14px;
font-size: 18px;
}
}
@ -163,8 +163,8 @@
.checkbox {
position: absolute;
top: 19px;
right: 17px;
top: 0;
right: 0;
label {
margin-right: 0;

123
modules/backend/assets/less/layout/fancylayout.less
View File

@ -37,7 +37,7 @@
overflow: hidden;
&:before, &:after {
top: 7px;
top: 13px;
font-size: 14px;
color: @color-fancy-master-tabs-inactive-text;
}
@ -54,11 +54,12 @@
> ul.nav-tabs {
margin-left: -8px;
> li {
margin-left: -8px;
margin-left: -5px;
top: 1px;
padding-top: 3px;
span.tab-close{
top: 9px;
top: 15px;
right: -3px;
left: auto;
z-index: 110;
@ -67,7 +68,8 @@
top: 4px;
right: 1px;
color: rgba(255, 255, 255, 0.3) !important;
font: 14px bold "Helvetica Neue", Helvetica, Arial, sans-serif;
font-style: normal;
font-weight: bold;
&:hover { color: @color-fancy-master-tabs-active-text !important; }
}
@ -85,37 +87,48 @@
> span.title {
position: relative;
display: inline-block;
padding: 8px 5px 9px 5px;
height: 31px;
font-size: 13px;
padding: 12px 5px 0 5px;
height: 38px;
font-size: 14px;
z-index: 100;
background-color: @color-fancy-form-inactive-tab;
&:before, &:after {
content: ' ';
position: absolute;
background: transparent url(../images/tab-shape.svg) no-repeat left -80px;
width: 20px;
display: block;
height: 30px;
height: 37px;
top: 0;
z-index: 100;
background-color: @color-fancy-form-inactive-tab;
}
&:before {
left: -20px;
left: -14px;
.border-radius(8px 0 0 0);
.transform( ~'skewX(-20deg)');
}
&:after {
right: -20px;
background-position: -80px -80px;
right: -14px;
.border-radius(0 8px 0 0);
.transform( ~'skewX(20deg)');
}
span {
border-top: none;
padding: 0;
margin-top: 0;
overflow: visible;
}
}
&:before {
z-index: 110;
position: absolute;
top: 15px;
top: 18px;
left: 22px;
}
@ -135,11 +148,11 @@
background-color: @color-fancy-form-tabless-fields-bg;
z-index: 105;
&:before {
background-position: left -40px;
z-index: 107;
background-color: @color-fancy-form-tabless-fields-bg;
}
&:after {
background-position: -80px -40px;
background-color: @color-fancy-form-tabless-fields-bg;
z-index: 107;
}
}
@ -184,6 +197,7 @@
&.secondary-tabs {
> div > ul.nav-tabs {
background: @color-fancy-secondary-tabs-bg;
padding-left: 15px;
> li {
border-right: none;
padding-right: 0;
@ -191,8 +205,20 @@
a {
background: transparent;
border: none;
padding: 8px 10px;
padding: 12px 10px 13px 10px;
font-size: 14px;
font-weight: normal;
line-height: 14px;
color: @color-fancy-secondary-tabs-inactive-text;
span {
span {
overflow: visible;
border-top: none;
margin-top: 0;
padding-top: 0;
}
}
}
&.active {
@ -233,42 +259,45 @@
a {
padding: 8px 16px 0 16px;
font-weight: 400;
height: 33px;
height: 36px;
color: #2b3e50;
.opacity(0.6);
> span.title {
position: relative;
display: inline-block;
padding: 4px 5px 9px 5px;
font-size: 13px;
padding: 8px 5px 9px 5px;
font-size: 14px;
z-index: 100;
height: 25px!important;
height: 27px!important;
background-color: transparent;
&:before, &:after {
content: ' ';
position: absolute;
background: transparent url(../images/secondary-tab-shape-content.svg) no-repeat left top;
background-color: white;
width: 15px;
height: 25px;
height: 28px;
top: 0;
z-index: 100;
display: none;
}
&:before {
left: -15px;
left: -11px;
.border-radius(8px 0 0 0);
.transform( ~'skewX(-20deg)');
}
&:after {
right: -15px;
background-position: -60px 0;
right: -11px;
.border-radius(0 8px 0 0);
.transform( ~'skewX(20deg)');
}
span {
height: 18px;
font-size: 12px;
font-size: 14px;
}
}
}
@ -301,6 +330,12 @@
> li {
a {
color: white;
> span.title {
&:before, &:after {
background-color: white;
}
}
}
&.active a {
@ -330,6 +365,7 @@
> li {
background: transparent;
border-right: none;
margin-right: -8px;
&:first-child {
margin-left: -5px;
@ -339,7 +375,7 @@
background: transparent;
border: none;
padding: 12px 16px 0px;
font-size: 12px;
font-size: 14px;
font-weight: 400;
color: @color-fancy-primary-tabs-inactive-text;
@ -349,15 +385,22 @@
padding: 5px 5px 3px 5px;
&:before, &:after {
background: @color-fancy-primary-tabs-inactive-bg;
border-width: 0;
top: 0;
}
&:before {
background-position: left -92px;
left: -20px;
}
&:after {
background-position: -61px -92px;
right: -20px;
}
span {
border-width: 0;
vertical-align: top;
}
}
}
@ -372,12 +415,8 @@
span.title {
background: @color-fancy-primary-tabs-active-bg;
&:before {
background-position: left -62px;
}
&:after {
background-position: -61px -62px;
&:before, &:after {
background: @color-fancy-primary-tabs-active-bg;
}
}
}
@ -386,15 +425,11 @@
}
> .tab-content > .tab-pane {
padding: 15px 15px 0 15px;
padding: @padding-standard @padding-standard 0 @padding-standard;
&.pane-compact {
padding: 0;
}
.form-control {
border-width: 1px;
}
}
&.collapsed {
@ -413,7 +448,7 @@
padding: 0;
&.padded-pane {
padding: 15px 15px 0 15px;
padding: @padding-standard @padding-standard 0 @padding-standard;
}
}
}
@ -602,4 +637,10 @@ html.cssanimations {
}
}
}
}
html.gecko {
.fancy-layout .control-tabs.secondary-tabs > div > ul.nav-tabs > li.active a {
padding-top: 13px;
}
}

2
modules/backend/assets/less/layout/mainmenu.less
View File

@ -135,7 +135,7 @@ nav#layout-mainmenu {
padding: 16px 20px 13px 10px;
font-size: 18px;
position: relative;
z-index: 590;
z-index: 200; // Previous value 590 was overlappnig with drop-down menus on small screens
}
img {

21
modules/backend/assets/less/layout/outerlayout.less
View File

@ -112,6 +112,27 @@ html.csstransitions {
}
}
@media (max-width: @screen-sm) {
body.outer .layout > .layout-row {
&.layout-head {
> .layout-cell {
padding: 50px @padding-standard;
}
}
> .layout-cell .outer-form-container {
width: auto;
padding: @padding-standard;
.horizontal-form input {
display: block;
width: 100%!important;
margin-bottom: @padding-standard;
}
}
}
}
/*
.outer-form-container {

4
modules/backend/assets/less/layout/sidenav.less
View File

@ -45,10 +45,6 @@
font-weight: normal;
position: relative;
&:after {
.sidenav-shadow-element();
}
&:hover {
text-decoration: none;
background-color: transparent;

32
modules/backend/assets/less/layout/sidepanel.less
View File

@ -5,12 +5,16 @@
#layout-side-panel {
.fix-button {
position: absolute;
right: 2px;
top: 1px;
display: block;
width: 20px;
height: 20px;
right: -25px;
top: 0;
display: none;
width: 25px;
height: 25px;
font-size: 13px;
background: #ecf0f1;
z-index: 120;
.opacity(0.5);
.border-radius(~'0 4px 4px 0');
i {
display: block;
@ -21,24 +25,26 @@
&:hover {
text-decoration: none;
display: block;
.opacity(1)!important;
}
}
.fix-button-content-header .fix-button {
top: 9px;
right: 7px;
i {
color: @color-scrollpanel-fix-button-light;
&:hover {
.fix-button {
display: block;
}
}
.fix-button-content-header .fix-button {
top: 46px;
}
.sidepanel-content-header {
background: #d35400;
color: white;
font-size: 14px;
padding: 8px 15px;
font-size: 15px;
padding: 12px 20px 13px;
position: relative;
&:after {

4
modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
View File

@ -1,4 +1,4 @@
.field-codeeditor{width:100%;position:relative;border:2px solid #bdc3c7;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
.field-codeeditor{width:100%;position:relative;border:2px solid #bdc3c7;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
.field-codeeditor textarea{opacity:0;filter:alpha(opacity=0)}
.field-codeeditor.editor-focus{border:2px solid #1f99dc}
.field-codeeditor.size-tiny{min-height:50px}
@ -7,7 +7,7 @@
.field-codeeditor.size-huge{min-height:250px}
.field-codeeditor.size-giant{min-height:350px}
.field-codeeditor .ace_search{font-family:sans-serif;font-size:14px;color:#333333;z-index:603}
.field-codeeditor .editor-code{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
.field-codeeditor .editor-code{-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
.field-codeeditor .editor-toolbar{position:absolute;top:10px;right:10px;z-index:600}
.field-codeeditor .editor-toolbar > ul,.field-codeeditor .editor-toolbar ul > li{list-style-type:none;padding:0;margin:0}
.field-codeeditor .editor-toolbar > ul > li{float:left}

20
modules/backend/formwidgets/richeditor/assets/css/richeditor.css
View File

@ -1,29 +1,29 @@
.redactor-editor figure{position:relative}
.redactor-editor figcaption{text-align:center;line-height:22px;font-size:16px}
.redactor-editor figcaption{text-align:center;line-height:21px;font-size:15px}
.redactor-editor figure[data-type=table]{clear:both}
.redactor-editor figure[data-type=video]{position:relative;margin-bottom:22px;text-align:center;clear:both}
.redactor-editor figure[data-type=video]{position:relative;margin-bottom:21px;text-align:center;clear:both}
.redactor-editor figure[data-type=video] p{margin:0}
.redactor-editor figure[data-type=video].oc-figure-full:before{position:relative;padding-bottom:51%;width:100%;height:0;content:"";display:block}
.redactor-editor figure[data-type=video].oc-figure-full iframe{width:100%;height:100%;position:absolute;left:0;top:0}
.redactor-editor figure[data-type=image]{position:relative;margin-bottom:22px}
.redactor-editor figure[data-type=image]{position:relative;margin-bottom:21px}
.redactor-editor figure[data-type=image] .oc-figure-controls{top:0px}
.redactor-editor figure[data-type=image] img{width:100%}
.redactor-editor figure[data-type=image].oc-figure-large{width:100%;clear:both}
.redactor-editor figure[data-type=image].oc-figure-medium{width:50%}
.redactor-editor figure[data-type=image].oc-figure-small{width:33%}
.redactor-editor figure[data-type=quote]{font-family:Georgia,serif;margin-bottom:22px;margin-left:22px;font-style:italic;position:relative;border-left:solid 4px #cccccc;padding-left:22px}
.redactor-editor figure[data-type=quote]{font-family:Georgia,serif;margin-bottom:21px;margin-left:21px;font-style:italic;position:relative;border-left:solid 4px #cccccc;padding-left:21px}
.redactor-editor figure[data-type=quote] figcaption{font-weight:bold;text-align:left}
.redactor-editor figure[data-type=quote] .oc-figure-controls{margin-left:-5px}
.redactor-editor figure[data-type=quote].oc-figure-medium,.redactor-editor figure[data-type=quote].oc-figure-medium blockquote{font-size:20px}
.redactor-editor figure[data-type=quote].oc-figure-large,.redactor-editor figure[data-type=quote].oc-figure-large blockquote{font-size:24px}
.redactor-editor figure[data-type=quote].oc-figure-right{width:33%}
.redactor-editor figure[data-type=quote].oc-figure-left{width:33%;border-left:none;border-right:solid 4px #cccccc;padding-left:0;padding-right:22px;margin-left:0;margin-right:22px}
.redactor-editor figure[data-type=quote].oc-figure-left{width:33%;border-left:none;border-right:solid 4px #cccccc;padding-left:0;padding-right:21px;margin-left:0;margin-right:21px}
.redactor-editor figure[data-type=quote].oc-figure-left .oc-figure-controls{margin-left:0;margin-right:-5px}
.redactor-editor figure[data-type=quote] cite{display:block;text-align:left;font-weight:normal}
.redactor-editor figure[data-type=quote] cite:before{content:"\2014\00a0"}
.redactor-editor figure[data-type=quote] cite:empty:before{opacity:0.4;content:"\2014 Type to add citation (optional)"}
.redactor-box figcaption:empty:before{opacity:.4;content:"Type to add caption (optional)"}
.redactor-box .oc-figure-controls{background:#2b3e50 !important;padding:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;position:absolute;display:none;white-space:nowrap;left:10px;top:-50px;margin:0 auto;font-family:sans-serif;line-height:22px;font-style:normal;z-index:1100;text-align:center}
.redactor-box .oc-figure-controls{background:#2b3e50 !important;padding:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;position:absolute;display:none;white-space:nowrap;left:10px;top:-50px;margin:0 auto;font-family:sans-serif;line-height:21px;font-style:normal;z-index:1100;text-align:center}
.redactor-box .oc-figure-controls:after{content:' ';left:0;position:absolute;display:block;height:10px;background:rgba(0,0,0,0.1);width:100%;bottom:-10px;opacity:0.1;filter:alpha(opacity=10)}
.redactor-box .oc-figure-controls:before{content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-top:9px solid #2b3e50;border-bottom-width:0;position:absolute;left:14px;bottom:-8px}
.redactor-box figure:hover .oc-figure-controls{display:block}
@ -45,14 +45,14 @@
.redactor-box .oc-figure-controls span.oc-figure-controls-arrow-down:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f063"}
.redactor-box .oc-figure-controls span.oc-figure-controls-resize-full:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f065"}
.redactor-box .oc-figure-controls span.oc-figure-controls-resize-small:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f066"}
.redactor-box .oc-figure-controls span.oc-figure-controls-delete{margin-left:22px}
.redactor-box .oc-figure-controls span.oc-figure-controls-delete{margin-left:21px}
.redactor-box .oc-figure-controls span.oc-figure-controls-delete:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f014"}
.redactor-box .oc-figure-controls span.oc-figure-controls-delete:hover{background:#c63e26}
.redactor-box .oc-figure-controls span.oc-figure-controls-table{width:auto;padding-left:11px;padding-right:11px;text-align:left}
.redactor-box .oc-figure-controls span.oc-figure-controls-table{width:auto;padding-left:10.5px;padding-right:10.5px;text-align:left}
.redactor-box .oc-figure-controls span.oc-figure-controls-table:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f0ce"}
.redactor-box .oc-figure-right{float:right;margin-left:22px}
.redactor-box .oc-figure-right{float:right;margin-left:21px}
.redactor-box .oc-figure-right .oc-figure-controls{right:0}
.redactor-box .oc-figure-left{float:left;margin-right:22px}
.redactor-box .oc-figure-left{float:left;margin-right:21px}
.redactor-box .oc-dropdown-menu,.redactor-box .oc-dropdown-menu ul{padding:0 !important}
.redactor-box .oc-dropdown-menu ul{background-color:#ffffff !important}
.redactor-box .oc-dropdown-menu a{text-decoration:none;padding:0 15px !important;color:#39454a !important;text-decoration:none !important;line-height:25px}

2
modules/backend/lang/en/lang.php
View File

@ -108,7 +108,7 @@ return [
'is_new_user_default_field_comment' => 'Add new administrators to this group by default',
'code_field' => 'Code',
'code_comment' => 'Enter a unique code if you want to access the group object with the API.',
'menu_label' => 'Groups',
'menu_label' => 'Manage Groups',
'list_title' => 'Manage Groups',
'new' => 'New Group',
'delete_confirm' => 'Do you really want to delete this administrator group?',

2
modules/cms/ServiceProvider.php
View File

@ -72,7 +72,7 @@ class ServiceProvider extends ModuleServiceProvider
CombineAssets::registerCallback(function($combiner) {
$combiner->registerBundle('~/modules/cms/widgets/mediamanager/assets/js/mediamanager-global.js');
$combiner->registerBundle('~/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser.js');
// $combiner->registerBundle('~/modules/cms/widgets/mediamanager/assets/less/mediamanager.less');
$combiner->registerBundle('~/modules/cms/widgets/mediamanager/assets/less/mediamanager.less');
});
}

7
modules/cms/assets/css/october.components.css
View File

@ -282,13 +282,13 @@ div.control-componentlist div.components div.layout-cell.adding > div {
.control-filelist.component-list ul li div.group {
background: #f1f3f4;
border-top: 1px solid #e6ebed;
padding: 10px;
padding: 10px 15px 10px 10px;
position: relative;
cursor: pointer;
}
.control-filelist.component-list ul li div.group h4 {
text-transform: uppercase;
font-size: 12px;
font-size: 14px;
margin-top: 3px;
}
.control-filelist.component-list ul li div.group h4 a {
@ -302,8 +302,9 @@ div.control-componentlist div.components div.layout-cell.adding > div {
}
.control-filelist.component-list ul li div.group span.description {
display: block;
font-size: 12px;
font-size: 13px;
padding-left: 33px;
color: #8f8f8f;
}
.control-filelist.component-list ul li div.group i {
position: absolute;

2
modules/cms/assets/css/october.theme-selector.css
View File

@ -111,7 +111,7 @@
}
.theme-selector-layout .create-new-theme:hover,
.theme-selector-layout .find-more-themes:hover {
background: #1795f1;
background: #0181b9;
color: white;
}
@media (max-width: 768px) {

7
modules/cms/assets/less/october.components.less
View File

@ -294,13 +294,13 @@ div.control-componentlist {
div.group {
background: @color-group-bg;
border-top: 1px solid darken(@color-panel-light, 2%);
padding: 10px;
padding: 10px 15px 10px 10px;
position: relative;
cursor: pointer;
h4 {
text-transform: uppercase;
font-size: 12px;
font-size: 14px;
margin-top: 3px;
a {
@ -318,8 +318,9 @@ div.control-componentlist {
span.description {
display: block;
font-size: 12px;
font-size: 13px;
padding-left: 33px;
color: @color-text-description;
}
i {

4
modules/cms/widgets/TemplateList.php
View File

@ -102,6 +102,10 @@ class TemplateList extends WidgetBase
*/
public function render()
{
$toolbarClass = Str::contains($this->controlClass, 'hero') ? 'separator' : null;
$this->vars['toolbarClass'] = $toolbarClass;
return $this->makePartial('body', [
'data'=>$this->getData()
]);

45
modules/cms/widgets/assetlist/assets/css/assetlist.css
View File

@ -1,13 +1,13 @@
.control-assetlist p.no-data {
padding: 18px;
padding: 22px;
margin: 0;
color: #666666;
font-size: 12px;
font-size: 14px;
text-align: center;
font-weight: 400;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
.control-assetlist p.parent,
.control-assetlist ul li {
@ -40,7 +40,7 @@
outline: none;
font-weight: 500;
color: #405261;
font-size: 12px;
font-size: 14px;
}
.control-assetlist p.parent a.link:hover,
.control-assetlist ul li a.link:hover,
@ -98,6 +98,17 @@
background-color: #ffffff;
word-wrap: break-word;
}
.control-assetlist p.parent.parent a.link:before,
.control-assetlist ul li.parent a.link:before {
content: '';
display: block;
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 1px;
background: #ecf0f1;
}
.control-assetlist p.parent.parent a.link:after,
.control-assetlist ul li.parent a.link:after {
font-size: 13px;
@ -123,6 +134,9 @@
opacity: 1;
filter: alpha(opacity=100);
}
.control-assetlist p.parent a.link:hover:before {
display: none;
}
.control-assetlist ul {
padding: 0;
margin: 0;
@ -201,8 +215,8 @@
}
.control-assetlist ul li .checkbox {
position: absolute;
top: 13px;
right: 17px;
top: -5px;
right: -5px;
}
.control-assetlist ul li .checkbox label {
margin-right: 0;
@ -221,15 +235,12 @@
transition: all 0.2s ease;
}
.control-assetlist div.list-container.goForward ul {
-webkit-transform: translate(-300px, 0);
-ms-transform: translate(-300px, 0);
transform: translate(-300px, 0);
-webkit-transform: translate(-350px, 0);
-ms-transform: translate(-350px, 0);
transform: translate(-350px, 0);
}
.control-assetlist div.list-container.goBackward ul {
-webkit-transform: translate(300px, 0);
-ms-transform: translate(300px, 0);
transform: translate(300px, 0);
}
input[type="file"].asset-list-upload-field {
display: none;
-webkit-transform: translate(350px, 0);
-ms-transform: translate(350px, 0);
transform: translate(350px, 0);
}

3
modules/cms/widgets/assetlist/assets/js/assetlist.js
View File

@ -39,6 +39,7 @@
else
$container.addClass('goForward')
$.oc.stripeLoadIndicator.show()
this.$form.request(this.alias+'::onOpenDirectory', {
data: {
path: path,
@ -52,6 +53,8 @@
$container.removeClass('goForward goBackward')
alert(jqXHR.responseText.length ? jqXHR.responseText : jqXHR.statusText)
}
}).always(function(){
$.oc.stripeLoadIndicator.hide()
})
}

31
modules/cms/widgets/assetlist/assets/less/assetlist.less
View File

@ -2,10 +2,10 @@
.control-assetlist {
p.no-data {
padding: 18px;
padding: 22px;
margin: 0;
color: @color-filelist-norecords-text;
font-size: 12px;
font-size: 14px;
text-align: center;
font-weight: 400;
.border-radius(@border-radius-base);
@ -39,7 +39,7 @@
outline: none;
font-weight: 500;
color: @color-text-title;
font-size: 12px;
font-size: 14px;
&:hover, &:focus, &:active {text-decoration: none;}
@ -84,6 +84,19 @@
background-color: @color-list-parent-bg;
word-wrap: break-word;
&:before {
content: '';
height: 1px;
display: block;
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 1px;
background: #ecf0f1;
}
&:after {
font-size: 13px;
color: @color-list-nav-arrow;
@ -104,6 +117,10 @@
&:after {
.opacity(1);
}
&:before {
display: none;
}
}
ul {
@ -185,8 +202,8 @@
.checkbox {
position: absolute;
top: 13px;
right: 17px;
top: -5px;
right: -5px;
label {
margin-right: 0;
@ -208,11 +225,11 @@
}
&.goForward ul {
.translate(-300px, 0);
.translate(-350px, 0);
}
&.goBackward ul {
.translate(300px, 0);
.translate(350px, 0);
}
}

6
modules/cms/widgets/assetlist/partials/_toolbar.htm
View File

@ -5,12 +5,12 @@
<div class="toolbar-item" data-calculate-width>
<div class="btn-group">
<div class="dropdown last">
<button type="button" class="btn btn-primary oc-icon-plus"
<button type="button" class="btn btn-default oc-icon-plus"
data-control="create-asset"
data-toggle="dropdown"
><?= e(trans('cms::lang.sidebar.add')) ?></button>
<ul class="dropdown-menu" role="menu" data-dropdown-title="<?= e(trans('cms::lang.asset.drop_down_add_title')) ?>">
<ul class="dropdown-menu offset-left" role="menu" data-dropdown-title="<?= e(trans('cms::lang.asset.drop_down_add_title')) ?>">
<li role="presentation"><a role="menuitem" tabindex="-1" href="javascript:;" data-control="create-template" class="oc-icon-file-text-o"><?= e(trans('cms::lang.asset.create_file')) ?></a></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="javascript:;" data-control="upload-assets" class="oc-icon-upload"><?= e(trans('cms::lang.asset.upload_files')) ?></a></li>
<li role="presentation" class="divider"></li>
@ -30,7 +30,7 @@
data-trigger-action="show"
data-trigger="<?= '#'.$this->getId('asset-list') ?> input[type=checkbox]"
data-trigger-condition="checked">
<button type="button" class="btn btn-primary empty oc-icon-wrench last"
<button type="button" class="btn btn-default empty oc-icon-wrench last"
data-toggle="dropdown"
data-control="asset-tools"
></button>

2
modules/cms/widgets/mediamanager/partials/_rename-form.htm
View File

@ -10,7 +10,7 @@
<div class="modal-body">
<div class="form-group">
<label><?= e(trans('cms::lang.asset.rename_new_name')) ?></label>
<input type="text" class="form-control" name="name" value="<?= e($name) ?>" />
<input type="text" default-focus class="form-control" name="name" value="<?= e($name) ?>" />
<input type="hidden" name="originalName" value="<?= e($name) ?>">
<input type="hidden" name="type" value="<?= e($type) ?>">
</div>

6
modules/cms/widgets/templatelist/partials/_toolbar.htm
View File

@ -1,13 +1,13 @@
<div class="layout-row min-size">
<div class="control-toolbar toolbar-padded">
<div class="control-toolbar toolbar-padded <?= $toolbarClass ?>">
<!-- Control Panel -->
<div class="toolbar-item" data-calculate-width>
<div class="btn-group">
<button type="button" class="btn btn-primary oc-icon-plus last"
<button type="button" class="btn btn-default oc-icon-plus last"
data-control="create-template"
><?= e(trans('cms::lang.sidebar.add')) ?></button>
<button type="button" class="btn btn-primary empty oc-icon-trash-o hide"
<button type="button" class="btn btn-default empty oc-icon-trash-o hide"
id="<?= $this->getId('delete-button') ?>"
data-control="delete-template"
data-confirmation="<?= e(trans($this->deleteConfirmation)) ?>"

2
modules/system/ServiceProvider.php
View File

@ -442,7 +442,7 @@ class ServiceProvider extends ModuleServiceProvider
* Register asset bundles
*/
CombineAssets::registerCallback(function($combiner) {
// $combiner->registerBundle('~/modules/system/assets/less/styles.less');
$combiner->registerBundle('~/modules/system/assets/less/styles.less');
$combiner->registerBundle('~/modules/system/assets/ui/storm.less');
$combiner->registerBundle('~/modules/system/assets/ui/storm.js');
});

38
modules/system/assets/css/styles.css
View File

@ -40,7 +40,7 @@ table{border-collapse:collapse;border-spacing:0}
td,th{padding:0}
*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}
body{font-family:sans-serif;font-size:16px;line-height:1.42857143;color:#333333;background-color:#f9f9f9}
body{font-family:sans-serif;font-size:15px;line-height:1.42857143;color:#333333;background-color:#f9f9f9}
input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}
button,input,select[multiple],textarea{background-image:none}
a{color:#0181b9;text-decoration:none}
@ -50,7 +50,7 @@ img{vertical-align:middle}
.img-responsive{display:block;max-width:100%;height:auto}
.img-rounded{border-radius:6px}
.img-circle{border-radius:50%}
hr{margin-top:22px;margin-bottom:22px;border:0;border-top:1px solid #eeeeee}
hr{margin-top:21px;margin-bottom:21px;border:0;border-top:1px solid #eeeeee}
.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0}
@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}
a,a:visited{text-decoration:underline}
@ -345,19 +345,19 @@ th.visible-print,td.visible-print{display:table-cell !important}
}
h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}
h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999999}
h1,.h1,h2,.h2,h3,.h3{margin-top:22px;margin-bottom:11px}
h1,.h1,h2,.h2,h3,.h3{margin-top:21px;margin-bottom:10.5px}
h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}
h4,.h4,h5,.h5,h6,.h6{margin-top:11px;margin-bottom:11px}
h4,.h4,h5,.h5,h6,.h6{margin-top:10.5px;margin-bottom:10.5px}
h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}
h1,.h1{font-size:41px}
h2,.h2{font-size:34px}
h3,.h3{font-size:28px}
h4,.h4{font-size:20px}
h5,.h5{font-size:16px}
h6,.h6{font-size:14px}
p{margin:0 0 11px}
.lead{margin-bottom:22px;font-size:18px;font-weight:200;line-height:1.4}
@media (min-width:768px){.lead{font-size:24px}
h1,.h1{font-size:39px}
h2,.h2{font-size:32px}
h3,.h3{font-size:26px}
h4,.h4{font-size:19px}
h5,.h5{font-size:15px}
h6,.h6{font-size:13px}
p{margin:0 0 10.5px}
.lead{margin-bottom:21px;font-size:17px;font-weight:200;line-height:1.4}
@media (min-width:768px){.lead{font-size:22.5px}
}
small,.small{font-size:85%}
cite{font-style:normal}
@ -386,13 +386,13 @@ a.bg-info:hover{background-color:#afd9ee}
a.bg-warning:hover{background-color:#f7ecb5}
.bg-danger{background-color:#f2dede}
a.bg-danger:hover{background-color:#e4b9b9}
.page-header{padding-bottom:10px;margin:44px 0 22px;border-bottom:1px solid #eeeeee}
ul,ol{margin-top:0;margin-bottom:11px}
.page-header{padding-bottom:9.5px;margin:42px 0 21px;border-bottom:1px solid #eeeeee}
ul,ol{margin-top:0;margin-bottom:10.5px}
ul ul,ol ul,ul ol,ol ol{margin-bottom:0}
.list-unstyled{padding-left:0;list-style:none}
.list-inline{padding-left:0;list-style:none;margin-left:-5px}
.list-inline > li{display:inline-block;padding-left:5px;padding-right:5px}
dl{margin-top:0;margin-bottom:22px}
dl{margin-top:0;margin-bottom:21px}
dt,dd{line-height:1.42857143}
dt{font-weight:bold}
dd{margin-left:0}
@ -401,7 +401,7 @@ dd{margin-left:0}
}
abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999999}
.initialism{font-size:90%;text-transform:uppercase}
blockquote{padding:11px 22px;margin:0 0 22px;font-size:20px;border-left:5px solid #eeeeee}
blockquote{padding:10.5px 21px;margin:0 0 21px;font-size:18.75px;border-left:5px solid #eeeeee}
blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}
blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999999}
blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}
@ -409,7 +409,7 @@ blockquote footer:before,blockquote small:before,blockquote .small:before{conten
.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}
.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}
blockquote:before,blockquote:after{content:""}
address{margin-bottom:22px;font-style:normal;line-height:1.42857143}
address{margin-bottom:21px;font-style:normal;line-height:1.42857143}
.oc-icon-glass:before,.icon-glass:before{content:"\f000"}
.oc-icon-music:before,.icon-music:before{content:"\f001"}
.oc-icon-search:before,.icon-search:before{content:"\f002"}
@ -995,7 +995,7 @@ address{margin-bottom:22px;font-style:normal;line-height:1.42857143}
.oc-icon-vimeo:before,.icon-vimeo:before{content:"\f27d"}
.oc-icon-black-tie:before,.icon-black-tie:before{content:"\f27e"}
.oc-icon-fonticons:before,.icon-fonticons:before{content:"\f280"}
.close{float:right;font-size:24px;font-weight:bold;line-height:1;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20)}
.close{float:right;font-size:22.5px;font-weight:bold;line-height:1;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20)}
.close:hover,.close:focus{color:#000000;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50)}
button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}
@font-face{font-family:'FontAwesome';src:url('../ui/font/fontawesome-webfont.eot?v=1.0.1');src:url('../ui/font/fontawesome-webfont.eot?#iefix&v=1.0.1') format('embedded-opentype'),url('../ui/font/fontawesome-webfont.woff?v=1.0.1') format('woff'),url('../ui/font/fontawesome-webfont.ttf?v=1.0.1') format('truetype'),url('../ui/font/fontawesome-webfont.svg#fontawesomeregular?v=1.0.1') format('svg');font-weight:normal;font-style:normal}

20
modules/system/assets/css/updates/details.css
View File

@ -5,16 +5,16 @@
margin-top: 0;
}
.plugin-details-content h1 {
font-size: 28px;
font-size: 31px;
}
.plugin-details-content h2 {
font-size: 24px;
font-size: 26px;
}
.plugin-details-content h3 {
font-size: 20px;
font-size: 22px;
}
.plugin-details-content h4 {
font-size: 17px;
font-size: 18px;
}
.plugin-details-content h1,
.plugin-details-content h2 {
@ -23,12 +23,12 @@
}
.plugin-details-content ul,
.plugin-details-content ol {
padding-left: 20px;
padding-left: 25px;
}
.plugin-details-content pre {
display: block;
border: none;
padding: 10px 10px 10px 20px;
padding: 10px 10px 10px 25px;
font-size: 13px;
word-break: break-all;
word-wrap: break-word;
@ -36,8 +36,8 @@
background-color: #333;
margin-top: 10px;
margin-bottom: 20px;
margin-left: -20px;
margin-right: -20px;
margin-left: -25px;
margin-right: -25px;
}
.plugin-details-content pre code {
padding: 0;
@ -49,6 +49,6 @@
}
.plugin-details-content ul pre,
.plugin-details-content ol pre {
margin-left: -40px;
padding-left: 40px;
margin-left: -50px;
padding-left: 50px;
}

2
modules/system/assets/css/updates/updates.css
View File

@ -3,7 +3,7 @@
}
.control-updatelist {
border: 1px solid #ccc;
margin-bottom: 20px;
margin-bottom: 21px;
}
.control-updatelist .update-item {
border-bottom: 1px solid #ccc;

1
modules/system/assets/less/updates/details.less
View File

@ -1,6 +1,5 @@
@import "../../../../backend/assets/less/core/boot.less";
@padding-standard: 20px;
@padding-container: 0;
.plugin-details-content {

2
modules/system/assets/ui/js/inspector.surface.js
View File

@ -920,7 +920,7 @@
Surface.prototype.hasChanges = function(originalValues) {
var values = originalValues !== undefined ? originalValues : this.originalValues
return !this.comparePropertyValues(values, this.values)
return !this.comparePropertyValues(values, this.getValues())
}
// EVENT HANDLERS

52
modules/system/assets/ui/less/breadcrumb.less
View File

@ -9,48 +9,72 @@
// Breadcrumb
// --------------------------------------------------
@color-breadcrumb-text-active: #555555;
@color-breadcrumb-text: #9B9B9B;
@color-breadcrumb-text: #FFFFFF;
@color-breadcrumb-active-text: #2A3E51;
@color-breadcrumb-background: #D3D9DA;
@color-breadcrumb-inactive-background: #9DA4A5;
@color-breadcrumb-active-background: #1F99DC;
.control-breadcrumb {
font-size: 15px;
padding: 12px 20px 13px 20px;
margin: -(@padding-standard) -(@padding-standard) @padding-standard -(@padding-standard);
background-color: @color-breadcrumb-background;
ul {
padding: 0;
margin: 0;
font-size: 0;
}
li {
font-size: 15px;
list-style: none;
margin: 0;
padding: 0;
padding: 12px 10px 13px 30px;
display: inline-block;
color: @color-breadcrumb-text-active;
position: relative;
color: @color-breadcrumb-text;
background-color: @color-breadcrumb-inactive-background;
a {
display: inline-block;
color: @color-breadcrumb-text;
text-decoration: none;
&:hover { color: @color-breadcrumb-text; }
}
&:before, &:after {
top: 0;
right: -15px;
position: absolute;
z-index: 10;
}
&:after {
font-size: 14px;
line-height: 14px;
display: inline-block;
margin-left: 6px;
margin-right: 2px;
vertical-align: baseline;
color: @color-breadcrumb-text-active;
.icon(@angle-right);
.triangle(right, 15px, 46px, @color-breadcrumb-inactive-background);
}
&:before {
right: -16px;
z-index: 9;
.triangle(right, 15px, 46px, @color-breadcrumb-background);
}
&:first-child {
padding-left: 20px;
}
&:last-child:after {
content:'';
}
&:last-child {
background-color: transparent;
color: @color-breadcrumb-active-text;
&:after {
display: none;
}
}
}
}

2
modules/system/assets/ui/less/button.base.less
View File

@ -51,7 +51,7 @@
// --------------------------------------------------
.btn-default {
.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border; @btn-primary-bg; @btn-primary-bg);
}
.btn-primary {
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);

6
modules/system/assets/ui/less/button.mixins.less
View File

@ -2,7 +2,7 @@
// -------------------------
// Easily pump out default styles, as well as :hover, :focus, :active,
// and disabled options for all buttons
.button-variant(@color; @background; @border) {
.button-variant(@color; @background; @border; @background-hover: @background; @border-hover: @border) {
color: @color;
background-color: @background;
border-color: @border;
@ -13,8 +13,8 @@
&.active,
.open .dropdown-toggle& {
color: @color;
background-color: darken(@background, 8%);
border-color: darken(@border, 12%);
background-color: darken(@background-hover, 8%);
border-color: darken(@border-hover, 12%);
}
&:active,

4
modules/system/assets/ui/less/button.variables.less
View File

@ -1,8 +1,8 @@
@btn-font-weight: normal;
@btn-default-color: #FFFFFF;
@btn-default-bg: #BDC3C7;
@btn-default-border: #BDC3C7;
@btn-default-bg: #a7afb4;
@btn-default-border: #a7afb4;
@btn-primary-color: #fff;
@btn-primary-bg: #1681BA;

10
modules/system/assets/ui/less/dropdown.less
View File

@ -22,6 +22,10 @@
border: none;
.box-shadow(none);
&.offset-left {
left: 10px;
}
.dropdown-container {
> ul {
border: 1px solid @dropdown-border;
@ -51,8 +55,8 @@
li {
a {
outline: none;
padding: 8px 15px;
font-size: 13px;
padding: 10px 15px;
font-size: 14px;
display: block;
color: @dropdown-link-color;
position: relative;
@ -79,7 +83,7 @@
position: absolute;
font-size: 14px;
left: 9px;
top: 7px;
top: 10px;
color: @dropdown-border;
}
}

4
modules/system/assets/ui/less/flashmessage.less
View File

@ -26,7 +26,7 @@
top: 13px;
margin-left: -250px;
color: @color-flash-text;
font-size: 13px;
font-size: 14px;
padding: 10px 30px 10px 15px;
z-index: 10000;
word-wrap: break-word;
@ -56,6 +56,8 @@
top: 8px;
color: white;
outline: none;
&:hover {
color: white
}

2
modules/system/assets/ui/less/form.base.less
View File

@ -31,7 +31,7 @@ legend {
label {
display: inline-block;
margin-bottom: 14px;
margin-bottom: 11px;
font-weight: normal;
font-size: @label-font-size;
color: @color-label;

4
modules/system/assets/ui/less/form.less
View File

@ -21,7 +21,7 @@
//
.form-preview {
padding: 15px;
padding: @padding-standard;
margin-bottom: 20px;
background: white;
border: 1px solid #eee;
@ -131,7 +131,7 @@
}
&.checkbox-align {
padding-left: 23px;
padding-left: 39px;
margin-top: -5px;
}

10
modules/system/assets/ui/less/inspector.less
View File

@ -567,8 +567,8 @@ div.inspector-dictionary-container {
color: #ffffff;
h3 {
font-size: 14px;
font-weight: 600;
font-size: 16px;
font-weight: bold;
margin-top: 0;
margin-bottom: 0;
padding-right: 15px;
@ -576,9 +576,9 @@ div.inspector-dictionary-container {
}
p {
font-size: 13px;
font-weight: 100;
margin: 10px 0 0 0;
font-size: 14px;
font-weight: normal;
margin: 5px 0 0 0;
&:empty {
display: none;

2
modules/system/assets/ui/less/list.less
View File

@ -296,7 +296,7 @@ table.table.data {
padding: 5px;
display: block;
text-align: center;
font-size: 14px;
font-size: 18px;
position: relative;
top: 5px;
left: 10px;

12
modules/system/assets/ui/less/popover.less
View File

@ -141,8 +141,8 @@ div.control-popover {
}
h3 {
font-size: 14px;
font-weight: 600;
font-size: 16px;
font-weight: bold;
margin-top: 0;
margin-bottom: 0;
padding-right: 15px;
@ -150,9 +150,9 @@ div.control-popover {
}
p {
font-size: 13px;
font-weight: 100;
margin: 10px 0 0 0;
font-size: 14px;
font-weight: normal;
margin: 5px 0 0 0;
&:empty {
display: none;
@ -176,7 +176,7 @@ div.control-popover {
.inspector-move-to-container {
.opacity(0.4);
position: absolute;
top: 12px;
top: 14px;
right: 26px;
float: none;
color: #ffffff;

5
modules/system/assets/ui/less/select.less
View File

@ -45,12 +45,13 @@
.select2-search--dropdown {
position: relative;
padding: 9px;
&:after {
position: absolute;
.icon(@search);
right: 10px;
top: 7px;
right: 19px;
top: 15px;
color: #95a5a6;
}

20
modules/system/assets/ui/less/tab.less
View File

@ -70,10 +70,12 @@
font-size: 0;
overflow: hidden;
border-bottom: none;
vertical-align: bottom;
> li {
font-size: 15px;
float: none;
display: inline-block;
vertical-align: bottom;
margin-right: 20px;
position: relative;
z-index: 90;
@ -379,8 +381,8 @@
border-right: 1px solid @color-tab-border;
a {
font-size: 12px;
font-weight: 600;
font-size: 14px;
font-weight: bold;
padding-bottom: 0;
}
@ -391,6 +393,12 @@
}
}
}
> div.tab-content {
> div.tab-pane {
padding-top: 15px;
}
}
}
//
@ -419,11 +427,17 @@
a {
font-size: 12px;
padding: 17px 20px;
padding: 11px 20px;
margin: 0;
border: none;
text-transform: uppercase;
background: transparent;
span.title {
span {
border-top: none;
}
}
}
&:first-child {

43
modules/system/assets/ui/less/toolbar.less
View File

@ -238,3 +238,46 @@
.tb-alignjustify:before { content: "\e61d"; }
.tb-aligncenter:before { content: "\e61e"; }
.tb-gallery:before { content: "\e61f"; }
/* Toolbar tweaks for the side panel */
#layout-side-panel,
.compact-toolbar {
div.control-toolbar {
&, &.toolbar-padded {
padding: 0;
}
&.separator {
border-bottom: 1px solid #ecf0f1;
}
.toolbar-item {
padding-right: 0;
}
.btn {
.border-radius(0)!important;
padding-top: 12px;
padding-bottom: 13px;
margin-right: 0;
}
input.form-control {
border: none;
padding: 12px 13px 13px;
height: auto;
.border-radius(0)!important;
&.icon.search {
background-position: right -78px;
}
}
div.loading-indicator-container.size-input-text {
.loading-indicator {
top: 6px;
}
}
}
}

2
modules/system/assets/ui/storm-min.js vendored
View File

@ -3610,7 +3610,7 @@ if(!editor.validate(silentMode)){if(!silentMode){editor.markInvalid()}
return false}}
return true}
Surface.prototype.hasChanges=function(originalValues){var values=originalValues!==undefined?originalValues:this.originalValues
return!this.comparePropertyValues(values,this.values)}
return!this.comparePropertyValues(values,this.getValues())}
Surface.prototype.onGroupClick=function(ev){var row=ev.currentTarget
this.toggleGroup(row)
$.oc.foundation.event.stop(ev)

77
modules/system/assets/ui/storm.css
View File

@ -415,11 +415,11 @@ address{margin-bottom:21px;font-style:normal;line-height:1.42857143}
.btn:hover,.btn:focus{color:#ffffff;text-decoration:none}
.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}
.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}
.btn-default{color:#ffffff;background-color:#bdc3c7;border-color:#bdc3c7}
.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#ffffff;background-color:#a7afb4;border-color:#9ca5ab}
.btn-default{color:#ffffff;background-color:#a7afb4;border-color:#a7afb4}
.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#ffffff;background-color:#126896;border-color:#105b83}
.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}
.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#bdc3c7;border-color:#bdc3c7}
.btn-default .badge{color:#bdc3c7;background-color:#ffffff}
.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#a7afb4;border-color:#a7afb4}
.btn-default .badge{color:#a7afb4;background-color:#ffffff}
.btn-primary{color:#ffffff;background-color:#1681ba;border-color:#1371a3;font-weight:bold}
.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#ffffff;background-color:#126896;border-color:#0d4b6c}
.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}
@ -514,8 +514,8 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"
.btn-icon.margin-left{margin-left:5px}
.btn-icon.small{font-size:17px;height:17px;line-height:15px}
.btn-icon.larger{font-size:21px;height:21px;line-height:17px}
.btn-text{font-size:16px;padding:8px 0;vertical-align:middle;display:inline-block;color:#bdc3c7}
.btn-text a{color:#bdc3c7;text-decoration:underline}
.btn-text{font-size:16px;padding:8px 0;vertical-align:middle;display:inline-block;color:#a7afb4}
.btn-text a{color:#a7afb4;text-decoration:underline}
.btn-text a:hover{color:#0181b9}
.tooltip{position:absolute;z-index:1060;display:block;visibility:visible;font-size:13px;line-height:1.4;opacity:0;filter:alpha(opacity=0)}
.tooltip.in{opacity:0.9;filter:alpha(opacity=90)}
@ -1154,14 +1154,15 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
.dropup .caret{border-top:0;border-bottom:4px solid;content:""}
.dropup .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}
.dropdown-menu{padding:0;background:transparent;border:none;-webkit-box-shadow:none;box-shadow:none}
.dropdown-menu.offset-left{left:10px}
.dropdown-menu .dropdown-container > ul{border:1px solid #949ea6;background-color:#ffffff;border-radius:5px;padding:0;list-style:none;position:relative;margin-top:7px}
.dropdown-menu .dropdown-container > ul:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #ffffff;position:absolute;left:15px;top:-8px;z-index:101}
.dropdown-menu .dropdown-container > ul:before{content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-bottom:9px solid #949ea6;position:absolute;left:14px;top:-9px;z-index:100}
.dropdown-menu .dropdown-container > ul li a{outline:none;padding:8px 15px;font-size:13px;display:block;color:#39454a;position:relative}
.dropdown-menu .dropdown-container > ul li a{outline:none;padding:10px 15px;font-size:14px;display:block;color:#39454a;position:relative}
.dropdown-menu .dropdown-container > ul li a:hover,.dropdown-menu .dropdown-container > ul li a:focus{text-decoration:none;color:#ffffff;background-color:#2f99da}
.dropdown-menu .dropdown-container > ul li a:hover[class^="oc-icon-"]:before,.dropdown-menu .dropdown-container > ul li a:focus[class^="oc-icon-"]:before,.dropdown-menu .dropdown-container > ul li a:hover[class*=" oc-icon-"]:before,.dropdown-menu .dropdown-container > ul li a:focus[class*=" oc-icon-"]:before{color:white}
.dropdown-menu .dropdown-container > ul li a[class^="oc-icon-"],.dropdown-menu .dropdown-container > ul li a[class*=" oc-icon-"]{padding-left:30px}
.dropdown-menu .dropdown-container > ul li a[class^="oc-icon-"]:before,.dropdown-menu .dropdown-container > ul li a[class*=" oc-icon-"]:before{position:absolute;font-size:14px;left:9px;top:7px;color:#949ea6}
.dropdown-menu .dropdown-container > ul li a[class^="oc-icon-"]:before,.dropdown-menu .dropdown-container > ul li a[class*=" oc-icon-"]:before{position:absolute;font-size:14px;left:9px;top:10px;color:#949ea6}
.dropdown-menu .dropdown-container > ul li.first-item a:hover:after,.dropdown-menu .dropdown-container > ul li.first-item a:focus:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #2f99da;position:absolute;left:15px;top:-8px;z-index:102}
.dropdown-menu .dropdown-container > ul li.dropdown-title{display:none}
.dropdown-menu .dropdown-container > ul li.divider{margin:0}
@ -1206,12 +1207,12 @@ div.control-popover div.popover-body.form-container{padding-bottom:0}
div.control-popover div.popover-footer{padding:0 20px 20px 20px}
div.control-popover .popover-head{background:#d35400;padding:14px 16px;position:relative;color:#ffffff;border-top-right-radius:2px;border-top-left-radius:2px}
div.control-popover .popover-head:before{z-index:602;position:absolute}
div.control-popover .popover-head h3{font-size:14px;font-weight:600;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%}
div.control-popover .popover-head p{font-size:13px;font-weight:100;margin:10px 0 0 0}
div.control-popover .popover-head h3{font-size:16px;font-weight:bold;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%}
div.control-popover .popover-head p{font-size:14px;font-weight:normal;margin:5px 0 0 0}
div.control-popover .popover-head p:empty{display:none}
div.control-popover .popover-head .close{float:none;position:absolute;right:11px;top:12px;color:#ffffff;outline:none;opacity:0.4;filter:alpha(opacity=40)}
div.control-popover .popover-head .close:hover{opacity:1;filter:alpha(opacity=100)}
div.control-popover .popover-head .inspector-move-to-container{opacity:0.4;filter:alpha(opacity=40);position:absolute;top:12px;right:26px;float:none;color:#ffffff;cursor:pointer;text-decoration:none}
div.control-popover .popover-head .inspector-move-to-container{opacity:0.4;filter:alpha(opacity=40);position:absolute;top:14px;right:26px;float:none;color:#ffffff;cursor:pointer;text-decoration:none}
div.control-popover .popover-head .inspector-move-to-container:hover{opacity:1;filter:alpha(opacity=100);color:#ffffff}
div.control-popover .popover-head .inspector-move-to-container:before{-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}
div.control-popover.placement-bottom .popover-head:before{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-bottom:8px solid #d35400;left:15px;top:-8px}
@ -1234,13 +1235,18 @@ 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{font-size:15px;padding:12px 20px 13px 20px;margin:-25px -25px 25px -25px;background-color:#d3d9da}
.control-breadcrumb ul{padding:0;margin:0}
.control-breadcrumb li{list-style:none;margin:0;padding:0;display:inline-block;color:#555555}
.control-breadcrumb li a{color:#9b9b9b;text-decoration:none}
.control-breadcrumb li a:hover{color:#9b9b9b}
.control-breadcrumb li:after{font-size:14px;line-height:14px;display:inline-block;margin-left:6px;margin-right:2px;vertical-align:baseline;color:#555555;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f105"}
.control-breadcrumb{margin:-25px -25px 25px -25px;background-color:#d3d9da}
.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 a{display:inline-block;color:#ffffff;text-decoration:none}
.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:first-child{padding-left:20px}
.control-breadcrumb li:last-child:after{content:''}
.control-breadcrumb li:last-child{background-color:transparent;color:#2a3e51}
.control-breadcrumb li:last-child:after{display:none}
body.breadcrumb-flush .control-breadcrumb,.control-breadcrumb.breadcrumb-flush{margin-bottom:0}
body.slim-container .control-breadcrumb{margin-left:0;margin-right:0}
body.compact-container .control-breadcrumb{margin-top:0;margin-left:0;margin-right:0}
@ -1349,8 +1355,8 @@ to{background-position:0 0}
.control-tabs.scroll-active-before:before{color:#dbe1e3}
.control-tabs.scroll-active-after:after{color:#dbe1e3}
.control-tabs:before,.control-tabs:after{top:5px;margin-top:0}
.control-tabs > ul.nav-tabs,.control-tabs > div > ul.nav-tabs,.control-tabs > div > div > ul.nav-tabs{white-space:nowrap;font-size:0;overflow:hidden;border-bottom:none}
.control-tabs > ul.nav-tabs > li,.control-tabs > div > ul.nav-tabs > li,.control-tabs > div > div > ul.nav-tabs > li{font-size:15px;float:none;display:inline-block;margin-right:20px;position:relative;z-index:90}
.control-tabs > ul.nav-tabs,.control-tabs > div > ul.nav-tabs,.control-tabs > div > div > ul.nav-tabs{white-space:nowrap;font-size:0;overflow:hidden;border-bottom:none;vertical-align:bottom}
.control-tabs > ul.nav-tabs > li,.control-tabs > div > ul.nav-tabs > li,.control-tabs > div > div > ul.nav-tabs > li{font-size:15px;float:none;display:inline-block;vertical-align:bottom;margin-right:20px;position:relative;z-index:90}
.control-tabs > ul.nav-tabs > li:last-child,.control-tabs > div > ul.nav-tabs > li:last-child,.control-tabs > div > div > ul.nav-tabs > li:last-child{margin-right:0}
.control-tabs > ul.nav-tabs > li a,.control-tabs > div > ul.nav-tabs > li a,.control-tabs > div > div > ul.nav-tabs > li a{border-left:none !important;border-top:none !important;border-right:none !important;padding:0 0 10px 0;color:#cccccc;background:#f9f9f9;font-weight:400;overflow:hidden}
.control-tabs > ul.nav-tabs > li a:hover,.control-tabs > div > ul.nav-tabs > li a:hover,.control-tabs > div > div > ul.nav-tabs > li a:hover{background-color:transparent;border-bottom-color:transparent}
@ -1399,12 +1405,14 @@ to{background-position:0 0}
.control-tabs.primary > ul.nav-tabs > li.active a:before,.control-tabs.primary-tabs > ul.nav-tabs > li.active a:before,.control-tabs.primary > div > ul.nav-tabs > li.active a:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a:before,.control-tabs.primary > div > div > ul.nav-tabs > li.active a:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a:before{position:absolute;bottom:0;height:2px;right:2px;left:2px;content:' ';background-color:#f9f9f9}
.control-tabs.primary.tabs-inset > ul.nav-tabs,.control-tabs.primary-tabs.tabs-inset > ul.nav-tabs,.control-tabs.primary.tabs-inset > div > ul.nav-tabs,.control-tabs.primary-tabs.tabs-inset > div > ul.nav-tabs,.control-tabs.primary.tabs-inset > div > div > ul.nav-tabs,.control-tabs.primary-tabs.tabs-inset > div > div > ul.nav-tabs{margin-left:-20px;margin-right:-20px}
.control-tabs.secondary > ul.nav-tabs > li,.control-tabs.secondary-tabs > ul.nav-tabs > li,.control-tabs.secondary > div > ul.nav-tabs > li,.control-tabs.secondary-tabs > div > ul.nav-tabs > li,.control-tabs.secondary > div > div > ul.nav-tabs > li,.control-tabs.secondary-tabs > div > div > ul.nav-tabs > li{padding-right:10px;margin-right:10px;border-right:1px solid #ecf0f1}
.control-tabs.secondary > ul.nav-tabs > li a,.control-tabs.secondary-tabs > ul.nav-tabs > li a,.control-tabs.secondary > div > ul.nav-tabs > li a,.control-tabs.secondary-tabs > div > ul.nav-tabs > li a,.control-tabs.secondary > div > div > ul.nav-tabs > li a,.control-tabs.secondary-tabs > div > div > ul.nav-tabs > li a{font-size:12px;font-weight:600;padding-bottom:0}
.control-tabs.secondary > ul.nav-tabs > li a,.control-tabs.secondary-tabs > ul.nav-tabs > li a,.control-tabs.secondary > div > ul.nav-tabs > li a,.control-tabs.secondary-tabs > div > ul.nav-tabs > li a,.control-tabs.secondary > div > div > ul.nav-tabs > li a,.control-tabs.secondary-tabs > div > div > ul.nav-tabs > li a{font-size:14px;font-weight:bold;padding-bottom:0}
.control-tabs.secondary > ul.nav-tabs > li:last-child,.control-tabs.secondary-tabs > ul.nav-tabs > li:last-child,.control-tabs.secondary > div > ul.nav-tabs > li:last-child,.control-tabs.secondary-tabs > div > ul.nav-tabs > li:last-child,.control-tabs.secondary > div > div > ul.nav-tabs > li:last-child,.control-tabs.secondary-tabs > div > div > ul.nav-tabs > li:last-child{border-right:none;margin-right:0;padding-right:0}
.control-tabs.secondary > div.tab-content > div.tab-pane,.control-tabs.secondary-tabs > div.tab-content > div.tab-pane{padding-top:15px}
.control-tabs.content-tabs > ul.nav-tabs{position:relative}
.control-tabs.content-tabs > ul.nav-tabs:before{content:' ';position:absolute;bottom:0;left:0;width:100%;height:1px;background:#e3e5e7}
.control-tabs.content-tabs > ul.nav-tabs li{margin-right:0;border-top:1px solid #e3e5e7;border-right:1px solid #e3e5e7}
.control-tabs.content-tabs > ul.nav-tabs li a{font-size:12px;padding:17px 20px;margin:0;border:none;text-transform:uppercase;background:transparent}
.control-tabs.content-tabs > ul.nav-tabs li a{font-size:12px;padding:11px 20px;margin:0;border:none;text-transform:uppercase;background:transparent}
.control-tabs.content-tabs > ul.nav-tabs li a span.title span{border-top:none}
.control-tabs.content-tabs > ul.nav-tabs li:first-child{border-left:1px solid #e3e5e7}
.control-tabs.content-tabs > ul.nav-tabs li:last-child{border-right:1px solid #e3e5e7}
.control-tabs.content-tabs > ul.nav-tabs li.active{background:#ffffff}
@ -1554,6 +1562,13 @@ ul.status-list li span.status.info{background:#5bc0de}
.tb-alignjustify:before{content:"\e61d"}
.tb-aligncenter:before{content:"\e61e"}
.tb-gallery:before{content:"\e61f"}
#layout-side-panel div.control-toolbar,.compact-toolbar div.control-toolbar,#layout-side-panel div.control-toolbar.toolbar-padded,.compact-toolbar div.control-toolbar.toolbar-padded{padding:0}
#layout-side-panel div.control-toolbar.separator,.compact-toolbar div.control-toolbar.separator{border-bottom:1px solid #ecf0f1}
#layout-side-panel div.control-toolbar .toolbar-item,.compact-toolbar div.control-toolbar .toolbar-item{padding-right:0}
#layout-side-panel div.control-toolbar .btn,.compact-toolbar div.control-toolbar .btn{-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;padding-top:12px;padding-bottom:13px;margin-right:0}
#layout-side-panel div.control-toolbar input.form-control,.compact-toolbar div.control-toolbar input.form-control{border:none;padding:12px 13px 13px;height:auto;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important}
#layout-side-panel div.control-toolbar input.form-control.icon.search,.compact-toolbar div.control-toolbar input.form-control.icon.search{background-position:right -78px}
#layout-side-panel div.control-toolbar div.loading-indicator-container.size-input-text .loading-indicator,.compact-toolbar div.control-toolbar div.loading-indicator-container.size-input-text .loading-indicator{top:6px}
div.scoreboard{position:relative;padding:0}
div.scoreboard:after,div.scoreboard:before{display:none;position:absolute;top:50%;margin-top:-7px;height:9px;font-size:10px;color:#bbbbbb}
div.scoreboard:before{left:-6px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f104"}
@ -1573,14 +1588,14 @@ div.scoreboard .control-chart .canvas + ul{margin-left:0}
div.scoreboard .scoreboard-offset{padding-left:20px}
body.slim-container div.scoreboard{padding:0 25px}
#layout-canvas .flash-message{display:none}
.flash-message{position:fixed;width:500px;left:50%;top:13px;margin-left:-250px;color:#ffffff;font-size:13px;padding:10px 30px 10px 15px;z-index:10000;word-wrap:break-word;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
.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:5px;-moz-border-radius:5px;border-radius:5px}
.flash-message.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:all 0.5s,width 0s;transition:all 0.5s,width 0s;-webkit-transform:scale(0.9);-ms-transform:scale(0.9);transform:scale(0.9)}
.flash-message.fade.in{opacity:1;filter:alpha(opacity=100);-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}
.flash-message.success{background:#8da85e}
.flash-message.error{background:#cc3300}
.flash-message.warning{background:#f0ad4e}
.flash-message.info{background:#5fb6f5}
.flash-message button{float:none;position:absolute;right:10px;top:8px;color:white}
.flash-message button{float:none;position:absolute;right:10px;top:8px;color:white;outline:none}
.flash-message button:hover{color:white}
.flash-message.static{position:static !important;width:auto !important;display:block !important;margin-left:0 !important}
@media (max-width:768px){.flash-message{left:10px;right:10px;top:10px;margin-left:0;width:auto}
@ -1847,7 +1862,7 @@ body.slim-container div.scoreboard{padding:0 25px}
.flag-ss{background-position:0 -3936px}
fieldset{padding:0;margin:0;border:0;min-width:0}
legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:inherit;color:#333333;border:0;border-bottom:1px solid #e5e5e5}
label{display:inline-block;margin-bottom:14px;font-weight:normal;font-size:15px;color:#2a3e51}
label{display:inline-block;margin-bottom:11px;font-weight:normal;font-size:15px;color:#2a3e51}
input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9; line-height:normal}
input[type="file"]{display:block}
@ -2091,8 +2106,8 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.select2-container.in-progress .select2-selection .select2-selection__arrow b{display:none !important}
.select2-container--default{display:block; }
.select2-container--default .select2-selection{background-color:#ffffff;border:2px solid #bdc3c7;border-radius:3px;color:#555555;font-size:15px;outline:0}
.select2-container--default .select2-search--dropdown{position:relative}
.select2-container--default .select2-search--dropdown:after{position:absolute;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f002";right:10px;top:7px;color:#95a5a6}
.select2-container--default .select2-search--dropdown{position:relative;padding:9px}
.select2-container--default .select2-search--dropdown:after{position:absolute;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f002";right:19px;top:15px;color:#95a5a6}
.select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:2px solid #bdc3c7;border-radius:3px;color:#555555;font-size:15px}
.select2-container--default .select2-search__field{outline:0}
.select2-container--default .select2-search__field::-webkit-input-placeholder{color:#cccccc}
@ -2222,7 +2237,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.custom-switch > span span{z-index:5;display:block;width:50%;position:absolute;top:1px;left:-1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
.custom-switch > span span:last-child{left:28px;color:#FFFFFF;display:block}
.custom-switch > span span:first-of-type{padding-left:13px;display:none;color:#666666}
.form-preview{padding:15px;margin-bottom:20px;background:white;border:1px solid #eee}
.form-preview{padding:25px;margin-bottom:20px;background:white;border:1px solid #eee}
.form-preview > .form-group:last-child{padding-bottom:0}
.form-preview.form-flush{border-top:none}
.form-elements:before,.form-tabless-fields:before,.form-elements:after,.form-tabless-fields:after{content:" ";display:table}
@ -2248,7 +2263,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.form-group.layout-relative{padding-bottom:0}
.form-group.checkbox-field{padding-bottom:5px}
.form-group.number-field > .form-control{text-align:right}
.form-group.checkbox-align{padding-left:23px;margin-top:-5px}
.form-group.checkbox-align{padding-left:39px;margin-top:-5px}
.form-group.field-slim.span-left,.form-group.field-slim.span-right{width:50%}
.form-group.field-indent{padding-left:23px}
.form-group.input-sidebar-control{padding-right:35px}
@ -2410,7 +2425,7 @@ table.table.data .list-checkbox .custom-checkbox{position:relative;top:-14px;lef
table.table.data .list-checkbox .custom-checkbox label{margin-right:0;margin-bottom:0}
table.table.data thead tr th.list-checkbox{padding:18px 0 0 25px}
table.table.data .list-tree{width:10px;padding:0}
table.table.data .list-tree a.list-expand-collapse{padding:5px;display:block;text-align:center;font-size:14px;position:relative;top:5px;left:10px;text-decoration:none !important}
table.table.data .list-tree a.list-expand-collapse{padding:5px;display:block;text-align:center;font-size:18px;position:relative;top:5px;left:10px;text-decoration:none !important}
table.table.data tr.list-tree-level-1 a.list-expand-collapse{left:30px}
table.table.data tr.list-tree-level-1 td.list-cell-index-1{padding-left:35px}
table.table.data tr.list-tree-level-2 a.list-expand-collapse{left:40px}
@ -2554,8 +2569,8 @@ div.inspector-dictionary-container table.inspector-dictionary-table tbody tr td
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}
.inspector-header{background:#d35400;padding:14px 16px;position:relative;color:#ffffff}
.inspector-header h3{font-size:14px;font-weight:600;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%}
.inspector-header p{font-size:13px;font-weight:100;margin:10px 0 0 0}
.inspector-header h3{font-size:16px;font-weight:bold;margin-top:0;margin-bottom:0;padding-right:15px;line-height:130%}
.inspector-header p{font-size:14px;font-weight:normal;margin:5px 0 0 0}
.inspector-header p:empty{display:none}
.inspector-header span,.inspector-header a{text-decoration:none;position:absolute;top:12px;float:none;color:#ffffff;cursor:pointer;opacity:0.4;filter:alpha(opacity=40)}
.inspector-header span:hover,.inspector-header a:hover{opacity:1;filter:alpha(opacity=100);color:#ffffff}