diff --git a/.gitignore b/.gitignore index 4b114324f..48125b238 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .sass-cache .DS_Store +css/GridField_print.css \ No newline at end of file diff --git a/admin/css/screen.css b/admin/css/screen.css index 38643178a..11f1a2fab 100644 --- a/admin/css/screen.css +++ b/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'); } diff --git a/admin/images/btn-icon-s41050dc384.png b/admin/images/btn-icon-s41050dc384.png new file mode 100644 index 000000000..1e891a5fc Binary files /dev/null and b/admin/images/btn-icon-s41050dc384.png differ diff --git a/dev/install/config-form.html b/dev/install/config-form.html index 3e8d288a8..12b5c3203 100644 --- a/dev/install/config-form.html +++ b/dev/install/config-form.html @@ -15,6 +15,7 @@
+

SilverStripe

Version

diff --git a/dev/install/images/ss-logo.png b/dev/install/images/ss-logo.png new file mode 100644 index 000000000..a5c45fa3b Binary files /dev/null and b/dev/install/images/ss-logo.png differ diff --git a/dev/install/install.css b/dev/install/install.css index ecc1ea4be..9882953ef 100644 --- a/dev/install/install.css +++ b/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; }