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

Replace Layout with flexbox CSS classes

Browse Source
This commit is contained in:
Paul Clarke 2016-10-05 17:46:49 +13:00 committed by Damian Mooyman
parent e71f39d171
commit a37bf87857
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/client/dist/styles/bundle.css vendored
View File

@ -7457,6 +7457,7 @@ h1{
.table thead th{ .table thead th{
border:0; border:0;
background-color:transparent;
} }
.table td,.table th{ .table td,.table th{
@ -15381,7 +15382,6 @@ div.grid-field__sort-field+.form__fieldgroup-item{
padding-left:1.5385rem; padding-left:1.5385rem;
padding-right:1.5385rem; padding-right:1.5385rem;
height:53px; height:53px;
background-color:#f6f7f8;
width:100%; width:100%;
} }

2
admin/client/src/components/Toolbar/Toolbar.scss
View File

@ -4,7 +4,6 @@
.toolbar--south { .toolbar--south {
@include make-container(); @include make-container();
height: $toolbar-total-height; height: $toolbar-total-height;
background-color: $body-bg;
width: 100%; width: 100%;
.btn-toolbar { .btn-toolbar {
@ -44,6 +43,7 @@
margin-right: -$panel-padding-x; margin-right: -$panel-padding-x;
padding: $spacer-xs; padding: $spacer-xs;
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
// If toolbar has too many items for smaller screens // If toolbar has too many items for smaller screens

4
admin/code/SecurityAdmin.php
View File

@ -217,13 +217,13 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
$fields, $fields,
$actions $actions
)->setHTMLID('Form_EditForm'); )->setHTMLID('Form_EditForm');
$form->addExtraClass('cms-edit-form'); $form->addExtraClass('cms-edit-form fill-height');
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm')); $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
// Tab nav in CMS is rendered through separate template // Tab nav in CMS is rendered through separate template
if($form->Fields()->hasTabSet()) { if($form->Fields()->hasTabSet()) {
$form->Fields()->findOrMakeTab('Root')->setTemplate('SilverStripe\\Forms\\CMSTabSet'); $form->Fields()->findOrMakeTab('Root')->setTemplate('SilverStripe\\Forms\\CMSTabSet');
} }
$form->addExtraClass('center ss-tabset cms-tabset ' . $this->BaseCSSClasses()); $form->addExtraClass('ss-tabset cms-tabset ' . $this->BaseCSSClasses());
$form->setAttribute('data-pjax-fragment', 'CurrentForm'); $form->setAttribute('data-pjax-fragment', 'CurrentForm');
$this->extend('updateEditForm', $form); $this->extend('updateEditForm', $form);

2
admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Content.ss
View File

@ -1,4 +1,4 @@
<div class="cms-content $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content"> <div class="cms-content flexbox-area-grow $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
$Tools $Tools

2
admin/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
View File

@ -27,7 +27,7 @@
$EditFormTools $EditFormTools
<% end_with %> <% end_with %>
<div class="panel panel--padded cms-content-fields panel--double-toolbar <% if not $Fields.hasTabset %>cms-panel-padded<% end_if %>"> <div class="panel panel--padded panel--scrollable flexbox-area-grow <% if not $Fields.hasTabset %>cms-panel-padded<% end_if %>">
<% if $Message %> <% if $Message %>
<p id="{$FormName}_error" class="message $MessageType">$Message</p> <p id="{$FormName}_error" class="message $MessageType">$Message</p>
<% else %> <% else %>