Merge https://github.com/redmatrix/hubzilla into pending_merge

6 files changed, 44 insertions, 23 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 24a22defb..d49359f46 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -248,12 +248,32 @@ a.wall-item-name-link {
 
 /* event item */
 
+.event-item-title h3 {
+	margin: 0px 0px 10px 0px;
+	font-weight: bold;
+}
+
+.event-item-description {
+	padding-bottom: 10px;
+}
+
+.event-item-label {
+	font-weight: bold;
+}
+
+/* vevent */
+
 .event-title h3 {
 	margin: 0px 0px 10px 0px;
 	font-weight: bold;
 }
 
+.vevent {
+	padding-top: 10px;
+}
+
 .event-description {
+	padding-top: 10px;
 	padding-bottom: 10px;
 }
 
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index dc1dc902f..e72464539 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -24,29 +24,21 @@
 	padding: 6px 12px;
 }
 
-.event-wrapper {
+.event-wrapper,
+.vevent {
 	max-width: 700px;
-	height: auto;
-	padding: 10px;
 }
 
 .event-owner {
-	margin-bottom: 15px;
+	padding: 10px;
 }
 
 .event-owner img {
 	margin-right: 5px;
 }
 
-.event-buttons,
-.event-description {
-	margin-top: 10px;
-}
-
-#event-upload-form {
-	margin-top: 10px;
+.vevent,
+.event-buttons {
+	padding: 10px;
 }
 
-#event-upload-choose {
-	width: 100%;
-}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index eb771cc06..f1c1436c7 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -124,3 +124,12 @@ li:hover .group-edit-icon {
 	width: 250px;
 }
 
+/* events tools */
+
+#event-upload-form {
+	margin-top: 10px;
+}
+
+#event-upload-choose {
+	width: 100%;
+}
diff --git a/view/tpl/event_item_content.tpl b/view/tpl/event_item_content.tpl
index 868e5ad27..76e0f4616 100644
--- a/view/tpl/event_item_content.tpl
+++ b/view/tpl/event_item_content.tpl
@@ -1,10 +1,10 @@
 {{if $description}}
-<div class="event-description">
+<div class="event-item-description">
 	{{$description}}
 </div>
 {{/if}}
 {{if $location}}
-<div class="event-location">
-	<span class="event-label">{{$location_label}}</span>&nbsp;<span class="event_location">{{$location}}</span>
+<div class="event-item-location">
+	<span class="event-item-label">{{$location_label}}</span>&nbsp;<span class="event-item-location">{{$location}}</span>
 </div>
 {{/if}}
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
index 70ddfd808..9547676e9 100755
--- a/view/tpl/event_item_header.tpl
+++ b/view/tpl/event_item_header.tpl
@@ -1,11 +1,11 @@
-<div class="event-title">
+<div class="event-item-title">
 	<h3><i class="icon-calendar"></i>&nbsp;{{$title}}</h3>
 </div>
-<div class="event-start">
-	<span class="event-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
+<div class="event-item-start">
+	<span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
 </div>
 {{if $finish}}
-<div class="event-start">
-	<span class="event-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
+<div class="event-item-start">
+	<span class="event-item-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
 </div>
 {{/if}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 2c71c64fb..af5f222fe 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -159,12 +159,12 @@
 							{{/foreach}}
 							</select>
 						</div>
+						{{/if}}
 						{{include file="field_checkbox.tpl" field=$cal_first_day}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
 					</div>
-					{{/if}}
 				</div>
 			</div>
 		</div>