tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Combining CSS in CMS, added AssetAdmin styles

Browse Source
This commit is contained in:
Ingo Schommer 2012-02-23 20:19:03 +01:00
parent 7574c3177d
commit 09fd710dd4
9 changed files with 114 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/AssetAdmin.php
View File

@ -57,7 +57,7 @@ class AssetAdmin extends LeftAndMain {
Requirements::javascript(CMS_DIR . "/javascript/AssetAdmin.js");
Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang', false, true);
Requirements::css(CMS_DIR . "/css/AssetAdmin.css");
Requirements::css(CMS_DIR . "/css/screen.css");
Requirements::customScript(<<<JS
_TREE_ICONS = {};

2
code/controllers/CMSMain.php
View File

@ -58,7 +58,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
parent::init();
Requirements::css(CMS_DIR . '/css/CMSMain.css');
Requirements::css(CMS_DIR . '/css/screen.css');
Requirements::combine_files(
'cmsmain.js',

2
code/controllers/ReportAdmin.php
View File

@ -26,7 +26,7 @@ class ReportAdmin extends LeftAndMain {
public function init() {
parent::init();
Requirements::css(CMS_DIR . '/css/ReportAdmin.css');
Requirements::css(CMS_DIR . '/css/screen.css');
// Set custom options for TinyMCE specific to ReportAdmin
HtmlEditorConfig::get('cms')->setOption('ContentCSS', project() . '/css/editor.css');

35
css/screen.css Normal file
View File

@ -0,0 +1,35 @@
/** This file is the central collection of included modules, links to custom SCSS files, and any global SCSS variable definitions. DO NOT ADD stylesheet rules to this file directly! Note: By prefixing files with an underscore, they won't create individual CSS files. */
/** ----------------------------- Core Compass Libraries ------------------------------ */
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font-size: 100%; font: inherit; vertical-align: baseline; }
body { line-height: 1; }
ol, ul { list-style: none; }
table { border-collapse: collapse; border-spacing: 0; }
caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }
q, blockquote { quotes: none; }
q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; }
a img { border: none; }
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; }
/** ----------------------------- CMS Components ------------------------------ */
/** Style custom to the CMSMain admin interface. CMSMain extends the built in sapphire admin section styles. As much as possible we want to use those built in styles. If anything in this file can be implemented in a generic way then it should be include in the admin scss files. @package cms */
/** ------------------------------------------------------------------ Page History Section. ----------------------------------------------------------------- */
#cms-page-history-versions tr.loading { color: #999; }
#cms-page-history-versions tr.loading td:hover { cursor: none; }
#cms-page-history-versions td:hover { cursor: pointer; }
.CMSPageHistoryController ins { background-color: #DFD; padding: 2px; text-decoration: none; }
.CMSPageHistoryController del { background-color: #FDD; padding: 2px; color: #ff4444; }
.cms .AssetAdmin #Form_EditForm_File td { padding-top: 0; padding-bottom: 0; }
.cms .AssetAdmin #Form_EditForm_File td.col-StripThumbnail { padding: 0; width: 32px; height: 32px; display: block; }
.cms .AssetAdmin #Form_EditForm_File td.col-StripThumbnail img { width: 32px; height: 32px; }
.cms .AssetAdmin #Form_EditForm_File tr[data-class=Folder] td.col-StripThumbnail { background: transparent url(../../sapphire/admin/images/sprites-32x32/blue-folder-horizontal.png) no-repeat top left; }
.cms .AssetAdmin #Form_EditForm_File tr[data-class=File] td.col-StripThumbnail { background: transparent url(../../sapphire/admin/images/sprites-32x32/blue-document.png) no-repeat top left; }
.cms .AssetAdmin #Form_EditForm_File td.col-Title { cursor: pointer; }

19
scss/AssetAdmin.scss Normal file
View File

@ -0,0 +1,19 @@
.cms .AssetAdmin {
#Form_EditForm_File {
td.col-StripThumbnail {
padding: 0;
img {
width: 32px;
height: 32px;
}
}
tr td.col-StripThumbnail {
// TODO Figure out how to share sprites and SCSS rules between sapphire/admin/scss and cms/scss
background: transparent url(../../sapphire/admin/images/sprites-32x32/blue-folder-horizontal.png) no-repeat top left;
}
td.col-Title {
cursor: pointer;
}
}
}

34
scss/_AssetAdmin.scss Normal file
View File

@ -0,0 +1,34 @@
.cms .AssetAdmin {
#Form_EditForm_File {
td {
// Taken care of by minimum image sizes
padding-top: 0;
padding-bottom: 0;
}
td.col-StripThumbnail {
padding: 0;
width: 32px;
height: 32px;
display: block;
img {
width: 32px;
height: 32px;
}
}
// TODO Figure out how to share sprites and SCSS rules between sapphire/admin/scss and cms/scss
tr[data-class=Folder] {
td.col-StripThumbnail {
background: transparent url(../../sapphire/admin/images/sprites-32x32/blue-folder-horizontal.png) no-repeat top left;
}
}
tr[data-class=File] {
td.col-StripThumbnail {
background: transparent url(../../sapphire/admin/images/sprites-32x32/blue-document.png) no-repeat top left;
}
}
td.col-Title {
cursor: pointer;
}
}
}

0
scss/CMSMain.scss → scss/_CMSMain.scss
View File

0
scss/ReportAdmin.scss → scss/_ReportAdmin.scss
View File

23
scss/screen.scss Normal file
View File

@ -0,0 +1,23 @@
/**
* This file is the central collection of included modules, links to custom SCSS files,
* and any global SCSS variable definitions.
*
* DO NOT ADD stylesheet rules to this file directly!
*
* Note: By prefixing files with an underscore, they won't create individual CSS files.
*/
/** -----------------------------
* Core Compass Libraries
* ------------------------------ */
@import "compass/reset";
@import "compass/css3";
@import "compass/utilities/sprites/sprite-img";
@import "compass/utilities/general";
/** -----------------------------
* CMS Components
* ------------------------------ */
@import "CMSMain.scss";
@import "AssetAdmin.scss";
@import "ReportAdmin.scss";