tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00: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; }
/** -------------------------------------------- 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 .cms-tree-view-modes { float: right; padding-top: 5px; }
.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; }
/* -------------------------------------------------------- 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 .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%; }
@ -409,7 +409,7 @@ body.cms { overflow: hidden; }
.cms-content-tools td { border-bottom: 1px solid #ced7dc; padding: 7px 2px; font-size: 11px; }
/** 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 label { display: none; }
.cms-content-batchactions .view-mode-batchactions-wrapper fieldset, .cms-content-batchactions .view-mode-batchactions-wrapper .Actions { display: inline-block; }

39
admin/scss/_style.scss
View File

@ -91,8 +91,8 @@ body.cms {
z-index: 60;
@include box-shadow($color-shadow-dark 0 0 ($grid-x / 2) inset);
background: {
image:url(../images/textures/cms_content_header.png);
repeat:repeat;
image: url(../images/textures/cms_content_header.png);
repeat: repeat;
}
.cms-content-header-info *,
@ -144,7 +144,7 @@ body.cms {
.ui-widget-header .ui-state-default {
border: {
top:none;
}
}
@include box-shadow($color-shadow-light 0 0 2px);
}
@ -156,7 +156,7 @@ body.cms {
}
padding-bottom:0px;
@include box-shadow(none);
}
}
.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
border-radius:0;
}
@ -240,7 +240,7 @@ body.cms {
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.9);
}
}
}
}
.CMSPagesController {
.cms-content-header-tabs {
@ -280,20 +280,20 @@ body.cms {
}
&.content-galleryview a {
background-position: -87px -40px;
}
}
&.content-listview a {
background-position: -38px -40px;
}
}
}
}
}
}
.CMSPageEditController, .CMSPageSettingsController, .CMSPageHistoryController {
.cms-content-header-tabs .ui-tabs-nav .ui-state-active {
background: darken($color-widget-bg, 2%);
}
}
}
/** -------------------------------------------------------
* Loading Interface
@ -484,7 +484,7 @@ body.cms {
overflow: auto;
}
#PageType {
#PageType {
ul {
padding-left: 20px;
li {
@ -541,7 +541,7 @@ body.cms {
}
}
}
}
}
}
/** --------------------------------------------
@ -551,7 +551,7 @@ body.cms {
.cms-content-toolbar {
min-height:35px;
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 legacy-pie-clearfix();
@ -567,7 +567,7 @@ body.cms {
}
}
/* smaller treedropdown */
/* smaller treedropdown */
.chzn-container-single .chzn-single {
height: 26px;
line-height: 26px;
@ -609,7 +609,7 @@ body.cms {
width:24px;
}
}
}
}
/* --------------------------------------------------------
@ -619,7 +619,7 @@ body.cms {
.cms-content-tools {
background-color: #F1F4F5;
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%);
overflow-y: auto;
overflow-x: hidden;
@ -775,7 +775,6 @@ body.cms {
float: left;
position: relative;
display: block;
margin-left: 8px;
.view-mode-batchactions-wrapper {
float: left;
@ -1076,7 +1075,7 @@ form.member-profile-form {
.ui-tabs-nav {
li {
margin:0 0 -1px 0;
}
}
.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
border-radius:0;
}
@ -1136,7 +1135,7 @@ form.member-profile-form {
}
}
}
}
}
/** --------------------------------------------
* "Settings" Form
@ -1198,7 +1197,7 @@ form.member-profile-form {
cursor: pointer;
.cms-panel-header * {
display: none;
display:none;
}
.cms-panel-content {
@ -1663,7 +1662,7 @@ body.cms-dialog {
.filter &{
margin-bottom:0;
}
}
}
/** --------------------------------------------
* Step labels
@ -1784,7 +1783,7 @@ form.small {
.ui-button-text {
padding-left:26px; //to accomodate wider export icon
}
}
}
}
/**