diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 8af167d9b..6aafece55 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -639,7 +639,7 @@ .control-simplelist.is-divided li, .control-simplelist.is-selectable li { padding: 5px 10px; - border-bottom: 1px solid #e2e2e2; + border-bottom: 1px solid #d4d8da; } .control-simplelist.is-divided li .heading, .control-simplelist.is-selectable li .heading { @@ -2013,12 +2013,16 @@ .sidenav-tree .control-toolbar input.form-control { border: none; outline: none; + padding: 12px 13px 13px; -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 .control-toolbar input.form-control.search { + background-position: right -78px; +} .sidenav-tree ul { padding: 0; margin: 0; @@ -2055,8 +2059,8 @@ background: #2a3e51; color: #ecf0f1; text-transform: uppercase; - font-size: 16px; - padding: 22px 15px 21px 40px; + font-size: 15px; + padding: 15px 15px 15px 40px; margin: 0; position: relative; cursor: pointer; @@ -2067,7 +2071,7 @@ width: 10px; height: 10px; left: 16px; - top: 21px; + top: 15px; color: #cfcfcf; font-family: FontAwesome; font-weight: normal; @@ -2100,7 +2104,7 @@ .sidenav-tree ul.top-level > li > ul li a { display: block; position: relative; - padding: 25px 25px 25px 60px; + padding: 18px 25px 18px 55px; background: transparent; border-bottom: 1px solid #2a3e51; color: #ffffff; @@ -2121,8 +2125,8 @@ } .sidenav-tree ul.top-level > li > ul li a i { position: absolute; - left: 20px; - top: 24px; + left: 16px; + top: 18px; font-size: 22px; } .sidenav-tree ul.top-level > li > ul li a span { @@ -2802,8 +2806,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: -35px; - margin-right: -35px; + margin-left: -25px; + margin-right: -25px; } .control-tabs.primary-tabs.tabs-no-inset > ul.nav-tabs, .control-tabs.primary-tabs.tabs-no-inset > div > ul.nav-tabs, @@ -2843,7 +2847,7 @@ body { .layout > .layout-row > .layout-cell .layout-container, .layout > .layout-row > .layout-cell.padded-container, .layout > .layout-row > .layout-cell .padded-container { - padding: 35px 35px 0 35px; + padding: 25px 25px 0 25px; } .layout > .layout-row > .layout-cell.layout-container .container-flush, .layout > .layout-row > .layout-cell .layout-container .container-flush, @@ -2888,7 +2892,7 @@ body { .layout > .layout-row > .layout-cell .layout-container, .layout > .layout-row > .layout-cell.padded-container, .layout > .layout-row > .layout-cell .padded-container { - padding: 35px 35px 0 35px; + padding: 25px 25px 0 25px; } .layout > .layout-row > .layout-cell.layout-container .container-flush, .layout > .layout-row > .layout-cell .layout-container .container-flush, @@ -2941,7 +2945,7 @@ body { .layout > .layout-cell .layout-container, .layout > .layout-cell.padded-container, .layout > .layout-cell .padded-container { - padding: 35px 35px 0 35px; + padding: 25px 25px 0 25px; } .layout > .layout-cell.layout-container .container-flush, .layout > .layout-cell .layout-container .container-flush, diff --git a/modules/backend/assets/less/controls/sidenav-tree.less b/modules/backend/assets/less/controls/sidenav-tree.less index 458c42ea8..975b66af2 100644 --- a/modules/backend/assets/less/controls/sidenav-tree.less +++ b/modules/backend/assets/less/controls/sidenav-tree.less @@ -23,9 +23,13 @@ input.form-control { border: none; outline: none; - + padding: 12px 13px 13px; .border-radius(0); .box-shadow(inset -5px 0 3px rgba(0,0,0,0.1)); + + &.search { + background-position: right -78px; + } } } @@ -69,8 +73,8 @@ background: @color-sidebarnav-tree-group-bg; color: @color-sidebarnav-tree-group; text-transform: uppercase; - font-size: 16px; - padding: 22px 15px 21px 40px; + font-size: 15px; + padding: 15px 15px 15px 40px; margin: 0; position: relative; cursor: pointer; @@ -81,7 +85,7 @@ width: 10px; height: 10px; left: 16px; - top: 21px; + top: 15px; color: @color-list-arrow; .icon(@angle-right); .transform(~'rotate(90deg) translate(5px, -3px)'); @@ -104,7 +108,7 @@ a { display: block; position: relative; - padding: 25px 25px 25px 60px; + padding: 18px 25px 18px 55px; background: @color-sidebarnav-tree-inactive-bg; border-bottom: 1px solid @color-sidebarnav-tree-group-bg; color: @color-sidebarnav-tree-inactive-text; @@ -120,8 +124,8 @@ i { position: absolute; - left: 20px; - top: 24px; + left: 16px; + top: 18px; font-size: 22px; } diff --git a/modules/backend/assets/less/core/variables.less b/modules/backend/assets/less/core/variables.less index eb0201180..563056828 100644 --- a/modules/backend/assets/less/core/variables.less +++ b/modules/backend/assets/less/core/variables.less @@ -67,7 +67,7 @@ @color-outer-form-label: #666666; @color-breadcrumb-text-active: #9da3a7; -@color-breadcrumb-text: #ecf0f1; +@color-breadcrumb-text: #9B9B9B; @color-breadcrumb-background: #2b343d; @color-custom-input-icon: #666666; diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less index 7bc367fcd..08df8e380 100644 --- a/modules/backend/assets/less/layout/layout.less +++ b/modules/backend/assets/less/layout/layout.less @@ -50,8 +50,8 @@ body { .control-tabs.primary-tabs { > ul.nav-tabs, > div > ul.nav-tabs, > div > div > ul.nav-tabs { - margin-left: -35px; - margin-right: -35px; + margin-left: -(@padding-standard); + margin-right: -(@padding-standard); } &.tabs-no-inset { @@ -78,7 +78,7 @@ body { &.width-300 { width: 300px; } &.layout-container, .layout-container, &.padded-container, .padded-container { - padding: 35px 35px 0 35px; + padding: @padding-standard @padding-standard 0 @padding-standard; // Container to sit flush to the element above .container-flush { diff --git a/modules/backend/controllers/UserGroups.php b/modules/backend/controllers/UserGroups.php index 118e627c0..3db4d78ee 100644 --- a/modules/backend/controllers/UserGroups.php +++ b/modules/backend/controllers/UserGroups.php @@ -3,6 +3,7 @@ use BackendMenu; use BackendAuth; use Backend\Classes\Controller; +use System\Classes\SettingsManager; /** * Backend user groups controller @@ -28,6 +29,7 @@ class UserGroups extends Controller parent::__construct(); BackendMenu::setContext('October.System', 'system', 'users'); + SettingsManager::setContext('October.System', 'administrators'); } /** @@ -38,44 +40,21 @@ class UserGroups extends Controller /* * Add permissions tab */ - $form->addTabFields($this->generatePermissionFields()); + $form->addTabFields($this->generatePermissionsField()); } /** - * 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' => 'checkbox', - 'span' => 'auto', - 'tab' => 'backend::lang.user.permissions' - ]; - - $permissionFields[$fieldName] = $fieldConfig; - } - } - - return $permissionFields; + 'type' => 'Backend\FormWidgets\PermissionEditor', + 'mode' => 'checkbox' + ] + ]; } } diff --git a/modules/backend/formwidgets/PermissionEditor.php b/modules/backend/formwidgets/PermissionEditor.php index 4947ffdc2..a024dce7b 100644 --- a/modules/backend/formwidgets/PermissionEditor.php +++ b/modules/backend/formwidgets/PermissionEditor.php @@ -12,11 +12,16 @@ use BackendAuth; */ class PermissionEditor extends FormWidgetBase { + public $mode; + /** * {@inheritDoc} */ public function init() { + $this->fillFromConfig([ + 'mode' + ]); } /** @@ -33,9 +38,30 @@ class PermissionEditor extends FormWidgetBase */ public function prepareVars() { + $this->vars['mode'] = $this->getControlMode(); + $this->vars['permissions'] = BackendAuth::listTabbedPermissions(); $this->vars['baseFieldName'] = $this->formField->getName(); - $this->vars['permissionsData'] = $this->formField->getValueFromData($this->model); + $permissionsData = $this->formField->getValueFromData($this->model); + + if (!is_array($permissionsData)) { + $permissionsData = []; + } + + $this->vars['permissionsData'] = $permissionsData; + $this->vars['field'] = $this->formField; + } + + /** + * {@inheritDoc} + */ + public function getSaveValue($value) + { + if (is_array($value)) { + return $value; + } + + return []; } /** @@ -45,4 +71,9 @@ class PermissionEditor extends FormWidgetBase { $this->addCss('css/permissioneditor.css', 'core'); } -} + + protected function getControlMode() + { + return strlen($this->mode) ? $this->mode : 'radio'; + } +} \ No newline at end of file diff --git a/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css b/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css index ee1a7d62d..af3049327 100644 --- a/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css +++ b/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css @@ -1,21 +1,37 @@ +.permissioneditor { + position: relative; +} +.permissioneditor.control-disabled .permissions-overlay { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: rgba(255, 255, 255, 0.01); + cursor: not-allowed; +} +.permissioneditor.control-disabled table { + opacity: 0.5; + filter: alpha(opacity=50); +} .permissioneditor table { width: 100%; } .permissioneditor table th { - padding: 30px 0 15px; + padding: 30px 4px 8px 4px; color: #2a3e51; font-weight: normal; border-bottom: 1px solid #dbe1e3; } .permissioneditor table th.tab { - font-size: 16px; + font-size: 15px; } .permissioneditor table th.permission-type { font-size: 15px; text-align: center; } .permissioneditor table td { - padding: 10px 0; + padding: 10px 4px; vertical-align: top; border-bottom: 1px solid #ecf0f1; } @@ -23,7 +39,7 @@ text-align: center; } .permissioneditor table td.permission-name { - font-size: 15px; + font-size: 14px; color: #555555; } .permissioneditor table td p.comment { @@ -33,21 +49,38 @@ .permissioneditor table td p.comment:empty { display: none; } -.permissioneditor table .custom-radio { +.permissioneditor table th:first-child, +.permissioneditor table td:first-child { + padding-left: 0; +} +.permissioneditor table th:last-child, +.permissioneditor table td:last-child { + padding-right: 0; +} +.permissioneditor table .custom-radio, +.permissioneditor table .custom-checkbox { display: inline-block; padding-left: 0; } .permissioneditor table .custom-radio, -.permissioneditor table .custom-radio label { +.permissioneditor table .custom-checkbox, +.permissioneditor table .custom-radio label, +.permissioneditor table .custom-checkbox label { margin-bottom: 0; } -.permissioneditor table .custom-radio label { - text-indent: -10000em; +.permissioneditor table .custom-radio label, +.permissioneditor table .custom-checkbox label { padding: 0 0 0 14px; margin: 0; top: 2px; } -.permissioneditor table .custom-radio label:before { +.permissioneditor table .custom-radio label span, +.permissioneditor table .custom-checkbox label span { + text-indent: -10000em; + display: block; +} +.permissioneditor table .custom-radio label:before, +.permissioneditor table .custom-checkbox label:before { margin-right: 0; } .permissioneditor table tr:last-child td { diff --git a/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less b/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less index 74544fb73..1b1eb264e 100644 --- a/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less +++ b/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less @@ -5,27 +5,47 @@ .permissioneditor { + position: relative; + + &.control-disabled { + .permissions-overlay { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: rgba(255, 255, 255, 0.01); + cursor: not-allowed; + } + + table { + .opacity(0.5); + } + } + table { width: 100%; th { - padding: 30px 0 15px; + padding: 30px 4px 8px 4px; color: @color-label; font-weight: normal; border-bottom: 1px solid @color-permissioneditor-section-border; &.tab { - font-size: 16px; + font-size: 15px; } &.permission-type { font-size: 15px; text-align: center; } + + } td { - padding: 10px 0; + padding: 10px 4px; vertical-align: top; border-bottom: 1px solid @color-permissioneditor-permission-border; @@ -34,7 +54,7 @@ } &.permission-name { - font-size: 15px; + font-size: 14px; color: @color-help-block-text; } @@ -48,7 +68,18 @@ } } - .custom-radio { + th, td { + &:first-child { + padding-left: 0; + } + + &:last-child { + padding-right: 0; + } + } + + .custom-radio, + .custom-checkbox { display: inline-block;; padding-left: 0; @@ -57,11 +88,15 @@ } label { - text-indent: -10000em; padding: 0 0 0 14px; margin: 0; top: 2px; + span { + text-indent: -10000em; + display: block; + } + &:before { margin-right: 0; } diff --git a/modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm b/modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm index 68f959550..5f33d3bcb 100644 --- a/modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm +++ b/modules/backend/formwidgets/permissioneditor/partials/_permissioneditor.htm @@ -1,4 +1,4 @@ -
+
getAttributes() ?>> - - + + + + + $permission): $globalIndex++; - $permissionValue = array_key_exists($permission->code, $permissionsData) ? - $permissionsData[$permission->code] : 0; + if ($mode === 'radio') { + $permissionValue = array_key_exists($permission->code, $permissionsData) ? + $permissionsData[$permission->code] : 0; + } + else { + $isChecked = array_key_exists($permission->code, $permissionsData); + } ?> - - + + + +
@@ -26,50 +34,68 @@

comment)) ?>

-
- - data-radio-color="green" - > + +
+ + data-radio-color="green" + > - -
-
-
- - type="radio" - > + +
+ +
+ + > - -
+ + +
-
- - type="radio" - data-radio-color="red" - > - -
-
+
+ + type="radio" + > + + +
+
+
+ + type="radio" + data-radio-color="red" + > + + +
+
+
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 550f120d0..ee07af66d 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -101,9 +101,11 @@ return [ 'deny' => 'Deny', 'group' => [ 'name' => 'Group', + 'name_comment' => 'The name is displayed in the group list on the Create/Edit Administrator form.', 'name_field' => 'Name', 'description_field' => 'Description', - 'is_new_user_default_field' => 'Add new administrators to this group by default.', + 'is_new_user_default_field_label' => 'Default group', + 'is_new_user_default_field_comment' => 'Add new administrators to this group by default', 'code_field' => 'Code', 'code_comment' => 'Enter a unique code if you want to access it with the API.', 'menu_label' => 'Groups', diff --git a/modules/backend/models/user/fields.yaml b/modules/backend/models/user/fields.yaml index 3fd52e945..5df53a671 100644 --- a/modules/backend/models/user/fields.yaml +++ b/modules/backend/models/user/fields.yaml @@ -52,14 +52,12 @@ tabs: commentAbove: backend::lang.user.groups_comment type: checkboxlist - secondaryTabs: fields: - avatar: label: backend::lang.user.avatar type: fileupload mode: image - imageHeight: 230 - imageWidth: 230 + imageHeight: 250 + imageWidth: 250 diff --git a/modules/backend/models/usergroup/fields.yaml b/modules/backend/models/usergroup/fields.yaml index 10dda15b4..be3d0a483 100644 --- a/modules/backend/models/usergroup/fields.yaml +++ b/modules/backend/models/usergroup/fields.yaml @@ -4,16 +4,18 @@ fields: is_new_user_default: - label: backend::lang.user.group.is_new_user_default_field - type: checkbox + label: backend::lang.user.group.is_new_user_default_field_label + comment: backend::lang.user.group.is_new_user_default_field_comment + type: switch name: label: backend::lang.user.group.name_field + commentAbove: backend::lang.user.group.name_comment span: auto code: label: backend::lang.user.group.code_field - comment: backend::lang.user.group.code_comment + commentAbove: backend::lang.user.group.code_comment span: auto description: diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php index 9a985390c..ada1f7ca3 100644 --- a/modules/cms/lang/en/lang.php +++ b/modules/cms/lang/en/lang.php @@ -225,7 +225,7 @@ return [ 'saved'=> 'The template has been successfully saved.' ], 'permissions' => [ - 'name' => 'Cms', + 'name' => 'CMS', 'manage_content' => 'Manage website content files', 'manage_assets' => 'Manage website assets - images, JavaScript files, CSS files', 'manage_pages' => 'Create, modify and delete website pages', diff --git a/modules/system/assets/ui/less/breadcrumb.less b/modules/system/assets/ui/less/breadcrumb.less index bcc3839ef..5796d69cd 100644 --- a/modules/system/assets/ui/less/breadcrumb.less +++ b/modules/system/assets/ui/less/breadcrumb.less @@ -10,13 +10,13 @@ // -------------------------------------------------- @color-breadcrumb-text-active: #555555; -@color-breadcrumb-text: #686868; +@color-breadcrumb-text: #9B9B9B; @color-breadcrumb-background: #D3D9DA; .control-breadcrumb { font-size: 15px; padding: 12px 20px 13px 20px; - margin: -20px -20px 20px -20px; + margin: -(@padding-standard) -(@padding-standard) @padding-standard -(@padding-standard); background-color: @color-breadcrumb-background; ul { diff --git a/modules/system/assets/ui/less/button.less b/modules/system/assets/ui/less/button.less index 7dce7d5c5..1b754eda7 100644 --- a/modules/system/assets/ui/less/button.less +++ b/modules/system/assets/ui/less/button.less @@ -16,7 +16,7 @@ // -------------------------------------------------- .btn { - font-size: 16px; + font-size: 15px; border: none; text-align: left; outline: none !important; @@ -130,13 +130,13 @@ .btn-text { font-size: 16px; - padding: 9px 0; + padding: 8px 0; vertical-align: middle; display: inline-block; - color: @btn-default-color; + color: @btn-default-bg; a { - color: @btn-default-color; + color: @btn-default-bg; text-decoration: underline; &:hover { diff --git a/modules/system/assets/ui/less/checkbox.less b/modules/system/assets/ui/less/checkbox.less index 24238e70e..15cda8a9d 100644 --- a/modules/system/assets/ui/less/checkbox.less +++ b/modules/system/assets/ui/less/checkbox.less @@ -62,13 +62,13 @@ text-align: center; color: @color-checkbox-icon; - width: 22px; - height: 22px; + width: 20px; + height: 20px; margin-right: 15px; position: absolute; left: -3px; - bottom: 0; + top: 0; background-color: #FFFFFF; border: 2px solid @color-checkbox-border; } @@ -90,13 +90,13 @@ &:after { content: ''; - width: 16px; - height: 16px; + width: 14px; + height: 14px; background-color: @color-checkbox-checked; display: inline-block; position: absolute; left: 0px; - top: 2px; + top: 3px; .border-radius(17px); } } @@ -125,7 +125,7 @@ .icon(@check); border-color: @color-checkbox-checked; background-color: @color-checkbox-checked; - font-size: 14px; + font-size: 12px; line-height: 17px; border-width: 2px; } @@ -157,19 +157,19 @@ .switch-field { .field-switch { - padding-left: 90px; + padding-left: 85px; float: left; > label { - margin-top: 5px; + margin-top: 3px; } } } .custom-switch { display: block; - width: 69px; - height: 30px; + width: 65px; + height: 26px; position: relative; text-transform: uppercase; border: none; @@ -182,10 +182,10 @@ z-index: 4; display: block; position: absolute; - right: 43px; - top: 4px; - width: 22px; - height: 22px; + right: 42px; + top: 3px; + width: 20px; + height: 20px; background-color: @color-checkbox-switch-bg; .border-radius(20px); .transition(all 0.1s); @@ -235,7 +235,7 @@ left: 0; width: 100%; background-color: @color-checkbox-switch-off; - font-size: 14px; + font-size: 13px; font-weight: bold; .user-select(none); .border-radius(20px); @@ -245,11 +245,11 @@ display: block; width: 50%; position: absolute; - top: 4px; - left: 0; + top: 1px; + left: -1px; .box-sizing(border-box); &:last-child { - left: 31px; + left: 28px; color: #FFFFFF; display: block; } diff --git a/modules/system/assets/ui/less/form.base.less b/modules/system/assets/ui/less/form.base.less index e66a66862..86d9304c7 100644 --- a/modules/system/assets/ui/less/form.base.less +++ b/modules/system/assets/ui/less/form.base.less @@ -117,7 +117,7 @@ output { 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 + 1) @padding-base-horizontal (@padding-base-vertical - 1); + padding: (@padding-base-vertical) @padding-base-horizontal (@padding-base-vertical + 1); font-size: @input-font-size; line-height: @line-height-base; color: @input-color; diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less index 8f97433ff..2cf7e6467 100644 --- a/modules/system/assets/ui/less/form.less +++ b/modules/system/assets/ui/less/form.less @@ -59,7 +59,7 @@ background-image: url('@{image-path}/bitmap-icons.png'); &.plus { background-position: right -124px; } - &.search { background-position: right -77px; } + &.search { background-position: right -83px; } &.user { background-position: right -41px; } &.lock { background-position: right 0; } } @@ -81,7 +81,7 @@ } &, &.layout-item { - padding-bottom: 35px; + padding-bottom: @padding-standard; margin-bottom: 0; } @@ -178,7 +178,7 @@ } .help-block { - font-size: 15px; + font-size: 14px; margin-bottom: 0; &.before-field { margin-top: 0; @@ -266,7 +266,7 @@ } .field-checkboxlist { - padding: 20px 20px 5px 20px; + padding: 20px 20px 2px 20px; .border-radius(@border-radius-base); background: @color-form-checkboxlist-background; @@ -344,7 +344,7 @@ .form-buttons { .clearfix(); - padding-bottom: 35px; + padding-bottom: @padding-standard; font-size: 0; .btn { diff --git a/modules/system/assets/ui/less/form.variables.less b/modules/system/assets/ui/less/form.variables.less index 43c63579c..98b36589e 100644 --- a/modules/system/assets/ui/less/form.variables.less +++ b/modules/system/assets/ui/less/form.variables.less @@ -23,8 +23,8 @@ @input-group-addon-bg: @gray-lighter; @input-group-addon-border-color: @input-border; -@label-font-size: 16px; -@input-font-size: 16px; +@label-font-size: 15px; +@input-font-size: 15px; @color-label: #2A3E51; @input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; diff --git a/modules/system/assets/ui/less/global.variables.less b/modules/system/assets/ui/less/global.variables.less index 148f686f4..e153d36ea 100644 --- a/modules/system/assets/ui/less/global.variables.less +++ b/modules/system/assets/ui/less/global.variables.less @@ -73,7 +73,7 @@ @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-base: @font-family-sans-serif; -@font-size-base: 16px; +@font-size-base: 15px; @font-size-large: ceil((@font-size-base * 1.25)); // ~18px @font-size-small: ceil((@font-size-base * 0.85)); // ~12px @@ -153,8 +153,10 @@ // // General // -------------------------------------------------- -@padding-base-vertical: 10px; -@padding-base-horizontal: 16px; +@padding-standard: 25px; + +@padding-base-vertical: 8px; +@padding-base-horizontal: 13px; @padding-large-vertical: 10px; @padding-large-horizontal: 16px; diff --git a/modules/system/assets/ui/less/list.less b/modules/system/assets/ui/less/list.less index 5d4d66599..cf21e5ce7 100644 --- a/modules/system/assets/ui/less/list.less +++ b/modules/system/assets/ui/less/list.less @@ -32,7 +32,7 @@ table.table.data { } } - font-size: 12px; + font-size: 15px; &.no-offset-bottom { margin-bottom: 0!important; @@ -44,14 +44,15 @@ table.table.data { td, th { border-width: 1px; border-top: 1px solid @color-list-border !important; + border-bottom: 2px solid @color-list-border !important; border-color: @color-list-border; padding: 0; + font-size: 15px; font-weight: normal; > a, > span { display: block; padding: 13px 15px; - text-transform: uppercase; color: @color-list-text-head; text-decoration: none; &:hover { color: @color-list-text-active; } @@ -70,8 +71,13 @@ table.table.data { } } } + tr th:first-child { - padding-left: 5px; + padding-left: 10px; + } + + tr th:last-child a { + padding-right: 25px; } } @@ -122,7 +128,7 @@ table.table.data { tr td:first-child { border-left: 3px solid transparent; - padding-left: 17px; + padding-left: 22px; } tr.active td { color: @color-list-text-active; @@ -393,7 +399,7 @@ table.table.data { .list-header { background-color: @color-list-header-bg; - padding: 0 20px 1px 20px; + padding: 0 @padding-standard 1px @padding-standard; h3 { font-size: 14px; diff --git a/modules/system/assets/ui/less/list.variables.less b/modules/system/assets/ui/less/list.variables.less index df29e5454..8b361afc8 100644 --- a/modules/system/assets/ui/less/list.variables.less +++ b/modules/system/assets/ui/less/list.variables.less @@ -22,16 +22,16 @@ @color-list-header-bg: transparent; @color-list-head-bg: #ffffff; @color-list-progress-bg: #0181b9; -@color-list-border: #e2e2e2; +@color-list-border: #D4D8DA; @color-list-border-light: #eeeeee; -@color-list-text-head: #333333; +@color-list-text-head: @color-label; @color-list-text: #666666; @color-list-text-active: #000000; @color-list-stripe-active: #ff9933; -@color-list-accent: #f5f5f5; -@color-list-norecords-text: #666666; +@color-list-accent: #ECF0F1; +@color-list-norecords-text: #555555; @color-list-hover-bg: #4da7e8; @color-list-active-sort: #c63e26; -@color-list-grid: #eeeeee; +@color-list-grid: #E4E7E8; @color-status-list-text: #7e8c8d; diff --git a/modules/system/assets/ui/less/pagination.less b/modules/system/assets/ui/less/pagination.less index aa6c59501..9aec06ab9 100644 --- a/modules/system/assets/ui/less/pagination.less +++ b/modules/system/assets/ui/less/pagination.less @@ -22,7 +22,7 @@ font-size: 0; .page-iteration { margin-right: 4px; - font-size: 12px; + font-size: 14px; color: @color-pagination; } .page-next, .page-back { diff --git a/modules/system/assets/ui/less/tab.less b/modules/system/assets/ui/less/tab.less index ff6667c66..3f047eea3 100644 --- a/modules/system/assets/ui/less/tab.less +++ b/modules/system/assets/ui/less/tab.less @@ -108,8 +108,8 @@ text-overflow: ellipsis; display: inline-block; border-top: 2px solid @color-tab-border; - margin-top: -8px; - padding-top: 11px; + margin-top: -4px; + padding-top: 7px; } } @@ -271,7 +271,7 @@ } a { - font-size: 16px; + font-size: 15px; padding-bottom: 3px; margin: 0; position: relative; @@ -282,7 +282,7 @@ > span.title { position: relative; display: inline-block; - padding: 8px 25px 0px 25px; + padding: 4px 25px 0px 25px; .box-sizing(border-box); z-index: 100; diff --git a/modules/system/assets/ui/less/toolbar.less b/modules/system/assets/ui/less/toolbar.less index d84a23c34..eb3a5736a 100644 --- a/modules/system/assets/ui/less/toolbar.less +++ b/modules/system/assets/ui/less/toolbar.less @@ -92,7 +92,7 @@ input.form-control[type=text] { height: auto; - padding: 11px 17px 12px 17px; + padding: 6px 13px 6px; } &.toolbar-padded { diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 2e32acdf2..9df1fda36 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -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:16px;line-height:1.42857143;color:#333333;background-color:#f9f9f9} +body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;line-height:1.42857143;color:#333333;background-color:#f9f9f9} input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit} button,input,select[multiple],textarea{background-image:none} a{color:#0181b9;text-decoration:none} @@ -50,7 +50,7 @@ img{vertical-align:middle} .img-responsive{display:block;max-width:100%;height:auto} .img-rounded{border-radius:6px} .img-circle{border-radius:50%} -hr{margin-top:22px;margin-bottom:22px;border:0;border-top:1px solid #eeeeee} +hr{margin-top:21px;margin-bottom:21px;border:0;border-top:1px solid #eeeeee} .sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0} @media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important} a,a:visited{text-decoration:underline} @@ -345,19 +345,19 @@ th.visible-print,td.visible-print{display:table-cell !important} } h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit} h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999999} -h1,.h1,h2,.h2,h3,.h3{margin-top:22px;margin-bottom:11px} +h1,.h1,h2,.h2,h3,.h3{margin-top:21px;margin-bottom:10.5px} h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%} -h4,.h4,h5,.h5,h6,.h6{margin-top:11px;margin-bottom:11px} +h4,.h4,h5,.h5,h6,.h6{margin-top:10.5px;margin-bottom:10.5px} h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%} -h1,.h1{font-size:41px} -h2,.h2{font-size:34px} -h3,.h3{font-size:28px} -h4,.h4{font-size:20px} -h5,.h5{font-size:16px} -h6,.h6{font-size:14px} -p{margin:0 0 11px} -.lead{margin-bottom:22px;font-size:18px;font-weight:200;line-height:1.4} -@media (min-width:768px){.lead{font-size:24px} +h1,.h1{font-size:39px} +h2,.h2{font-size:32px} +h3,.h3{font-size:26px} +h4,.h4{font-size:19px} +h5,.h5{font-size:15px} +h6,.h6{font-size:13px} +p{margin:0 0 10.5px} +.lead{margin-bottom:21px;font-size:17px;font-weight:200;line-height:1.4} +@media (min-width:768px){.lead{font-size:22.5px} } small,.small{font-size:85%} cite{font-style:normal} @@ -386,13 +386,13 @@ a.bg-info:hover{background-color:#afd9ee} a.bg-warning:hover{background-color:#f7ecb5} .bg-danger{background-color:#f2dede} a.bg-danger:hover{background-color:#e4b9b9} -.page-header{padding-bottom:10px;margin:44px 0 22px;border-bottom:1px solid #eeeeee} -ul,ol{margin-top:0;margin-bottom:11px} +.page-header{padding-bottom:9.5px;margin:42px 0 21px;border-bottom:1px solid #eeeeee} +ul,ol{margin-top:0;margin-bottom:10.5px} ul ul,ol ul,ul ol,ol ol{margin-bottom:0} .list-unstyled{padding-left:0;list-style:none} .list-inline{padding-left:0;list-style:none;margin-left:-5px} .list-inline > li{display:inline-block;padding-left:5px;padding-right:5px} -dl{margin-top:0;margin-bottom:22px} +dl{margin-top:0;margin-bottom:21px} dt,dd{line-height:1.42857143} dt{font-weight:bold} dd{margin-left:0} @@ -401,7 +401,7 @@ dd{margin-left:0} } abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999999} .initialism{font-size:90%;text-transform:uppercase} -blockquote{padding:11px 22px;margin:0 0 22px;font-size:20px;border-left:5px solid #eeeeee} +blockquote{padding:10.5px 21px;margin:0 0 21px;font-size:18.75px;border-left:5px solid #eeeeee} blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999999} blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'} @@ -409,8 +409,8 @@ blockquote footer:before,blockquote small:before,blockquote .small:before{conten .blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''} .blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'} blockquote:before,blockquote:after{content:""} -address{margin-bottom:22px;font-style:normal;line-height:1.42857143} -.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} +address{margin-bottom:21px;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:8px 19.5px;font-size:15px;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:#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)} @@ -450,9 +450,9 @@ address{margin-bottom:22px;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: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-lg,.btn-group-lg > .btn{padding:10px 24px;font-size:19px;line-height:1.3333333;border-radius:6px} +.btn-sm,.btn-group-sm > .btn{padding:5px 15px;font-size:13px;line-height:1.5;border-radius:3px} +.btn-xs,.btn-group-xs > .btn{padding:1px 7.5px;font-size:13px;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%} @@ -493,7 +493,7 @@ 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:16px;border:none;text-align:left;outline:none !important} +.btn{font-size:15px;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} @@ -514,10 +514,10 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button" .btn-icon.margin-left{margin-left:5px} .btn-icon.small{font-size:17px;height:17px;line-height:15px} .btn-icon.larger{font-size:21px;height:21px;line-height:17px} -.btn-text{font-size:16px;padding:9px 0;vertical-align:middle;display:inline-block;color:#ffffff} -.btn-text a{color:#ffffff;text-decoration:underline} +.btn-text{font-size:16px;padding:8px 0;vertical-align:middle;display:inline-block;color:#bdc3c7} +.btn-text a{color:#bdc3c7;text-decoration:underline} .btn-text 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{position:absolute;z-index:1060;display:block;visibility:visible;font-size:13px;line-height:1.4;opacity:0;filter:alpha(opacity=0)} .tooltip.in{opacity:0.9;filter:alpha(opacity=90)} .tooltip.top{margin-top:-3px;padding:5px 0} .tooltip.right{margin-left:3px;padding:0 5px} @@ -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:24px;font-weight:bold;line-height:1;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20)} +.close{float:right;font-size:22.5px;font-weight:bold;line-height:1;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20)} .close:hover,.close:focus{color:#000000;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50)} button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none} @font-face{font-family:'FontAwesome';src:url('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: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{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:15px;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:10px 0;overflow:hidden;background-color:#e5e5e5} +.dropdown-menu .divider{height:1px;margin:9.5px 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,7 +1148,7 @@ 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:14px;line-height:1.42857143;color:#999999} +.dropdown-header{display:block;padding:3px 20px;font-size:13px;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:""} @@ -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:15px;padding:12px 20px 13px 20px;margin:-20px -20px 20px -20px;background-color:#d3d9da} +.control-breadcrumb{font-size:15px;padding:12px 20px 13px 20px;margin:-25px -25px 25px -25px;background-color:#d3d9da} .control-breadcrumb ul{padding:0;margin:0} .control-breadcrumb li{list-style:none;margin:0;padding:0;display:inline-block;color:#555555} -.control-breadcrumb li a{color:#686868;text-decoration:none} -.control-breadcrumb li a:hover{color:#686868} +.control-breadcrumb li a{color:#9b9b9b;text-decoration:none} +.control-breadcrumb li a:hover{color:#9b9b9b} .control-breadcrumb li:after{font-size:14px;line-height:14px;display:inline-block;margin-left:6px;margin-right:2px;vertical-align:baseline;color:#555555;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f105"} .control-breadcrumb 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: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{overflow:hidden;height:9px;margin-bottom:21px;background-color:#d9dee0;border-radius:5px} +.progress-bar{float:left;width:0%;height:100%;font-size:13px;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:22px} +.callout{font-size:14px;margin-bottom:21px} .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} @@ -1355,7 +1355,7 @@ to{background-position:0 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;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 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:-4px;padding-top:7px} .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} @@ -1385,8 +1385,8 @@ to{background-position:0 0} .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: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,.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:15px;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:4px 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)} @@ -1505,7 +1505,7 @@ ul.status-list li span.status.info{background:#5bc0de} .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:5px !important;border-top-right-radius:5px !important} -.control-toolbar input.form-control[type=text]{height:auto;padding:11px 17px 12px 17px} +.control-toolbar input.form-control[type=text]{height:auto;padding:6px 13px 6px} .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} @@ -1846,16 +1846,16 @@ 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: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} +legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:inherit;color:#333333;border:0;border-bottom:1px solid #e5e5e5} +label{display:inline-block;margin-bottom:14px;font-weight:normal;font-size:15px;color:#2a3e51} 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: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} +output{display:block;padding-top:9px;font-size:15px;line-height:1.42857143;color:#555555} +.form-control{display:block;width:100%;height:39px;padding:8px 13px 9px;font-size:15px;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} @@ -1864,24 +1864,24 @@ output{display:block;padding-top:11px;font-size:16px;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:44px} +input[type="date"]{line-height:39px} .form-group{margin-bottom:15px} -.radio,.checkbox{display:block;min-height:22px;margin-top:10px;margin-bottom:10px;padding-left:20px} +.radio,.checkbox{display:block;min-height:21px;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:33px;padding:5px 10px;font-size:14px;line-height:1.5;border-radius:3px} -select.input-sm{height:33px;line-height:33px} +.input-sm{height:31px;padding:5px 10px;font-size:13px;line-height:1.5;border-radius:3px} +select.input-sm{height:31px;line-height:31px} textarea.input-sm,select[multiple].input-sm{height:auto} -.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} +.input-lg{height:48px;padding:10px 16px;font-size:19px;line-height:1.3333333;border-radius:6px} +select.input-lg{height:48px;line-height:48px} textarea.input-lg,select[multiple].input-lg{height:auto} .has-feedback{position:relative} -.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-feedback .form-control{padding-right:48.75px} +.has-feedback .form-control-feedback{position:absolute;top:26px;right:0;display:block;width:39px;height:39px;line-height:39px;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} @@ -1908,28 +1908,28 @@ label + .help-block,label + .help-block.before-field{margin-top:-7px} .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:11px} -.form-horizontal .radio,.form-horizontal .checkbox{min-height:33px} +.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:9px} +.form-horizontal .radio,.form-horizontal .checkbox{min-height:30px} .form-horizontal .form-group{margin-left:-15px;margin-right:-15px} -.form-horizontal .form-control-static{padding-top:11px} +.form-horizontal .form-control-static{padding-top:9px} @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: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} +.input-group-lg > .form-control,.input-group-lg > .input-group-addon,.input-group-lg > .input-group-btn > .btn{height:48px;padding:10px 16px;font-size:19px;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:48px;line-height:48px} 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: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} +.input-group-sm > .form-control,.input-group-sm > .input-group-addon,.input-group-sm > .input-group-btn > .btn{height:31px;padding:5px 10px;font-size:13px;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:31px;line-height:31px} 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: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{padding:8px 13px;font-size:15px;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:13px;border-radius:3px} +.input-group-addon.input-lg{padding:10px 16px;font-size:19px;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} @@ -2075,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 #bdc3c7;border-radius:3px;color:#555555;font-size:16px;outline:0} +.select2-container--default .select2-selection{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#555555;font-size:15px;outline:0} .select2-container--default .select2-search--dropdown{position:relative} .select2-container--default .select2-search--dropdown:after{position:absolute;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f002";right:10px;top:7px;color:#95a5a6} -.select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#555555;font-size:16px} +.select2-container--default .select2-search--dropdown .select2-search__field{background-color:#ffffff;border:1px solid #bdc3c7;border-radius:3px;color:#555555;font-size:15px} .select2-container--default .select2-search__field{outline:0} .select2-container--default .select2-search__field::-webkit-input-placeholder{color:#cccccc} .select2-container--default .select2-search__field:-moz-placeholder{color:#cccccc} @@ -2088,14 +2088,14 @@ 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:10px 16px} +.select2-container--default .select2-results__option .select2-results__option{padding:8px 13px} .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:-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-results__option .select2-results__option .select2-results__option{margin-left:-13px;padding-left:26px} +.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-26px;padding-left:39px} +.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-39px;padding-left:52px} +.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-52px;padding-left:65px} +.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:-65px;padding-left:78px} +.select2-container--default .select2-results__group{color:#999999;display:block;padding:8px 13px;font-size:13px;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} @@ -2108,44 +2108,44 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .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:#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: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-results > .select2-results__options{font-size:15px;max-height:200px;overflow-y:auto} +.select2-container--default .select2-selection--single{height:39px;line-height:1.42857143;padding:8px 25px 8px 13px} +.select2-container--default .select2-selection--single .select2-selection__arrow{position:absolute;bottom:0;right:13px;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:44px} +.select2-container--default .select2-selection--multiple{min-height:39px} .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: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{color:#555555;background:#ffffff;border:1px solid #cccccc;border-radius:4px;cursor:default;float:left;margin:7px 0 0 6.5px;padding:0 8px} +.select2-container--default .select2-selection--multiple .select2-search--inline .select2-search__field{background:transparent;padding:0 13px;height:37px;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:4px} .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333} -.select2-container--default .select2-selection--multiple .select2-selection__clear{margin-top:10px} +.select2-container--default .select2-selection--multiple .select2-selection__clear{margin-top:8px} .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:14px;height:33px;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:13px;height:31px;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: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,.input-group-sm .select2-container--default .select2-selection--multiple,.form-group-sm .select2-container--default .select2-selection--multiple{min-height:31px} +.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:13px;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:13px;height:29px;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:20px;height:49px;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:19px;height:48px;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: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,.input-group-lg .select2-container--default .select2-selection--multiple,.form-group-lg .select2-container--default .select2-selection--multiple{min-height:48px} +.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:19px;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:19px;height:46px;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:28px;padding-right:16px} +.select2-container--default[dir="rtl"] .select2-selection--single{padding-left:25px;padding-right:13px} .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:16px;right:auto} +.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:13px;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:8px} +.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:0;margin-right:6.5px} .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} @@ -2175,27 +2175,27 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .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: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:before,.custom-radio label:before{content:"";display:inline-block;text-align:center;color:#ffffff;width:20px;height:20px;margin-right:15px;position:absolute;left:-3px;top: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]:checked + label:after,.custom-radio input[type=radio]:checked + label:after{content:'';width:14px;height:14px;background-color:#1f99dc;display:inline-block;position:absolute;left:0px;top:3px;-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 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:12px;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{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} +.switch-field .field-switch{padding-left:85px;float:left} +.switch-field .field-switch > label{margin-top:3px} +.custom-switch{display:block;width:65px;height:26px;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: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 .slide-button{z-index:4;display:block;position:absolute;right:42px;top:3px;width:20px;height:20px;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)} @@ -2203,9 +2203,9 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .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:#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{display:block;height:100%;position:absolute;left:0;width:100%;background-color:#bb2424;font-size:13px;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:1px;left:-1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} +.custom-switch > span span:last-child{left:28px;color:#FFFFFF;display:block} .custom-switch > span span:first-of-type{padding-left:13px;display:none;color:#666666} .form-preview{padding:15px;margin-bottom:20px;background:white;border:1px solid #eee} .form-preview > .form-group:last-child{padding-bottom:0} @@ -2218,14 +2218,14 @@ html.cssanimations .cursor-loading-indicator.hide{display:none} .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 -77px} +.form-control.icon.search{background-position:right -83px} .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:35px;margin-bottom:0} +.form-group,.form-group.layout-item{padding-bottom:25px;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} @@ -2241,7 +2241,7 @@ 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:15px;margin-bottom:0} +.help-block{font-size:14px;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} @@ -2263,7 +2263,7 @@ 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{padding:20px 20px 2px 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} @@ -2276,7 +2276,7 @@ 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:35px;font-size:0} +.form-buttons{padding-bottom:25px;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} @@ -2309,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:22px;border-collapse:separate} +.table{width:100%;margin-bottom:21px;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} @@ -2333,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:16.5px;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:15.75px;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} @@ -2341,11 +2341,11 @@ table td[class*="col-"],table th[class*="col-"]{position:static;float:none;displ .table-responsive > .table-bordered > thead > tr > th:last-child,.table-responsive > .table-bordered > tbody > tr > th:last-child,.table-responsive > .table-bordered > tfoot > tr > th:last-child,.table-responsive > .table-bordered > thead > tr > td:last-child,.table-responsive > .table-bordered > tbody > tr > td:last-child,.table-responsive > .table-bordered > tfoot > tr > td:last-child{border-right:0} .table-responsive > .table-bordered > tbody > tr:last-child > th,.table-responsive > .table-bordered > tfoot > tr:last-child > th,.table-responsive > .table-bordered > tbody > tr:last-child > td,.table-responsive > .table-bordered > tfoot > tr:last-child > td{border-bottom:0} } -table.table.data{font-size:12px} +table.table.data{font-size:15px} table.table.data.no-offset-bottom{margin-bottom:0 !important} table.table.data thead{background:#ffffff} -table.table.data thead td,table.table.data thead th{border-width:1px;border-top:1px solid #e2e2e2 !important;border-color:#e2e2e2;padding:0;font-weight:normal} -table.table.data thead td > a,table.table.data thead th > a,table.table.data thead td > span,table.table.data thead th > span{display:block;padding:13px 15px;text-transform:uppercase;color:#333333;text-decoration:none} +table.table.data thead td,table.table.data thead th{border-width:1px;border-top:1px solid #d4d8da !important;border-bottom:2px solid #d4d8da !important;border-color:#d4d8da;padding:0;font-size:15px;font-weight:normal} +table.table.data thead td > a,table.table.data thead th > a,table.table.data thead td > span,table.table.data thead th > span{display:block;padding:13px 15px;color:#2a3e51;text-decoration:none} table.table.data thead td > a:hover,table.table.data thead th > a:hover,table.table.data thead td > span:hover,table.table.data thead th > span:hover{color:#000000} table.table.data thead td.sort-desc > span:after,table.table.data thead th.sort-desc > span:after,table.table.data thead td.sort-desc > a:after,table.table.data thead th.sort-desc > a:after{font-size:14px;line-height:14px;display:inline-block;margin-left:8px;vertical-align:baseline;opacity:0.2;filter:alpha(opacity=20);font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f107"} table.table.data thead td.sort-desc > span:hover:after,table.table.data thead th.sort-desc > span:hover:after,table.table.data thead td.sort-desc > a:hover:after,table.table.data thead th.sort-desc > a:hover:after{opacity:0.6;filter:alpha(opacity=60)} @@ -2353,16 +2353,17 @@ table.table.data thead td.sort-asc > span:after,table.table.data thead th.sort-a table.table.data thead td.sort-asc > span:hover:after,table.table.data thead th.sort-asc > span:hover:after,table.table.data thead td.sort-asc > a:hover:after,table.table.data thead th.sort-asc > a:hover:after{opacity:0.6;filter:alpha(opacity=60)} table.table.data thead td.active,table.table.data thead th.active{background-color:inherit} table.table.data thead td.active > span:after,table.table.data thead th.active > span:after,table.table.data thead td.active > a:after,table.table.data thead th.active > a:after{color:#c63e26;opacity:1 !important;filter:alpha(opacity=100) !important} -table.table.data thead tr th:first-child{padding-left:5px} -table.table.data tbody tr:nth-child(even) td,table.table.data tbody tr:nth-child(even) th{background-color:#f5f5f5} -table.table.data tbody td,table.table.data tbody th{padding:11px 15px;color:#666666;border-color:#eeeeee} +table.table.data thead tr th:first-child{padding-left:10px} +table.table.data thead tr th:last-child a{padding-right:25px} +table.table.data tbody tr:nth-child(even) td,table.table.data tbody tr:nth-child(even) th{background-color:#ecf0f1} +table.table.data tbody td,table.table.data tbody th{padding:11px 15px;color:#666666;border-color:#e4e7e8} table.table.data tbody td a:not(.btn),table.table.data tbody th a:not(.btn){color:#666666} table.table.data tbody td a:not(.btn):hover,table.table.data tbody th a:not(.btn):hover{text-decoration:none} table.table.data tbody td div.progress,table.table.data tbody th div.progress{position:relative;overflow:visible;height:auto;margin-bottom:0;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none} table.table.data tbody td div.progress div.bar,table.table.data tbody th div.progress div.bar{position:absolute;left:-15px;top:-11px;bottom:-11px;background:#0181b9;opacity:0.3;filter:alpha(opacity=30)} table.table.data tbody td div.progress a,table.table.data tbody th div.progress a{position:relative} table.table.data tbody tr:first-child th,table.table.data tbody tr:first-child td{border-top-width:0} -table.table.data tbody tr td:first-child{border-left:3px solid transparent;padding-left:17px} +table.table.data tbody tr td:first-child{border-left:3px solid transparent;padding-left:22px} table.table.data tbody tr.active td{color:#000000} table.table.data tbody tr.active td:first-child{border-left:3px solid #ff9933} table.table.data tbody tr:not(.no-data):hover td,table.table.data tbody tr:not(.no-data).selected td{background:#4da7e8 !important;color:white} @@ -2385,7 +2386,7 @@ table.table.data tbody.icons td i[class^="icon-"]{display:inline-block;margin-ri table.table.data tbody.clickable{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} table.table.data.no-active-indicator tbody tr td:first-child{border-left:none} table.table.data tfoot a{color:#666666;text-decoration:none} -table.table.data tfoot td,table.table.data tfoot th{border-color:#e2e2e2;padding:10px 15px} +table.table.data tfoot td,table.table.data tfoot th{border-color:#d4d8da;padding:10px 15px} table.table.data th.list-cell-type-switch,table.table.data td.list-cell-type-switch{text-align:center} table.table.data .list-checkbox{padding-left:16px;padding-right:8px;width:52px;vertical-align:top;border-right:1px solid #eeeeee} table.table.data .list-checkbox .checkbox{margin:0} @@ -2414,31 +2415,31 @@ table.table.data tr.list-tree-level-9 a.list-expand-collapse{left:110px} table.table.data tr.list-tree-level-9 td.list-cell-index-1{padding-left:115px} table.table.data tr.list-tree-level-10 a.list-expand-collapse{left:120px} table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:125px} -.list-preview{padding:0;margin-bottom:20px;background:white;border:1px solid #e2e2e2} +.list-preview{padding:0;margin-bottom:20px;background:white;border:1px solid #d4d8da} .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:5px;-moz-border-radius:5px;border-radius:5px} +.control-list p.no-data{padding:18px 20px;margin:0 20px;color:#555555;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)} .control-list table.table.data .list-setup a:hover:before{opacity:1;filter:alpha(opacity=100);color:#4da7e8 !important} .control-list table.table.data .list-pagination{font-size:14px;text-align:right;padding-top:20px} .control-list table.table.data .list-pagination .loading-indicator div{margin-left:20px;font-size:12px} -.list-header{background-color:transparent;padding:0 20px 1px 20px} +.list-header{background-color:transparent;padding:0 25px 1px 25px} .list-header h3{font-size:14px;color:#7e8c8d;text-transform:uppercase;font-weight:600;margin-top:0;margin-bottom:15px} .report-widget .table-container{margin:-15px} .report-widget .table-container table.table.data{margin-bottom:0} .report-widget .table-container table.table.data thead tr th{border-top:none !important} .report-widget .table-container table.table.data tbody tr:nth-child(even) td,.report-widget .table-container table.table.data tbody tr:nth-child(even) th{background-color:transparent} @media only screen and (max-width:960px){.control-list:not(.list-unresponsive) table,.control-list:not(.list-unresponsive) thead,.control-list:not(.list-unresponsive) tbody,.control-list:not(.list-unresponsive) th,.control-list:not(.list-unresponsive) td,.control-list:not(.list-unresponsive) tr{display:block} -.control-list:not(.list-unresponsive) table{position:relative;border-top:1px solid #e2e2e2} +.control-list:not(.list-unresponsive) table{position:relative;border-top:1px solid #d4d8da} .control-list:not(.list-unresponsive) table thead tr td,.control-list:not(.list-unresponsive) table thead tr th{position:absolute;top:-9999px;left:-9999px} .control-list:not(.list-unresponsive) table thead tr th.list-setup{position:absolute;top:auto;left:auto;bottom:0;right:0;border:none !important} .control-list:not(.list-unresponsive) table thead tr th.list-setup a{padding:10px 15px} -.control-list:not(.list-unresponsive) table tbody tr{border-bottom:1px solid #e2e2e2} +.control-list:not(.list-unresponsive) table tbody tr{border-bottom:1px solid #d4d8da} .control-list:not(.list-unresponsive) table tbody tr td{border:none;border-left:3px solid transparent;position:relative;padding-left:40% !important;white-space:normal;text-align:left;min-height:40px} -.control-list:not(.list-unresponsive) table tbody tr td:before{position:absolute;top:0;left:0;width:35%;padding:11px 15px;white-space:nowrap;text-align:left;color:#333333;content:attr(data-title)} +.control-list:not(.list-unresponsive) table tbody tr td:before{position:absolute;top:0;left:0;width:35%;padding:11px 15px;white-space:nowrap;text-align:left;color:#2a3e51;content:attr(data-title)} .control-list:not(.list-unresponsive) table tbody tr:hover td:before{color:white !important} .control-list:not(.list-unresponsive) table tbody tr.active td{border-left:3px solid #ff9933} .control-list:not(.list-unresponsive) table tbody tr.active td:before{color:#000000} @@ -2558,7 +2559,7 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a{padding:5px 12px;white .select2-dropdown.ocInspectorDropdown .select2-search: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:10px;color:#95a5a6} .select2-dropdown.ocInspectorDropdown .select2-search input.select2-search__field{min-height:26px;background:transparent !important;padding-left:12px;padding-right:12px;border:none} .control-pagination{font-size:0} -.control-pagination .page-iteration{margin-right:4px;font-size:12px;color:#98a7a8} +.control-pagination .page-iteration{margin-right:4px;font-size:14px;color:#98a7a8} .control-pagination .page-next,.control-pagination .page-back{display:inline-block;padding:10px 15px} .control-pagination .page-next:before,.control-pagination .page-back:before{color:#666666;font-size:19px;line-height:19px;display:inline-block;vertical-align:baseline;position:relative;top:2px} .control-pagination a.page-next:hover:before,.control-pagination a.page-back:hover:before{color:#0181b9}