css fixes

3 files changed, 64 insertions, 54 deletions

diff --git a/view/css/widgets.css b/view/css/widgets.css
index 8900b858c..622c1cb86 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -124,16 +124,6 @@ li:hover .group-edit-icon {
 	width: 250px;
 }
 
-/* events tools */
-
-#event-upload-form {
-	margin-top: 10px;
-}
-
-#event-upload-choose {
-	width: 100%;
-}
-
 /* cover photo */
 
 #cover-photo {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fba5edc43..e8e2da40a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1678,13 +1678,22 @@ dl.bb-dl > dd > li {
 	border-bottom-right-radius: $radius;
 }
 
+.sub-menu-wrapper {
+	padding-left: 1rem;
+	display: none;
+}
+
 .sub-menu {
 	width: 100%;
-	margin-top: 10px;
-	padding-left: 15px;
+	margin-top: 0.5rem;
+	padding-left: 1rem;
 	border-left: 0.2rem solid #eee;
 }
 
+.w100 {
+	width: 100%;
+}
+
 .app-icon {
 	font-size: 80px;
 	color: $toolicon_colour;
@@ -1701,8 +1710,7 @@ dl.bb-dl > dd > li {
 	margin-left: auto;
 	margin-right: auto;
 }
+
 #permcat-index {
 	margin: 10px;
 }
-
-.shiny { background-color: red; }
diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl
index b59e135c2..4ee1376ea 100644
--- a/view/tpl/website_portation_tools.tpl
+++ b/view/tpl/website_portation_tools.tpl
@@ -1,48 +1,60 @@
 <div id="website-portation-tools" class="widget">
 	<div class="nav nav-pills flex-column">
 		<a class="nav-link"  href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
-		<form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
-			<input type="hidden" name="action" value="scan">
-			<p class="descriptive-text">{{$file_import_text}}</p>
-			<div class="form-group">
-				<input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
-			</div>
-			<div class="form-group">
-				<button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button>
-			</div>
-			<!-- Or upload a zipped file containing the website -->
-			<p class="descriptive-text">{{$file_upload_text}}</p>
-			<div class="form-group">
-				<input class="form-control-file" type="file" name="zip_file" />
-			</div>
-			<div class="form-group">
-				<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button>
-			</div>
-		</form>
+		<div id="import-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="scan">
+					<p class="descriptive-text">{{$file_import_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button>
+					</div>
+					<!-- Or upload a zipped file containing the website -->
+					<p class="descriptive-text">{{$file_upload_text}}</p>
+					<div class="form-group">
+						<input class="form-control-file w100" type="file" name="zip_file" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
 	</div>
 	<div class="nav nav-pills flex-column">
 		<a class="nav-link" href="#" onclick="openClose('export-form'); openClose('export-cloud-form'); return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a>
-		<form id="export-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
-			<input type="hidden" name="action" value="exportzipfile">
-			<!-- Or download a zipped file containing the website -->
-			<p class="descriptive-text">{{$file_download_text}}</p>
-			<div class="form-group">
-				<input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
-			</div>
-			<div class="form-group">
-				<button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button>
-			</div>
-		</form>
-		<form id="export-cloud-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
-			<input type="hidden" name="action" value="exportcloud">
-			<!-- Or export the website elements to a cloud files folder -->
-			<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
-			<div class="form-group">
-				<input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
-			</div>
-			<div class="form-group">
-				<button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button>
-			</div>
-		</form>
+		<div id="export-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="exportzipfile">
+					<!-- Or download a zipped file containing the website -->
+					<p class="descriptive-text">{{$file_download_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<div id="export-cloud-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<input type="hidden" name="action" value="exportcloud">
+					<!-- Or export the website elements to a cloud files folder -->
+					<p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p>
+					<div class="form-group">
+						<input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" />
+					</div>
+					<div class="form-group">
+						<button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button>
+					</div>
+				</form>
+			</div>
+		</div>
 	</div>
 </div>