From c0282789579c745418cf227556b67c6724916839 Mon Sep 17 00:00:00 2001 From: scott1702 Date: Tue, 25 Aug 2015 15:08:09 +1200 Subject: [PATCH] Update font icons to use new library --- code/controllers/AssetAdmin.php | 6 +-- css/screen.css | 9 ---- scss/_CMSMain.scss | 42 ------------------- templates/Includes/AssetAdmin_Content.ss | 2 +- templates/Includes/CMSMain_Content.ss | 2 +- .../Includes/CMSPagesController_Content.ss | 2 +- .../CMSPagesController_ContentToolActions.ss | 2 +- 7 files changed, 7 insertions(+), 58 deletions(-) diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index 4339b958..84b9868a 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -192,7 +192,7 @@ JS $uploadBtn = new LiteralField( 'UploadButton', sprintf( - '%s', + '%s', Controller::join_links(singleton('CMSFileAddController')->Link(), '?ID=' . $folder->ID), _t('Folder.UploadFilesButton', 'Upload') ) @@ -206,7 +206,7 @@ JS $addFolderBtn = new LiteralField( 'AddFolderButton', sprintf( - '%s', + '%s', Controller::join_links($this->Link('AddForm'), '?' . http_build_query(array( 'action_doAdd' => 1, 'ParentID' => $folder->ID, @@ -224,7 +224,7 @@ JS $syncButton = new LiteralField( 'SyncButton', sprintf( - '%s', + '%s', _t('AssetAdmin.FILESYSTEMSYNCTITLE', 'Update the CMS database entries of files on the filesystem. Useful when new files have been uploaded outside of the CMS, e.g. through FTP.'), $this->Link('doSync'), _t('AssetAdmin.FILESYSTEMSYNC','Sync files') diff --git a/css/screen.css b/css/screen.css index f98442e3..ea2af2f1 100644 --- a/css/screen.css +++ b/css/screen.css @@ -20,15 +20,6 @@ .cms-content-tools #cms-content-treeview .cms-tree .badge { display: none; } .cms-content-tools #cms-content-treeview .cms-tree a:hover > .text > .badge, .cms-content-tools #cms-content-treeview .cms-tree .jstree-clicked > .text > .badge { display: inline-block; } -/** -------------------------------------------- The CMS Content Toolbar. Associated behaviour in CMSMain.js -------------------------------------------- */ -.cms-content-toolbar [class*="font-icon-"].ss-ui-button, .cms-content-toolbar [class^="font-icon-"].ss-ui-button { padding: 5px 8px; vertical-align: middle; } -.cms-content-toolbar [class*="font-icon-"].ss-ui-button:hover, .cms-content-toolbar [class^="font-icon-"].ss-ui-button:hover { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.cms-content-toolbar [class*="font-icon-"].ss-ui-button:focus, .cms-content-toolbar [class^="font-icon-"].ss-ui-button:focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.cms-content-toolbar [class*="font-icon-"].ss-ui-button:before, .cms-content-toolbar [class^="font-icon-"].ss-ui-button:before { font-size: 1.3em; margin-right: 0.3em; margin-top: 0; vertical-align: middle; } -.cms-content-toolbar [class*="font-icon-"].ss-ui-button.ui-state-focus, .cms-content-toolbar [class^="font-icon-"].ss-ui-button.ui-state-focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.cms-content-toolbar [class*="font-icon-"].ss-ui-button.active, .cms-content-toolbar [class*="font-icon-"].ss-ui-button:active, .cms-content-toolbar [class^="font-icon-"].ss-ui-button.active, .cms-content-toolbar [class^="font-icon-"].ss-ui-button:active { -moz-box-shadow: 0 0 3px rgba(191, 194, 196, 0.9) inset; -webkit-box-shadow: 0 0 3px rgba(191, 194, 196, 0.9) inset; box-shadow: 0 0 3px rgba(191, 194, 196, 0.9) inset; } -.cms-content-toolbar [class*="font-icon-"].ss-ui-button .ui-button-text, .cms-content-toolbar [class^="font-icon-"].ss-ui-button .ui-button-text { display: inline-block; vertical-align: middle; *vertical-align: auto; *zoom: 1; *display: inline; vertical-align: baseline; padding: 0; } - /** ------------------------------------------------------------------ URLSegment field ----------------------------------------------------------------- */ .field.urlsegment.loading { background: url(../images/loading.gif) no-repeat 162px 8px; } .field.urlsegment .preview { padding-top: 8px; display: inline-block; } diff --git a/scss/_CMSMain.scss b/scss/_CMSMain.scss index e82336e5..cd86c654 100644 --- a/scss/_CMSMain.scss +++ b/scss/_CMSMain.scss @@ -90,48 +90,6 @@ } } -/** -------------------------------------------- - * The CMS Content Toolbar. - * Associated behaviour in CMSMain.js - * -------------------------------------------- */ -.cms-content-toolbar { - [class*="font-icon-"].ss-ui-button, - [class^="font-icon-"].ss-ui-button { - padding: 5px 8px; - vertical-align: middle; - - &:hover { - @include box-shadow(none); - } - - &:focus { - @include box-shadow(none); - } - - &:before { - font-size: 1.3em; - margin-right: 0.3em; - margin-top: 0; - vertical-align: middle; - } - - &.ui-state-focus { - @include box-shadow(none); - } - - &.active, - &:active { - @include box-shadow(0 0 3px rgba(191, 194, 196, .9) inset); - } - - .ui-button-text { - @include inline-block; - vertical-align: baseline; - padding: 0; - } - } -} - /** ------------------------------------------------------------------ * URLSegment field * ----------------------------------------------------------------- */ diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss index f33d36d6..db5f1e51 100644 --- a/templates/Includes/AssetAdmin_Content.ss +++ b/templates/Includes/AssetAdmin_Content.ss @@ -16,7 +16,7 @@
diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss index 46da6852..039be30c 100644 --- a/templates/Includes/CMSMain_Content.ss +++ b/templates/Includes/CMSMain_Content.ss @@ -48,7 +48,7 @@
- +
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss index 9dc12452..ebf7b390 100644 --- a/templates/Includes/CMSPagesController_Content.ss +++ b/templates/Includes/CMSPagesController_Content.ss @@ -10,7 +10,7 @@