Standardset styling

AlchemyCMS · Nov 1, 2011 · 7d0c30a · 7d0c30a
1 parent 8c17a82
commit 7d0c30a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 23 deletions.
diff --git a/app/views/elements/_contactform_view.html.erb b/app/views/elements/_contactform_view.html.erb
@@ -5,9 +5,7 @@
     <table class="contactform">
     	<tr>
     		<td class="label">
-    			<label for="mail_salutation">
-    				<%= t('alchemy.contactform.labels.salutation') %>
-    			</label>
+					<%= f.label :salutation, t('alchemy.contactform.labels.salutation') %>
     		</td>
     		<td class="field">
     			<%= f.select(
@@ -23,39 +21,31 @@
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_firstname">
-    				<%= t('alchemy.contactform.labels.firstname') %>
-    			</label>
+					<%= f.label :firstname, t('alchemy.contactform.labels.firstname') %>
     		</td>
     		<td class="field">
     			<%= f.text_field(:firstname, :class => "field") %>
     		</td>
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_lastname">
-    				<%= t('alchemy.contactform.labels.lastname') %>
-    			</label><small>*</small>
+					<%= f.label :lastname, (t('alchemy.contactform.labels.lastname') + '<small>*</small>').html_safe %>
     		</td>
     		<td class="field">
     			<%= f.text_field(:lastname, :class => "field") %>
     		</td>
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_address">
-    				<%= t('alchemy.contactform.labels.address') %>
-    			</label>
+					<%= f.label :address, t('alchemy.contactform.labels.address') %>
     		</td>
     		<td class="field">
     			<%= f.text_field :address, :class => 'field' %>
     		</td>
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_zip">
-    				<%= t('alchemy.contactform.labels.zip') %>
-    			</label>
+					<%= f.label :zip, t('alchemy.contactform.labels.zip') %>
     		</td>
     		<td class="field">
     			<%= f.text_field :zip, :class => 'field short' %>
@@ -64,28 +54,25 @@
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_phone">
-    				<%= t('alchemy.contactform.labels.phone') %>
-    			</label>
+					<%= f.label :phone, t('alchemy.contactform.labels.phone') %>
     		</td>
     		<td class="field">
     			<%= f.text_field :phone, :class => 'field' %>
     		</td>
     	</tr>
     	<tr>
     		<td class="label">
-    			<label for="mail_email">
-    				<%= t('alchemy.contactform.labels.email') %>
-    			</label><small>*</small>
+					<%= f.label :email, (t('alchemy.contactform.labels.email') + '<small>*</small>').html_safe %>
     		</td>
     		<td class="field">
     			<%= f.text_field :email, :class => 'field' %>
     		</td>
     	</tr>
     </table>
     <div id="message">
-        <%= f.text_area :message %>
+			<%= f.text_area :message %>
     </div>
+		<p class="foot_notice">*) <%= t('alchemy.contactform.labels.mandatory_fields') %></p>
     <p class="right">
     	<%= f.button t('alchemy.contactform.labels.send'), :name => nil, :class => 'button' %>
     </p>

diff --git a/assets/stylesheets/standard_set.css b/assets/stylesheets/standard_set.css
@@ -1,3 +1,5 @@
+/* @override http://localhost:3000/stylesheets/alchemy/standard_set.css */
+
 body {
 	margin: 0;
 	padding: 0;
@@ -371,4 +373,32 @@ label {
 
 p.right {
 	text-align: right;
-}
+}
+
+.search_results ul {
+	list-style-type: none;
+	padding: 0 0 0 12px;
+}
+
+.search_results ul li {
+	margin-bottom: 2em;
+}
+
+.search_results ul li p {
+	margin-top: 0.5em;
+	margin-bottom: 0.5em;
+}
+
+.search_results ul li h3 {
+	margin-bottom: 0.5em;
+	margin-top: 0.5em;
+}
+
+.search_results ul li h4 {
+	margin-top: 0.5em;
+	margin-bottom: 0.5em;
+}
+
+.search_results em {
+	font-weight: bold;
+}