Permalink
Browse files

ENHANCEMENT:added logo to header on ss3 install page - plus compass r…

…egenerated icon sprites.
  • Loading branch information...
1 parent a946096 commit c1f6f20114207d6dd2ade2bb35b7c252e8e79043 Jeremy Bridson committed Apr 4, 2012
View
1 .gitignore
@@ -1,2 +1,3 @@
.sass-cache
.DS_Store
+css/GridField_print.css
View
37 admin/css/screen.css
@@ -35,7 +35,7 @@ If more variables exist in the future, consider creating a variables file.*/
/** ---------------------------------------------------- Double tone borders http://daverupert.com/2011/06/two-tone-borders-with-css3/ ----------------------------------------------------- */
/** ----------------------------- Sprite images ----------------------------- */
/** Helper SCSS file for generating sprites for the interface. */
-.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-state-default .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-state-default .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-grid_print, .ui-state-default .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled { background: url('../images/btn-icon-s469eb2bf90.png') no-repeat; }
+.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-state-default .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-state-default .btn-icon-chain--arrow, .ui-state-default .btn-icon-chain--exclamation, .ui-state-default .btn-icon-chain--minus, .ui-state-default .btn-icon-chain--pencil, .ui-state-default .btn-icon-chain--plus, .ui-state-default .btn-icon-chain-small, .ui-state-default .btn-icon-chain-unchain, .ui-state-default .btn-icon-chain, .ui-state-default .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-state-default .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled { background: url('../images/btn-icon-s41050dc384.png') no-repeat; }
.ui-state-default .btn-icon-accept { background-position: 0 0; }
.ui-state-default .btn-icon-accept_disabled { background-position: 0 -17px; }
@@ -61,24 +61,23 @@ If more variables exist in the future, consider creating a variables file.*/
.ui-state-default .btn-icon-download-csv { background-position: 0 -343px; }
.ui-state-default .btn-icon-drive-upload { background-position: 0 -361px; }
.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -377px; }
-.ui-state-default .btn-icon-grid_print { background-position: 0 -393px; }
-.ui-state-default .btn-icon-magnifier { background-position: 0 -409px; }
-.ui-state-default .btn-icon-minus-circle { background-position: 0 -425px; }
-.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -441px; }
-.ui-state-default .btn-icon-navigation { background-position: 0 -457px; }
-.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -473px; }
-.ui-state-default .btn-icon-network-cloud { background-position: 0 -489px; }
-.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -505px; }
-.ui-state-default .btn-icon-pencil { background-position: 0 -521px; }
-.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -537px; }
-.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -553px; }
-.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -569px; }
-.ui-state-default .btn-icon-preview { background-position: 0 -585px; }
-.ui-state-default .btn-icon-preview_disabled { background-position: 0 -602px; }
-.ui-state-default .btn-icon-settings { background-position: 0 -619px; }
-.ui-state-default .btn-icon-settings_disabled { background-position: 0 -635px; }
-.ui-state-default .btn-icon-unpublish { background-position: 0 -651px; }
-.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -669px; }
+.ui-state-default .btn-icon-magnifier { background-position: 0 -393px; }
+.ui-state-default .btn-icon-minus-circle { background-position: 0 -409px; }
+.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -425px; }
+.ui-state-default .btn-icon-navigation { background-position: 0 -441px; }
+.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -457px; }
+.ui-state-default .btn-icon-network-cloud { background-position: 0 -473px; }
+.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -489px; }
+.ui-state-default .btn-icon-pencil { background-position: 0 -505px; }
+.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -521px; }
+.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -537px; }
+.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -553px; }
+.ui-state-default .btn-icon-preview { background-position: 0 -569px; }
+.ui-state-default .btn-icon-preview_disabled { background-position: 0 -586px; }
+.ui-state-default .btn-icon-settings { background-position: 0 -603px; }
+.ui-state-default .btn-icon-settings_disabled { background-position: 0 -619px; }
+.ui-state-default .btn-icon-unpublish { background-position: 0 -635px; }
+.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -653px; }
.icon { text-indent: -9999px; border: none; outline: none; }
.icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s546fcae8fd.png'); }
View
BIN admin/images/btn-icon-s41050dc384.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1 dev/install/config-form.html
@@ -15,6 +15,7 @@
<div class="header">
<div class="inner">
<div class="brand">
+ <span class="logo"></span>
<h1>SilverStripe</h1>
</div>
<p>Version <?php echo $silverstripe_version; ?></p>
View
BIN dev/install/images/ss-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
12 dev/install/install.css
@@ -10,6 +10,18 @@
float:none;
}
+.brand h1 {
+ float:left;
+}
+
+.brand .logo {
+ float:left;
+ margin-right:15px;
+ height:55px;
+ width:55px;
+ background:url(../install/images/ss-logo.png) center center no-repeat;
+}
+
#Navigation {
display:none;
}

0 comments on commit c1f6f20

Please sign in to comment.