Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

ENHANCEMENT:Trac#7166 - styled the new combined tree and edit view.

  • Loading branch information...
commit 1e25637acb37a58c39806c76b818a9db537123e1 1 parent 0f7dd79
Jeremy Bridson authored
Showing with 20 additions and 2 deletions.
  1. +4 −1 css/screen.css
  2. +16 −1 scss/_CMSMain.scss
View
5 css/screen.css
@@ -13,8 +13,11 @@
/** -------------------------------------------- Tree View (collapsed for sidebar) -------------------------------------------- */
#cms-content-treeview .cms-tree-expand-trigger { display: none; }
+.cms-content-tools #cms-content-treeview .cms-content-toolbar { border-bottom: none; box-shadow: none; margin-bottom: 8px; }
+.cms-content-tools #cms-content-treeview .cms-content-toolbar .cms-page-add-button { margin-top: 8px; }
.cms-content-tools #cms-content-treeview .cms-tree-view-modes, .cms-content-tools #cms-content-treeview .cms-content-batchactions { display: none; }
-.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; }
+.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger { display: inline-block; margin: 0 0 2px 0; position: absolute; top: 8px; right: 4px; }
+.cms-content-tools #cms-content-treeview .cms-tree-expand-trigger span.ui-button-text { padding-right: 8px; }
.cms-content-tools #cms-content-treeview .cms-tree .badge, .cms-content-tools #cms-content-treeview .cms-tree a > .jstree-icon { display: none; }
.cms .AssetAdmin .cms-content-fields { overflow: hidden; }
View
17 scss/_CMSMain.scss
@@ -55,12 +55,27 @@
.cms-content-tools { // Hide certain elements when shown in "sidebar mode"
#cms-content-treeview {
+ .cms-content-toolbar {
+ border-bottom:none;
+ box-shadow:none;
+ margin-bottom:8px;
+ .cms-page-add-button {
+ margin-top:8px;
@ajshort
ajshort added a note

Just wondering why this was added? The Add New button is no longer aligned when the tree is shown in the sidebar.

Sorry I wrote that quite awhile ago and can't remember exactly why I did it. I can't see what you mean about the Add New button not being aligned though. If you create a new ticket on open.silverstripe.org for the bug then someone can take a look at it.

Cheers.

@chillu Owner
chillu added a note
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ }
+ }
.cms-tree-view-modes,
.cms-content-batchactions {
display: none;
}
.cms-tree-expand-trigger {
- display: inline-block;
+ display: inline-block;
+ margin:0 0 2px 0;
+ position:absolute;
+ top:8px;
+ right:4px;
+ span.ui-button-text{
+ padding-right:8px;
+ }
}
.cms-tree {
Please sign in to comment.
Something went wrong with that request. Please try again.