tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 13:48:37 +02:00
Code Issues Projects Releases Wiki Activity

Wider side panel to fit "add" and "edit" button

Browse Source 
Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.

Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
This commit is contained in:
Ingo Schommer 2012-12-17 11:27:24 +01:00
parent dc43a6b0f6
commit 432ff753c2
2 changed files with 135 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/css/screen.css
View File

@ -368,7 +368,7 @@ body.cms { overflow: hidden; }
.cms-add-form #PageType ul li .description { font-style: italic; } .cms-add-form #PageType ul li .description { font-style: italic; }
/** -------------------------------------------- Content toolbar -------------------------------------------- */ /** -------------------------------------------- Content toolbar -------------------------------------------- */
.cms-content-toolbar { min-height: 35px; display: block; margin: 0 0 15px 0; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); *zoom: 1; /* smaller treedropdown */ } .cms-content-toolbar { min-height: 35px; display: block; margin: 0 0 8px 0; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); *zoom: 1; /* smaller treedropdown */ }
.cms-content-toolbar:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; } .cms-content-toolbar:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; }
.cms-content-toolbar .cms-tree-view-modes { float: right; padding-top: 5px; } .cms-content-toolbar .cms-tree-view-modes { float: right; padding-top: 5px; }
.cms-content-toolbar .cms-tree-view-modes * { display: inline-block; } .cms-content-toolbar .cms-tree-view-modes * { display: inline-block; }
@ -381,7 +381,7 @@ body.cms { overflow: hidden; }
.cms-content-toolbar .chzn-container-single .chzn-single div b { background: url(../images/sprites-32x32/menu-arrow-deselected-down.png) no-repeat 9px 11px; float: right; width: 24px; } .cms-content-toolbar .chzn-container-single .chzn-single div b { background: url(../images/sprites-32x32/menu-arrow-deselected-down.png) no-repeat 9px 11px; float: right; width: 24px; }
/* -------------------------------------------------------- Content Tools is the sidebar on the left of the main content panel */ /* -------------------------------------------------------- Content Tools is the sidebar on the left of the main content panel */
.cms-content-tools { background-color: #F1F4F5; background: #f0f3f4 url(../images/textures/bg_cms_main_content.png) repeat top left; width: 192px; border-right: 1px solid #bfcad2; overflow-y: auto; overflow-x: hidden; z-index: 70; -webkit-box-shadow: rgba(0, 0, 0, 0.6) 0 2px 3px; -moz-box-shadow: rgba(0, 0, 0, 0.6) 0 2px 3px; box-shadow: rgba(0, 0, 0, 0.6) 0 2px 3px; float: left; position: relative; } .cms-content-tools { background-color: #F1F4F5; background: #f0f3f4 url(../images/textures/bg_cms_main_content.png) repeat top left; width: 200px; border-right: 1px solid #bfcad2; overflow-y: auto; overflow-x: hidden; z-index: 70; -webkit-box-shadow: rgba(0, 0, 0, 0.6) 0 2px 3px; -moz-box-shadow: rgba(0, 0, 0, 0.6) 0 2px 3px; box-shadow: rgba(0, 0, 0, 0.6) 0 2px 3px; float: left; position: relative; }
.cms-content-tools.filter { padding: 0 !important; } .cms-content-tools.filter { padding: 0 !important; }
.cms-content-tools .cms-panel-header { clear: both; margin: 0 0 7px; line-height: 24px; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); } .cms-content-tools .cms-panel-header { clear: both; margin: 0 0 7px; line-height: 24px; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
.cms-content-tools .cms-panel-content { width: 184px; padding: 8px 8px 0; overflow: auto; height: 100%; } .cms-content-tools .cms-panel-content { width: 184px; padding: 8px 8px 0; overflow: auto; height: 100%; }
@ -409,7 +409,7 @@ body.cms { overflow: hidden; }
.cms-content-tools td { border-bottom: 1px solid #ced7dc; padding: 7px 2px; font-size: 11px; } .cms-content-tools td { border-bottom: 1px solid #ced7dc; padding: 7px 2px; font-size: 11px; }
/** CMS Batch actions */ /** CMS Batch actions */
.cms-content-batchactions { float: left; position: relative; display: block; margin-left: 8px; } .cms-content-batchactions { float: left; position: relative; display: block; }
.cms-content-batchactions .view-mode-batchactions-wrapper { float: left; padding: 4px 6px; border: 1px solid #aaa; margin-bottom: 8px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -o-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(top, #ffffff, #d9d9d9); border-top-left-radius: 4px; border-bottom-left-radius: 4px; } .cms-content-batchactions .view-mode-batchactions-wrapper { float: left; padding: 4px 6px; border: 1px solid #aaa; margin-bottom: 8px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9); background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9); background-image: -o-linear-gradient(top, #ffffff, #d9d9d9); background-image: linear-gradient(top, #ffffff, #d9d9d9); border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
.cms-content-batchactions .view-mode-batchactions-wrapper label { display: none; } .cms-content-batchactions .view-mode-batchactions-wrapper label { display: none; }
.cms-content-batchactions .view-mode-batchactions-wrapper fieldset, .cms-content-batchactions .view-mode-batchactions-wrapper .Actions { display: inline-block; } .cms-content-batchactions .view-mode-batchactions-wrapper fieldset, .cms-content-batchactions .view-mode-batchactions-wrapper .Actions { display: inline-block; }

265
admin/scss/_style.scss
View File

@ -91,8 +91,8 @@ body.cms {
z-index: 60; z-index: 60;
@include box-shadow($color-shadow-dark 0 0 ($grid-x / 2) inset); @include box-shadow($color-shadow-dark 0 0 ($grid-x / 2) inset);
background: { background: {
image:url(../images/textures/cms_content_header.png); image: url(../images/textures/cms_content_header.png);
repeat:repeat; repeat: repeat;
} }
.cms-content-header-info *, .cms-content-header-info *,
@ -136,36 +136,36 @@ body.cms {
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
padding: 0 $grid-x*2; padding: 0 $grid-x*2;
} }
} }
.ui-state-default, .ui-state-default,
.ui-widget-content .ui-state-default, .ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default { .ui-widget-header .ui-state-default {
border: { border: {
top:none; top:none;
} }
@include box-shadow($color-shadow-light 0 0 2px); @include box-shadow($color-shadow-light 0 0 2px);
} }
.ui-state-active, .ui-state-active,
.ui-widget-content .ui-state-active, .ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active { .ui-widget-header .ui-state-active {
border: { border: {
top:none; top:none;
} }
padding-bottom:0px; padding-bottom:0px;
@include box-shadow(none); @include box-shadow(none);
} }
.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
border-radius:0; border-radius:0;
} }
.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
border-radius:0; border-radius:0;
}
} }
} }
}
// Reset to default styles // Reset to default styles
.ss-ui-button { .ss-ui-button {
@ -176,14 +176,14 @@ body.cms {
} }
} }
} }
.cms-edit-form { .cms-edit-form {
.cms-content-header-tabs { .cms-content-header-tabs {
.ui-tabs-nav { .ui-tabs-nav {
li { li {
a { a {
text-indent:0; text-indent:0;
} }
} }
} }
} }
@ -195,13 +195,13 @@ body.cms {
.cms-content-header .ui-tabs-nav, .cms-dialog .ui-tabs-nav { .cms-content-header .ui-tabs-nav, .cms-dialog .ui-tabs-nav {
li { li {
margin:0; margin:0;
a { a {
font-weight: bold; font-weight: bold;
line-height: $grid-y * 2; line-height: $grid-y * 2;
padding: ($grid-y * 2 - 4) ($grid-x * 2 + 4) $grid-y + 3; padding: ($grid-y * 2 - 4) ($grid-x * 2 + 4) $grid-y + 3;
}
} }
}
.ui-state-default, .ui-state-default,
.ui-widget-content .ui-state-default, .ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default { .ui-widget-header .ui-state-default {
@ -210,18 +210,18 @@ body.cms {
@include background-image( @include background-image(
linear-gradient($color-base, darken($color-base, 12%)) linear-gradient($color-base, darken($color-base, 12%))
); );
border: { border: {
right-color: darken($color-base, 15%); right-color: darken($color-base, 15%);
left-color: lighten($color-base, 10%); left-color: lighten($color-base, 10%);
} }
a { a {
color: #FFF; color: #FFF;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
}
} }
}
.ui-state-active, .ui-state-active,
.ui-widget-content .ui-state-active, .ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active { .ui-widget-header .ui-state-active {
@ -233,14 +233,14 @@ body.cms {
margin-right:-1px; margin-right:-1px;
margin-left:-1px; margin-left:-1px;
z-index:2; z-index:2;
a { a {
border-bottom: none; border-bottom: none;
color: $color-text; color: $color-text;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.9); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.9);
}
} }
} }
}
.CMSPagesController { .CMSPagesController {
.cms-content-header-tabs { .cms-content-header-tabs {
@ -254,46 +254,46 @@ body.cms {
text-indent: -9999em; text-indent: -9999em;
display: block; display: block;
background: url(../images/content-header-tabs-sprite.png) no-repeat; background: url(../images/content-header-tabs-sprite.png) no-repeat;
} }
&.content-treeview a { &.content-treeview a {
background-position: 2px 0px; background-position: 2px 0px;
} }
&.content-galleryview a { &.content-galleryview a {
background-position: -87px 0px; background-position: -87px 0px;
} }
&.content-listview a { &.content-listview a {
background-position: -38px 0px; background-position: -38px 0px;
} }
} }
.ui-state-active, .ui-state-active,
.ui-widget-content .ui-state-active, .ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active { .ui-widget-header .ui-state-active {
border: { border: {
top:none; top:none;
} }
padding-bottom:1px; padding-bottom:1px;
&.content-treeview a { &.content-treeview a {
background-position: 2px -40px; background-position: 2px -40px;
} }
&.content-galleryview a { &.content-galleryview a {
background-position: -87px -40px; background-position: -87px -40px;
} }
&.content-listview a { &.content-listview a {
background-position: -38px -40px; background-position: -38px -40px;
}
}
} }
} }
} }
}
}
.CMSPageEditController, .CMSPageSettingsController, .CMSPageHistoryController { .CMSPageEditController, .CMSPageSettingsController, .CMSPageHistoryController {
.cms-content-header-tabs .ui-tabs-nav .ui-state-active { .cms-content-header-tabs .ui-tabs-nav .ui-state-active {
background: darken($color-widget-bg, 2%); background: darken($color-widget-bg, 2%);
} }
} }
/** ------------------------------------------------------- /** -------------------------------------------------------
* Loading Interface * Loading Interface
@ -358,7 +358,7 @@ body.cms {
@include border-radius(5px); @include border-radius(5px);
display: inline-block; display: inline-block;
zoom: 1; zoom: 1;
*display: inline; *display: inline;
} }
} }
@ -393,16 +393,16 @@ body.cms {
margin: 0 0 $grid-y 0; margin: 0 0 $grid-y 0;
padding: $grid-y - 1 $grid-x - 1; padding: $grid-y - 1 $grid-x - 1;
font-weight: bold; font-weight: bold;
border: 1px black solid; border: 1px black solid;
&.notice { &.notice {
background-color: lighten($color-notice, 20%); background-color: lighten($color-notice, 20%);
border-color: $color-notice; border-color: $color-notice;
a { a {
color: #999; color: #999;
} }
} }
&.warning { &.warning {
@ -412,7 +412,7 @@ body.cms {
&.error, &.bad, &.required, &.validation { &.error, &.bad, &.required, &.validation {
background-color: lighten($color-error, 20%); background-color: lighten($color-error, 20%);
border-color: $color-error; border-color: $color-error;
} }
&.good { &.good {
background-color: $color-good;//for browsers that don't understand rgba background-color: $color-good;//for browsers that don't understand rgba
@ -474,7 +474,7 @@ body.cms {
padding-top:5px; //aligns label with point of arrow padding-top:5px; //aligns label with point of arrow
font-weight:bold; //to match pagetype label font-weight:bold; //to match pagetype label
@include text-shadow(1px 1px 0 $color-text-shadow); @include text-shadow(1px 1px 0 $color-text-shadow);
} }
} }
ul.SelectionGroup { ul.SelectionGroup {
padding-left:28px; padding-left:28px;
@ -482,66 +482,66 @@ body.cms {
.parent-mode { .parent-mode {
padding: $grid-x; padding: $grid-x;
overflow: auto; overflow: auto;
} }
#PageType { #PageType {
ul { ul {
padding-left: 20px; padding-left: 20px;
li { li {
float: none; float: none;
width: 100%; width: 100%;
padding: 9px 0 9px 15px; padding: 9px 0 9px 15px;
overflow: hidden; overflow: hidden;
border-bottom-width: 2px; border-bottom-width: 2px;
border-bottom: 2px groove lighten($color-shadow-light, 95%); border-bottom: 2px groove lighten($color-shadow-light, 95%);
-webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; -webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch;
border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch;
&:last-child { &:last-child {
border-bottom: none; border-bottom: none;
} }
&:hover, &.selected { &:hover, &.selected {
background-color: $color-highlight-opacity; background-color: $color-highlight-opacity;
} }
&.disabled { &.disabled {
color: $color-text-disabled; color: $color-text-disabled;
&:hover { &:hover {
background: none; background: none;
}
}
input {
margin: inherit;
}
label {
padding-left: 0;
padding-bottom: 0;
}
input, label, .page-icon, .title {
float: left;
line-height: 1.3em;
}
.page-icon {
margin: 0 4px;
}
.title {
width: 120px;
font-weight: bold;
padding-right: 10px;
}
.description {
font-style: italic;
} }
} }
}
input {
margin: inherit;
}
label {
padding-left: 0;
padding-bottom: 0;
}
input, label, .page-icon, .title {
float: left;
line-height: 1.3em;
}
.page-icon {
margin: 0 4px;
}
.title {
width: 120px;
font-weight: bold;
padding-right: 10px;
}
.description {
font-style: italic;
}
}
} }
}
} }
/** -------------------------------------------- /** --------------------------------------------
@ -551,7 +551,7 @@ body.cms {
.cms-content-toolbar { .cms-content-toolbar {
min-height:35px; min-height:35px;
display: block; display: block;
margin: 0 0 15px 0; margin: 0 0 $grid-y 0;
@include doubleborder(bottom, $color-light-separator, lighten($color-light-separator, 50%)); @include doubleborder(bottom, $color-light-separator, lighten($color-light-separator, 50%));
@include legacy-pie-clearfix(); @include legacy-pie-clearfix();
@ -567,7 +567,7 @@ body.cms {
} }
} }
/* smaller treedropdown */ /* smaller treedropdown */
.chzn-container-single .chzn-single { .chzn-container-single .chzn-single {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
@ -609,7 +609,7 @@ body.cms {
width:24px; width:24px;
} }
} }
} }
/* -------------------------------------------------------- /* --------------------------------------------------------
@ -619,7 +619,7 @@ body.cms {
.cms-content-tools { .cms-content-tools {
background-color: #F1F4F5; background-color: #F1F4F5;
background: $tab-panel-texture-background; // Pages bg panel look like same as pages view background: $tab-panel-texture-background; // Pages bg panel look like same as pages view
width: $grid-x * 24; width: $grid-x * 25;
border-right: 1px solid darken($color-widget-bg, 15%); border-right: 1px solid darken($color-widget-bg, 15%);
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
@ -775,7 +775,6 @@ body.cms {
float: left; float: left;
position: relative; position: relative;
display: block; display: block;
margin-left: 8px;
.view-mode-batchactions-wrapper { .view-mode-batchactions-wrapper {
float: left; float: left;
@ -850,7 +849,7 @@ body.cms {
display: none; display: none;
width: 1px; // collapsed by default width: 1px; // collapsed by default
z-index: 100; z-index: 100;
.cms-preview-toggle { .cms-preview-toggle {
width: 10px; width: 10px;
cursor: pointer; cursor: pointer;
@ -1023,7 +1022,7 @@ form.member-profile-form {
.Actions { .Actions {
text-align: left; text-align: left;
border: 0; border: 0;
} }
input.customFormat { input.customFormat {
width: $grid-x * 10; width: $grid-x * 10;
@ -1076,14 +1075,14 @@ form.member-profile-form {
.ui-tabs-nav { .ui-tabs-nav {
li { li {
margin:0 0 -1px 0; margin:0 0 -1px 0;
} }
.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
border-radius:0; border-radius:0;
} }
.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
border-radius:0; border-radius:0;
} }
} }
} }
@ -1119,7 +1118,7 @@ form.member-profile-form {
ul.optionset li { ul.optionset li {
float:none; float:none;
} }
} }
.field { .field {
.fieldholder-small { // Small fields have a second set of headers .fieldholder-small { // Small fields have a second set of headers
@ -1136,8 +1135,8 @@ form.member-profile-form {
} }
} }
} }
} }
/** -------------------------------------------- /** --------------------------------------------
* "Settings" Form * "Settings" Form
* -------------------------------------------- */ * -------------------------------------------- */
@ -1191,20 +1190,20 @@ form.member-profile-form {
&.south { &.south {
border-top: 1px solid #FFF; border-top: 1px solid #FFF;
} }
} }
&.collapsed { &.collapsed {
cursor: pointer; cursor: pointer;
.cms-panel-header * { .cms-panel-header * {
display: none; display:none;
} }
.cms-panel-content { .cms-panel-content {
display: none; display: none;
} }
//.cms-panel-header { //.cms-panel-header {
// @include rotate(-90deg); // @include rotate(-90deg);
// position: relative; // position: relative;
@ -1326,13 +1325,13 @@ form.member-profile-form {
// Elements with this class can either frame inline markup or an iframe, // Elements with this class can either frame inline markup or an iframe,
// most styles should be applied to .cms-dialog instead (which declares the content in the frame) // most styles should be applied to .cms-dialog instead (which declares the content in the frame)
.ui-dialog { .ui-dialog {
background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4; background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4;
border: 3px solid #000 !important; border: 3px solid #000 !important;
border-radius: $grid-y; border-radius: $grid-y;
overflow: visible; overflow: visible;
padding: 0; padding: 0;
// Titlebar for pop-up dialog. // Titlebar for pop-up dialog.
.ui-dialog-titlebar.ui-widget-header { .ui-dialog-titlebar.ui-widget-header {
font-size: $font-base-size+2; font-size: $font-base-size+2;
padding: 0; padding: 0;
@ -1371,7 +1370,7 @@ form.member-profile-form {
&.ui-tabs { &.ui-tabs {
background: none; background: none;
.ui-tabs-nav { .ui-tabs-nav {
border: none; border: none;
padding: 0 $grid-x*5 0 0; //allows for 40px gap to the right of tabs to match the tabs on main CMS padding: 0 $grid-x*5 0 0; //allows for 40px gap to the right of tabs to match the tabs on main CMS
float:right; float:right;
@ -1381,7 +1380,7 @@ form.member-profile-form {
&.ui-tabs-selected { &.ui-tabs-selected {
margin-bottom: -1px; margin-bottom: -1px;
padding-bottom:11px; padding-bottom:11px;
} }
&:first-child { &:first-child {
margin-left: 15px; margin-left: 15px;
@ -1443,14 +1442,14 @@ form.member-profile-form {
} }
.ui-tabs-panel { .ui-tabs-panel {
background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4; background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4;
overflow-x:hidden; overflow-x:hidden;
clear:both; clear:both;
border-top: 1px solid darken($color-tab, 20%); border-top: 1px solid darken($color-tab, 20%);
}
} }
} }
}
.clear { .clear {
clear: both; clear: both;
} }
@ -1492,10 +1491,10 @@ body.cms-dialog {
position: relative; position: relative;
label { label {
position: absolute; position: absolute;
left: 8px; left: 8px;
top: 13px; top: 13px;
font-weight: normal; color: #888; font-weight: normal; color: #888;
} }
.middleColumn { .middleColumn {
@ -1663,7 +1662,7 @@ body.cms-dialog {
.filter &{ .filter &{
margin-bottom:0; margin-bottom:0;
} }
} }
/** -------------------------------------------- /** --------------------------------------------
* Step labels * Step labels
@ -1698,7 +1697,7 @@ body.cms-dialog {
.title { .title {
height: 26px - 2*4px; // minus padding height: 26px - 2*4px; // minus padding
padding: 4px; padding: 4px;
} }
} }
@ -1783,9 +1782,9 @@ form.small {
} }
.ui-button-text { .ui-button-text {
padding-left:26px; //to accomodate wider export icon padding-left:26px; //to accomodate wider export icon
}
} }
} }
}
/** /**
* Import forms * Import forms
@ -1831,7 +1830,7 @@ form.import-form {
font-weight: bold; font-weight: bold;
line-height: $grid-y * 2; line-height: $grid-y * 2;
padding: $grid-y $grid-x*2.5 $grid-y; padding: $grid-y $grid-x*2.5 $grid-y;
} }
} }
.ui-state-default, .ui-state-default,
.ui-widget-content .ui-state-default, .ui-widget-content .ui-state-default,
@ -1896,7 +1895,7 @@ form.import-form {
.ss-uploadfield-item-edit-all .ui-button-text{ .ss-uploadfield-item-edit-all .ui-button-text{
padding-right:0; padding-right:0;
} }
.toggle-details-icon { .toggle-details-icon {