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

Merge branch 'master' into develop

This commit is contained in:
Samuel Georges 2015-04-24 09:31:30 +10:00
parent 95a5aa9c54 7ad12350c6
commit 04369861ad
5 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/backend/assets/css/controls.css
View File

@ -813,6 +813,7 @@ div.control-popover > div{position:relative;background:#ffffff;-webkit-box-shado
div.control-popover > div:after,div.control-popover > div:before{position:absolute}
div.control-popover > div:after{z-index:601}
div.control-popover > div:before{z-index:600}
div.control-popover.placement-bottom > div{border:1px solid #949ea6}
div.control-popover.placement-bottom > div: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;left:15px;top:-8px}
div.control-popover.placement-bottom > div: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;left:14px;top:-9px}
div.control-popover.placement-top > div:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #ffffff;border-bottom-width:0;left:15px;bottom:-8px}

2
modules/backend/assets/less/controls/popover.less
View File

@ -41,6 +41,8 @@ div.control-popover {
}
&.placement-bottom > div {
border: 1px solid @color-popover-border;
&:after {
.triangle(up, 15px, 8px, @color-popover-bg);
left: 15px;

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

@ -247,9 +247,9 @@ to{background-position:0 0}
.redactor-box{margin-bottom:0}
.redactor-box iframe{border:none}
.redactor-box-fullscreen{z-index:715 !important}
.redactor-toolbar,.redactor-dropdown{z-index:710 !important}
.redactor-dropdown{z-index:725 !important}
#redactor-modal-overlay,#redactor-modal-box,#redactor-modal{z-index:720 !important}
.redactor-toolbar{background:#dddddd;-webkit-box-shadow:none;box-shadow:none}
.redactor-toolbar{background:#dddddd;-webkit-box-shadow:none;box-shadow:none;z-index:410 !important}
.redactor-toolbar li.redactor-btn-right{float:right;margin-right:2px}
.redactor-toolbar li a{color:#404040;font-size:14px;width:20px;line-height:20px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
.redactor-toolbar li a:hover{background-color:#999999;color:#ffffff}

5
modules/backend/formwidgets/richeditor/assets/less/richeditor.less
View File

@ -49,9 +49,9 @@
.redactor-box-fullscreen {
z-index: @richeditor-zindex + 115 !important;
}
.redactor-toolbar,
.redactor-dropdown {
z-index: @richeditor-zindex + 110 !important;
z-index: @richeditor-zindex + 125 !important;
}
#redactor-modal-overlay,
#redactor-modal-box,
@ -62,6 +62,7 @@
.redactor-toolbar {
background: @color-richeditor-toolbar;
.box-shadow(none);
z-index: 410 !important;
& li.redactor-btn-right {
float: right;

36
modules/backend/models/brandsettings/custom.less
View File

@ -128,6 +128,16 @@ table.table.data {
}
}
&.secondary {
&.content-tabs {
&.primary-collapsed {
> div > ul.nav-tabs {
background: @color-fancy-form-tabless-fields-bg;
}
}
}
}
&.primary {
> div > ul.nav-tabs {
&.master-area {
@ -203,6 +213,32 @@ div.control-componentlist {
}
}
.nav.selector-group {
li {
&.active {
border-color: @color-list-active-border;
}
}
}
//
// TreeView
//
.control-treeview {
ol {
> li {
&.active {
> div {
&:after {
background: @color-list-active-border;
}
}
}
}
}
}
//
// Sidenav Tree
//