Improvements to edit forms

Minor CSS improvements on blocks
jon48 · Jun 22, 2020 · 0e2df15 · 0e2df15
1 parent 6753c8a
commit 0e2df15
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 44 deletions.
diff --git a/src/sass/resources/images/block_bg.png b/src/sass/resources/images/block_bg.png
diff --git a/src/sass/rural/_global.scss b/src/sass/rural/_global.scss
@@ -179,37 +179,40 @@ input, select, .custom-select{
  * Select2 overrides
  */
 
-.select2 {
+ .select2-container {
 	.select2-selection, .select2-dropdown {
 		background-color: $maj-c-theme-lighter;
 	}
 
-	.select2-selection.select2-selection--single {
+	.select2-selection--single {
 		min-height: 28px;
 		height: auto;
-	}
-
-	.select2-container .select2-selection--single .select2-selection__rendered {
-		padding-left: 2px;
-	}
-
-	.select2-selection--single .NAME {
-		padding-left: 4px;
+
+		.select2-selection__rendered {
+			padding-left: 2px;
+		}
+
+		.NAME {
+			padding-left: 4px;
+		}
 	}
 }
 
 /*
  * Common classes
  */
 
- .maj-font-color-brown {
+.center {
+	text-align: center;
+}
+
+.maj-font-color-brown {
 	@include maj-font-color($maj-c-theme-dark, $maj-c-theme-medium);
- }
+}
 
- .maj-font-color-blue {
+.maj-font-color-blue {
 	@include maj-font-color($maj-c-bluegray, $maj-c-bluegray-dark);
- }
-
+}
 
 .maj-content-tabs {
 

diff --git a/src/sass/rural/_main.scss b/src/sass/rural/_main.scss
@@ -124,6 +124,29 @@
 	text-align: center;
 }
 
+
+form.wt-page-content {
+	@extend .container;
+
+	> .form-group {
+
+		background-color: $maj-c-theme-light;
+
+		.col-form-label {
+			color: $maj-c-theme-primary;
+			background-color: $maj-c-theme-medium;
+		}
+
+		> div {
+			padding: $input-padding-y $input-padding-x;
+		}
+	}
+
+	> .card {
+		@extend .row;
+	}
+}
+
 /* Tabs */
 
 .nav-tabs {

diff --git a/src/sass/rural/_pages-blocks.scss b/src/sass/rural/_pages-blocks.scss
@@ -21,8 +21,16 @@
  * along with webtrees-MyArtJaub. If not, see <http://www.gnu.org/licenses/>.
  */
 
+ @mixin maj-block-large {
+	padding-top: 0;
+	padding-left: 46px;
+	background-image: url(block_bg.png);
+	background-repeat: repeat-y;
+ }
+
 .wt-block {
 	border-style: none;
+	background-color: transparent;
 
 	&:first-child {
 			margin-top: 1rem;
@@ -36,17 +44,18 @@
 	.wt-side-blocks &.wt-side-block-optional {
 		display: none !important;
 	}
+
+	#edit-blocks & {
+		@include maj-block-large;
+	}
 
-	@include media-breakpoint-up(md) {
-		.wt-main-blocks & {
+	.wt-main-blocks & {
+		@include media-breakpoint-up(md) {
+			@include maj-block-large;
+
 			&:first-child {
 				margin-top: 1rem;
 			}
-
-			padding-top: 0;
-			padding-left: 46px;
-			background-image: url(block_bg.png);
-			background-repeat: repeat-y;
 		}
 	}
 
@@ -64,30 +73,17 @@
 		.dataTables_wrapper {
 			border: none;
 		}
+
+		& > p {
+			text-align: center;
+		}
 	}
 
-
-
-	.wt-block-content-user_messages {
-
-
-		button {
-			@extend .btn;
-			@extend .btn-primary;
-
-			margin-left: 1rem;
-		}
-
-		h2 {
-			font-size: 1rem;
-
-			&:first-child {
-				font-weight: bold;
-			}
-		}
-
-		table {
-			@extend .table-striped;
+	.wt-block-content-charts {
+		overflow-y: auto;
+
+		.wt-chart-box {
+			width: 15rem;
 		}
 	}
 
@@ -107,5 +103,42 @@
 			}
 		}
 	}
+
+	.wt-block-content-html {	
+		p {
+			text-align: unset;
+		}
+	}
+
+	.wt-block-content-user_messages {		
+		button[type=submit] {
+			@extend .btn;
+			@extend .btn-primary;
+		}
+
+		label + select {
+			margin-left: 0.5rem;
+			margin-right: 0.5rem;
+		}
+
+		h2 {
+			font-size: 1rem;
+
+			&:first-child {
+				font-weight: bold;
+			}
+		}
+
+		table {
+			@extend .table-striped;
+
+			tr:nth-child(even) .list_value_wrap	{background: $maj-c-theme-light}
+			tr:nth-child(odd) .list_value_wrap	{background: $maj-c-theme-lighter}
+
+			.list_value_wrap .btn-primary {
+				@extend .btn-primary;
+			}
+		}
+	}
 
 }