LPS-90531 Update styling on date input

pei-jung · Mar 5, 2019 · c763e4d · c763e4d
1 parent 5bd2775
commit c763e4d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/modules/apps/expando/expando-web/src/main/resources/META-INF/resources/css/main.scss b/modules/apps/expando/expando-web/src/main/resources/META-INF/resources/css/main.scss
@@ -4,7 +4,7 @@
 		margin-right: 5px;
 	}
 
-	.localized-input-wrapper {
+	.date-input-wrapper, .localized-input-wrapper {
 		margin-bottom: 1.5rem;
 
 		.control-label {

diff --git a/...s/expando/expando-web/src/main/resources/META-INF/resources/edit/default_value_input.jspf b/...s/expando/expando-web/src/main/resources/META-INF/resources/edit/default_value_input.jspf
@@ -38,27 +38,31 @@
 		}
 		%>
 
-		<aui:field-wrapper label="default-value">
-			<liferay-ui:input-date
-				dayParam="defaultValueDay"
-				dayValue="<%= defaultValueDate.get(Calendar.DATE) %>"
-				disabled="<%= false %>"
-				firstDayOfWeek="<%= defaultValueDate.getFirstDayOfWeek() - 1 %>"
-				monthParam="defaultValueMonth"
-				monthValue="<%= defaultValueDate.get(Calendar.MONTH) %>"
-				yearParam="defaultValueYear"
-				yearValue="<%= defaultValueDate.get(Calendar.YEAR) %>"
-			/>
-
-			<liferay-ui:input-time
-				amPmParam="defaultValueAmPm"
-				amPmValue="<%= defaultValueDate.get(Calendar.AM_PM) %>"
-				disabled="<%= false %>"
-				hourParam="defaultValueHour"
-				hourValue="<%= defaultValueDate.get(Calendar.HOUR) %>"
-				minuteParam="defaultValueMinute"
-				minuteValue="<%= defaultValueDate.get(Calendar.MINUTE) %>"
-			/>
+		<aui:field-wrapper cssClass="date-input-wrapper" label="default-value">
+			<div class="form-group-autofit">
+				<liferay-ui:input-date
+					cssClass="form-group-item"
+					dayParam="defaultValueDay"
+					dayValue="<%= defaultValueDate.get(Calendar.DATE) %>"
+					disabled="<%= false %>"
+					firstDayOfWeek="<%= defaultValueDate.getFirstDayOfWeek() - 1 %>"
+					monthParam="defaultValueMonth"
+					monthValue="<%= defaultValueDate.get(Calendar.MONTH) %>"
+					yearParam="defaultValueYear"
+					yearValue="<%= defaultValueDate.get(Calendar.YEAR) %>"
+				/>
+
+				<liferay-ui:input-time
+					amPmParam="defaultValueAmPm"
+					amPmValue="<%= defaultValueDate.get(Calendar.AM_PM) %>"
+					cssClass="form-group-item"
+					disabled="<%= false %>"
+					hourParam="defaultValueHour"
+					hourValue="<%= defaultValueDate.get(Calendar.HOUR) %>"
+					minuteParam="defaultValueMinute"
+					minuteValue="<%= defaultValueDate.get(Calendar.MINUTE) %>"
+				/>
+			</div>
 		</aui:field-wrapper>
 	</c:when>
 	<c:when test="<%= type == ExpandoColumnConstants.DATE_ARRAY %>">