diff --git a/admin/css/screen.css b/admin/css/screen.css index cf4d4234c..d59ea02e5 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -291,12 +291,14 @@ body.cms { overflow: hidden; } /** -------------------------------------------- Tabs -------------------------------------------- */ .ui-tabs { padding: 0; background: none; } .ui-tabs .ui-tabs { position: static; } +.ui-tabs .ui-tabs-panel { padding: 8px 0; } .ui-tabs .ui-widget-header { border: 0; background: none; } -.ui-tabs .ui-tabs-panel { padding: 8px; background: transparent; } -.ui-tabs .ui-tabs-nav { float: right; margin: 0 0 -1px 0; padding: 0 8px 0 0; border-bottom: none; } +.ui-tabs .ui-tabs-panel { background: transparent; } +.ui-tabs .ui-tabs-nav { float: right; margin: 0 0 -1px 0; padding: 0 16px 0 0; border-bottom: none; } .ui-tabs .ui-tabs-nav ~ .ui-tabs-panel { border-top: 1px solid #c0c0c2; clear: both; } .ui-tabs .ui-tabs-nav li { top: 0; float: left; border-bottom: 0 !important; } .ui-tabs .ui-tabs-nav li a, .ui-tabs .ui-tabs-nav li .cms .jstree .jstree-wholerow a:hover, .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li a:hover, .ui-tabs .ui-tabs-nav .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav li.vakata-hover > a, .ui-tabs .ui-tabs-nav .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.vakata-hover > a, .ui-tabs .ui-tabs-nav .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .ui-tabs .ui-tabs-nav li.vakata-hover > a, .ui-tabs .ui-tabs-nav .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.vakata-hover > a, .ui-tabs .ui-tabs-nav li .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li a:hover, .ui-tabs .ui-tabs-nav .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .ui-tabs .ui-tabs-nav li.vakata-hover > a, .ui-tabs .ui-tabs-nav .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.vakata-hover > a, .ui-tabs .ui-tabs-nav .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav li.vakata-hover > a, .ui-tabs .ui-tabs-nav .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.vakata-hover > a { display: -moz-inline-stack; display: inline-block; vertical-align: middle; *vertical-align: auto; zoom: 1; *display: inline; float: none; font-weight: bold; color: #444444; line-height: 32px; padding: 0 16px 0; } +.ui-tabs .ui-tabs-nav li:last-child { margin-right: 0; } .ui-tabs .ui-tabs-nav .ui-state-default { border: 1px solid #c0c0c2; background: #ced7dc; } .ui-tabs .ui-tabs-nav .ui-state-default a, .ui-tabs .ui-tabs-nav .ui-state-default .cms .jstree .jstree-wholerow a:hover, .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav .ui-state-default a:hover, .ui-tabs .ui-tabs-nav .ui-state-default .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav .ui-state-default li.vakata-hover > a, .ui-tabs .ui-tabs-nav .ui-state-default .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav .ui-state-default li.vakata-hover > a, .ui-tabs .ui-tabs-nav .ui-state-default .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .ui-tabs .ui-tabs-nav .ui-state-default li.vakata-hover > a, .ui-tabs .ui-tabs-nav .ui-state-default .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav .ui-state-default li.vakata-hover > a, .ui-tabs .ui-tabs-nav .ui-state-default .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav .ui-state-default a:hover, .ui-tabs .ui-tabs-nav .ui-state-default .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .ui-tabs .ui-tabs-nav .ui-state-default li.vakata-hover > a, .ui-tabs .ui-tabs-nav .ui-state-default .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav .ui-state-default li.vakata-hover > a, .ui-tabs .ui-tabs-nav .ui-state-default .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav .ui-state-default li.vakata-hover > a, .ui-tabs .ui-tabs-nav .ui-state-default .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav .ui-state-default li.vakata-hover > a { color: #5e5e5e; text-shadow: #e6e6e6 0 1px 0; } .ui-tabs .ui-tabs-nav .ui-state-active { padding-bottom: 1px; border: 1px solid #c0c0c2; background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; } @@ -314,7 +316,11 @@ body.cms { overflow: hidden; } .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .cms .jstree .jstree-wholerow a:hover, .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active a:hover, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active a:hover, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.gallery.ui-state-active li.vakata-hover > a { background: url('../images/sprites-64x64-s4903182cfd.png') 0 0 no-repeat; } .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .cms .jstree .jstree-wholerow a:hover, .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active a:hover, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active a:hover, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.edit.ui-state-active li.vakata-hover > a { background: url('../images/sprites-64x64-s4903182cfd.png') 0 -350px no-repeat; } .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .cms .jstree .jstree-wholerow a:hover, .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active a:hover, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active a:hover, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav li.cms-tabset-icon.search.ui-state-active li.vakata-hover > a { background: url('../images/sprites-64x64-s4903182cfd.png') 0 -50px no-repeat; } +.ui-tabs .cms-edit-form { padding: 8px 16px 0 16px; } +.ui-tabs .cms-edit-form .ui-tabs-panel { padding-left: 0; padding-right: 0; } +.ui-tabs .cms-edit-form .ui-tabs-nav { padding-right: 0; } .ui-tabs .cms-panel-padded .ui-tabs-panel { padding: 0; } +.ui-tabs .cms-panel-padded .ui-tabs-panel .ui-tabs-panel { padding: 8px 0 0 0; } .ui-tabs.ss-tabset-tabshidden .ui-tabs-panel { border-top: none; } .ui-tabs .ss-ui-button { line-height: 24px; } .ui-tabs .ss-ui-button .ui-button-text { line-height: 1.4; } @@ -327,7 +333,7 @@ body.cms { overflow: hidden; } .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; background: #e6eaed; background: #f0f3f4 url(../images/textures/bg_cms_main_content.png) repeat top left; border-top: none; border-right-color: #b3b3b3; border-left-color: #b3b3b3; z-index: 2; } .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active a, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .cms .jstree .jstree-wholerow a:hover, .cms .jstree .jstree-wholerow .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active a:hover, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active li.vakata-hover > a, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active li.vakata-hover > a, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active li.vakata-hover > a, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active li.vakata-hover > a, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active a:hover, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active li.vakata-hover > a, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active li.vakata-hover > a, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active li.vakata-hover > a, .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs.cms-tabset-primary .ui-tabs-nav .ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .cms .jstree .jstree-wholerow a:hover, .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active a:hover, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active a:hover, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active li.vakata-hover > a, .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .ui-tabs .ui-tabs-nav.cms-tabset-nav-primary .ui-state-active li.vakata-hover > a { border-bottom: none; } -.cms-content-header-tabs { float: right; padding-right: 8px; } +.cms-content-header-tabs { float: right; } /** ------------------------------------------------------- Loading Interface ------------------------------------------------------- */ .cms-content-loading-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 9998; } @@ -518,7 +524,7 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto; .cms-panel .collapsed-flyout { display: block !important; left: 41px; margin-top: -40px; position: fixed; width: 191px; } .cms-panel .collapsed-flyout li a span, .cms-panel .collapsed-flyout li .cms .jstree .jstree-wholerow a:hover span, .cms .jstree .jstree-wholerow .cms-panel .collapsed-flyout li a:hover span, .cms-panel .collapsed-flyout .cms .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a span, .cms .jstree .jstree-wholerow #vakata-contextmenu .cms-panel .collapsed-flyout li.vakata-hover > a span, .cms-panel .collapsed-flyout .cms #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a span, .cms #vakata-contextmenu .jstree .jstree-wholerow .cms-panel .collapsed-flyout li.vakata-hover > a span, .cms-panel .collapsed-flyout .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a span, .cms .jstree .jstree-wholerow .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms-panel .collapsed-flyout li.vakata-hover > a span, .cms-panel .collapsed-flyout .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow li.vakata-hover > a span, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .cms .jstree .jstree-wholerow .cms-panel .collapsed-flyout li.vakata-hover > a span, .cms-panel .collapsed-flyout li .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover span, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms-panel .collapsed-flyout li a:hover span, .cms-panel .collapsed-flyout .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu li.vakata-hover > a span, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms #vakata-contextmenu .cms-panel .collapsed-flyout li.vakata-hover > a span, .cms-panel .collapsed-flyout .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li.vakata-hover > a span, .cms #vakata-contextmenu .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow .cms-panel .collapsed-flyout li.vakata-hover > a span, .cms-panel .collapsed-flyout .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu li.vakata-hover > a span, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow #vakata-contextmenu .cms-panel .collapsed-flyout li.vakata-hover > a span, .cms-panel .collapsed-flyout .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow li.vakata-hover > a span, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .jstree .jstree-wholerow .cms-panel .collapsed-flyout li.vakata-hover > a span { display: block !important; } -.cms .cms-panel-padded { padding: 16px 16px; margin: 0; } +.cms .cms-panel-padded { padding: 8px 16px; margin: 0; } /** ------------------------------------------------------------------ * Dialog diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 30736ba04..8ce732d0d 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -143,21 +143,24 @@ body.cms { .ui-tabs { position: static; } - + + .ui-tabs-panel { + padding: $grid-x 0; + } + .ui-widget-header { border: 0; background: none; } .ui-tabs-panel { - padding: $grid-y; background: transparent; // default it's white } .ui-tabs-nav { float: right; margin: 0 0 -1px 0; - padding: 0 $grid-x 0 0; + padding: 0 $grid-x*2 0 0; border-bottom: none; & ~ .ui-tabs-panel { @@ -178,6 +181,11 @@ body.cms { line-height: $grid-y * 4; padding: 0 $grid-x*2 0; } + + &:last-child { + // correctly right-align last tab + margin-right: 0; + } } .ui-state-default { @@ -228,8 +236,26 @@ body.cms { } } + .cms-edit-form { + padding: $grid-x $grid-y*2 0 $grid-y*2; + + .ui-tabs-panel { + padding-left: 0; + padding-right: 0; + } + + .ui-tabs-nav { + padding-right: 0; + } + } + .cms-panel-padded .ui-tabs-panel { - padding: 0; // Removes double paddle around main pages page, does not effect other areas of the site from what I can tell + padding: 0; // Removes double paddle around main pages page, does not effect other areas of the site + + .ui-tabs-panel { + // Reset nested tabs to default styling + padding: $grid-x 0 0 0; + } } &.ss-tabset-tabshidden .ui-tabs-panel { @@ -297,7 +323,6 @@ body.cms { .cms-content-header-tabs { float: right; - padding-right: $grid-x; } /** ------------------------------------------------------- @@ -1273,7 +1298,7 @@ form.member-profile-form { .cms { .cms-panel-padded { - padding: $grid-y*2 $grid-x*2; + padding: $grid-y $grid-x*2; margin:0; } }