TPS/birzha
TPS
/
birzha
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

UI updates

This commit is contained in:
alekseybobkov 2016-02-19 22:12:41 -08:00
parent 68aa59dae7
commit a943708b99
46 changed files with 13499 additions and 713 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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');
});
@ -88,6 +88,7 @@ class ServiceProvider extends ModuleServiceProvider
'dashboard' => [
'label' => 'backend::lang.dashboard.menu_label',
'icon' => 'icon-dashboard',
'iconSvg' => 'modules/backend/assets/images/dashboard-icon.svg',
'url' => Backend::url('backend'),
'permissions' => ['backend.access_dashboard'],
'order' => 1

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

@ -533,7 +533,7 @@
background-repeat: no-repeat;
}
.sweet-alert .btn-default:focus {
border-color: #e3e3e3;
border-color: #bdc3c7;
outline: 0;
}
.sweet-alert .btn-success:focus {
@ -801,9 +801,9 @@
font-size: 12px;
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-filelist ul {
padding: 0;
@ -1217,9 +1217,9 @@
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
.report-widget h3 {
font-size: 14px;
@ -2001,14 +2001,23 @@
}
}
.sidenav-tree {
width: 280px;
background: #34495e;
width: 300px;
background: #31495f;
}
.sidenav-tree .control-toolbar {
padding: 20px 0 20px 20px;
padding: 0;
}
.sidenav-tree .control-toolbar .toolbar-item {
display: block;
}
.sidenav-tree .control-toolbar input.form-control {
border: none;
outline: none;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
}
.sidenav-tree ul {
padding: 0;
@ -2019,33 +2028,46 @@
background: #2b3e50!important;
}
.sidenav-tree ul.top-level > li[data-status=collapsed] > div.group h3:before {
-webkit-transform: rotate(0deg) translate(3px, 0);
-ms-transform: rotate(0deg) translate(3px, 0);
transform: rotate(0deg) translate(3px, 0);
-webkit-transform: rotate(0deg) translate(2px, -2px);
-ms-transform: rotate(0deg) translate(2px, -2px);
transform: rotate(0deg) translate(2px, -2px);
}
.sidenav-tree ul.top-level > li[data-status=collapsed] > div.group h3:after {
display: none;
}
.sidenav-tree ul.top-level > li[data-status=collapsed] ul {
display: none;
}
.sidenav-tree ul.top-level > li > div.group {
position: relative;
}
.sidenav-tree ul.top-level > li > div.group:after {
content: '';
position: absolute;
top: 0;
right: 0;
width: 10px;
height: 100%;
-webkit-box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
}
.sidenav-tree ul.top-level > li > div.group h3 {
background: #2b3e50;
background: #2a3e51;
color: #ecf0f1;
text-transform: uppercase;
font-size: 14px;
padding: 15px 15px 15px 33px;
font-size: 16px;
padding: 22px 15px 21px 40px;
margin: 0;
position: relative;
cursor: pointer;
}
.sidenav-tree ul.top-level > li > div.group h3:before {
width: 10px;
height: 10px;
display: block;
position: absolute;
top: 1px;
}
.sidenav-tree ul.top-level > li > div.group h3:before {
left: 13px;
top: 15px;
width: 10px;
height: 10px;
left: 16px;
top: 21px;
color: #cfcfcf;
font-family: FontAwesome;
font-weight: normal;
@ -2053,69 +2075,84 @@
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em;
content: "\f0da";
-webkit-transform: rotate(90deg) translate(5px, 0);
-ms-transform: rotate(90deg) translate(5px, 0);
transform: rotate(90deg) translate(5px, 0);
content: "\f105";
-webkit-transform: rotate(90deg) translate(5px, -3px);
-ms-transform: rotate(90deg) translate(5px, -3px);
transform: rotate(90deg) translate(5px, -3px);
-webkit-transition: all 0.1s ease;
transition: all 0.1s ease;
font-size: 16px;
}
.sidenav-tree ul.top-level > li > div.group h3:after {
content: '';
display: block;
width: 0;
height: 0;
border-left: 7.5px solid transparent;
border-right: 7.5px solid transparent;
border-top: 8px solid #2a3e51;
border-bottom-width: 0;
position: absolute;
left: 15px;
bottom: -8px;
z-index: 101;
}
.sidenav-tree ul.top-level > li > ul li a {
display: block;
position: relative;
padding: 15px 15px 15px 40px;
background: #3d5265;
margin-bottom: 1px;
color: rgba(255, 255, 255, 0.26);
padding: 25px 25px 25px 60px;
background: transparent;
border-bottom: 1px solid #2a3e51;
color: #ffffff;
text-decoration: none!important;
}
.sidenav-tree ul.top-level > li > ul li a:after {
content: '';
position: absolute;
top: 0;
right: 0;
width: 10px;
height: 100%;
-webkit-box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
box-shadow: inset -5px 0 3px rgba(0, 0, 0, 0.1);
}
.sidenav-tree ul.top-level > li > ul li a:hover {
text-decoration: none;
}
.sidenav-tree ul.top-level > li > ul li a i {
position: absolute;
left: 15px;
top: 17px;
font-size: 16px;
left: 20px;
top: 24px;
font-size: 22px;
}
.sidenav-tree ul.top-level > li > ul li a span {
display: block;
line-height: 150%;
}
.sidenav-tree ul.top-level > li > ul li a span.header {
color: rgba(255, 255, 255, 0.74);
font-size: 14px;
color: #ffffff;
font-size: 16px;
margin-bottom: 5px;
}
.sidenav-tree ul.top-level > li > ul li a span.description {
color: rgba(255, 255, 255, 0.64);
font-size: 12px;
font-weight: 100;
color: #bdc3c7;
font-size: 15px;
}
.sidenav-tree ul.top-level > li > ul li.active a {
background: #34495e;
.sidenav-tree ul.top-level > li > ul li.active a,
.sidenav-tree ul.top-level > li > ul li:hover a {
background: #1f99dc;
color: rgba(255, 255, 255, 0.91);
}
.sidenav-tree ul.top-level > li > ul li.active a:before {
content: ' ';
position: absolute;
width: 4px;
background: #e67e22;
left: 0;
top: 0;
height: 100%;
}
.sidenav-tree ul.top-level > li > ul li.active a span.header {
.sidenav-tree ul.top-level > li > ul li.active a span.header,
.sidenav-tree ul.top-level > li > ul li:hover a span.header {
color: #ffffff;
}
.sidenav-tree ul.top-level > li > ul li.active a span.description {
.sidenav-tree ul.top-level > li > ul li.active a span.description,
.sidenav-tree ul.top-level > li > ul li:hover a span.description {
color: rgba(255, 255, 255, 0.91);
}
.sidenav-tree ul.top-level > li > ul li:last-child a {
margin-bottom: 0;
}
.sidenav-tree ul.top-level > li > ul li:hover a {
background-color: #34495e;
border-bottom: none;
}
.sidenav-tree .back-link {
display: none;
@ -2437,6 +2474,25 @@ div.control-scrollpad[data-direction=horizontal] > .scrollpad-scrollbar .drag-ha
.autocomplete.dropdown-menu li a {
padding: 3px 12px;
}
.svg-icon-container img.svg-icon {
display: none;
}
.svg-icon-container.svg-active-effects img.svg-icon {
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
opacity: 0.6;
filter: alpha(opacity=60);
}
.svg-icon-container.svg-active-effects:hover img.svg-icon,
.svg-icon-container.svg-active-effects.active img.svg-icon {
-webkit-filter: none;
filter: none;
opacity: 1;
filter: alpha(opacity=100);
}
html.svg .svg-icon-container i.svg-replace {
display: none;
}
@-webkit-keyframes fadeIn {
0% {
opacity: 0;
@ -2746,8 +2802,8 @@ body {
.control-tabs.primary-tabs > ul.nav-tabs,
.control-tabs.primary-tabs > div > ul.nav-tabs,
.control-tabs.primary-tabs > div > div > ul.nav-tabs {
margin-left: -20px;
margin-right: -20px;
margin-left: -35px;
margin-right: -35px;
}
.control-tabs.primary-tabs.tabs-no-inset > ul.nav-tabs,
.control-tabs.primary-tabs.tabs-no-inset > div > ul.nav-tabs,
@ -2787,7 +2843,7 @@ body {
.layout > .layout-row > .layout-cell .layout-container,
.layout > .layout-row > .layout-cell.padded-container,
.layout > .layout-row > .layout-cell .padded-container {
padding: 20px 20px 0 20px;
padding: 35px 35px 0 35px;
}
.layout > .layout-row > .layout-cell.layout-container .container-flush,
.layout > .layout-row > .layout-cell .layout-container .container-flush,
@ -2832,7 +2888,7 @@ body {
.layout > .layout-row > .layout-cell .layout-container,
.layout > .layout-row > .layout-cell.padded-container,
.layout > .layout-row > .layout-cell .padded-container {
padding: 20px 20px 0 20px;
padding: 35px 35px 0 35px;
}
.layout > .layout-row > .layout-cell.layout-container .container-flush,
.layout > .layout-row > .layout-cell .layout-container .container-flush,
@ -2885,7 +2941,7 @@ body {
.layout > .layout-cell .layout-container,
.layout > .layout-cell.padded-container,
.layout > .layout-cell .padded-container {
padding: 20px 20px 0 20px;
padding: 35px 35px 0 35px;
}
.layout > .layout-cell.layout-container .container-flush,
.layout > .layout-cell .layout-container .container-flush,
@ -3070,20 +3126,20 @@ body.slim-container .layout .layout-container {
body.mainmenu-open {
overflow: hidden;
}
nav#layout-mainmenu.navbar {
nav#layout-mainmenu {
background-color: #111111;
padding: 0 0 0 20px;
line-height: 0;
white-space: nowrap;
vertical-align: top;
}
nav#layout-mainmenu.navbar a {
nav#layout-mainmenu a {
text-decoration: none;
}
nav#layout-mainmenu.navbar a:focus {
nav#layout-mainmenu a:focus {
background: transparent;
}
nav#layout-mainmenu.navbar ul {
nav#layout-mainmenu ul {
margin: 0;
padding: 0;
list-style: none;
@ -3091,95 +3147,165 @@ nav#layout-mainmenu.navbar ul {
white-space: nowrap;
overflow: hidden;
}
nav#layout-mainmenu.navbar ul li {
nav#layout-mainmenu ul li {
color: #555555;
display: inline-block;
vertical-align: top;
margin-right: 30px;
position: relative;
}
nav#layout-mainmenu.navbar ul li:last-child {
nav#layout-mainmenu ul li a {
padding: 19px 0 15px;
display: inline-block;
font-size: 16px;
color: inherit;
outline: none;
}
nav#layout-mainmenu ul li a:hover {
background-color: transparent !important;
}
nav#layout-mainmenu ul li a:active,
nav#layout-mainmenu ul li a:focus {
text-decoration: none;
color: #555555;
}
nav#layout-mainmenu ul li a i {
position: relative;
top: -2px;
line-height: 1;
font-size: 35px;
vertical-align: middle;
margin-right: 10px;
}
nav#layout-mainmenu ul li a i {
font-size: 30px;
}
nav#layout-mainmenu ul li a img.svg-icon {
height: 30px;
width: 30px;
margin-right: 10px;
position: relative;
top: 0;
}
nav#layout-mainmenu ul li:last-child {
margin-right: 0;
}
nav#layout-mainmenu.navbar ul li.active:after {
nav#layout-mainmenu ul li.active:after {
content: ' ';
position: absolute;
bottom: 0;
left: 50%;
margin-left: -8.5px;
}
nav#layout-mainmenu.navbar ul li.icon {
nav#layout-mainmenu ul li.active a {
font-size: 18px;
padding-top: 13px;
padding-bottom: 8px;
}
nav#layout-mainmenu ul li.active a i {
font-size: 40px;
}
nav#layout-mainmenu ul li.active a img.svg-icon {
height: 40px;
width: 40px;
}
nav#layout-mainmenu ul li.icon {
margin-right: 0;
}
nav#layout-mainmenu.navbar ul li.icon i {
nav#layout-mainmenu ul li.icon i {
margin-right: 0;
}
nav#layout-mainmenu.navbar ul li.icon a {
nav#layout-mainmenu ul li.icon a {
padding: 14px;
}
nav#layout-mainmenu.navbar ul li.power-off i,
nav#layout-mainmenu.navbar ul li.preview i {
nav#layout-mainmenu ul li.power-off i,
nav#layout-mainmenu ul li.preview i {
font-size: 20px;
}
nav#layout-mainmenu.navbar ul li.power-off a,
nav#layout-mainmenu.navbar ul li.preview a {
nav#layout-mainmenu ul li.power-off a,
nav#layout-mainmenu ul li.preview a {
padding: 25px 10px 19px 21px;
}
nav#layout-mainmenu.navbar ul li.account {
nav#layout-mainmenu ul li.account {
margin-right: 0;
}
nav#layout-mainmenu.navbar ul li.account > a {
padding: 20px 20px 9px 10px;
nav#layout-mainmenu ul li.account > a {
padding: 16px 20px 13px 10px;
font-size: 18px;
position: relative;
z-index: 590;
}
nav#layout-mainmenu.navbar ul li.account img {
nav#layout-mainmenu ul li.account img {
width: 35px;
margin-right: 15px;
position: relative;
top: -4px;
top: -1px;
}
nav#layout-mainmenu.navbar ul li.account ul {
nav#layout-mainmenu ul li.account ul {
line-height: 23px;
}
nav#layout-mainmenu.navbar ul.nav {
nav#layout-mainmenu ul.nav {
display: inline-block;
}
nav#layout-mainmenu.navbar .menu-toggle {
nav#layout-mainmenu .menu-toggle {
padding: 19px 0 15px;
display: inline-block;
font-size: 16px;
color: inherit;
outline: none;
display: none;
}
nav#layout-mainmenu.navbar .toolbar-item {
nav#layout-mainmenu .menu-toggle:hover {
background-color: transparent !important;
}
nav#layout-mainmenu .menu-toggle:active,
nav#layout-mainmenu .menu-toggle:focus {
text-decoration: none;
color: #555555;
}
nav#layout-mainmenu .menu-toggle i {
position: relative;
top: -2px;
line-height: 1;
font-size: 35px;
vertical-align: middle;
margin-right: 10px;
}
nav#layout-mainmenu .toolbar-item {
padding-right: 0;
}
nav#layout-mainmenu.navbar .toolbar-item:before,
nav#layout-mainmenu.navbar .toolbar-item:after {
nav#layout-mainmenu .toolbar-item:before,
nav#layout-mainmenu .toolbar-item:after {
margin-top: 0;
}
nav#layout-mainmenu.navbar .toolbar-item:before {
nav#layout-mainmenu .toolbar-item:before {
left: -12px;
}
nav#layout-mainmenu.navbar .toolbar-item:after {
nav#layout-mainmenu .toolbar-item:after {
right: -12px;
}
nav#layout-mainmenu.navbar .toolbar-item.scroll-active-before:before {
nav#layout-mainmenu .toolbar-item.scroll-active-before:before {
color: #ffffff;
}
nav#layout-mainmenu.navbar .toolbar-item.scroll-active-after:after {
nav#layout-mainmenu .toolbar-item.scroll-active-after:after {
color: #ffffff;
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu {
html.svg nav#layout-mainmenu img.svg-icon,
html.svg .mainmenu-collapsed img.svg-icon {
display: inline-block;
}
nav#layout-mainmenu ul li .mainmenu-accountmenu {
position: fixed;
top: 61px;
top: 64px;
right: 0;
background: #2b3e50;
z-index: 590;
display: none;
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu.active {
nav#layout-mainmenu ul li .mainmenu-accountmenu.active {
display: block;
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after {
nav#layout-mainmenu ul li .mainmenu-accountmenu:after {
content: '';
display: block;
width: 0;
@ -3191,84 +3317,35 @@ nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after {
top: -12px;
position: absolute;
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu ul {
nav#layout-mainmenu ul li .mainmenu-accountmenu ul {
float: none;
display: block;
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li {
nav#layout-mainmenu ul li .mainmenu-accountmenu li {
padding: 0;
margin: 0;
font-weight: normal;
text-align: left;
display: block;
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li a {
nav#layout-mainmenu ul li .mainmenu-accountmenu li a {
display: block;
padding: 12px 30px;
text-align: left;
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li:hover {
nav#layout-mainmenu ul li .mainmenu-accountmenu li:hover {
background: #3d5265!important;
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu li.divider {
nav#layout-mainmenu ul li .mainmenu-accountmenu li.divider {
height: 1px;
width: 100%;
background-color: #4b6372;
}
@media (max-width: 768px) {
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after {
nav#layout-mainmenu ul li .mainmenu-accountmenu:after {
right: 71px;
}
}
nav#layout-mainmenu.navbar ul li a,
nav#layout-mainmenu .menu-toggle,
.mainmenu-collapsed li a {
padding: 19px 0 15px;
display: inline-block;
font-size: 16px;
color: inherit;
outline: none;
}
nav#layout-mainmenu.navbar ul li a:hover,
nav#layout-mainmenu .menu-toggle:hover,
.mainmenu-collapsed li a:hover {
background-color: transparent !important;
}
nav#layout-mainmenu.navbar ul li a:active,
nav#layout-mainmenu .menu-toggle:active,
.mainmenu-collapsed li a:active,
nav#layout-mainmenu.navbar ul li a:focus,
nav#layout-mainmenu .menu-toggle:focus,
.mainmenu-collapsed li a:focus {
text-decoration: none;
color: #555555;
}
nav#layout-mainmenu.navbar ul li a i,
nav#layout-mainmenu .menu-toggle i,
.mainmenu-collapsed li a i {
position: relative;
top: -2px;
line-height: 1;
font-size: 35px;
vertical-align: middle;
margin-right: 10px;
}
nav#layout-mainmenu.navbar ul li a i {
font-size: 30px;
}
nav#layout-mainmenu.navbar ul li.active a {
font-size: 18px;
padding-top: 16px;
padding-bottom: 13px;
}
nav#layout-mainmenu.navbar ul li.active a i {
font-size: 35px;
}
.mainmenu-collapsed li a i {
width: 40px;
text-align: left;
display: inline-block;
}
nav#layout-mainmenu.navbar ul li:hover a:active,
.mainmenu-collapsed li:hover a:active,
nav#layout-mainmenu.navbar ul li:hover a:focus,
@ -3333,12 +3410,48 @@ body.drag .mainmenu-collapsed ul li:hover {
color: #555555;
}
.mainmenu-collapsed > div ul li a {
padding: 19px 0 15px;
display: inline-block;
font-size: 16px;
color: inherit;
outline: none;
white-space: nowrap;
display: block;
padding: 15px 20px;
}
.mainmenu-collapsed > div ul li a:hover {
background-color: transparent !important;
}
.mainmenu-collapsed > div ul li a:active,
.mainmenu-collapsed > div ul li a:focus {
text-decoration: none;
color: #555555;
}
.mainmenu-collapsed > div ul li a i {
position: relative;
top: -2px;
line-height: 1;
font-size: 35px;
vertical-align: middle;
margin-right: 10px;
}
.mainmenu-collapsed > div ul li a:hover {
text-decoration: none;
}
.mainmenu-collapsed > div ul li a img.svg-icon {
margin-right: 10px;
position: relative;
top: -3px;
width: 30px;
height: 30px;
}
.mainmenu-collapsed > div ul li a i {
width: 40px;
text-align: left;
display: inline-block;
}
.mainmenu-collapsed > div ul li.active a {
padding: 9px 20px 11px 20px;
}
.mainmenu-collapsed .scroll-marker {
position: absolute;
@ -3395,7 +3508,7 @@ body.mainmenu-open .mainmenu-collapsed ul {
}
}
#layout-sidenav {
background-color: #34495e;
background-color: #31495f;
position: absolute;
height: 100%;
width: 100%;
@ -4400,7 +4513,7 @@ html.csstransitions body.outer.preload .outer-form-container {
}
.fancy-layout .field-richeditor {
border: none;
border-left: 1px solid #e0e0e0 !important;
border-left: 1px solid #bdc3c7 !important;
}
.fancy-layout .field-richeditor,
.fancy-layout .field-richeditor .redactor_box,

20
modules/backend/assets/images/dashboard-icon.svg Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
<title>dashboard-icon</title>
<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>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

107
modules/backend/assets/less/controls/sidenav-tree.less
View File

@ -1,12 +1,31 @@
.sidenav-tree-shadow-element() {
content: '';
position: absolute;
height: 100%;
top: 0;
right: 0;
width: 10px;
height: 100%;
.box-shadow(inset -5px 0 3px rgba(0,0,0,0.1));
}
.sidenav-tree {
width: 280px;
width: 300px;
background: @color-sidebarnav-bg;
.control-toolbar {
padding: 20px 0 20px 20px;
padding: 0;
.toolbar-item {
display: block;
}
input.form-control {
border: none;
outline: none;
.border-radius(0);
.box-shadow(inset -5px 0 3px rgba(0,0,0,0.1));
}
}
@ -22,8 +41,16 @@
ul.top-level > li {
&[data-status=collapsed] {
> div.group h3:before {
.transform(~'rotate(0deg) translate(3px, 0)');
> div.group {
h3 {
&:before {
.transform(~'rotate(0deg) translate(2px, -2px)');
}
&:after {
display: none;
}
}
}
ul {
@ -32,31 +59,42 @@
}
> div.group {
position: relative;
&:after {
.sidenav-tree-shadow-element();
}
h3 {
background: @color-sidebarnav-tree-group-bg;
color: @color-sidebarnav-tree-group;
text-transform: uppercase;
font-size: 14px;
padding: 15px 15px 15px 33px;
font-size: 16px;
padding: 22px 15px 21px 40px;
margin: 0;
position: relative;
cursor: pointer;
&:before {
width: 10px;
height: 10px;
display: block;
position: absolute;
top: 1px;
width: 10px;
height: 10px;
left: 16px;
top: 21px;
color: @color-list-arrow;
.icon(@angle-right);
.transform(~'rotate(90deg) translate(5px, -3px)');
.transition(all 0.1s ease);
font-size: 16px;
}
&:before {
left: 13px;
top: 15px;
color: @color-list-arrow;
.icon(@caret-right);
.transform(~'rotate(90deg) translate(5px, 0)');
.transition(all 0.1s ease);
&:after {
.triangle(down, 15px, 8px, @color-sidebarnav-tree-group-bg);
position: absolute;
left: 15px;
bottom: -8px;
z-index: 101;
}
}
}
@ -66,21 +104,25 @@
a {
display: block;
position: relative;
padding: 15px 15px 15px 40px;
padding: 25px 25px 25px 60px;
background: @color-sidebarnav-tree-inactive-bg;
margin-bottom: 1px;
border-bottom: 1px solid @color-sidebarnav-tree-group-bg;
color: @color-sidebarnav-tree-inactive-text;
text-decoration: none!important;
&:after {
.sidenav-tree-shadow-element();
}
&:hover {
text-decoration: none;
}
i {
position: absolute;
left: 15px;
top: 17px;
font-size: 16px;
left: 20px;
top: 24px;
font-size: 22px;
}
span {
@ -89,32 +131,21 @@
&.header {
color: @color-sidebarnav-tree-inactive-header;
font-size: 14px;
font-size: 16px;
margin-bottom: 5px;
}
&.description {
color: @color-sidebarnav-tree-inactive-desc;
font-size: 12px;
font-weight: 100;
font-size: 15px;
}
}
}
&.active a {
&.active a, &:hover a {
background: @color-sidebarnav-tree-active-bg;
color: @color-sidebarnav-tree-active-text;
&:before {
content: ' ';
position: absolute;
width: 4px;
background: @color-sidebarnav-tree-active-marker;
left: 0;
top: 0;
height: 100%;
}
span.header {
color: @color-sidebarnav-tree-active-header;
}
@ -125,11 +156,7 @@
}
&:last-child a {
margin-bottom: 0;
}
&:hover a {
background-color: @color-sidebarnav-tree-active-bg;
border-bottom: none;
}
}
}

33
modules/backend/assets/less/controls/svg-icons.less Normal file
View File

@ -0,0 +1,33 @@
.svg-icon-container {
img.svg-icon {
// SVG icons are invisible until SVG support is detected
// with JavaScript to reduce flickering on page load.
// This should be overridden in a specific control,
// inside html.svg {}
display: none;
}
&.svg-active-effects {
img.svg-icon {
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
.opacity(0.6);
}
&:hover, &.active {
img.svg-icon {
-webkit-filter: none;
filter: none;
.opacity(1);
}
}
}
}
html.svg {
.svg-icon-container {
i.svg-replace {
display: none;
}
}
}

14
modules/backend/assets/less/core/variables.less
View File

@ -29,7 +29,7 @@
@color-footer-border: #dfdfdf;
@color-footer-text: #666666;
@color-sidebarnav-bg: #34495e;
@color-sidebarnav-bg: #31495F;
@color-sidebarnav-active-text: #ffffff;
@color-sidebarnav-active-icon: #ffffff;
@color-sidebarnav-inactive-text: rgba(255,255,255,.35);
@ -38,13 +38,13 @@
@color-sidebarnav-counter-text: #ffffff;
@color-sidebarnav-tree-group: #ecf0f1;
@color-sidebarnav-tree-group-bg: #2b3e50;
@color-sidebarnav-tree-inactive-header: rgba(255,255,255,.74);
@color-sidebarnav-tree-inactive-desc: rgba(255,255,255,.64);
@color-sidebarnav-tree-inactive-text: rgba(255,255,255,.26);
@color-sidebarnav-tree-group-bg: #2A3E51;
@color-sidebarnav-tree-inactive-header: #ffffff;
@color-sidebarnav-tree-inactive-desc: #BDC3C7;
@color-sidebarnav-tree-inactive-text: #ffffff;
@color-sidebarnav-tree-active-header: #ffffff;
@color-sidebarnav-tree-inactive-bg: #3d5265;
@color-sidebarnav-tree-active-bg: #34495e;
@color-sidebarnav-tree-inactive-bg: transparent;
@color-sidebarnav-tree-active-bg: #1F99DC;
@color-sidebarnav-tree-active-text: rgba(255,255,255,.91);
@color-sidebarnav-tree-active-marker: #e67e22;
@color-sidebarnav-back-link-bg: #2b3e50;

6
modules/backend/assets/less/layout/layout.less
View File

@ -50,8 +50,8 @@ body {
.control-tabs.primary-tabs {
> ul.nav-tabs, > div > ul.nav-tabs, > div > div > ul.nav-tabs {
margin-left: -20px;
margin-right: -20px;
margin-left: -35px;
margin-right: -35px;
}
&.tabs-no-inset {
@ -78,7 +78,7 @@ body {
&.width-300 { width: 300px; }
&.layout-container, .layout-container, &.padded-container, .padded-container {
padding: 20px 20px 0 20px;
padding: 35px 35px 0 35px;
// Container to sit flush to the element above
.container-flush {

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

@ -6,7 +6,33 @@ body.mainmenu-open {
overflow: hidden;
}
nav#layout-mainmenu.navbar {
.main-menu-item-link() {
padding: 19px 0 15px;
display: inline-block;
font-size: 16px;
color: inherit;
outline: none;
&:hover {
background-color: transparent !important;
}
&:active, &:focus {
text-decoration: none;
color: @color-mainmenu-inactive;
}
i {
position: relative;
top: -2px;
line-height: 1;
font-size: 35px;
vertical-align: middle;
margin-right: 10px;
}
}
nav#layout-mainmenu {
background-color: @color-mainmenu;
padding: 0 0 0 20px;
line-height: 0;
@ -35,7 +61,25 @@ nav#layout-mainmenu.navbar {
margin-right: 30px;
position: relative;
&:last-child { margin-right: 0; }
a {
.main-menu-item-link();
i {
font-size: 30px;
}
img.svg-icon {
height: 30px;
width: 30px;
margin-right: 10px;
position: relative;
top: 0;
}
}
&:last-child {
margin-right: 0;
}
&.active {
&:after {
@ -45,24 +89,50 @@ nav#layout-mainmenu.navbar {
left: 50%;
margin-left: -8.5px;
}
a {
font-size: 18px;
padding-top: 13px;
padding-bottom: 8px;
i {
font-size: 40px;
}
img.svg-icon {
height: 40px;
width: 40px;
}
}
}
&.icon {
margin-right: 0;
i { margin-right: 0; }
a { padding: 14px; }
i {
margin-right: 0;
}
a {
padding: 14px;
}
}
&.power-off, &.preview {
i { font-size: 20px; }
a { padding: 25px 10px 19px 21px; }
i {
font-size: 20px;
}
a {
padding: 25px 10px 19px 21px;
}
}
&.account {
margin-right: 0;
> a {
padding: 20px 20px 9px 10px;
padding: 16px 20px 13px 10px;
font-size: 18px;
position: relative;
z-index: 590;
@ -72,7 +142,7 @@ nav#layout-mainmenu.navbar {
width: 35px;
margin-right: 15px;
position: relative;
top: -4px;
top: -1px;
}
ul {
@ -81,9 +151,15 @@ nav#layout-mainmenu.navbar {
}
}
&.nav { display: inline-block; }
&.nav {
display: inline-block;
}
}
.menu-toggle {
.main-menu-item-link();
display: none;
}
.menu-toggle { display: none; }
.toolbar-item {
padding-right: 0;
@ -91,17 +167,37 @@ nav#layout-mainmenu.navbar {
&:before, &:after {
margin-top: 0;
}
&:before { left: -12px; }
&:after { right: -12px; }
&.scroll-active-before:before { color: @color-mainmenu-active; }
&.scroll-active-after:after { color: @color-mainmenu-active; }
&:before {
left: -12px;
}
&:after {
right: -12px;
}
&.scroll-active-before:before {
color: @color-mainmenu-active;
}
&.scroll-active-after:after {
color: @color-mainmenu-active;
}
}
}
nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu {
html.svg {
nav#layout-mainmenu,
.mainmenu-collapsed {
img.svg-icon {
display: inline-block;
}
}
}
nav#layout-mainmenu ul li .mainmenu-accountmenu {
position: fixed;
top: 61px;
top: 64px;
right: 0;
background: @color-accountmenu-bg;
z-index: 590;
@ -154,57 +250,6 @@ nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu {
}
}
nav#layout-mainmenu.navbar ul li a,
nav#layout-mainmenu .menu-toggle,
.mainmenu-collapsed li a {
padding: 19px 0 15px;
display: inline-block;
font-size: 16px;
color: inherit;
outline: none;
&:hover {
background-color: transparent !important;
}
&:active, &:focus {
text-decoration: none;
color: @color-mainmenu-inactive;
}
i {
position: relative;
top: -2px;
line-height: 1;
font-size: 35px;
vertical-align: middle;
margin-right: 10px;
}
}
nav#layout-mainmenu.navbar ul li {
a {
i {
font-size: 30px;
}
}
&.active a {
font-size: 18px;
padding-top: 16px;
padding-bottom: 13px;
i {
font-size: 35px;
}
}
}
.mainmenu-collapsed li a i {
width: 40px;
text-align: left;
display: inline-block;
}
nav#layout-mainmenu.navbar ul li:hover,
.mainmenu-collapsed li:hover {
a {
@ -277,6 +322,8 @@ body.drag {
color: @color-mainmenu-inactive;
a {
.main-menu-item-link();
white-space: nowrap;
display: block;
padding: 15px 20px;
@ -284,6 +331,24 @@ body.drag {
&:hover {
text-decoration: none;
}
img.svg-icon {
margin-right: 10px;
position: relative;
top: -3px;
width: 30px;
height: 30px;
}
i {
width: 40px;
text-align: left;
display: inline-block;
}
}
&.active a {
padding: 9px 20px 11px 20px;
}
}
}
@ -303,4 +368,4 @@ body.mainmenu-open .mainmenu-collapsed ul {
@media (min-width: @menu-breakpoint-min) {
#layout-canvas {position: static!important;}
.mainmenu-collapsed {display: none!important;}
}
}

1
modules/backend/assets/less/october.less
View File

@ -36,6 +36,7 @@
@import "controls/namevaluelist.less";
@import "controls/scrollpad.less";
@import "controls/autocomplete.less";
@import "controls/svg-icons.less";
//
// October Storm UI

2
modules/backend/classes/NavigationManager.php
View File

@ -34,6 +34,7 @@ class NavigationManager
'code' => null,
'label' => null,
'icon' => null,
'iconSvg' => null,
'url' => null,
'permissions' => [],
'order' => 500,
@ -45,6 +46,7 @@ class NavigationManager
'label' => null,
'icon' => null,
'url' => null,
'iconSvg' => null,
'counter' => null,
'counterLabel'=> null,
'order' => -1,

57
modules/backend/controllers/Users.php
View File

@ -100,7 +100,7 @@ class Users extends Controller
/*
* Add permissions tab
*/
$form->addTabFields($this->generatePermissionFields());
$form->addTabFields($this->generatePermissionsField());
/*
* Mark default groups
@ -114,52 +114,21 @@ class Users extends Controller
}
/**
* Generates an array of form fields to assign permissions provided
* by the system.
* Adds the permissions editor widget to the form.
* @return array
*/
protected function generatePermissionFields()
protected function generatePermissionsField()
{
$permissionFields = [];
foreach (BackendAuth::listTabbedPermissions() as $tab => $permissions) {
$fieldName = 'permissions_'.snake_case($tab).'_section';
$fieldConfig = [
'label' => $tab,
'type' => 'section',
return [
'permissions' => [
'tab' => 'backend::lang.user.permissions',
'containerAttributes' => [
'data-field-collapsible' => 1
],
];
$permissionFields[$fieldName] = $fieldConfig;
foreach ($permissions as $permission) {
$fieldName = 'permissions['.$permission->code.']';
$fieldConfig = [
'label' => $permission->label,
'comment' => $permission->comment,
'type' => 'balloon-selector',
'options' => [
1 => 'backend::lang.user.allow',
0 => 'backend::lang.user.inherit',
-1 => 'backend::lang.user.deny',
],
'trigger' => [
'action' => 'disable',
'field' => 'is_superuser',
'condition' => 'checked'
],
'span' => 'auto',
'tab' => 'backend::lang.user.permissions',
];
$permissionFields[$fieldName] = $fieldConfig;
}
}
return $permissionFields;
'type' => 'Backend\FormWidgets\PermissionEditor',
'trigger' => [
'action' => 'disable',
'field' => 'is_superuser',
'condition' => 'checked'
]
]
];
}
}

2
modules/backend/formwidgets/FileUpload.php
View File

@ -119,7 +119,7 @@ class FileUpload extends FormWidgetBase
$this->vars['fileList'] = $fileList = $this->getFileList();
$this->vars['singleFile'] = $fileList->first();
$this->vars['displayMode'] = $this->getDisplayMode();
$this->vars['emptyIcon'] = $this->getConfig('emptyIcon', 'icon-plus');
$this->vars['emptyIcon'] = $this->getConfig('emptyIcon', 'icon-upload');
$this->vars['imageHeight'] = $this->imageHeight;
$this->vars['imageWidth'] = $this->imageWidth;
$this->vars['acceptedFileTypes'] = $this->getAcceptedFileTypes(true);

48
modules/backend/formwidgets/PermissionEditor.php Normal file
View File

@ -0,0 +1,48 @@
<?php namespace Backend\FormWidgets;
use Backend\Classes\FormWidgetBase;
use BackendAuth;
/**
* User/group permission editor
* This widget is used by the system internally on the System / Administrators pages.
*
* @package october\backend
* @author Alexey Bobkov, Samuel Georges
*/
class PermissionEditor extends FormWidgetBase
{
/**
* {@inheritDoc}
*/
public function init()
{
}
/**
* {@inheritDoc}
*/
public function render()
{
$this->prepareVars();
return $this->makePartial('permissioneditor');
}
/**
* Prepares the list data
*/
public function prepareVars()
{
$this->vars['permissions'] = BackendAuth::listTabbedPermissions();
$this->vars['baseFieldName'] = $this->formField->getName();
$this->vars['permissionsData'] = $this->formField->getValueFromData($this->model);
}
/**
* {@inheritDoc}
*/
protected function loadAssets()
{
$this->addCss('css/permissioneditor.css', 'core');
}
}

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

@ -1,12 +1,12 @@
.field-codeeditor{width:100%;position:relative;border:2px solid #e0e0e0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
.field-codeeditor{width:100%;position:relative;border:2px solid #bdc3c7;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
.field-codeeditor textarea{opacity:0;filter:alpha(opacity=0)}
.field-codeeditor.editor-focus{border:2px solid #808c8d}
.field-codeeditor.editor-focus{border:2px solid #1f99dc}
.field-codeeditor.size-tiny{min-height:50px}
.field-codeeditor.size-small{min-height:100px}
.field-codeeditor.size-large{min-height:200px}
.field-codeeditor.size-huge{min-height:250px}
.field-codeeditor.size-giant{min-height:350px}
.field-codeeditor .ace_search{font-family:'Open Sans',Arial,sans-serif;font-size:14px;color:#333333;z-index:603}
.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-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}

40
modules/backend/formwidgets/fileupload/assets/css/fileupload.css
View File

@ -4,7 +4,7 @@
.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-weight:600;font-size:13px;color:#2b3e50;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: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 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}
@ -39,16 +39,18 @@
.fileupload-config-form .file-upload-modal-image-header,.fileupload-config-form .file-upload-modal-image-header img{border-top-right-radius:2px;border-top-left-radius:2px}
.fileupload-config-form .file-upload-modal-image-header .close{position:absolute;top:20px;right:20px}
.field-fileupload.style-image-multi .upload-button,.field-fileupload.style-image-multi .upload-object{margin:0 10px 10px 0}
.field-fileupload.style-image-multi .upload-button{display:block;float:left;border:2px dotted rgba(0,0,0,0.1);position:relative;outline:none;width:76px;height:76px}
.field-fileupload.style-image-multi .upload-button{display:block;float:left;border:2px dashed #BDC3C7;background-clip:content-box;background-color:#F9F9F9;position:relative;outline:none;width:76px;height:76px}
.field-fileupload.style-image-multi .upload-button .upload-button-icon{position:absolute;width:22px;height:22px;top:50%;left:50%;margin-top:-11px;margin-left:-11px}
.field-fileupload.style-image-multi .upload-button .upload-button-icon:before{text-align:center;display:block;font-size:22px;height:22px;width:22px;line-height:22px;color:rgba(0,0,0,0.1)}
.field-fileupload.style-image-multi .upload-button:hover{border:2px dotted rgba(0,0,0,0.2)}
.field-fileupload.style-image-multi .upload-button:hover .upload-button-icon:before{color:#31ac5f;color:rgba(0,0,0,0.2)}
.field-fileupload.style-image-multi .upload-button:focus{border:2px solid rgba(0,0,0,0.3);background:transparent}
.field-fileupload.style-image-multi .upload-button:focus .upload-button-icon:before{color:#31ac5f;color:rgba(0,0,0,0.2)}
.field-fileupload.style-image-multi .upload-button .upload-button-icon:before{text-align:center;display:block;font-size:22px;height:22px;width:22px;line-height:22px;color:#BDC3C7}
.field-fileupload.style-image-multi .upload-button .upload-button-icon.large-icon{width:34px;height:34px;top:50%;left:50%;margin-top:-17px;margin-left:-17px}
.field-fileupload.style-image-multi .upload-button .upload-button-icon.large-icon:before{font-size:34px;height:24px;width:24px;line-height:24px}
.field-fileupload.style-image-multi .upload-button:hover{border:2px dashed #1F99DC}
.field-fileupload.style-image-multi .upload-button:hover .upload-button-icon:before{color:#1F99DC}
.field-fileupload.style-image-multi .upload-button:focus{border:2px dashed #1F99DC}
.field-fileupload.style-image-multi .upload-button:focus .upload-button-icon:before{color:#1F99DC}
.field-fileupload.style-image-multi .upload-files-container{margin-left:90px}
.field-fileupload.style-image-multi .upload-object{background:#fff;border:1px solid #ecf0f1;width:260px}
.field-fileupload.style-image-multi .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:2px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;bottom:10px;left:0}
.field-fileupload.style-image-multi .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:5px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;bottom:10px;left:0}
.field-fileupload.style-image-multi .upload-object .progress-bar .upload-progress{float:left;width:0%;height:100%;line-height:5px;color:#ffffff;background-color:#5fb6f5;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
.field-fileupload.style-image-multi .upload-object .icon-container{border-right:1px solid #f6f8f9;float:left;display:inline-block;overflow:hidden;width:75px;height:75px}
.field-fileupload.style-image-multi .upload-object .icon-container i{font-size:35px}
@ -73,17 +75,19 @@
.field-fileupload.style-image-multi .upload-object{margin-right:0;display:block;width:auto}
}
.field-fileupload.style-image-single.is-populated .upload-button{display:none}
.field-fileupload.style-image-single .upload-button{display:block;float:left;border:2px dotted rgba(0,0,0,0.1);position:relative;outline:none;min-height:100px;min-width:100px}
.field-fileupload.style-image-single .upload-button{display:block;float:left;border:2px dashed #BDC3C7;background-clip:content-box;background-color:#F9F9F9;position:relative;outline:none;min-height:100px;min-width:100px}
.field-fileupload.style-image-single .upload-button .upload-button-icon{position:absolute;width:22px;height:22px;top:50%;left:50%;margin-top:-11px;margin-left:-11px}
.field-fileupload.style-image-single .upload-button .upload-button-icon:before{text-align:center;display:block;font-size:22px;height:22px;width:22px;line-height:22px;color:rgba(0,0,0,0.1)}
.field-fileupload.style-image-single .upload-button:hover{border:2px dotted rgba(0,0,0,0.2)}
.field-fileupload.style-image-single .upload-button:hover .upload-button-icon:before{color:#31ac5f;color:rgba(0,0,0,0.2)}
.field-fileupload.style-image-single .upload-button:focus{border:2px solid rgba(0,0,0,0.3);background:transparent}
.field-fileupload.style-image-single .upload-button:focus .upload-button-icon:before{color:#31ac5f;color:rgba(0,0,0,0.2)}
.field-fileupload.style-image-single .upload-button .upload-button-icon:before{text-align:center;display:block;font-size:22px;height:22px;width:22px;line-height:22px;color:#BDC3C7}
.field-fileupload.style-image-single .upload-button .upload-button-icon.large-icon{width:34px;height:34px;top:50%;left:50%;margin-top:-17px;margin-left:-17px}
.field-fileupload.style-image-single .upload-button .upload-button-icon.large-icon:before{font-size:34px;height:24px;width:24px;line-height:24px}
.field-fileupload.style-image-single .upload-button:hover{border:2px dashed #1F99DC}
.field-fileupload.style-image-single .upload-button:hover .upload-button-icon:before{color:#1F99DC}
.field-fileupload.style-image-single .upload-button:focus{border:2px dashed #1F99DC}
.field-fileupload.style-image-single .upload-button:focus .upload-button-icon:before{color:#1F99DC}
.field-fileupload.style-image-single .upload-object{padding-bottom:66px}
.field-fileupload.style-image-single .upload-object .icon-container{border:1px solid #f6f8f9;background:rgba(255,255,255,0.5)}
.field-fileupload.style-image-single .upload-object .icon-container.image img{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;display:block;max-width:100%;height:auto;min-height:100px;min-width:100px}
.field-fileupload.style-image-single .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:2px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;bottom:10px;left:0}
.field-fileupload.style-image-single .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:5px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;bottom:10px;left:0}
.field-fileupload.style-image-single .upload-object .progress-bar .upload-progress{float:left;width:0%;height:100%;line-height:5px;color:#ffffff;background-color:#5fb6f5;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
.field-fileupload.style-image-single .upload-object .info{position:absolute;left:0;right:0;bottom:0;height:66px}
.field-fileupload.style-image-single .upload-object .meta{position:absolute;bottom:65px;left:0;right:0;margin:0 15px}
@ -103,7 +107,7 @@
.field-fileupload.style-file-multi .upload-object .info h4{padding-right:15px}
.field-fileupload.style-file-multi .upload-object .info h4 a{padding:10px 0;right:15px}
.field-fileupload.style-file-multi .upload-object .info p.size{position:absolute;top:0;right:0;width:15%;display:none;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.field-fileupload.style-file-multi .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:2px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;top:18px;left:0}
.field-fileupload.style-file-multi .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:5px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;top:18px;left:0}
.field-fileupload.style-file-multi .upload-object .progress-bar .upload-progress{float:left;width:0%;height:100%;line-height:5px;color:#ffffff;background-color:#5fb6f5;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
.field-fileupload.style-file-multi .upload-object .meta{position:absolute;top:0;right:0;margin-right:15px;width:15%}
.field-fileupload.style-file-multi .upload-object .meta a.drag-handle{top:-2px;bottom:auto;line-height:150%;padding:10px 0}
@ -126,7 +130,7 @@
.field-fileupload.style-file-multi .info p.size{width:25% !important;padding-right:35px !important}
.field-fileupload.style-file-multi .meta{width:25% !important}
}
.field-fileupload.style-file-single{background-color:#ffffff;border:1px solid #e0e0e0;overflow:hidden;position:relative;padding-right:30px}
.field-fileupload.style-file-single{background-color:#ffffff;border:1px solid #bdc3c7;overflow:hidden;position:relative;padding-right:30px}
.field-fileupload.style-file-single .upload-button{position:absolute;top:50%;margin-top:-44px;height:88px;background:transparent;right:-2px;color:#595959}
.field-fileupload.style-file-single .upload-button i{font-size:14px}
.field-fileupload.style-file-single .upload-button:hover{color:#333333}
@ -140,7 +144,7 @@
.field-fileupload.style-file-single .upload-object .info h4,.field-fileupload.style-file-single .upload-object .info p{display:inline;margin:0;padding:0;font-size:12px;line-height:150%;color:#666666}
.field-fileupload.style-file-single .upload-object .info p.size{font-weight:normal}
.field-fileupload.style-file-single .upload-object .info p.size:before{content:" - "}
.field-fileupload.style-file-single .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:2px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;top:50%;margin-top:-2px;right:5px}
.field-fileupload.style-file-single .upload-object .progress-bar{display:block;width:100%;overflow:hidden;height:5px;background-color:#f5f5f5;border-radius:5px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);position:absolute;top:50%;margin-top:-2px;right:5px}
.field-fileupload.style-file-single .upload-object .progress-bar .upload-progress{float:left;width:0%;height:100%;line-height:5px;color:#ffffff;background-color:#5fb6f5;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
.field-fileupload.style-file-single .upload-object .meta{position:absolute;top:50%;margin-top:-44px;height:88px;right:0;width:15%}
.field-fileupload.style-file-single .upload-object .meta .upload-remove-button{position:absolute;top:50%;right:0;height:20px;margin-top:-10px;margin-right:10px;z-index:100}

38
modules/backend/formwidgets/fileupload/assets/less/fileupload.base.less
View File

@ -38,7 +38,9 @@
.uploader-block-button() {
display: block;
float: left;
border: 2px dotted rgba(0,0,0,.1);
border: 2px dashed #BDC3C7;
background-clip: content-box;
background-color: #F9F9F9;
position: relative;
outline: none;
@ -58,26 +60,39 @@
height: 22px;
width: 22px;
line-height: 22px;
color: rgba(0,0,0,.1);
color: #BDC3C7;
}
&.large-icon {
width: 34px;
height: 34px;
top: 50%;
left: 50%;
margin-top: -17px;
margin-left: -17px;
&:before {
font-size: 34px;
height: 24px;
width: 24px;
line-height: 24px;
}
}
}
&:hover {
border: 2px dotted rgba(0,0,0,.2);
border: 2px dashed #1F99DC;
.upload-button-icon:before {
color: @brand-success;
color: rgba(0,0,0,.2);
color: #1F99DC;
}
}
&:focus {
border: 2px solid rgba(0,0,0,.3);
background: transparent;
border: 2px dashed #1F99DC;
.upload-button-icon:before {
color: @brand-success;
color: rgba(0,0,0,.2);
color: #1F99DC;
}
}
}
@ -144,9 +159,8 @@
}
h4 {
font-weight: 600;
font-size: 13px;
color: #2b3e50;
font-size: 15px;
color: #2A3E51;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

2
modules/backend/formwidgets/fileupload/partials/_image_single.htm
View File

@ -16,7 +16,7 @@
href="javascript:;"
style="<?= $cssBlockDimensions ?>"
class="upload-button">
<span class="upload-button-icon oc-<?= $emptyIcon ?>"></span>
<span class="upload-button-icon oc-<?= $emptyIcon ?> <?= $imageWidth > 100 ? 'large-icon' : '' ?>"></span>
</a>
<!-- Existing file -->

62
modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css Normal file
View File

@ -0,0 +1,62 @@
.permissioneditor table {
width: 100%;
}
.permissioneditor table th {
padding: 30px 0 15px;
color: #2a3e51;
font-weight: normal;
border-bottom: 1px solid #dbe1e3;
}
.permissioneditor table th.tab {
font-size: 16px;
}
.permissioneditor table th.permission-type {
font-size: 15px;
text-align: center;
}
.permissioneditor table td {
padding: 10px 0;
vertical-align: top;
border-bottom: 1px solid #ecf0f1;
}
.permissioneditor table td.permission-value {
text-align: center;
}
.permissioneditor table td.permission-name {
font-size: 15px;
color: #555555;
}
.permissioneditor table td p.comment {
margin-top: 5px;
margin-bottom: 0;
}
.permissioneditor table td p.comment:empty {
display: none;
}
.permissioneditor table .custom-radio {
display: inline-block;
padding-left: 0;
}
.permissioneditor table .custom-radio,
.permissioneditor table .custom-radio label {
margin-bottom: 0;
}
.permissioneditor table .custom-radio label {
text-indent: -10000em;
padding: 0 0 0 14px;
margin: 0;
top: 2px;
}
.permissioneditor table .custom-radio label:before {
margin-right: 0;
}
.permissioneditor table tr:last-child td {
border-bottom: none;
}
.permissioneditor table tr:first-child th {
padding-top: 0;
}
.permissioneditor table tr.last-section-row td {
border-bottom: none;
padding-bottom: 0;
}

86
modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less Normal file
View File

@ -0,0 +1,86 @@
@import "../../../../assets/less/core/boot.less";
@color-permissioneditor-section-border: #DBE1E3;
@color-permissioneditor-permission-border: #ECF0F1;
.permissioneditor {
table {
width: 100%;
th {
padding: 30px 0 15px;
color: @color-label;
font-weight: normal;
border-bottom: 1px solid @color-permissioneditor-section-border;
&.tab {
font-size: 16px;
}
&.permission-type {
font-size: 15px;
text-align: center;
}
}
td {
padding: 10px 0;
vertical-align: top;
border-bottom: 1px solid @color-permissioneditor-permission-border;
&.permission-value{
text-align: center;
}
&.permission-name {
font-size: 15px;
color: @color-help-block-text;
}
p.comment {
margin-top: 5px;
margin-bottom: 0;
&:empty {
display: none;
}
}
}
.custom-radio {
display: inline-block;;
padding-left: 0;
&, label {
margin-bottom: 0;
}
label {
text-indent: -10000em;
padding: 0 0 0 14px;
margin: 0;
top: 2px;
&:before {
margin-right: 0;
}
}
}
tr:last-child td {
border-bottom: none;
}
tr:first-child th {
padding-top: 0;
}
tr.last-section-row {
td {
border-bottom: none;
padding-bottom: 0;
}
}
}
}

75
modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm Normal file
View File

@ -0,0 +1,75 @@
<div class="permissioneditor">
<table>
<?php
$firstTab = true;
$globalIndex = 0;
foreach ($permissions as $tab=>$tabPermissions): ?>
<tr class="section">
<th class="tab"><?= e(trans($tab)) ?></th>
<th class="permission-type"><?= $firstTab ? e(Lang::get('backend::lang.user.allow')) : '' ?></th>
<th class="permission-type"><?= $firstTab ? e(Lang::get('backend::lang.user.inherit')) : '' ?></th>
<th class="permission-type"><?= $firstTab ? e(Lang::get('backend::lang.user.deny')) : '' ?></th>
</tr>
<?php
$lastIndex = count($tabPermissions)-1;
foreach ($tabPermissions as $index=>$permission):
$globalIndex++;
$permissionValue = array_key_exists($permission->code, $permissionsData) ?
$permissionsData[$permission->code] : 0;
?>
<tr class="<?= $lastIndex == $index ? 'last-section-row' : '' ?>">
<td class="permission-name">
<?= e(trans($permission->label)) ?>
<p class="comment"><?= e(trans($permission->comment)) ?></p>
</td>
<td class="permission-value">
<div class="radio custom-radio">
<input
id="<?= 'permission-'.$globalIndex.'-allow' ?>"
name="<?= e($baseFieldName) ?>[<?= e($permission->code) ?>]"
value="1"
type="radio"
<?= $permissionValue == 1 ? 'checked="checked"' : '' ?>
data-radio-color="green"
>
<label for="<?= 'permission-'.$globalIndex.'-allow' ?>">Label</label>
</div>
</td>
<td class="permission-value">
<div class="radio custom-radio">
<input
id="<?= 'permission-'.$globalIndex.'-inherit' ?>"
name="<?= e($baseFieldName) ?>[<?= e($permission->code) ?>]"
value="0"
<?= $permissionValue == 0 ? 'checked="checked"' : '' ?>
type="radio"
>
<label for="<?= 'permission-'.$globalIndex.'-inherit' ?>">Label</label>
</div>
</td>
<td class="permission-value">
<div class="radio custom-radio">
<input
id="<?= 'permission-'.$globalIndex.'-deny' ?>"
name="<?= e($baseFieldName) ?>[<?= e($permission->code) ?>]"
value="-1"
<?= $permissionValue == -1 ? 'checked="checked"' : '' ?>
type="radio"
data-radio-color="red"
>
<label for="<?= 'permission-'.$globalIndex.'-deny' ?>">Label</label>
</div>
</td>
</tr>
<?php endforeach ?>
<?php
$firstTab = false;
endforeach ?>
</table>
</div>

26
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:20px;font-size:14px}
.redactor-editor figcaption{text-align:center;line-height:22px;font-size:16px}
.redactor-editor figure[data-type=table]{clear:both}
.redactor-editor figure[data-type=video]{position:relative;margin-bottom:20px;text-align:center;clear:both}
.redactor-editor figure[data-type=video]{position:relative;margin-bottom:22px;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:20px}
.redactor-editor figure[data-type=image]{position:relative;margin-bottom:22px}
.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:20px;margin-left:20px;font-style:italic;position:relative;border-left:solid 4px #cccccc;padding-left:20px}
.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] 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:20px;margin-left:0;margin-right:20px}
.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 .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:'Open Sans',Arial,sans-serif;line-height:20px;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:22px;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:20px}
.redactor-box .oc-figure-controls span.oc-figure-controls-delete{margin-left:22px}
.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:10px;padding-right:10px;text-align:left}
.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: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:20px}
.redactor-box .oc-figure-right{float:right;margin-left:22px}
.redactor-box .oc-figure-right .oc-figure-controls{right:0}
.redactor-box .oc-figure-left{float:left;margin-right:20px}
.redactor-box .oc-figure-left{float:left;margin-right:22px}
.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}
@ -223,10 +223,10 @@ to{background-position:0 0}
.redactor-editor h5{font-size:16px}
.redactor-editor h6{font-size:12px;text-transform:uppercase}
.field-flush .field-richeditor,.field-flush .field-richeditor.editor-focus{border:none}
.field-richeditor{border:1px solid #e0e0e0;-webkit-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s}
.field-richeditor{border:1px solid #bdc3c7;-webkit-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s}
.field-richeditor,.field-richeditor .redactor-box{-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
.field-richeditor .redactor-toolbar{border-top-right-radius:5px;border-top-left-radius:5px}
.field-richeditor.editor-focus{border-color:#808c8d}
.field-richeditor.editor-focus{border-color:#1f99dc}
.field-richeditor.size-tiny .redactor-editor{height:20px !important}
.field-richeditor.size-small .redactor-editor{height:70px !important}
.field-richeditor.size-large .redactor-editor{height:170px !important}
@ -254,7 +254,7 @@ to{background-position:0 0}
.field-richeditor.stretch .redactor-box textarea{padding:10px}
body .redactor-box-fullscreen{background:#f9f9f9;overflow-y:scroll !important;width:100% !important}
body .redactor-box-fullscreen .redactor-editor{background:#fff;max-width:960px;padding:50px 30px !important;margin:20px auto !important;padding:20px;top:0 !important}
.redactor-editor figure[data-ui-block]{display:block;margin:0 0 15px 0;padding:10px 10px 10px 36px;border:2px dotted #bdc3c7;background:white;position:relative;cursor:pointer;color:#6c7071;font:15px 'Open Sans',Arial,sans-serif;font-weight:500;line-height:150%;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
.redactor-editor figure[data-ui-block]{display:block;margin:0 0 15px 0;padding:10px 10px 10px 36px;border:2px dotted #bdc3c7;background:white;position:relative;cursor:pointer;color:#6c7071;font:15px sans-serif;font-weight:500;line-height:150%;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
.redactor-editor figure[data-ui-block]:focus,.redactor-editor figure[data-ui-block].inspector-open{border-color:#2581b8;border-style:solid;outline:none}
.redactor-editor figure[data-video],.redactor-editor figure[data-audio]{padding-left:13px}
.redactor-editor figure[data-video]:after,.redactor-editor figure[data-audio]:after{content:attr(data-label)}

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

@ -84,14 +84,14 @@ return [
'full_name' => 'Full Name',
'email' => 'Email',
'groups' => 'Groups',
'groups_comment' => 'Specify which groups this account should belong to.',
'groups_comment' => 'Specify which groups the account should belong to. Groups define user permissions, which can be overriden on the user level, on the Permissions tab.',
'avatar' => 'Avatar',
'password' => 'Password',
'password_confirmation' => 'Confirm Password',
'permissions' => 'Permissions',
'account' => 'Account',
'superuser' => 'Super User',
'superuser_comment' => 'Grants this account unlimited access to all areas.',
'superuser_comment' => 'Grants this account unlimited access to all areas of the system. Super users can add and manage other users. ',
'send_invite' => 'Send invitation by email',
'send_invite_comment' => 'Sends a welcome message containing login and password information.',
'delete_confirm' => 'Do you really want to delete this administrator?',

10
modules/backend/layouts/_mainmenu.htm
View File

@ -12,9 +12,15 @@
<ul class="nav">
<?php foreach (BackendMenu::listMainMenuItems() as $item): ?>
<li class="<?= BackendMenu::isMainMenuItemActive($item) ? 'active' : null ?>">
<li class="<?= BackendMenu::isMainMenuItemActive($item) ? 'active' : null ?> svg-icon-container svg-active-effects">
<a href="<?= $item->url ?>">
<i class="<?= $item->icon ?>"></i><?= e(trans($item->label)) ?>
<?php if ($item->iconSvg): ?>
<img class="svg-icon" src="<?= URL::asset($item->iconSvg) ?>">
<?php endif ?>
<i class="<?= $item->iconSvg ? 'svg-replace' : null ?> <?= $item->icon ?>"></i>
<?= e(trans($item->label)) ?>
</a>
</li>
<?php endforeach ?>

4
modules/backend/models/user/fields.yaml
View File

@ -60,6 +60,6 @@ secondaryTabs:
label: backend::lang.user.avatar
type: fileupload
mode: image
imageHeight: 260
imageWidth: 260
imageHeight: 230
imageWidth: 230

4
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');
});
}
@ -86,6 +86,7 @@ class ServiceProvider extends ModuleServiceProvider
'cms' => [
'label' => 'cms::lang.cms.menu_label',
'icon' => 'icon-magic',
'iconSvg' => 'modules/cms/assets/images/cms-icon.svg',
'url' => Backend::url('cms'),
'permissions' => ['cms.*'],
'order' => 10,
@ -143,6 +144,7 @@ class ServiceProvider extends ModuleServiceProvider
'media' => [
'label' => 'cms::lang.media.menu_label',
'icon' => 'icon-folder',
'iconSvg' => 'modules/cms/assets/images/media-icon.svg',
'url' => Backend::url('cms/media'),
'permissions' => ['media.*'],
'order' => 20

27
modules/cms/assets/images/cms-icon.svg Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="65px" height="64px" viewBox="0 0 65 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
<title>cms-icon</title>
<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="Group" sketch:type="MSLayerGroup">
<path d="M0.754,3.84 C0.754,1.719 2.473,0 4.594,0 L32.754,0 L48.754,13.44 L48.754,60.16 C48.754,62.281 47.035,64 44.914,64 L4.594,64 C2.473,64 0.754,62.281 0.754,60.16 L0.754,3.84 Z" id="Fill-637" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
<path d="M32.754,0 L32.754,9.6 C32.754,11.721 34.473,13.44 36.594,13.44 L48.754,13.44 L32.754,0 Z" id="Fill-638" fill="#F0F1F1" sketch:type="MSShapeGroup"></path>
<path d="M29.754,47 L39.754,47 C40.305,47 40.754,46.552 40.754,46 L40.754,41 C40.754,40.448 40.305,40 39.754,40 L29.754,40 C29.203,40 28.754,40.448 28.754,41 L28.754,46 C28.754,46.552 29.203,47 29.754,47" id="Fill-639" fill="#E2E4E5" sketch:type="MSShapeGroup"></path>
<path d="M29.754,40 C29.203,40 28.754,40.448 28.754,41 L28.754,46 C28.754,46.552 29.203,47 29.754,47 L39.754,47 C40.305,47 40.754,46.552 40.754,46 L40.754,41 C40.754,40.448 40.305,40 39.754,40 L29.754,40 Z M39.754,49 L29.754,49 C28.1,49 26.754,47.654 26.754,46 L26.754,41 C26.754,39.346 28.1,38 29.754,38 L39.754,38 C41.408,38 42.754,39.346 42.754,41 L42.754,46 C42.754,47.654 41.408,49 39.754,49 L39.754,49 Z" id="Fill-640" fill="#B6BCBD" sketch:type="MSShapeGroup"></path>
<path d="M7.754,47 L17.754,47 C18.305,47 18.754,46.552 18.754,46 L18.754,41 C18.754,40.448 18.305,40 17.754,40 L7.754,40 C7.203,40 6.754,40.448 6.754,41 L6.754,46 C6.754,46.552 7.203,47 7.754,47" id="Fill-641" fill="#E2E4E5" sketch:type="MSShapeGroup"></path>
<path d="M7.754,40 C7.203,40 6.754,40.448 6.754,41 L6.754,46 C6.754,46.552 7.203,47 7.754,47 L17.754,47 C18.305,47 18.754,46.552 18.754,46 L18.754,41 C18.754,40.448 18.305,40 17.754,40 L7.754,40 Z M17.754,49 L7.754,49 C6.1,49 4.754,47.654 4.754,46 L4.754,41 C4.754,39.346 6.1,38 7.754,38 L17.754,38 C19.408,38 20.754,39.346 20.754,41 L20.754,46 C20.754,47.654 19.408,49 17.754,49 L17.754,49 Z" id="Fill-642" fill="#B6BCBD" sketch:type="MSShapeGroup"></path>
<path d="M18.754,27 L28.754,27 C29.305,27 29.754,26.552 29.754,26 L29.754,21 C29.754,20.448 29.305,20 28.754,20 L18.754,20 C18.203,20 17.754,20.448 17.754,21 L17.754,26 C17.754,26.552 18.203,27 18.754,27" id="Fill-643" fill="#9CE5F4" sketch:type="MSShapeGroup"></path>
<path d="M28.026,29 L25.768,29 L30.482,38 L32.74,38 L28.026,29 Z" id="Fill-644" fill="#CFD3D4" sketch:type="MSShapeGroup"></path>
<path d="M19.482,29 L14.768,38 L17.026,38 L21.74,29 L19.482,29 Z" id="Fill-645" fill="#CFD3D4" sketch:type="MSShapeGroup"></path>
<path d="M18.754,20 C18.203,20 17.754,20.448 17.754,21 L17.754,26 C17.754,26.552 18.203,27 18.754,27 L28.754,27 C29.305,27 29.754,26.552 29.754,26 L29.754,21 C29.754,20.448 29.305,20 28.754,20 L18.754,20 Z M28.754,29 L18.754,29 C17.1,29 15.754,27.654 15.754,26 L15.754,21 C15.754,19.346 17.1,18 18.754,18 L28.754,18 C30.408,18 31.754,19.346 31.754,21 L31.754,26 C31.754,27.654 30.408,29 28.754,29 L28.754,29 Z" id="Fill-646" fill="#40C9E7" sketch:type="MSShapeGroup"></path>
<path d="M61.8979,34.4983 L40.6949,58.4653 L34.8179,59.6753 C34.6479,58.8573 34.2249,58.0823 33.5509,57.4863 C32.8769,56.8893 32.0559,56.5643 31.2229,56.4953 L31.7069,50.5143 L52.9099,26.5473 L61.8979,34.4983 Z" id="Fill-647" fill="#F4D0A1" sketch:type="MSShapeGroup"></path>
<path d="M61.8692,34.4729 C61.8852,34.4869 61.8862,34.5109 61.8722,34.5269 L41.1512,57.9499 C41.1182,57.9879 41.0652,57.9479 41.0892,57.9029 C41.7392,56.7029 41.5032,55.1759 40.4362,54.2309 C39.3092,53.2349 37.6512,53.2359 36.5312,54.1689 C36.4992,54.1959 36.4562,54.1589 36.4792,54.1229 C37.2692,52.8979 37.0682,51.2519 35.9422,50.2549 C34.8622,49.3009 33.2942,49.2619 32.1802,50.0819 C32.1442,50.1089 32.1032,50.0669 32.1332,50.0339 L52.8852,26.5759 C52.8992,26.5599 52.9232,26.5589 52.9392,26.5729 L61.8692,34.4729 Z" id="Fill-648" fill="#059BBF" sketch:type="MSShapeGroup"></path>
<path d="M61.8979,34.4983 L52.9099,26.5473 L54.2349,25.0493 L63.2229,33.0003 L61.8979,34.4983 Z" id="Fill-649" fill="#FACB1B" sketch:type="MSShapeGroup"></path>
<path d="M62.7497,24.5706 L62.6597,24.4916 C60.2027,22.3176 56.4487,22.5476 54.2747,25.0046 L54.2357,25.0496 L63.2227,33.0006 L63.2627,32.9556 C65.4367,30.4986 65.2067,26.7446 62.7497,24.5706" id="Fill-650" fill="#F89392" sketch:type="MSShapeGroup"></path>
<path d="M61.8728,34.5266 L41.1258,57.9796 C41.0948,58.0136 41.0478,57.9776 41.0698,57.9376 C41.7438,56.7326 41.5138,55.1846 40.4358,54.2306 C39.3118,53.2366 37.6588,53.2356 36.5388,54.1626 C36.5198,54.1786 36.4978,54.1546 36.5138,54.1366 L57.3788,30.5516 C57.3928,30.5356 57.4168,30.5336 57.4328,30.5476 L61.8698,34.4736 C61.8848,34.4866 61.8868,34.5106 61.8728,34.5266" id="Fill-651" fill="#0484AB" sketch:type="MSShapeGroup"></path>
<path d="M34.8181,59.6754 L30.9001,60.4824 L31.2231,56.4954 C32.0561,56.5644 32.8771,56.8894 33.5511,57.4864 C34.2251,58.0824 34.6481,58.8574 34.8181,59.6754" id="Fill-652" fill="#3E3E3F" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

22
modules/cms/assets/images/media-icon.svg Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="42px" height="42px" viewBox="0 0 42 42" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
<title>media-icon</title>
<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="slr_back_side" sketch:type="MSLayerGroup" transform="translate(0.000000, 2.000000)">
<path d="M37.8,4.22222222 L29.82,4.22222222 L27.72,1.05555556 C27.3,0.422222222 26.67,0.105555556 25.935,0.105555556 L15.855,0.105555556 C15.12,0.105555556 14.49,0.422222222 14.07,1.05555556 L11.97,4.22222222 L4.2,4.22222222 C1.89,4.22222222 0,6.12222222 0,8.44444444 L0,33.7777778 C0,36.1 1.89,38 4.2,38 L37.8,38 C40.11,38 42,36.1 42,33.7777778 L42,8.44444444 C42,6.12222222 40.11,4.22222222 37.8,4.22222222 L37.8,4.22222222 Z" id="Shape" fill="#5E35B1" sketch:type="MSShapeGroup"></path>
<path d="M7.35,10.5555556 L28.35,10.5555556 C28.98,10.5555556 29.4,10.9777778 29.4,11.6111111 L29.4,28.5 C29.4,29.1333333 28.98,29.5555556 28.35,29.5555556 L7.35,29.5555556 C6.72,29.5555556 6.3,29.1333333 6.3,28.5 L6.3,11.6111111 C6.3,10.9777778 6.72,10.5555556 7.35,10.5555556 L7.35,10.5555556 Z" id="Shape" fill="#F57C00" sketch:type="MSShapeGroup"></path>
<path d="M15.645,16.8888889 L8.4,27.4444444 L22.89,27.4444444 L15.645,16.8888889 Z" id="Shape" fill="#942A09" sketch:type="MSShapeGroup"></path>
<ellipse id="Oval" fill="#FFF9C4" sketch:type="MSShapeGroup" cx="24.15" cy="15.8333333" rx="2.1" ry="2.11111111"></ellipse>
<path d="M22.26,21.1111111 L17.22,27.4444444 L27.3,27.4444444 L22.26,21.1111111 Z" id="Shape" fill="#BF360C" sketch:type="MSShapeGroup"></path>
<g id="Group" transform="translate(31.500000, 2.111111)" fill="#8667C4" sketch:type="MSShapeGroup">
<path d="M0,2.11111111 L6.3,2.11111111 L6.3,1.26666667 C6.3,0.527777778 5.775,0 5.04,0 L1.26,0 C0.525,0 0,0.527777778 0,1.26666667 L0,2.11111111 L0,2.11111111 Z" id="Shape"></path>
<ellipse id="Oval" cx="4.2" cy="10.5555556" rx="2.1" ry="2.11111111"></ellipse>
<ellipse id="Oval" cx="4.2" cy="16.8888889" rx="2.1" ry="2.11111111"></ellipse>
<ellipse id="Oval" cx="4.2" cy="23.2222222" rx="2.1" ry="2.11111111"></ellipse>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

14
modules/cms/lang/en/lang.php
View File

@ -226,13 +226,13 @@ return [
],
'permissions' => [
'name' => 'Cms',
'manage_content' => 'Manage content',
'manage_assets' => 'Manage assets',
'manage_pages' => 'Manage pages',
'manage_layouts' => 'Manage layouts',
'manage_partials' => 'Manage partials',
'manage_themes' => 'Manage themes',
'manage_media' => 'Manage media'
'manage_content' => 'Manage website content files',
'manage_assets' => 'Manage website assets - images, JavaScript files, CSS files',
'manage_pages' => 'Create, modify and delete website pages',
'manage_layouts' => 'Create, modify and delete CMS layouts',
'manage_partials' => 'Create, modify and delete CMS partials',
'manage_themes' => 'Activate, deactivate and configure CMS themes',
'manage_media' => 'Upload and manage media contents - images, videos, sounds, documents'
],
'mediafinder' => [
'default_prompt' => 'Click the %s button to find a media item'

2
modules/cms/widgets/mediamanager/assets/css/mediamanager.css
View File

@ -43,7 +43,7 @@ div[data-control="media-manager"] .media-list.tiles li .image-placeholder{width:
div[data-control="media-manager"] .media-list.tiles li .image-placeholder[data-loading]:after{background-image:url('../../../../../../modules/system/assets/ui/images/loader-transparent.svg');background-position:50% 50%;content:' ';-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite;background-size:55px 55px;position:absolute;width:55px;height:55px;top:50%;left:50%;margin-top:-27.5px;margin-left:-27.5px}
div[data-control="media-manager"] .media-list.tiles li .icon-container{width:167px;height:167px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;border:1px solid #ecf0f1;overflow:hidden;background:#f6f8f9}
div[data-control="media-manager"] .media-list.tiles li .icon-container i{font-size:55px}
div[data-control="media-manager"] .media-list.tiles li .icon-container p{font-family:'Open Sans',Arial,sans-serif}
div[data-control="media-manager"] .media-list.tiles li .icon-container p{font-family:sans-serif}
div[data-control="media-manager"] .media-list.tiles li.selected .icon-container{background:#4da7e8 !important;border-color:#2581b8}
div[data-control="media-manager"] .media-list.tiles li.selected .icon-container i,div[data-control="media-manager"] .media-list.tiles li.selected .icon-container p{color:#ecf0f1}
div[data-control="media-manager"] .media-list.tiles li.selected h4{color:#2581b8}

3
modules/system/ServiceProvider.php
View File

@ -307,6 +307,7 @@ class ServiceProvider extends ModuleServiceProvider
'system' => [
'label' => 'system::lang.settings.menu_label',
'icon' => 'icon-cog',
'iconSvg' => 'modules/system/assets/images/cog-icon.svg',
'url' => Backend::url('system/settings'),
'permissions' => [],
'order' => 1000
@ -441,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');
});

56
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:'Open Sans',Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333333;background-color:#f9f9f9}
body{font-family:sans-serif;font-size:16px;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:20px;margin-bottom:20px;border:0;border-top:1px solid #eeeeee}
hr{margin-top:22px;margin-bottom:22px;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:20px;margin-bottom:10px}
h1,.h1,h2,.h2,h3,.h3{margin-top:22px;margin-bottom:11px}
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:10px;margin-bottom:10px}
h4,.h4,h5,.h5,h6,.h6{margin-top:11px;margin-bottom:11px}
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:36px}
h2,.h2{font-size:30px}
h3,.h3{font-size:24px}
h4,.h4{font-size:18px}
h5,.h5{font-size:14px}
h6,.h6{font-size:12px}
p{margin:0 0 10px}
.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}
@media (min-width:768px){.lead{font-size:21px}
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}
}
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:9px;margin:40px 0 20px;border-bottom:1px solid #eeeeee}
ul,ol{margin-top:0;margin-bottom:10px}
.page-header{padding-bottom:10px;margin:44px 0 22px;border-bottom:1px solid #eeeeee}
ul,ol{margin-top:0;margin-bottom:11px}
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:20px}
dl{margin-top:0;margin-bottom:22px}
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:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eeeeee}
blockquote{padding:11px 22px;margin:0 0 22px;font-size:20px;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:20px;font-style:normal;line-height:1.42857143}
address{margin-bottom:22px;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:20px;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:21px;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:24px;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}
@ -1010,22 +1010,8 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
.icon-3x{font-size:3em}
.icon-4x{font-size:4em}
.icon-5x{font-size:5em}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Light.eot');src:url('../../../backend/assets/font/OpenSans-Light.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Light.svg#open_sanslight') format('svg'),url('../../../backend/assets/font/OpenSans-Light.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Light.ttf') format('truetype');font-style:normal;font-weight:300}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Regular.eot');src:url('../../../backend/assets/font/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Regular.svg#open_sansregular') format('svg'),url('../../../backend/assets/font/OpenSans-Regular.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Regular.ttf') format('truetype');font-style:normal;font-weight:400}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Semibold.eot');src:url('../../../backend/assets/font/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Semibold.svg#open_sanssemibold') format('svg'),url('../../../backend/assets/font/OpenSans-Semibold.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Semibold.ttf') format('truetype');font-style:normal;font-weight:600}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Bold.eot');src:url('../../../backend/assets/font/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Bold.svg#open_sansbold') format('svg'),url('../../../backend/assets/font/OpenSans-Bold.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Bold.ttf') format('truetype');font-style:normal;font-weight:700}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-LightItalic.eot');src:url('../../../backend/assets/font/OpenSans-LightItalic.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-LightItalic.svg#open_sanslight_italic') format('svg'),url('../../../backend/assets/font/OpenSans-LightItalic.woff') format('woff'),url('../../../backend/assets/font/OpenSans-LightItalic.ttf') format('truetype');font-style:italic;font-weight:300}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Italic.eot');src:url('../../../backend/assets/font/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Italic.svg#open_sansitalic') format('svg'),url('../../../backend/assets/font/OpenSans-Italic.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Italic.ttf') format('truetype');font-style:italic;font-weight:400}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-SemiboldItalic.eot');src:url('../../../backend/assets/font/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-SemiboldItalic.svg#open_sanssemibold_italic') format('svg'),url('../../../backend/assets/font/OpenSans-SemiboldItalic.woff') format('woff'),url('../../../backend/assets/font/OpenSans-SemiboldItalic.ttf') format('truetype');font-style:italic;font-weight:600}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Light.eot');src:url('../../../backend/assets/font/OpenSans-Light.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Light.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Light.svg#open_sanslight') format('svg'),url('../../../backend/assets/font/OpenSans-Light.ttf') format('truetype');font-style:normal;font-weight:300}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Regular.eot');src:url('../../../backend/assets/font/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Regular.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Regular.svg#open_sansregular') format('svg'),url('../../../backend/assets/font/OpenSans-Regular.ttf') format('truetype');font-style:normal;font-weight:400}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Semibold.eot');src:url('../../../backend/assets/font/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Semibold.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Semibold.svg#open_sanssemibold') format('svg'),url('../../../backend/assets/font/OpenSans-Semibold.ttf') format('truetype');font-style:normal;font-weight:600}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Bold.eot');src:url('../../../backend/assets/font/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Bold.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Bold.svg#open_sansbold') format('svg'),url('../../../backend/assets/font/OpenSans-Bold.ttf') format('truetype');font-style:normal;font-weight:700}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-LightItalic.eot');src:url('../../../backend/assets/font/OpenSans-LightItalic.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-LightItalic.woff') format('woff'),url('../../../backend/assets/font/OpenSans-LightItalic.svg#open_sanslight_italic') format('svg'),url('../../../backend/assets/font/OpenSans-LightItalic.ttf') format('truetype');font-style:italic;font-weight:300}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Italic.eot');src:url('../../../backend/assets/font/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Italic.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Italic.svg#open_sansitalic') format('svg'),url('../../../backend/assets/font/OpenSans-Italic.ttf') format('truetype');font-style:italic;font-weight:400}
@font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-SemiboldItalic.eot');src:url('../../../backend/assets/font/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-SemiboldItalic.woff') format('woff'),url('../../../backend/assets/font/OpenSans-SemiboldItalic.svg#open_sanssemibold_italic') format('svg'),url('../../../backend/assets/font/OpenSans-SemiboldItalic.ttf') format('truetype');font-style:italic;font-weight:600}
body{padding-top:20px;font-family:'Open Sans',Arial,sans-serif;background:#f3f3f3;color:#405261}
h1,h2,h3,h4,h5{font-family:'Open Sans',Arial,sans-serif;text-transform:uppercase}
body{padding-top:20px;font-family:sans-serif;background:#f3f3f3;color:#405261}
h1,h2,h3,h4,h5{font-family:sans-serif;text-transform:uppercase}
h1{font-weight:300;font-size:50px;margin-bottom:15px}
h1 i[class^="icon-"]:before{font-size:46px}
i[class^="icon-"].warning{color:#c84530}

13
modules/system/assets/images/cog-icon.svg Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="42px" height="45px" viewBox="0 0 42 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
<title>cog-icon</title>
<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="services" sketch:type="MSLayerGroup">
<path d="M22.6,32.4 C22.7,32 22.7,31.5 22.7,31 C22.7,30.5 22.7,30.1 22.6,29.6 L25.4,27.6 C25.7,27.4 25.8,27 25.6,26.7 L22.9,22.1 C22.7,21.8 22.4,21.7 22.1,21.8 L19,23.3 C18.3,22.7 17.5,22.3 16.6,21.9 L16.3,18.5 C16.3,18.2 16,17.9 15.7,17.9 L10.4,17.9 C10.1,17.9 9.8,18.2 9.8,18.5 L9.4,22 C8.5,22.3 7.8,22.8 7,23.4 L3.9,22 C3.6,21.9 3.2,22 3.1,22.3 L0.4,26.9 C0.2,27.2 0.3,27.6 0.6,27.8 L3.4,29.8 C3.3,30.2 3.3,30.7 3.3,31.2 C3.3,31.7 3.3,32.1 3.4,32.6 L0.6,34.6 C0.3,34.8 0.2,35.2 0.4,35.5 L3.1,40.1 C3.3,40.4 3.6,40.5 3.9,40.4 L7,39 C7.7,39.6 8.5,40 9.4,40.4 L9.7,43.8 C9.7,44.1 10,44.4 10.3,44.4 L15.6,44.4 C15.9,44.4 16.2,44.1 16.2,43.8 L16.5,40.4 C17.4,40.1 18.1,39.6 18.9,39 L22,40.4 C22.3,40.5 22.7,40.4 22.8,40.1 L25.5,35.5 C25.7,35.2 25.6,34.8 25.3,34.6 L22.6,32.4 L22.6,32.4 Z M13,36 C10.2,36 8,33.8 8,31 C8,28.2 10.2,26 13,26 C15.8,26 18,28.2 18,31 C18,33.8 15.8,36 13,36 L13,36 Z" id="Shape" fill="#E65100" sketch:type="MSShapeGroup"></path>
<path d="M38.9,13.3 C39,12.8 39,12.4 39,12 C39,11.6 39,11.2 38.9,10.7 L41.4,8.9 C41.7,8.7 41.7,8.4 41.6,8.1 L39.1,3.8 C38.9,3.5 38.6,3.4 38.3,3.6 L35.4,4.9 C34.7,4.4 34,4 33.2,3.6 L32.9,0.5 C33,0.2 32.8,0 32.5,0 L27.6,0 C27.3,0 27,0.2 27,0.5 L26.7,3.6 C25.9,3.9 25.2,4.3 24.5,4.9 L21.6,3.6 C21.3,3.5 21,3.6 20.8,3.8 L18.3,8.1 C18.1,8.4 18.2,8.7 18.5,8.9 L21,10.7 L21,12 C21,12.4 21,12.8 21.1,13.3 L18.6,15.1 C18.3,15.3 18.3,15.6 18.4,15.9 L20.9,20.2 C21.1,20.5 21.4,20.6 21.7,20.4 L24.6,19.1 C25.3,19.6 26,20 26.8,20.4 L27.1,23.5 C27.1,23.8 27.4,24 27.7,24 L32.6,24 C32.9,24 33.2,23.8 33.2,23.5 L33.5,20.4 C34.3,20.1 35,19.7 35.7,19.1 L38.6,20.4 C38.9,20.5 39.2,20.4 39.4,20.2 L41.9,15.9 C42.1,15.6 42,15.3 41.7,15.1 L38.9,13.3 L38.9,13.3 Z M30,17 C27.2,17 25,14.8 25,12 C25,9.2 27.2,7 30,7 C32.8,7 35,9.2 35,12 C35,14.8 32.8,17 30,17 L30,17 Z" id="Shape" fill="#FFA000" sketch:type="MSShapeGroup"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

12131
modules/system/assets/ui/css/storm.css Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -9,14 +9,13 @@
// Breadcrumb
// --------------------------------------------------
@color-breadcrumb-text-active: #9da3a7;
@color-breadcrumb-text: #ecf0f1;
@color-breadcrumb-background: #2b343d;
@color-breadcrumb-text-active: #555555;
@color-breadcrumb-text: #686868;
@color-breadcrumb-background: #D3D9DA;
.control-breadcrumb {
font-size: 12px;
text-transform: uppercase;
padding: 15px 20px;
font-size: 15px;
padding: 12px 20px 13px 20px;
margin: -20px -20px 20px -20px;
background-color: @color-breadcrumb-background;
@ -31,7 +30,6 @@
padding: 0;
display: inline-block;
color: @color-breadcrumb-text-active;
letter-spacing: 0.05em;
a {
color: @color-breadcrumb-text;

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

@ -55,6 +55,7 @@
}
.btn-primary {
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
font-weight: bold;
}
// Success appears as green
.btn-success {

7
modules/system/assets/ui/less/button.less
View File

@ -16,7 +16,7 @@
// --------------------------------------------------
.btn {
font-size: 13px;
font-size: 16px;
border: none;
text-align: left;
outline: none !important;
@ -129,17 +129,18 @@
}
.btn-text {
font-size: 13px;
font-size: 16px;
padding: 9px 0;
vertical-align: middle;
display: inline-block;
color: @btn-default-color;
a {
color: @btn-default-color;
text-decoration: underline;
&:hover {
color: @link-color;
text-decoration: none;
}
}
}

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

@ -1,11 +1,11 @@
@btn-font-weight: normal;
@btn-default-color: #666666;
@btn-default-bg: #e3e3e3;
@btn-default-border: #e3e3e3;
@btn-default-color: #FFFFFF;
@btn-default-bg: #BDC3C7;
@btn-default-border: #BDC3C7;
@btn-primary-color: #fff;
@btn-primary-bg: @brand-primary;
@btn-primary-bg: #1681BA;
@btn-primary-border: darken(@btn-primary-bg, 5%);
@btn-success-color: #fff;

121
modules/system/assets/ui/less/checkbox.less
View File

@ -11,12 +11,17 @@
@import "checkbox.balloon.less";
@color-checkbox-icon: #666666;
@color-checkbox-border: #999999;
@color-checkbox-checked: #1F99DC;
@color-checkbox-icon: #FFFFFF;
@color-checkbox-border: #DCE1E3;
@color-checkbox-switch-bg: #f6f6f6;
@color-checkbox-switch-on: #8da85e;
@color-checkbox-switch-off: #cc3300;
@color-checkbox-switch-on: #76A544;
@color-checkbox-switch-off: #BB2424;
@color-label-green: @color-checkbox-switch-on;
@color-label-red: @color-checkbox-switch-off;
//
// Checkbox
@ -45,49 +50,83 @@
display: inline-block;
cursor: pointer;
position: relative;
padding-left: 20px;
padding-left: 35px;
margin-right: 15px;
margin-left: -20px;
.user-select(none);
font-size: 12px;
font-size: 15px;
&:before {
content: "";
display: inline-block;
text-align: center;
width: 16px;
height: 16px;
margin-right: 10px;
position: absolute;
left: -3px;
bottom: 1px;
background-color: #FFFFFF;
border: 1px solid @color-checkbox-border;
color: @color-checkbox-icon;
width: 22px;
height: 22px;
margin-right: 15px;
position: absolute;
left: -3px;
bottom: 0;
background-color: #FFFFFF;
border: 2px solid @color-checkbox-border;
}
&:hover:before {
border-color: darken(@color-checkbox-border, 10%);
color: darken(@color-checkbox-icon, 10%);
}
&:active:before {
border-color: darken(@color-checkbox-border, 20%);
color: darken(@color-checkbox-icon, 20%);
}
}
input[type=radio]:checked + label:before {
.icon(@circle);
font-size: 9px;
line-height: 12px;
border-width: 2px;
input[type=radio]:checked + label {
&:before {
border-color: @color-checkbox-checked;
line-height: 17px;
border-width: 2px;
}
&:after {
content: '';
width: 16px;
height: 16px;
background-color: @color-checkbox-checked;
display: inline-block;
position: absolute;
left: 0px;
top: 2px;
.border-radius(17px);
}
}
input[type=radio][data-radio-color=green]:checked + label {
&:before {
border-color: @color-label-green;
}
&:after {
background-color: @color-label-green;
}
}
input[type=radio][data-radio-color=red]:checked + label {
&:before {
border-color: @color-label-red;
}
&:after {
background-color: @color-label-red;
}
}
input[type=checkbox]:checked + label:before {
.icon(@check);
font-size: 10px;
line-height: 12px;
border-color: @color-checkbox-checked;
background-color: @color-checkbox-checked;
font-size: 14px;
line-height: 17px;
border-width: 2px;
}
@ -99,16 +138,17 @@
}
p.help-block {
margin-top: 0;
padding-left: 15px;
margin-bottom: 17px;
}
}
.custom-radio label:before {
border-radius: 8px;
.border-radius(18px);
}
.custom-checkbox label:before {
border-radius: @border-radius-base;
.border-radius(3px);
}
//
@ -117,15 +157,19 @@
.switch-field {
.field-switch {
padding-left: 75px;
padding-left: 90px;
float: left;
> label {
margin-top: 5px;
}
}
}
.custom-switch {
display: block;
width: 58px;
height: 26px;
width: 69px;
height: 30px;
position: relative;
text-transform: uppercase;
border: none;
@ -138,8 +182,8 @@
z-index: 4;
display: block;
position: absolute;
right: 34px;
top: 2px;
right: 43px;
top: 4px;
width: 22px;
height: 22px;
background-color: @color-checkbox-switch-bg;
@ -168,7 +212,7 @@
.opacity(0);
&:checked {
~ .slide-button {
right: 2px;
right: 4px;
}
~ span { background-color: @color-checkbox-switch-on; }
~ span span {
@ -191,7 +235,8 @@
left: 0;
width: 100%;
background-color: @color-checkbox-switch-off;
font-size: 11px;
font-size: 14px;
font-weight: bold;
.user-select(none);
.border-radius(20px);
@ -200,16 +245,16 @@
display: block;
width: 50%;
position: absolute;
top: 1px;
top: 4px;
left: 0;
.box-sizing(border-box);
&:last-child {
left: 50%;
left: 31px;
color: #FFFFFF;
display: block;
}
&:first-of-type {
padding-left: 9px;
padding-left: 13px;
display: none;
color: #666666;
}

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

@ -31,9 +31,10 @@ legend {
label {
display: inline-block;
margin-bottom: 5px;
font-weight: 600;
margin-bottom: 14px;
font-weight: normal;
font-size: @label-font-size;
color: @color-label;
}
@ -112,17 +113,17 @@ output {
// input[type="tel"]
// input[type="color"]
.form-control {
.form-control {
display: block;
width: 100%;
height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
padding: @padding-base-vertical @padding-base-horizontal;
padding: (@padding-base-vertical + 1) @padding-base-horizontal (@padding-base-vertical - 1);
font-size: @input-font-size;
line-height: @line-height-base;
color: @input-color;
background-color: @input-bg;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid @input-border;
border: 2px solid @input-border;
border-radius: @input-border-radius;
.transition(@input-transition);
@ -319,8 +320,13 @@ input[type="checkbox"],
.help-block {
display: block; // account for any element using help-block
margin-top: 5px;
margin-bottom: 10px;
color: lighten(@text-color, 25%); // lighten the text some for contrast
margin-bottom: 14px;
color: @color-help-block-text;
}
label + .help-block,
label + .help-block.before-field {
margin-top: -7px;
}
// Inline forms

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

@ -49,7 +49,7 @@
-webkit-appearance: none;
&:focus {
border: 1px solid @color-form-field-border-focus;
border: 2px solid @color-form-field-border-focus;
}
&.icon {
@ -59,7 +59,7 @@
background-image: url('@{image-path}/bitmap-icons.png');
&.plus { background-position: right -124px; }
&.search { background-position: right -84px; }
&.search { background-position: right -77px; }
&.user { background-position: right -41px; }
&.lock { background-position: right 0; }
}
@ -81,7 +81,7 @@
}
&, &.layout-item {
padding-bottom: 20px;
padding-bottom: 35px;
margin-bottom: 0;
}
@ -89,11 +89,15 @@
&.is-required {
> label:after {
color: @color-form-required-asterisk;
background-color: @color-form-required-asterisk;
width: 5px;
height: 5px;
margin-left: 3px;
vertical-align: super;
font-size: 60%;
content: " *";
text-shadow: 0 0 2px darken(@color-form-required-asterisk, 15%);
content: "";
display: inline-block;
.border-radius(8px);
}
}
@ -174,11 +178,11 @@
}
.help-block {
font-size: 12px;
font-size: 15px;
margin-bottom: 0;
&.before-field {
margin-top: 0;
margin-bottom: 10px;
margin-bottom: 17px;
}
}
@ -262,6 +266,10 @@
}
.field-checkboxlist {
padding: 20px 20px 5px 20px;
.border-radius(@border-radius-base);
background: @color-form-checkboxlist-background;
.checkbox:last-of-type {
margin-bottom: 0;
}
@ -336,11 +344,11 @@
.form-buttons {
.clearfix();
padding-bottom: 20px;
padding-bottom: 35px;
font-size: 0;
.btn {
margin-right: 10px;
margin-right: 20px;
&.no-margin-right {
margin-right: 0;

13
modules/system/assets/ui/less/form.variables.less
View File

@ -7,8 +7,8 @@
@input-bg-disabled: @gray-lighter;
@input-color: @gray;
@input-border: #e0e0e0;
@input-border-focus: #808c8d;
@input-border: #BDC3C7;
@input-border-focus: #1F99DC;
@input-border-radius: 3px;
@input-color-placeholder: #cccccc;
@ -23,8 +23,9 @@
@input-group-addon-bg: @gray-lighter;
@input-group-addon-border-color: @input-border;
@label-font-size: 12px;
@input-font-size: 13px;
@label-font-size: 16px;
@input-font-size: 16px;
@color-label: #2A3E51;
@input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
@ -35,12 +36,14 @@
@color-form-field-border: @input-border;
@color-form-field-border-focus: @input-border-focus;
@color-form-required-asterisk: #ff0000;
@color-form-required-asterisk: #C20A0A;
@color-form-sidebar: #ecf0f1;
@color-form-field-preview: #f6f6f6;
@color-form-field-bg: #ffffff;
@color-form-field-icon: #bdbdbd;
@color-help-block-text: #555555;
@color-form-field-recordfinder-btn: #333333;
@color-form-checkboxlist-border: #e2e2e2;
@color-form-checkboxlist-background: #FFFFFF;

8
modules/system/assets/ui/less/global.variables.less
View File

@ -73,7 +73,7 @@
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
@font-size-base: 16px;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
@ -153,8 +153,8 @@
//
// General
// --------------------------------------------------
@padding-base-vertical: 9px;
@padding-base-horizontal: 11px;
@padding-base-vertical: 10px;
@padding-base-horizontal: 16px;
@padding-large-vertical: 10px;
@padding-large-horizontal: 16px;
@ -168,7 +168,7 @@
@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
@line-height-small: 1.5;
@border-radius-base: 2px;
@border-radius-base: 5px;
@border-radius-large: 6px;
@border-radius-small: 3px;

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

@ -14,10 +14,10 @@
@color-scroll-indicator: #bbbbbb;
@color-tab-border: #d7d7d7;
@color-tab-border: #ECF0F1;
@color-tab-inactive-text: #cccccc;
@color-tab-active-text: @color-text-title;
@color-tab-active-border: #5fb6f5;
@color-tab-active-border: #DBE1E3;
@color-tab-bg: #ffffff;
@color-tab-active-marker: #ec8017;
@color-tab-content-active-bg: #ffffff;
@ -46,8 +46,6 @@
@nav-pills-active-link-hover-bg: @component-active-bg;
@nav-pills-active-link-hover-color: @component-active-color;
@tab-image-path: @image-path;
.control-tabs {
position: relative;
@ -78,6 +76,7 @@
display: inline-block;
margin-right: 20px;
position: relative;
z-index: 90;
&:last-child {
margin-right: 0;
@ -105,11 +104,12 @@
> span.title > span {
max-width: 150px;
height: 16px;
margin-bottom: -4px;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
border-top: 2px solid @color-tab-border;
margin-top: -8px;
padding-top: 11px;
}
}
@ -118,6 +118,8 @@
}
&.active {
z-index: 100;
a {
color: @color-tab-active-text;
}
@ -135,7 +137,7 @@
> div.tab-content {
> div.tab-pane {
padding: 20px 0 0 0;
padding: 35px 0 0 0;
.clearfix();
display: none;
@ -245,22 +247,23 @@
&:before {
position: absolute;
top: 26px;
bottom: 0;
height: 1px;
width: 100%;
z-index: 95;
content: ' ';
border-bottom: 1px solid @color-tab-border;
border-bottom: 2px solid @color-tab-active-border;
}
> li {
padding-right: 10px;
padding-left: 11px;
padding-right: 0;
padding-left: 0;
margin-left: 0;
margin-right: -30px;
margin-right: -20px;
background: transparent;
&:first-child {
padding-left: 15px !important;
padding-left: 35px !important;
}
&:last-child {
@ -268,9 +271,8 @@
}
a {
font-size: 12px;
font-size: 16px;
padding-bottom: 3px;
padding: 0 16px;
margin: 0;
position: relative;
z-index: 101;
@ -280,29 +282,35 @@
> span.title {
position: relative;
display: inline-block;
padding: 5px 5px 9px 5px;
padding: 8px 25px 0px 25px;
.box-sizing(border-box);
border-top: 1px solid #f0f0f0;
z-index: 100;
&:before, &:after {
content: ' ';
position: absolute;
background: transparent url('@{tab-image-path}/primary-tab-shape.png') no-repeat left -31px;
width: 16px;
height: 26px;
content: '';
display: block;
top: -1px;
z-index: 100;
border-top: 2px solid @color-tab-border;
position: absolute;
background: @body-bg;
top: 0;
z-index: -1;
width: 20px;
bottom: -2px;
transform-origin: bottom;
}
&:before {
left: -16px;
left: 0;
border-left: 2px solid @color-tab-border;
.border-radius(8px 0 0 0);
.transform( ~'skewX(-20deg)');
}
&:after {
right: -16px;
background-position: -61px -31px;
right: 0;
border-right: 2px solid @color-tab-border;
.border-radius(0 8px 0 0);
.transform( ~'skewX(20deg)');
}
}
}
@ -317,16 +325,6 @@
padding-left: 0;
}
&.active a:before {
position: absolute;
top: 26px;
height: 1px;
right: 2px;
left: 0;
content: ' ';
background-color: @body-bg;
}
&.active a {
z-index: 107;
@ -334,16 +332,24 @@
z-index: 105;
border-top-color: #d6d6d6;
&:before {
background-position: left 0;
z-index: 107;
&:before, &:after{
border-color: @color-tab-active-border;
}
&:after {
background-position: -61px 0;
z-index: 107;
span {
border-top-color: @color-tab-active-border;
}
}
&:before {
position: absolute;
bottom: 0;
height: 2px;
right: 2px;
left: 2px;
content: ' ';
background-color: @body-bg;
}
}
}
}

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

@ -92,7 +92,7 @@
input.form-control[type=text] {
height: auto;
padding: 8px 10px;
padding: 11px 17px 12px 17px;
}
&.toolbar-padded {

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

@ -2260,10 +2260,11 @@ $(window).off('.cursorLoadIndicator');}}
$(document).ready(function(){$.oc.cursorLoadIndicator=new CursorLoadIndicator();})
$(document).on('ajaxPromise','[data-cursor-load-indicator]',function(){$.oc.cursorLoadIndicator.show()}).on('ajaxFail ajaxDone','[data-cursor-load-indicator]',function(){$.oc.cursorLoadIndicator.hide()})}(window.jQuery);+function($){"use strict";if($.oc===undefined)
$.oc={}
var StripeLoadIndicator=function(){this.counter=0
var StripeLoadIndicator=function(){var self=this
this.counter=0
this.indicator=$('<div/>').addClass('stripe-loading-indicator loaded').append($('<div />').addClass('stripe')).append($('<div />').addClass('stripe-loaded'))
this.stripe=this.indicator.find('.stripe')
$(document.body).append(this.indicator)}
$(document).ready(function(){$(document.body).append(self.indicator)})}
StripeLoadIndicator.prototype.show=function(){this.counter++
this.stripe.after(this.stripe=this.stripe.clone()).remove()
if(this.counter>1)
@ -2275,7 +2276,7 @@ if(force!==undefined&&force)
this.counter=0
if(this.counter<=0){this.indicator.addClass('loaded')
$(document.body).removeClass('loading')}}
$(document).ready(function(){$.oc.stripeLoadIndicator=new StripeLoadIndicator()})
$.oc.stripeLoadIndicator=new StripeLoadIndicator()
$(document).on('ajaxPromise','[data-stripe-load-indicator]',function(event){event.stopPropagation()
$.oc.stripeLoadIndicator.show()
var $el=$(this)

353
modules/system/assets/ui/storm.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:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333333;background-color:#f9f9f9}
body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:16px;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:20px;margin-bottom:20px;border:0;border-top:1px solid #eeeeee}
hr{margin-top:22px;margin-bottom:22px;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:20px;margin-bottom:10px}
h1,.h1,h2,.h2,h3,.h3{margin-top:22px;margin-bottom:11px}
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:10px;margin-bottom:10px}
h4,.h4,h5,.h5,h6,.h6{margin-top:11px;margin-bottom:11px}
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:36px}
h2,.h2{font-size:30px}
h3,.h3{font-size:24px}
h4,.h4{font-size:18px}
h5,.h5{font-size:14px}
h6,.h6{font-size:12px}
p{margin:0 0 10px}
.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}
@media (min-width:768px){.lead{font-size:21px}
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}
}
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:9px;margin:40px 0 20px;border-bottom:1px solid #eeeeee}
ul,ol{margin-top:0;margin-bottom:10px}
.page-header{padding-bottom:10px;margin:44px 0 22px;border-bottom:1px solid #eeeeee}
ul,ol{margin-top:0;margin-bottom:11px}
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:20px}
dl{margin-top:0;margin-bottom:22px}
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:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eeeeee}
blockquote{padding:11px 22px;margin:0 0 22px;font-size:20px;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,22 +409,22 @@ 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:20px;font-style:normal;line-height:1.42857143}
.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:9px 16.5px;font-size:14px;line-height:1.42857143;border-radius:2px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
address{margin-bottom:22px;font-style:normal;line-height:1.42857143}
.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:10px 24px;font-size:16px;line-height:1.42857143;border-radius:5px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}
.btn:hover,.btn:focus{color:#666666;text-decoration:none}
.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:#666666;background-color:#e3e3e3;border-color:#e3e3e3}
.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#666666;background-color:#cfcfcf;border-color:#c4c4c4}
.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: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:#e3e3e3;border-color:#e3e3e3}
.btn-default .badge{color:#e3e3e3;background-color:#666666}
.btn-primary{color:#ffffff;background-color:#4da7e8;border-color:#369ce5}
.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#ffffff;background-color:#2995e3;border-color:#197dc5}
.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-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}
.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#4da7e8;border-color:#369ce5}
.btn-primary .badge{color:#4da7e8;background-color:#ffffff}
.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#1681ba;border-color:#1371a3}
.btn-primary .badge{color:#1681ba;background-color:#ffffff}
.btn-success{color:#ffffff;background-color:#31ac5f;border-color:#2b9854}
.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#ffffff;background-color:#288c4d;border-color:#1e693a}
.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}
@ -450,9 +450,9 @@ address{margin-bottom:20px;font-style:normal;line-height:1.42857143}
.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}
.btn-link:hover,.btn-link:focus{color:#001721;text-decoration:underline;background-color:transparent}
.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999999;text-decoration:none}
.btn-lg,.btn-group-lg > .btn{padding:10px 24px;font-size:18px;line-height:1.3333333;border-radius:6px}
.btn-sm,.btn-group-sm > .btn{padding:5px 15px;font-size:12px;line-height:1.5;border-radius:3px}
.btn-xs,.btn-group-xs > .btn{padding:1px 7.5px;font-size:12px;line-height:1.5;border-radius:3px}
.btn-lg,.btn-group-lg > .btn{padding:10px 24px;font-size:20px;line-height:1.3333333;border-radius:6px}
.btn-sm,.btn-group-sm > .btn{padding:5px 15px;font-size:14px;line-height:1.5;border-radius:3px}
.btn-xs,.btn-group-xs > .btn{padding:1px 7.5px;font-size:14px;line-height:1.5;border-radius:3px}
.btn-block{display:block;width:100%;padding-left:0;padding-right:0}
.btn-block + .btn-block{margin-top:5px}
input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}
@ -484,8 +484,8 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"
.btn-group-vertical > .btn-group > .btn{float:none}
.btn-group-vertical > .btn + .btn,.btn-group-vertical > .btn + .btn-group,.btn-group-vertical > .btn-group + .btn,.btn-group-vertical > .btn-group + .btn-group{margin-top:-1px;margin-left:0}
.btn-group-vertical > .btn:not(:first-child):not(:last-child){border-radius:0}
.btn-group-vertical > .btn:first-child:not(:last-child){border-top-right-radius:2px;border-bottom-right-radius:0;border-bottom-left-radius:0}
.btn-group-vertical > .btn:last-child:not(:first-child){border-bottom-left-radius:2px;border-top-right-radius:0;border-top-left-radius:0}
.btn-group-vertical > .btn:first-child:not(:last-child){border-top-right-radius:5px;border-bottom-right-radius:0;border-bottom-left-radius:0}
.btn-group-vertical > .btn:last-child:not(:first-child){border-bottom-left-radius:5px;border-top-right-radius:0;border-top-left-radius:0}
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn{border-radius:0}
.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}
.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child{border-top-right-radius:0;border-top-left-radius:0}
@ -493,14 +493,14 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"
.btn-group-justified > .btn,.btn-group-justified > .btn-group{float:none;display:table-cell;width:1%}
.btn-group-justified > .btn-group .btn{width:100%}
[data-toggle="buttons"] > .btn > input[type="radio"],[data-toggle="buttons"] > .btn > input[type="checkbox"]{display:none}
.btn{font-size:13px;border:none;text-align:left;outline:none !important}
.btn{font-size:16px;border:none;text-align:left;outline:none !important}
.btn[class^="oc-icon-"]:before,.btn[class*=" oc-icon-"]:before{font-size:14px;line-height:14px;position:relative}
.btn[disabled]{background-color:#dbdbdb;color:#aaaaaa}
.btn.active,.btn:active{-webkit-box-shadow:none;box-shadow:none}
.btn-default.on{background-color:#95a5a6;color:#f9f9f9}
.btn-group .btn{border-right:1px solid rgba(0,0,0,0.09);margin-left:0 !important}
.btn-group .btn:last-child,.btn-group .btn.last{border-right:none}
.btn-group .btn.last{border-bottom-right-radius:2px !important;border-top-right-radius:2px !important}
.btn-group .btn.last{border-bottom-right-radius:5px !important;border-top-right-radius:5px !important}
.btn-group > .dropdown{float:left}
.btn-group > .dropdown:not(:last-child,.last) > .btn{border-right:1px solid rgba(0,0,0,0.09);border-bottom-right-radius:0 !important;border-top-right-radius:0 !important}
.btn-group > .dropdown:not(:first-child) > .btn{border-bottom-left-radius:0 !important;border-top-left-radius:0 !important}
@ -514,16 +514,16 @@ 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:13px;padding:9px 0;vertical-align:middle;display:inline-block}
.btn-text a{color:#666666}
.btn-text a:hover{color:#0181b9;text-decoration:none}
.tooltip{position:absolute;z-index:1060;display:block;visibility:visible;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0)}
.btn-text{font-size:16px;padding:9px 0;vertical-align:middle;display:inline-block;color:#ffffff}
.btn-text a{color:#ffffff;text-decoration:underline}
.btn-text a:hover{color:#0181b9}
.tooltip{position:absolute;z-index:1060;display:block;visibility:visible;font-size:14px;line-height:1.4;opacity:0;filter:alpha(opacity=0)}
.tooltip.in{opacity:0.9;filter:alpha(opacity=90)}
.tooltip.top{margin-top:-3px;padding:5px 0}
.tooltip.right{margin-left:3px;padding:0 5px}
.tooltip.bottom{margin-top:3px;padding:5px 0}
.tooltip.left{margin-left:-3px;padding:0 5px}
.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#34495e;border-radius:2px}
.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#34495e;border-radius:5px}
.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}
.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#34495e}
.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-width:5px 5px 0;border-top-color:#34495e}
@ -1118,7 +1118,7 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"
.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:21px;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:24px;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('font/fontawesome-webfont.eot?v=1.0.1');src:url('font/fontawesome-webfont.eot?#iefix&v=1.0.1') format('embedded-opentype'),url('font/fontawesome-webfont.woff?v=1.0.1') format('woff'),url('font/fontawesome-webfont.ttf?v=1.0.1') format('truetype'),url('font/fontawesome-webfont.svg#fontawesomeregular?v=1.0.1') format('svg');font-weight:normal;font-style:normal}
@ -1136,9 +1136,9 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}
.dropdown{position:relative}
.dropdown-toggle:focus{outline:0}
.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#ffffff;border:1px solid #cccccc;border:1px solid #949ea6;border-radius:2px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}
.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:16px;background-color:#ffffff;border:1px solid #cccccc;border:1px solid #949ea6;border-radius:5px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}
.dropdown-menu.pull-right{right:0;left:auto}
.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}
.dropdown-menu .divider{height:1px;margin:10px 0;overflow:hidden;background-color:#e5e5e5}
.dropdown-menu > li > a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.42857143;color:#39454a;white-space:nowrap}
.dropdown-menu > li > a:hover,.dropdown-menu > li > a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}
.dropdown-menu > .active > a,.dropdown-menu > .active > a:hover,.dropdown-menu > .active > a:focus{color:#ffffff;text-decoration:none;outline:0;background-color:#4da7e8}
@ -1148,13 +1148,13 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
.open > a{outline:0}
.dropdown-menu-right{left:auto;right:0}
.dropdown-menu-left{left:0;right:auto}
.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#999999}
.dropdown-header{display:block;padding:3px 20px;font-size:14px;line-height:1.42857143;color:#999999}
.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}
.pull-right > .dropdown-menu{right:0;left:auto}
.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 .dropdown-container > ul{border:1px solid #949ea6;background-color:#ffffff;border-radius:2px;padding:0;list-style:none;position:relative;margin-top:7px}
.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}
@ -1234,18 +1234,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:12px;text-transform:uppercase;padding:15px 20px;margin:-20px -20px 20px -20px;background-color:#2b343d}
.control-breadcrumb{font-size:15px;padding:12px 20px 13px 20px;margin:-20px -20px 20px -20px;background-color:#d3d9da}
.control-breadcrumb ul{padding:0;margin:0}
.control-breadcrumb li{list-style:none;margin:0;padding:0;display:inline-block;color:#9da3a7;letter-spacing:0.05em}
.control-breadcrumb li a{color:#ecf0f1;text-decoration:none}
.control-breadcrumb li a:hover{color:#ecf0f1}
.control-breadcrumb li:after{font-size:14px;line-height:14px;display:inline-block;margin-left:6px;margin-right:2px;vertical-align:baseline;color:#9da3a7;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f105"}
.control-breadcrumb li{list-style:none;margin:0;padding:0;display:inline-block;color:#555555}
.control-breadcrumb li a{color:#686868;text-decoration:none}
.control-breadcrumb li a:hover{color:#686868}
.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 li:last-child:after{content:''}
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}
.progress{overflow:hidden;height:9px;margin-bottom:20px;background-color:#d9dee0;border-radius:2px}
.progress-bar{float:left;width:0%;height:100%;font-size:12px;line-height:9px;color:#ffffff;text-align:center;background-color:#2f99da;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
.progress{overflow:hidden;height:9px;margin-bottom:22px;background-color:#d9dee0;border-radius:5px}
.progress-bar{float:left;width:0%;height:100%;font-size:14px;line-height:9px;color:#ffffff;text-align:center;background-color:#2f99da;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}
.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}
.progress-bar-success{background-color:#31ac5f}
.progress-bar-info{background-color:#5bc0de}
@ -1257,7 +1257,7 @@ to{background-position:0 0}
@keyframes progress-bar-stripes{from{background-position:40px 0}
to{background-position:0 0}
}
.callout{font-size:14px;margin-bottom:20px}
.callout{font-size:14px;margin-bottom:22px}
.callout.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)}
.callout.fade.in{opacity:1;filter:alpha(opacity=100);-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}
.callout > .close{margin:15px 15px 0 0}
@ -1302,7 +1302,7 @@ to{background-position:0 0}
.nav .open > a,.nav .open > a:hover,.nav .open > a:focus{background-color:#eeeeee;border-color:#0181b9}
.nav-tabs{border-bottom:1px solid #dddddd}
.nav-tabs > li{float:left;margin-bottom:-1px}
.nav-tabs > li > a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:2px 2px 0 0}
.nav-tabs > li > a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:5px 5px 0 0}
.nav-tabs > li > a:hover{border-color:#eeeeee #eeeeee #dddddd}
.nav-tabs > li.active > a,.nav-tabs > li.active > a:hover,.nav-tabs > li.active > a:focus{color:#555555;background-color:#f9f9f9;border:1px solid #dddddd;border-bottom-color:transparent;cursor:default}
.nav-tabs.nav-justified{width:100%;border-bottom:0}
@ -1312,13 +1312,13 @@ to{background-position:0 0}
@media (min-width:768px){.nav-tabs.nav-justified > li{display:table-cell;width:1%}
.nav-tabs.nav-justified > li > a{margin-bottom:0}
}
.nav-tabs.nav-justified > li > a{margin-right:0;border-radius:2px}
.nav-tabs.nav-justified > li > a{margin-right:0;border-radius:5px}
.nav-tabs.nav-justified > .active > a,.nav-tabs.nav-justified > .active > a:hover,.nav-tabs.nav-justified > .active > a:focus{border:1px solid #dddddd}
@media (min-width:768px){.nav-tabs.nav-justified > li > a{border-bottom:1px solid #dddddd;border-radius:2px 2px 0 0}
@media (min-width:768px){.nav-tabs.nav-justified > li > a{border-bottom:1px solid #dddddd;border-radius:5px 5px 0 0}
.nav-tabs.nav-justified > .active > a,.nav-tabs.nav-justified > .active > a:hover,.nav-tabs.nav-justified > .active > a:focus{border-bottom-color:#f9f9f9}
}
.nav-pills > li{float:left}
.nav-pills > li > a{border-radius:2px}
.nav-pills > li > a{border-radius:5px}
.nav-pills > li + li{margin-left:2px}
.nav-pills > li.active > a,.nav-pills > li.active > a:hover,.nav-pills > li.active > a:focus{color:#ffffff;background-color:#4da7e8}
.nav-stacked > li{float:none}
@ -1331,9 +1331,9 @@ to{background-position:0 0}
.nav-justified > li > a{margin-bottom:0}
}
.nav-tabs-justified{border-bottom:0}
.nav-tabs-justified > li > a{margin-right:0;border-radius:2px}
.nav-tabs-justified > li > a{margin-right:0;border-radius:5px}
.nav-tabs-justified > .active > a,.nav-tabs-justified > .active > a:hover,.nav-tabs-justified > .active > a:focus{border:1px solid #dddddd}
@media (min-width:768px){.nav-tabs-justified > li > a{border-bottom:1px solid #dddddd;border-radius:2px 2px 0 0}
@media (min-width:768px){.nav-tabs-justified > li > a{border-bottom:1px solid #dddddd;border-radius:5px 5px 0 0}
.nav-tabs-justified > .active > a,.nav-tabs-justified > .active > a:hover,.nav-tabs-justified > .active > a:focus{border-bottom-color:#f9f9f9}
}
.tab-content > .tab-pane{display:none}
@ -1346,20 +1346,21 @@ to{background-position:0 0}
.control-tabs:after{right:-8px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f105"}
.control-tabs.scroll-before:before{display:block}
.control-tabs.scroll-after:after{display:block}
.control-tabs.scroll-active-before:before{color:#5fb6f5}
.control-tabs.scroll-active-after:after{color:#5fb6f5}
.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}
.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 > 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}
.control-tabs > ul.nav-tabs > li a:before,.control-tabs > div > ul.nav-tabs > li a:before,.control-tabs > div > div > ul.nav-tabs > li a:before{font-size:14px}
.control-tabs > ul.nav-tabs > li a > span.title > span,.control-tabs > div > ul.nav-tabs > li a > span.title > span,.control-tabs > div > div > ul.nav-tabs > li a > span.title > span{max-width:150px;height:16px;margin-bottom:-4px;overflow:hidden;text-overflow:ellipsis;display:inline-block}
.control-tabs > ul.nav-tabs > li a > span.title > span,.control-tabs > div > ul.nav-tabs > li a > span.title > span,.control-tabs > div > div > ul.nav-tabs > li a > span.title > span{max-width:150px;overflow:hidden;text-overflow:ellipsis;display:inline-block;border-top:2px solid #ecf0f1;margin-top:-8px;padding-top:11px}
.control-tabs > ul.nav-tabs > li span.tab-close,.control-tabs > div > ul.nav-tabs > li span.tab-close,.control-tabs > div > div > ul.nav-tabs > li span.tab-close{display:none}
.control-tabs > ul.nav-tabs > li.active,.control-tabs > div > ul.nav-tabs > li.active,.control-tabs > div > div > ul.nav-tabs > li.active{z-index:100}
.control-tabs > ul.nav-tabs > li.active a,.control-tabs > div > ul.nav-tabs > li.active a,.control-tabs > div > div > ul.nav-tabs > li.active a{color:#405261}
.control-tabs > ul.nav-tabs > li.active:after,.control-tabs > div > ul.nav-tabs > li.active:after,.control-tabs > div > div > ul.nav-tabs > li.active:after{width:100%;height:3px;bottom:0;background:#5fb6f5}
.control-tabs > div.tab-content > div.tab-pane{padding:20px 0 0 0;display:none}
.control-tabs > ul.nav-tabs > li.active:after,.control-tabs > div > ul.nav-tabs > li.active:after,.control-tabs > div > div > ul.nav-tabs > li.active:after{width:100%;height:3px;bottom:0;background:#dbe1e3}
.control-tabs > div.tab-content > div.tab-pane{padding:35px 0 0 0;display:none}
.control-tabs > div.tab-content > div.tab-pane:before,.control-tabs > div.tab-content > div.tab-pane:after{content:" ";display:table}
.control-tabs > div.tab-content > div.tab-pane:after{clear:both}
.control-tabs > div.tab-content > div.tab-pane:before,.control-tabs > div.tab-content > div.tab-pane:after{content:" ";display:table}
@ -1377,27 +1378,27 @@ to{background-position:0 0}
.control-tabs[data-closable] > ul.nav-tabs > li[data-modified] span.tab-close i,.control-tabs[data-closable] > div > ul.nav-tabs > li[data-modified] span.tab-close i,.control-tabs[data-closable] > div > div > ul.nav-tabs > li[data-modified] span.tab-close i{top:-4px}
.control-tabs[data-closable] > ul.nav-tabs > li[data-modified] span.tab-close i:before,.control-tabs[data-closable] > div > ul.nav-tabs > li[data-modified] span.tab-close i:before,.control-tabs[data-closable] > div > div > ul.nav-tabs > li[data-modified] span.tab-close i:before{content:"\f111";font-size:9px}
.control-tabs.master > ul.nav-tabs > li a,.control-tabs.master-tabs > ul.nav-tabs > li a,.control-tabs.master > div > ul.nav-tabs > li a,.control-tabs.master-tabs > div > ul.nav-tabs > li a,.control-tabs.master > div > div > ul.nav-tabs > li a,.control-tabs.master-tabs > div > div > ul.nav-tabs > li a{font-size:15px;border-bottom:transparent 4px solid;position:relative;z-index:101;line-height:100%}
.control-tabs.master > ul.nav-tabs > li.active a,.control-tabs.master-tabs > ul.nav-tabs > li.active a,.control-tabs.master > div > ul.nav-tabs > li.active a,.control-tabs.master-tabs > div > ul.nav-tabs > li.active a,.control-tabs.master > div > div > ul.nav-tabs > li.active a,.control-tabs.master-tabs > div > div > ul.nav-tabs > li.active a{border-bottom:#5fb6f5 4px solid}
.control-tabs.master > ul.nav-tabs > li.active a,.control-tabs.master-tabs > ul.nav-tabs > li.active a,.control-tabs.master > div > ul.nav-tabs > li.active a,.control-tabs.master-tabs > div > ul.nav-tabs > li.active a,.control-tabs.master > div > div > ul.nav-tabs > li.active a,.control-tabs.master-tabs > div > div > ul.nav-tabs > li.active a{border-bottom:#dbe1e3 4px solid}
.control-tabs.primary,.control-tabs.primary-tabs{margin-bottom:5px}
.control-tabs.primary > ul.nav-tabs,.control-tabs.primary-tabs > ul.nav-tabs,.control-tabs.primary > div > ul.nav-tabs,.control-tabs.primary-tabs > div > ul.nav-tabs,.control-tabs.primary > div > div > ul.nav-tabs,.control-tabs.primary-tabs > div > div > ul.nav-tabs{position:relative;margin-left:0;margin-right:0}
.control-tabs.primary > ul.nav-tabs:before,.control-tabs.primary-tabs > ul.nav-tabs:before,.control-tabs.primary > div > ul.nav-tabs:before,.control-tabs.primary-tabs > div > ul.nav-tabs:before,.control-tabs.primary > div > div > ul.nav-tabs:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs:before{position:absolute;top:26px;height:1px;width:100%;content:' ';border-bottom:1px solid #d7d7d7}
.control-tabs.primary > ul.nav-tabs > li,.control-tabs.primary-tabs > ul.nav-tabs > li,.control-tabs.primary > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > ul.nav-tabs > li,.control-tabs.primary > div > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li{padding-right:10px;padding-left:11px;margin-left:0;margin-right:-30px;background:transparent}
.control-tabs.primary > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > ul.nav-tabs > li:first-child,.control-tabs.primary > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:first-child,.control-tabs.primary > div > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:first-child{padding-left:15px !important}
.control-tabs.primary > ul.nav-tabs:before,.control-tabs.primary-tabs > ul.nav-tabs:before,.control-tabs.primary > div > ul.nav-tabs:before,.control-tabs.primary-tabs > div > ul.nav-tabs:before,.control-tabs.primary > div > div > ul.nav-tabs:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs:before{position:absolute;bottom:0;height:1px;width:100%;z-index:95;content:' ';border-bottom:2px solid #dbe1e3}
.control-tabs.primary > ul.nav-tabs > li,.control-tabs.primary-tabs > ul.nav-tabs > li,.control-tabs.primary > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > ul.nav-tabs > li,.control-tabs.primary > div > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li{padding-right:0;padding-left:0;margin-left:0;margin-right:-20px;background:transparent}
.control-tabs.primary > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > ul.nav-tabs > li:first-child,.control-tabs.primary > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:first-child,.control-tabs.primary > div > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:first-child{padding-left:35px !important}
.control-tabs.primary > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > ul.nav-tabs > li:last-child,.control-tabs.primary > div > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:last-child,.control-tabs.primary > div > div > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:last-child{margin-right:0}
.control-tabs.primary > ul.nav-tabs > li a,.control-tabs.primary-tabs > ul.nav-tabs > li a,.control-tabs.primary > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > ul.nav-tabs > li a,.control-tabs.primary > div > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a{font-size:12px;padding-bottom:3px;padding:0 16px;margin:0;position:relative;z-index:101;background:transparent;overflow:visible}
.control-tabs.primary > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title,.control-tabs.primary > div > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title{position:relative;display:inline-block;padding:5px 5px 9px 5px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-top:1px solid #f0f0f0;z-index:100}
.control-tabs.primary > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:after{content:' ';position:absolute;background:transparent url('images/primary-tab-shape.png') no-repeat left -31px;width:16px;height:26px;display:block;top:-1px;z-index:100}
.control-tabs.primary > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:before{left:-16px}
.control-tabs.primary > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:after{right:-16px;background-position:-61px -31px}
.control-tabs.primary > ul.nav-tabs > li a,.control-tabs.primary-tabs > ul.nav-tabs > li a,.control-tabs.primary > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > ul.nav-tabs > li a,.control-tabs.primary > div > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a{font-size:16px;padding-bottom:3px;margin:0;position:relative;z-index:101;background:transparent;overflow:visible}
.control-tabs.primary > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title,.control-tabs.primary > div > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title{position:relative;display:inline-block;padding:8px 25px 0px 25px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;z-index:100}
.control-tabs.primary > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:after{content:'';display:block;border-top:2px solid #ecf0f1;position:absolute;background:#f9f9f9;top:0;z-index:-1;width:20px;bottom:-2px;transform-origin:bottom}
.control-tabs.primary > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:before{left:0;border-left:2px solid #ecf0f1;-webkit-border-radius:8px 0 0 0;-moz-border-radius:8px 0 0 0;border-radius:8px 0 0 0;-webkit-transform:skewX(-20deg);-ms-transform:skewX(-20deg);transform:skewX(-20deg)}
.control-tabs.primary > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:after{right:0;border-right:2px solid #ecf0f1;-webkit-border-radius:0 8px 0 0;-moz-border-radius:0 8px 0 0;border-radius:0 8px 0 0;-webkit-transform:skewX(20deg);-ms-transform:skewX(20deg);transform:skewX(20deg)}
.control-tabs.primary > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > ul.nav-tabs > li:last-child,.control-tabs.primary > div > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:last-child,.control-tabs.primary > div > div > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:last-child{background-image:none;margin-right:0;padding-right:5px}
.control-tabs.primary > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > ul.nav-tabs > li:first-child,.control-tabs.primary > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:first-child,.control-tabs.primary > div > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:first-child{padding-left: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;top:26px;height:1px;right:2px;left:0;content:' ';background-color:#f9f9f9}
.control-tabs.primary > ul.nav-tabs > li.active a,.control-tabs.primary-tabs > ul.nav-tabs > li.active a,.control-tabs.primary > div > ul.nav-tabs > li.active a,.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a,.control-tabs.primary > div > div > ul.nav-tabs > li.active a,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a{z-index:107}
.control-tabs.primary > ul.nav-tabs > li.active a > span.title,.control-tabs.primary-tabs > ul.nav-tabs > li.active a > span.title,.control-tabs.primary > div > ul.nav-tabs > li.active a > span.title,.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a > span.title,.control-tabs.primary > div > div > ul.nav-tabs > li.active a > span.title,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a > span.title{z-index:105;border-top-color:#d6d6d6}
.control-tabs.primary > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a > span.title:before{background-position:left 0;z-index:107}
.control-tabs.primary > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary-tabs > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary > div > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary > div > div > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a > span.title:after{background-position:-61px 0;z-index:107}
.control-tabs.primary > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a > span.title:before,.control-tabs.primary > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary-tabs > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary > div > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary > div > div > ul.nav-tabs > li.active a > span.title:after,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a > span.title:after{border-color:#dbe1e3}
.control-tabs.primary > ul.nav-tabs > li.active a > span.title span,.control-tabs.primary-tabs > ul.nav-tabs > li.active a > span.title span,.control-tabs.primary > div > ul.nav-tabs > li.active a > span.title span,.control-tabs.primary-tabs > div > ul.nav-tabs > li.active a > span.title span,.control-tabs.primary > div > div > ul.nav-tabs > li.active a > span.title span,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li.active a > span.title span{border-top-color:#dbe1e3}
.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 #d7d7d7}
.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: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.content-tabs > ul.nav-tabs{position:relative}
@ -1434,7 +1435,7 @@ to{background-position:0 0}
.control-chart div.chart-legend table{font-size:12px;color:#666666}
.control-chart div.chart-legend table tr td{padding:0 0 7px 0;vertical-align:top}
.control-chart div.chart-legend table tr td.value{padding-left:10px;font-weight:600}
.control-chart div.chart-legend table tr td i{display:inline-block;width:13px;height:13px;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;text-indent:-100000em;margin-right:5px;position:relative;top:2px}
.control-chart div.chart-legend table tr td i{display:inline-block;width:13px;height:13px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;text-indent:-100000em;margin-right:5px;position:relative;top:2px}
.control-chart div.chart-legend table tr td.indicator{width:20px}
.control-chart div.chart-legend table tr:last-child td{padding-bottom:0}
.control-chart .canvas{margin-right:20px;display:inline-block}
@ -1444,7 +1445,7 @@ to{background-position:0 0}
.control-chart.wrap-legend div.chart-legend table tr:last-child td{padding-bottom:7px}
.report-container .wrapped .control-chart{text-align:left}
.report-container .wrapped .control-chart .canvas{margin-right:20px;display:inline-block}
#flotTip,#chart-tooltip{white-space:nowrap;padding:7px 10px;background:#000000;position:absolute;z-index:100;color:#ffffff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;font-size:12px;opacity:0.8;filter:alpha(opacity=80)}
#flotTip,#chart-tooltip{white-space:nowrap;padding:7px 10px;background:#000000;position:absolute;z-index:100;color:#ffffff;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px;font-size:12px;opacity:0.8;filter:alpha(opacity=80)}
.title-value h4{font-size:12px;text-transform:uppercase;color:#666666;margin:0}
.title-value span.goal-meter-indicator{float:left;height:24px;width:10px;margin-right:5px;position:relative;top:9px;background:#cc3300}
.title-value span.goal-meter-indicator > span{text-indent:-10000em;display:block;position:absolute;width:10px;left:0;bottom:0;background:#95b753;height:0;-webkit-transition:all 0.2s;transition:all 0.2s}
@ -1472,7 +1473,7 @@ ul.status-list li{margin:0 15px 0 0;list-style:none;display:inline-block;font-si
ul.status-list li:last-child{margin-right:0}
ul.status-list li a{color:#7e8c8d}
ul.status-list li a:hover{color:#0181b9;text-decoration:none}
ul.status-list li span.status{display:inline-block;padding:1px 5px;color:white;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
ul.status-list li span.status{display:inline-block;padding:1px 5px;color:white;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
ul.status-list li span.status.circle{-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px;width:12px;height:12px;vertical-align:middle;position:relative;top:-1px}
ul.status-list li span.status.success{background:#31ac5f}
ul.status-list li span.status.primary{background:#4da7e8}
@ -1503,8 +1504,8 @@ ul.status-list li span.status.info{background:#5bc0de}
.control-toolbar .toolbar-item .btn.standalone,.control-toolbar .toolbar-item .btn-group.standalone,.control-toolbar .toolbar-item .dropdown.standalone{margin-right:15px}
.control-toolbar .toolbar-item .btn-group > .btn,.control-toolbar .toolbar-item .btn-group > .dropdown{margin-right:0;display:inline-block;float:none}
.control-toolbar .toolbar-item .btn-group .dropdown > .btn{margin-right:0;border-bottom-right-radius:0;border-top-right-radius:0}
.control-toolbar .toolbar-item .btn-group .dropdown.last > .btn{border-bottom-right-radius:2px !important;border-top-right-radius:2px !important}
.control-toolbar input.form-control[type=text]{height:auto;padding:8px 10px}
.control-toolbar .toolbar-item .btn-group .dropdown.last > .btn{border-bottom-right-radius:5px !important;border-top-right-radius:5px !important}
.control-toolbar input.form-control[type=text]{height:auto;padding:11px 17px 12px 17px}
.control-toolbar.toolbar-padded{padding:20px}
[data-control=toolbar]{white-space:nowrap;width:100%;overflow:hidden}
.control-toolbar.editor-toolbar{padding:0;background:#dddddd;border-bottom-right-radius:0;border-bottom-left-radius:0}
@ -1572,7 +1573,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:13px;padding:10px 30px 10px 15px;z-index:10000;word-wrap:break-word;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
.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.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}
@ -1845,17 +1846,17 @@ body.slim-container div.scoreboard{padding:0 20px}
.flag-cw{background-position:0 -3920px}
.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:20px;font-size:21px;line-height:inherit;color:#333333;border:0;border-bottom:1px solid #e5e5e5}
label{display:inline-block;margin-bottom:5px;font-weight:600;font-size:12px}
legend{display:block;width:100%;padding:0;margin-bottom:22px;font-size:24px;line-height:inherit;color:#333333;border:0;border-bottom:1px solid #e5e5e5}
label{display:inline-block;margin-bottom:14px;font-weight:normal;font-size:16px;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}
input[type="range"]{display:block;width:100%}
select[multiple],select[size]{height:auto}
input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}
output{display:block;padding-top:10px;font-size:14px;line-height:1.42857143;color:#555555}
.form-control{display:block;width:100%;height:40px;padding:9px 11px;font-size:13px;line-height:1.42857143;color:#555555;background-color:#ffffff;background-image:none;border:1px solid #e0e0e0;border-radius:3px;-webkit-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s}
.form-control:focus{border-color:#808c8d;outline:0}
output{display:block;padding-top:11px;font-size:16px;line-height:1.42857143;color:#555555}
.form-control{display:block;width:100%;height:44px;padding:11px 16px 9px;font-size:16px;line-height:1.42857143;color:#555555;background-color:#ffffff;background-image:none;border:2px solid #bdc3c7;border-radius:3px;-webkit-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s}
.form-control:focus{border-color:#1f99dc;outline:0}
.form-control::-moz-placeholder{color:#cccccc;opacity:1}
.form-control:-ms-input-placeholder{color:#cccccc}
.form-control::-webkit-input-placeholder{color:#cccccc}
@ -1863,24 +1864,24 @@ output{display:block;padding-top:10px;font-size:14px;line-height:1.42857143;colo
textarea.form-control{height:auto}
.form-control.align-right{text-align:right}
input[type="search"]{-webkit-appearance:none}
input[type="date"]{line-height:40px}
input[type="date"]{line-height:44px}
.form-group{margin-bottom:15px}
.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}
.radio,.checkbox{display:block;min-height:22px;margin-top:10px;margin-bottom:10px;padding-left:20px}
.radio label,.checkbox label{display:inline;font-weight:normal;cursor:pointer}
.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}
.radio + .radio,.checkbox + .checkbox{margin-top:-5px}
.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer}
.radio-inline + .radio-inline,.checkbox-inline + .checkbox-inline{margin-top:0;margin-left:10px}
input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}
.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}
select.input-sm{height:30px;line-height:30px}
.input-sm{height:33px;padding:5px 10px;font-size:14px;line-height:1.5;border-radius:3px}
select.input-sm{height:33px;line-height:33px}
textarea.input-sm,select[multiple].input-sm{height:auto}
.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}
select.input-lg{height:46px;line-height:46px}
.input-lg{height:49px;padding:10px 16px;font-size:20px;line-height:1.3333333;border-radius:6px}
select.input-lg{height:49px;line-height:49px}
textarea.input-lg,select[multiple].input-lg{height:auto}
.has-feedback{position:relative}
.has-feedback .form-control{padding-right:50px}
.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:40px;height:40px;line-height:40px;text-align:center}
.has-feedback .form-control{padding-right:55px}
.has-feedback .form-control-feedback{position:absolute;top:27px;right:0;display:block;width:44px;height:44px;line-height:44px;text-align:center}
.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}
.has-success .form-control{border-color:#3c763d}
.has-success .form-control:focus{border-color:#2b542c}
@ -1897,7 +1898,8 @@ textarea.input-lg,select[multiple].input-lg{height:auto}
.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}
.has-error .form-control-feedback{color:#a94442}
.form-control-static{margin-bottom:0}
.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}
.help-block{display:block;margin-top:5px;margin-bottom:14px;color:#555555}
label + .help-block,label + .help-block.before-field{margin-top:-7px}
@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}
.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}
.form-inline .input-group > .form-control{width:100%}
@ -1906,28 +1908,28 @@ textarea.input-lg,select[multiple].input-lg{height:auto}
.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}
.form-inline .has-feedback .form-control-feedback{top:0}
}
.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:10px}
.form-horizontal .radio,.form-horizontal .checkbox{min-height:30px}
.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:11px}
.form-horizontal .radio,.form-horizontal .checkbox{min-height:33px}
.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}
.form-horizontal .form-control-static{padding-top:10px}
.form-horizontal .form-control-static{padding-top:11px}
@media (min-width:768px){.form-horizontal .control-label{text-align:right}
}
.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}
.input-group{position:relative;display:table;border-collapse:separate}
.input-group[class*="col-"]{float:none;padding-left:0;padding-right:0}
.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}
.input-group-lg > .form-control,.input-group-lg > .input-group-addon,.input-group-lg > .input-group-btn > .btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}
select.input-group-lg > .form-control,select.input-group-lg > .input-group-addon,select.input-group-lg > .input-group-btn > .btn{height:46px;line-height:46px}
.input-group-lg > .form-control,.input-group-lg > .input-group-addon,.input-group-lg > .input-group-btn > .btn{height:49px;padding:10px 16px;font-size:20px;line-height:1.3333333;border-radius:6px}
select.input-group-lg > .form-control,select.input-group-lg > .input-group-addon,select.input-group-lg > .input-group-btn > .btn{height:49px;line-height:49px}
textarea.input-group-lg > .form-control,textarea.input-group-lg > .input-group-addon,textarea.input-group-lg > .input-group-btn > .btn,select[multiple].input-group-lg > .form-control,select[multiple].input-group-lg > .input-group-addon,select[multiple].input-group-lg > .input-group-btn > .btn{height:auto}
.input-group-sm > .form-control,.input-group-sm > .input-group-addon,.input-group-sm > .input-group-btn > .btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}
select.input-group-sm > .form-control,select.input-group-sm > .input-group-addon,select.input-group-sm > .input-group-btn > .btn{height:30px;line-height:30px}
.input-group-sm > .form-control,.input-group-sm > .input-group-addon,.input-group-sm > .input-group-btn > .btn{height:33px;padding:5px 10px;font-size:14px;line-height:1.5;border-radius:3px}
select.input-group-sm > .form-control,select.input-group-sm > .input-group-addon,select.input-group-sm > .input-group-btn > .btn{height:33px;line-height:33px}
textarea.input-group-sm > .form-control,textarea.input-group-sm > .input-group-addon,textarea.input-group-sm > .input-group-btn > .btn,select[multiple].input-group-sm > .form-control,select[multiple].input-group-sm > .input-group-addon,select[multiple].input-group-sm > .input-group-btn > .btn{height:auto}
.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}
.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}
.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}
.input-group-addon{padding:9px 11px;font-size:14px;font-weight:normal;line-height:1;color:#555555;text-align:center;background-color:#eeeeee;border:1px solid #e0e0e0;border-radius:2px}
.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}
.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}
.input-group-addon{padding:10px 16px;font-size:16px;font-weight:normal;line-height:1;color:#555555;text-align:center;background-color:#eeeeee;border:1px solid #bdc3c7;border-radius:5px}
.input-group-addon.input-sm{padding:5px 10px;font-size:14px;border-radius:3px}
.input-group-addon.input-lg{padding:10px 16px;font-size:20px;border-radius:6px}
.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}
.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child > .btn,.input-group-btn:first-child > .btn-group > .btn,.input-group-btn:first-child > .dropdown-toggle,.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child > .btn-group:not(:last-child) > .btn{border-bottom-right-radius:0;border-top-right-radius:0}
.input-group-addon:first-child{border-right:0}
@ -2073,10 +2075,10 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.select2-container .loading-indicator > span{background-image:url('images/loader-transparent.svg');left:auto;right:10px;top:19px;background-size:17px 17px}
.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:1px solid #e0e0e0;border-radius:3px;color:#555555;font-size:13px;outline:0}
.select2-container--default .select2-selection{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#555555;font-size:16px;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 .select2-search__field{background-color:#ffffff;border:1px solid #e0e0e0;border-radius:3px;color:#555555;font-size:13px}
.select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#555555;font-size:16px}
.select2-container--default .select2-search__field{outline:0}
.select2-container--default .select2-search__field::-webkit-input-placeholder{color:#cccccc}
.select2-container--default .select2-search__field:-moz-placeholder{color:#cccccc}
@ -2086,64 +2088,64 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.select2-container--default .select2-results__option[aria-disabled=true]{color:#999999;cursor:not-allowed}
.select2-container--default .select2-results__option[aria-selected=true]{background-color:#f5f5f5;color:#262626}
.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#4da7e8;color:#ffffff}
.select2-container--default .select2-results__option .select2-results__option{padding:9px 11px}
.select2-container--default .select2-results__option .select2-results__option{padding:10px 16px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-11px;padding-left:22px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-22px;padding-left:33px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-33px;padding-left:44px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-44px;padding-left:55px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-55px;padding-left:66px}
.select2-container--default .select2-results__group{color:#999999;display:block;padding:9px 11px;font-size:12px;line-height:1.42857143;white-space:nowrap}
.select2-container--default.select2-container--focus .select2-selection,.select2-container--default.select2-container--open .select2-selection{-webkit-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;border-color:#808c8d}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-16px;padding-left:32px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-32px;padding-left:48px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-48px;padding-left:64px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-64px;padding-left:80px}
.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-80px;padding-left:96px}
.select2-container--default .select2-results__group{color:#999999;display:block;padding:10px 16px;font-size:14px;line-height:1.42857143;white-space:nowrap}
.select2-container--default.select2-container--focus .select2-selection,.select2-container--default.select2-container--open .select2-selection{-webkit-transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;transition:border-color ease-in-out 0.15s,box-shadow ease-in-out 0.15s;border-color:#1f99dc}
.select2-container--default.select2-container--open .select2-selection .select2-selection__arrow b:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f106"}
.select2-container--default.select2-container--open.select2-container--below .select2-selection{border-bottom-right-radius:0;border-bottom-left-radius:0;border-bottom-color:transparent}
.select2-container--default.select2-container--open.select2-container--above .select2-selection{border-top-right-radius:0;border-top-left-radius:0;border-top-color:transparent}
.select2-container--default .select2-selection__clear{color:#666666;cursor:pointer;float:right;font-weight:bold;margin-right:10px}
.select2-container--default .select2-selection__clear:hover{color:#333}
.select2-container--default.select2-container--disabled .select2-selection{border-color:#e0e0e0;-webkit-box-shadow:none;box-shadow:none}
.select2-container--default.select2-container--disabled .select2-selection{border-color:#bdc3c7;-webkit-box-shadow:none;box-shadow:none}
.select2-container--default.select2-container--disabled .select2-selection,.select2-container--default.select2-container--disabled .select2-search__field{cursor:not-allowed}
.select2-container--default.select2-container--disabled .select2-selection,.select2-container--default.select2-container--disabled .select2-selection--multiple .select2-selection__choice{background-color:#eeeeee}
.select2-container--default.select2-container--disabled .select2-selection__clear,.select2-container--default.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove{display:none}
.select2-container--default .select2-dropdown{-webkit-box-shadow:0 3px 6px rgba(0,0,0,0.075);box-shadow:0 3px 6px rgba(0,0,0,0.075);border-color:#808c8d;overflow-x:hidden;margin-top:-1px}
.select2-container--default .select2-dropdown{-webkit-box-shadow:0 3px 6px rgba(0,0,0,0.075);box-shadow:0 3px 6px rgba(0,0,0,0.075);border-color:#1f99dc;overflow-x:hidden;margin-top:-1px}
.select2-container--default .select2-dropdown--above{margin-top:1px;-webkit-box-shadow:0 -3px 6px rgba(0,0,0,0.075);box-shadow:0 -3px 6px rgba(0,0,0,0.075)}
.select2-container--default .select2-results > .select2-results__options{font-size:13px;max-height:200px;overflow-y:auto}
.select2-container--default .select2-selection--single{height:40px;line-height:1.42857143;padding:9px 23px 9px 11px}
.select2-container--default .select2-selection--single .select2-selection__arrow{position:absolute;bottom:0;right:11px;top:0;width:4px}
.select2-container--default .select2-results > .select2-results__options{font-size:16px;max-height:200px;overflow-y:auto}
.select2-container--default .select2-selection--single{height:44px;line-height:1.42857143;padding:10px 28px 10px 16px}
.select2-container--default .select2-selection--single .select2-selection__arrow{position:absolute;bottom:0;right:16px;top:0;width:4px}
.select2-container--default .select2-selection--single .select2-selection__arrow b{position:absolute;top:50%;height:9px;width:8px;right:3px;margin-top:-5px;line-height:9px}
.select2-container--default .select2-selection--single .select2-selection__arrow b:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f107";display:inline-block}
.select2-container--default .select2-selection--single .select2-selection__rendered{color:#555555;padding:0}
.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#cccccc}
.select2-container--default .select2-selection--multiple{min-height:40px}
.select2-container--default .select2-selection--multiple{min-height:44px}
.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;display:block;line-height:1.42857143;list-style:none;margin:0;overflow:hidden;padding:0;width:100%;text-overflow:ellipsis;white-space:nowrap}
.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#cccccc;float:left;margin-top:5px}
.select2-container--default .select2-selection--multiple .select2-selection__choice{color:#555555;background:#ffffff;border:1px solid #cccccc;border-radius:4px;cursor:default;float:left;margin:8px 0 0 5.5px;padding:0 9px}
.select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field{background:transparent;padding:0 11px;height:38px;line-height:1.42857143;margin-top:0;min-width:5em}
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:4.5px}
.select2-container--default .select2-selection--multiple .select2-selection__choice{color:#555555;background:#ffffff;border:1px solid #cccccc;border-radius:4px;cursor:default;float:left;margin:9px 0 0 8px;padding:0 10px}
.select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field{background:transparent;padding:0 16px;height:42px;line-height:1.42857143;margin-top:0;min-width:5em}
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:5px}
.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}
.select2-container--default .select2-selection--multiple .select2-selection__clear{margin-top:9px}
.select2-container--default .select2-selection--multiple .select2-selection__clear{margin-top:10px}
.select2-container--default.input-sm,.select2-container--default.input-lg{border-radius:0;font-size:12px;height:auto;line-height:1;padding:0}
.select2-container--default.input-sm .select2-selection--single,.input-group-sm .select2-container--default .select2-selection--single,.form-group-sm .select2-container--default .select2-selection--single{border-radius:3px;font-size:12px;height:30px;line-height:1.5;padding:5px 22px 5px 10px; }
.select2-container--default.input-sm .select2-selection--single,.input-group-sm .select2-container--default .select2-selection--single,.form-group-sm .select2-container--default .select2-selection--single{border-radius:3px;font-size:14px;height:33px;line-height:1.5;padding:5px 22px 5px 10px; }
.select2-container--default.input-sm .select2-selection--single .select2-selection__arrow b,.input-group-sm .select2-container--default .select2-selection--single .select2-selection__arrow b,.form-group-sm .select2-container--default .select2-selection--single .select2-selection__arrow b{margin-left:-5px}
.select2-container--default.input-sm .select2-selection--multiple,.input-group-sm .select2-container--default .select2-selection--multiple,.form-group-sm .select2-container--default .select2-selection--multiple{min-height:30px}
.select2-container--default.input-sm .select2-selection--multiple .select2-selection__choice,.input-group-sm .select2-container--default .select2-selection--multiple .select2-selection__choice,.form-group-sm .select2-container--default .select2-selection--multiple .select2-selection__choice{font-size:12px;line-height:1.5;margin:4px 0 0 5px;padding:0 5px}
.select2-container--default.input-sm .select2-selection--multiple .select2-search--inline .select2-search__field,.input-group-sm .select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field,.form-group-sm .select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field{padding:0 10px;font-size:12px;height:28px;line-height:1.5}
.select2-container--default.input-sm .select2-selection--multiple,.input-group-sm .select2-container--default .select2-selection--multiple,.form-group-sm .select2-container--default .select2-selection--multiple{min-height:33px}
.select2-container--default.input-sm .select2-selection--multiple .select2-selection__choice,.input-group-sm .select2-container--default .select2-selection--multiple .select2-selection__choice,.form-group-sm .select2-container--default .select2-selection--multiple .select2-selection__choice{font-size:14px;line-height:1.5;margin:4px 0 0 5px;padding:0 5px}
.select2-container--default.input-sm .select2-selection--multiple .select2-search--inline .select2-search__field,.input-group-sm .select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field,.form-group-sm .select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field{padding:0 10px;font-size:14px;height:31px;line-height:1.5}
.select2-container--default.input-sm .select2-selection--multiple .select2-selection__clear,.input-group-sm .select2-container--default .select2-selection--multiple .select2-selection__clear,.form-group-sm .select2-container--default .select2-selection--multiple .select2-selection__clear{margin-top:5px}
.select2-container--default.input-lg .select2-selection--single,.input-group-lg .select2-container--default .select2-selection--single,.form-group-lg .select2-container--default .select2-selection--single{border-radius:6px;font-size:18px;height:46px;line-height:1.3333333;padding:10px 31px 10px 16px; }
.select2-container--default.input-lg .select2-selection--single,.input-group-lg .select2-container--default .select2-selection--single,.form-group-lg .select2-container--default .select2-selection--single{border-radius:6px;font-size:20px;height:49px;line-height:1.3333333;padding:10px 31px 10px 16px; }
.select2-container--default.input-lg .select2-selection--single .select2-selection__arrow,.input-group-lg .select2-container--default .select2-selection--single .select2-selection__arrow,.form-group-lg .select2-container--default .select2-selection--single .select2-selection__arrow{width:5px}
.select2-container--default.input-lg .select2-selection--single .select2-selection__arrow b,.input-group-lg .select2-container--default .select2-selection--single .select2-selection__arrow b,.form-group-lg .select2-container--default .select2-selection--single .select2-selection__arrow b{border-width:5px 5px 0 5px;margin-left:-5px;margin-left:-10px;margin-top:-2.5px}
.select2-container--default.input-lg .select2-selection--multiple,.input-group-lg .select2-container--default .select2-selection--multiple,.form-group-lg .select2-container--default .select2-selection--multiple{min-height:46px}
.select2-container--default.input-lg .select2-selection--multiple .select2-selection__choice,.input-group-lg .select2-container--default .select2-selection--multiple .select2-selection__choice,.form-group-lg .select2-container--default .select2-selection--multiple .select2-selection__choice{font-size:18px;line-height:1.3333333;border-radius:4px;margin:9px 0 0 8px;padding:0 10px}
.select2-container--default.input-lg .select2-selection--multiple .select2-search--inline .select2-search__field,.input-group-lg .select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field,.form-group-lg .select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field{padding:0 16px;font-size:18px;height:44px;line-height:1.3333333}
.select2-container--default.input-lg .select2-selection--multiple,.input-group-lg .select2-container--default .select2-selection--multiple,.form-group-lg .select2-container--default .select2-selection--multiple{min-height:49px}
.select2-container--default.input-lg .select2-selection--multiple .select2-selection__choice,.input-group-lg .select2-container--default .select2-selection--multiple .select2-selection__choice,.form-group-lg .select2-container--default .select2-selection--multiple .select2-selection__choice{font-size:20px;line-height:1.3333333;border-radius:4px;margin:9px 0 0 8px;padding:0 10px}
.select2-container--default.input-lg .select2-selection--multiple .select2-search--inline .select2-search__field,.input-group-lg .select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field,.form-group-lg .select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field{padding:0 16px;font-size:20px;height:47px;line-height:1.3333333}
.select2-container--default.input-lg .select2-selection--multiple .select2-selection__clear,.input-group-lg .select2-container--default .select2-selection--multiple .select2-selection__clear,.form-group-lg .select2-container--default .select2-selection--multiple .select2-selection__clear{margin-top:10px}
.select2-container--default.input-lg.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #666666 transparent;border-width:0 5px 5px 5px}
.input-group-lg .select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #666666 transparent;border-width:0 5px 5px 5px}
.select2-container--default[dir="rtl"] .select2-selection--single{padding-left:23px;padding-right:11px}
.select2-container--default[dir="rtl"] .select2-selection--single{padding-left:28px;padding-right:16px}
.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:0;padding-left:0;text-align:right; }
.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}
.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:11px;right:auto}
.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:16px;right:auto}
.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow b{margin-left:0}
.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder{float:right}
.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:0;margin-right:5.5px}
.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:0;margin-right:8px}
.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}
.has-warning .select2-dropdown,.has-warning .select2-selection{border-color:#8a6d3b}
.has-warning .select2-container--focus .select2-selection,.has-warning .select2-container--open .select2-selection{border-color:#66512c}
@ -2164,7 +2166,7 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.form-control.select2-hidden-accessible{position:absolute !important;width:1px !important}
.form-inline .select2-container--default{display:inline-block}
.control-balloon-selector ul{padding:0;margin-top:-5px}
.control-balloon-selector ul li{list-style:none;display:inline-block;padding:6px 7px 5px;margin-right:5px;margin-top:6px;text-transform:uppercase;background:#bcc3c7;color:#ffffff;font-size:10px;line-height:100%;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-transition:all 0.1s ease;transition:all 0.1s ease}
.control-balloon-selector ul li{list-style:none;display:inline-block;padding:6px 7px 5px;margin-right:5px;margin-top:6px;text-transform:uppercase;background:#bcc3c7;color:#ffffff;font-size:10px;line-height:100%;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-transition:all 0.1s ease;transition:all 0.1s ease}
.control-balloon-selector ul li.active{background:#da5700 !important}
.control-balloon-selector.control-disabled{opacity:0.5;filter:alpha(opacity=50)}
.control-balloon-selector:not(.control-disabled) ul li:hover{background:#0181b9;cursor:pointer}
@ -2172,33 +2174,39 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.custom-checkbox.nolabel label,.custom-radio.nolabel label{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}
.custom-checkbox,.custom-radio{padding-left:23px;margin-top:0}
.custom-checkbox input[type=radio],.custom-radio input[type=radio],.custom-checkbox input[type=checkbox],.custom-radio input[type=checkbox]{display:none}
.custom-checkbox label,.custom-radio label{display:inline-block;cursor:pointer;position:relative;padding-left:20px;margin-right:15px;margin-left:-20px;font-size:12px}
.custom-checkbox label:before,.custom-radio label:before{content:"";display:inline-block;text-align:center;width:16px;height:16px;margin-right:10px;position:absolute;left:-3px;bottom:1px;background-color:#FFFFFF;border:1px solid #999999;color:#666666}
.custom-checkbox label:hover:before,.custom-radio label:hover:before{border-color:#808080;color:#4d4d4d}
.custom-checkbox label:active:before,.custom-radio label:active:before{border-color:#666666;color:#333333}
.custom-checkbox input[type=radio]:checked + label:before,.custom-radio input[type=radio]:checked + label:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f111";font-size:9px;line-height:12px;border-width:2px}
.custom-checkbox input[type=checkbox]:checked + label:before,.custom-radio input[type=checkbox]:checked + label:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f00c";font-size:10px;line-height:12px;border-width:2px}
.custom-checkbox label,.custom-radio label{display:inline-block;cursor:pointer;position:relative;padding-left:35px;margin-right:15px;margin-left:-20px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:15px}
.custom-checkbox label:before,.custom-radio label:before{content:"";display:inline-block;text-align:center;color:#ffffff;width:22px;height:22px;margin-right:15px;position:absolute;left:-3px;bottom:0;background-color:#FFFFFF;border:2px solid #dce1e3}
.custom-checkbox label:hover:before,.custom-radio label:hover:before{border-color:#c0c9cc}
.custom-checkbox label:active:before,.custom-radio label:active:before{border-color:#a3b0b6}
.custom-checkbox input[type=radio]:checked + label:before,.custom-radio input[type=radio]:checked + label:before{border-color:#1f99dc;line-height:17px;border-width:2px}
.custom-checkbox input[type=radio]:checked + label:after,.custom-radio input[type=radio]:checked + label:after{content:'';width:16px;height:16px;background-color:#1f99dc;display:inline-block;position:absolute;left:0px;top:2px;-webkit-border-radius:17px;-moz-border-radius:17px;border-radius:17px}
.custom-checkbox input[type=radio][data-radio-color=green]:checked + label:before,.custom-radio input[type=radio][data-radio-color=green]:checked + label:before{border-color:#76a544}
.custom-checkbox input[type=radio][data-radio-color=green]:checked + label:after,.custom-radio input[type=radio][data-radio-color=green]:checked + label:after{background-color:#76a544}
.custom-checkbox input[type=radio][data-radio-color=red]:checked + label:before,.custom-radio input[type=radio][data-radio-color=red]:checked + label:before{border-color:#bb2424}
.custom-checkbox input[type=radio][data-radio-color=red]:checked + label:after,.custom-radio input[type=radio][data-radio-color=red]:checked + label:after{background-color:#bb2424}
.custom-checkbox input[type=checkbox]:checked + label:before,.custom-radio input[type=checkbox]:checked + label:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f00c";border-color:#1f99dc;background-color:#1f99dc;font-size:14px;line-height:17px;border-width:2px}
.custom-checkbox:focus,.custom-radio:focus{outline:none}
.custom-checkbox:focus label:before,.custom-radio:focus label:before{border-color:#4da7e8}
.custom-checkbox p.help-block,.custom-radio p.help-block{margin-top:0}
.custom-radio label:before{border-radius:8px}
.custom-checkbox label:before{border-radius:2px}
.switch-field .field-switch{padding-left:75px;float:left}
.custom-switch{display:block;width:58px;height:26px;position:relative;text-transform:uppercase;border:none;cursor:pointer;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
.custom-checkbox p.help-block,.custom-radio p.help-block{padding-left:15px;margin-bottom:17px}
.custom-radio label:before{-webkit-border-radius:18px;-moz-border-radius:18px;border-radius:18px}
.custom-checkbox label:before{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
.switch-field .field-switch{padding-left:90px;float:left}
.switch-field .field-switch > label{margin-top:5px}
.custom-switch{display:block;width:69px;height:30px;position:relative;text-transform:uppercase;border:none;cursor:pointer;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
.custom-switch *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
.custom-switch.disabled{opacity:0.5;filter:alpha(opacity=50)}
.custom-switch .slide-button{z-index:4;display:block;position:absolute;right:34px;top:2px;width:22px;height:22px;background-color:#f6f6f6;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;-webkit-transition:all 0.1s;transition:all 0.1s}
.custom-switch .slide-button{z-index:4;display:block;position:absolute;right:43px;top:4px;width:22px;height:22px;background-color:#f6f6f6;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;-webkit-transition:all 0.1s;transition:all 0.1s}
.custom-switch label,.custom-switch > span{line-height:23px;vertical-align:middle}
.custom-switch label{z-index:3;width:100%;display:block;position:relative}
.custom-switch input{z-index:5;position:absolute;left:0;top:0;opacity:0;filter:alpha(opacity=0)}
.custom-switch input:checked ~ .slide-button{right:2px}
.custom-switch input:checked ~ span{background-color:#8da85e}
.custom-switch input:checked ~ .slide-button{right:4px}
.custom-switch input:checked ~ span{background-color:#76a544}
.custom-switch input:checked ~ span span:first-of-type{color:#FFFFFF;display:block}
.custom-switch input:checked ~ span span:last-of-type{color:#666666;display:none}
.custom-switch > span{display:block;height:100%;position:absolute;left:0;width:100%;background-color:#cc3300;font-size:11px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px}
.custom-switch > span span{z-index:5;display:block;width:50%;position:absolute;top:1px;left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
.custom-switch > span span:last-child{left:50%;color:#FFFFFF;display:block}
.custom-switch > span span:first-of-type{padding-left:9px;display:none;color:#666666}
.custom-switch > span{display:block;height:100%;position:absolute;left:0;width:100%;background-color:#bb2424;font-size:14px;font-weight:bold;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px}
.custom-switch > span span{z-index:5;display:block;width:50%;position:absolute;top:4px;left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
.custom-switch > span span:last-child{left:31px;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 > .form-group:last-child{padding-bottom:0}
.form-preview.form-flush{border-top:none}
@ -2207,18 +2215,18 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.form-elements:before,.form-tabless-fields:before,.form-elements:after,.form-tabless-fields:after{content:" ";display:table}
.form-elements:after,.form-tabless-fields:after{clear:both}
.form-control{position:relative;-webkit-appearance:none}
.form-control:focus{border:1px solid #808c8d}
.form-control:focus{border:2px solid #1f99dc}
.form-control.icon{background-repeat:no-repeat;background-position:right -2px;padding-right:30px !important;background-image:url('images/bitmap-icons.png')}
.form-control.icon.plus{background-position:right -124px}
.form-control.icon.search{background-position:right -84px}
.form-control.icon.search{background-position:right -77px}
.form-control.icon.user{background-position:right -41px}
.form-control.icon.lock{background-position:right 0}
.form-control.growable{width:110px}
.form-control.growable:focus,.form-control.growable:active{width:200px !important}
.form-group{position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
.form-group:empty{display:none}
.form-group,.form-group.layout-item{padding-bottom:20px;margin-bottom:0}
.form-group.is-required > label:after{color:#ff0000;vertical-align:super;font-size:60%;content:" *";text-shadow:0 0 2px #b30000}
.form-group,.form-group.layout-item{padding-bottom:35px;margin-bottom:0}
.form-group.is-required > label:after{background-color:#c20a0a;width:5px;height:5px;margin-left:3px;vertical-align:super;font-size:60%;content:"";display:inline-block;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px}
.form-group.span-full{width:100%;float:left}
.form-group.span-left{float:left;width:48.5%;clear:left}
.form-group.span-right{float:right;width:48.5%;clear:right}
@ -2233,20 +2241,20 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.form-group.input-sidebar-control .sidebar-control:hover,.form-group.input-sidebar-control .sidebar-control:focus{text-decoration:none;color:#0181b9;outline:none}
.form-group-preview .form-control{background-color:#f6f6f6;height:auto;min-height:38px}
.form-group-preview .custom-checkbox label,.form-group-preview .custom-radio label{cursor:default}
.help-block{font-size:12px;margin-bottom:0}
.help-block.before-field{margin-top:0;margin-bottom:10px}
.help-block{font-size:15px;margin-bottom:0}
.help-block.before-field{margin-top:0;margin-bottom:17px}
.input-with-icon{position:relative}
.input-with-icon > .icon{position:absolute;z-index:2;padding:13px;pointer-events:none;color:#bdbdbd;font-size:15px}
.input-with-icon.right-align > .icon{right:0}
.input-with-icon.right-align input{padding-right:32px !important}
.input-with-icon.left-align > .icon{left:0}
.input-with-icon.left-align input{padding-left:32px !important}
.field-section{border-bottom:1px solid #e0e0e0;padding-top:3px;padding-bottom:7px}
.field-section{border-bottom:1px solid #bdc3c7;padding-top:3px;padding-bottom:7px}
.field-section > h4{color:rgba(0,0,0,0.6)}
.field-section > p:first-child,.field-section > h4:first-child{margin:0}
.field-section.is-collapsible{cursor:pointer}
.field-section.is-collapsible > h4:before{display:inline-block;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;vertical-align:baseline;content:"\f077";font-size:12px;margin:2px 8px 0;float:right;color:rgba(0,0,0,0.4);-webkit-transition:all 0.3s;transition:all 0.3s;-webkit-transform:scale(1,1);-moz-transform:scale(1,1);-ms-transform:scale(1,1);-o-transform:scale(1,1);transform:scale(1,1)}
.field-section.is-collapsible:hover{border-bottom:1px solid #c7c7c7}
.field-section.is-collapsible:hover{border-bottom:1px solid #a1aab0}
.field-section.is-collapsible:hover > h4:before{color:inherit}
.form-group.section-field.collapsed .field-section.is-collapsible > h4:before{-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}
.field-textarea{resize:vertical}
@ -2255,11 +2263,12 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.field-textarea.size-large{min-height:200px}
.field-textarea.size-huge{min-height:250px}
.field-textarea.size-giant{min-height:350px}
.field-checkboxlist{padding:20px 20px 5px 20px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#ffffff}
.field-checkboxlist .checkbox:last-of-type{margin-bottom:0}
.field-checkboxlist-scrollable{background:white;border:1px solid #e2e2e2;padding-left:15px;height:300px}
.field-checkboxlist-scrollable .checkbox{margin-top:15px;margin-bottom:5px}
.field-checkboxlist-scrollable .checkbox ~ .checkbox{margin-top:0}
.field-recordfinder{background-color:#ffffff;border:1px solid #e0e0e0;overflow:hidden;position:relative}
.field-recordfinder{background-color:#ffffff;border:1px solid #bdc3c7;overflow:hidden;position:relative}
.field-recordfinder .form-control{background:transparent;border-color:transparent;height:auto;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;padding:8px 30px 10px 11px}
.field-recordfinder .btn{background:transparent;position:absolute;right:-2px;top:50%;margin-top:-44px;height:88px;color:#595959}
.field-recordfinder .btn i{font-size:14px}
@ -2267,12 +2276,12 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
.field-recordfinder .text-muted i{font-size:14px;position:relative;top:1px;display:inline-block;margin:0 2px}
.field-recordfinder .primary{font-weight:600}
.recordfinder-search{background-position:right -81px !important;border-top:none !important;border-left:none !important;border-right:none !important;border-radius:0}
.form-buttons{padding-bottom:20px;font-size:0}
.form-buttons{padding-bottom:35px;font-size:0}
.form-buttons:before,.form-buttons:after{content:" ";display:table}
.form-buttons:after{clear:both}
.form-buttons:before,.form-buttons:after{content:" ";display:table}
.form-buttons:after{clear:both}
.form-buttons .btn{margin-right:10px}
.form-buttons .btn{margin-right:20px}
.form-buttons .btn.no-margin-right{margin-right:0}
.form-buttons .btn-group{margin-right:10px}
.form-buttons .btn-group .btn{margin-right:0}
@ -2300,7 +2309,7 @@ tr.rowlink td.nolink{cursor:auto}
a.rowlink{color:inherit;font:inherit;text-decoration:inherit}
table{max-width:100%;background-color:transparent}
th{text-align:left}
.table{width:100%;margin-bottom:20px;border-collapse:separate}
.table{width:100%;margin-bottom:22px;border-collapse:separate}
.table > thead > tr > th,.table > tbody > tr > th,.table > tfoot > tr > th,.table > thead > tr > td,.table > tbody > tr > td,.table > tfoot > tr > td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #dddddd}
.table > thead > tr > th{vertical-align:bottom;border-bottom:2px solid #dddddd}
.table > caption + thead > tr:first-child > th,.table > colgroup + thead > tr:first-child > th,.table > thead:first-child > tr:first-child > th,.table > caption + thead > tr:first-child > td,.table > colgroup + thead > tr:first-child > td,.table > thead:first-child > tr:first-child > td{border-top:0}
@ -2324,7 +2333,7 @@ table td[class*="col-"],table th[class*="col-"]{position:static;float:none;displ
.table-hover > tbody > tr > td.warning:hover,.table-hover > tbody > tr > th.warning:hover,.table-hover > tbody > tr.warning:hover > td,.table-hover > tbody > tr.warning:hover > th{background-color:#faf2cc}
.table > thead > tr > td.danger,.table > tbody > tr > td.danger,.table > tfoot > tr > td.danger,.table > thead > tr > th.danger,.table > tbody > tr > th.danger,.table > tfoot > tr > th.danger,.table > thead > tr.danger > td,.table > tbody > tr.danger > td,.table > tfoot > tr.danger > td,.table > thead > tr.danger > th,.table > tbody > tr.danger > th,.table > tfoot > tr.danger > th{background-color:#f2dede}
.table-hover > tbody > tr > td.danger:hover,.table-hover > tbody > tr > th.danger:hover,.table-hover > tbody > tr.danger:hover > td,.table-hover > tbody > tr.danger:hover > th{background-color:#ebcccc}
@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #dddddd;-webkit-overflow-scrolling:touch}
@media (max-width:767px){.table-responsive{width:100%;margin-bottom:16.5px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #dddddd;-webkit-overflow-scrolling:touch}
.table-responsive > .table{margin-bottom:0}
.table-responsive > .table > thead > tr > th,.table-responsive > .table > tbody > tr > th,.table-responsive > .table > tfoot > tr > th,.table-responsive > .table > thead > tr > td,.table-responsive > .table > tbody > tr > td,.table-responsive > .table > tfoot > tr > td{white-space:nowrap}
.table-responsive > .table-bordered{border:0}
@ -2409,7 +2418,7 @@ table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:125px}
.list-preview .list-header:first-child{padding-top:20px}
.list-preview .control-list:last-child > table{margin-bottom:0}
.list-flush table.table.data thead tr th{border-top:none !important}
.control-list p.no-data{padding:18px 20px;margin:0 20px;color:#666666;font-size:14px;text-align:center;font-weight:300;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
.control-list p.no-data{padding:18px 20px;margin:0 20px;color:#666666;font-size:14px;text-align:center;font-weight:300;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
.control-list table.table.data .list-setup{width:48px}
.control-list table.table.data .list-setup a{display:block;color:#000000}
.control-list table.table.data .list-setup a:before{font-size:14px;line-height:14px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f0ca";display:inline-block;margin-left:8px;vertical-align:baseline;opacity:0.6;filter:alpha(opacity=60)}