MINOR AssetUploadField styling

silverstripe · Feb 23, 2012 · 3c29a92 · 3c29a92
1 parent cbc2891
commit 3c29a92
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 30 deletions.
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/images/btn-icon-s1c742dc591.png b/admin/images/btn-icon-s1c742dc591.png
diff --git a/admin/images/btn-icon-s4a0551bc3f.png b/admin/images/btn-icon-s4a0551bc3f.png
diff --git a/admin/images/btn-icon/back.png b/admin/images/btn-icon/back.png
diff --git a/admin/images/btn-icon/back_disabled.png b/admin/images/btn-icon/back_disabled.png
diff --git a/css/AssetUploadField.css b/css/AssetUploadField.css
diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss
@@ -16,6 +16,10 @@
 		padding: 0 0 7px;
 		clear: both;
 	}
+
+	.field {
+		border-bottom: 0;
+	}
 
 	.ss-uploadfield-files {
 		margin: 0;
@@ -162,8 +166,6 @@
 		}
 	}
 	.ss-uploadfield-addfile {
-		height: 70px;
-		padding: 5px 15px 15px;
 
 		.ss-uploadfield-item-info {
 			float: left;

diff --git a/templates/AssetUploadField.ss b/templates/AssetUploadField.ss
@@ -1,4 +1,12 @@
-<div class="ss-uploadfield-item ss-uploadfield-addfile">
+<div class="ss-uploadfield-item ss-uploadfield-addfile field">
+
+	<h3>
+		<span class="step-label">
+			<span class="flyout">1</span><span class="arrow"></span>
+			<span class="title"><% _t('AssetUploadField.ChooseFiles', 'Choose files') %></span>
+		</span>
+	</h3>
+
 	<div class="ss-uploadfield-item-info">
 		<label class="ss-uploadfield-fromcomputer ss-ui-button ss-ui-action-constructive" title="<% _t('AssetUploadField.FROMCOMPUTERINFO', 'Upload from your computer') %>" data-icon="drive-upload">
 			<% _t('AssetUploadField.FROMCOMPUTER', 'Choose files from your computer') %>
@@ -18,5 +26,13 @@
 	</div>
 	<div class="clear"><!-- --></div>
 </div>
-<h3 class="ss-uploadfield-editandorganize"><% _t('AssetUploadField.EDITANDORGANIZE', 'Edit & organize') %></h3>
-<ul class="ss-uploadfield-files files"></ul>
+
+<div class="ss-uploadfield-editandorganize">
+	<h3>
+		<span class="step-label">
+			<span class="flyout">2</span><span class="arrow"></span>
+			<span class="title"><% _t('AssetUploadField.EDITANDORGANIZE', 'Edit & organize') %></span>
+		</span>
+	</h3>
+	<ul class="ss-uploadfield-files files"></ul>
+</div>