Merge branch '9.0RC'9.0

5 files changed, 42 insertions, 153 deletions

diff --git a/view/theme/redbasic/css/blockmode.css b/view/theme/redbasic/css/blockmode.css
deleted file mode 100644
index cc1db209e..000000000
--- a/view/theme/redbasic/css/blockmode.css
+++ /dev/null
@@ -1,15 +0,0 @@
-
-.wall-item-content.conv-list-mode {
-	max-width: 280px;
-	height:200px;
-	min-height: 200px;
-	overflow: hidden;
-}
-
-.thread-wrapper.toplevel_item.conv-list-mode {
-	width: 300px;
-	height: 300px; 
-	float: left;
-	margin-left: 5px;
-	margin-bottom: 35px;
-}
diff --git a/view/theme/redbasic/css/mod_page.css b/view/theme/redbasic/css/mod_page.css
deleted file mode 100644
index 37f597fac..000000000
--- a/view/theme/redbasic/css/mod_page.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-section {
-left: 0px;
-width: 800px;
-margin-left: auto;
-margin-right: auto;
-}
-body {background-color: #d00 !important;}
-
-.page-content-wrapper {background: #fff;
-		color: #000;
-		border-radius: 20px;
-		box-shadow: 5px 5px 5px #111;
-}
-
-h3.page-title {
-padding-top: 30px;
-		color: #033}
-.page-body {padding: 40px;}
-
-.page-body strong {color: #033;}
-
-.nav-links {margin-top: 5px;}
-*/
\ No newline at end of file
diff --git a/view/theme/redbasic/css/sample.scss b/view/theme/redbasic/css/sample.scss
new file mode 100644
index 000000000..410026aa2
--- /dev/null
+++ b/view/theme/redbasic/css/sample.scss
@@ -0,0 +1,14 @@
+// To compiled custom site bootstrap from sass,
+// run this script from the document root for an example:
+// php vendor/bin/pscss view/theme/redbasic/css/sample.scss view/theme/redbasic/css/bootstrap-custom.css
+
+// See https://getbootstrap.com/docs/5.3/customize/sass/ for more infos
+
+// required import
+@import "vendor/twbs/bootstrap/scss/_functions";
+
+$primary: #ff0000; // set the $primary variable
+
+
+// set changes
+@import "vendor/twbs/bootstrap/scss/bootstrap";
diff --git a/view/theme/redbasic/css/sloppy_photos.css b/view/theme/redbasic/css/sloppy_photos.css
deleted file mode 100644
index 78aedc9cc..000000000
--- a/view/theme/redbasic/css/sloppy_photos.css
+++ /dev/null
@@ -1,58 +0,0 @@
-
-.rotleft1 {
--webkit-transform: rotate(-1deg);
--moz-transform: rotate(-1deg);
--ms-transform: rotate(-1deg);
--o-transform: rotate(-1deg);
-}
-
-.rotleft2 {
--webkit-transform: rotate(-2deg);
--moz-transform: rotate(-2deg);
--ms-transform: rotate(-2deg);
--o-transform: rotate(-2deg);
-}
-
-.rotleft3 {
--webkit-transform: rotate(-3deg);
--moz-transform: rotate(-3deg);
--ms-transform: rotate(-3deg);
--o-transform: rotate(-3deg);
-}
-
-.rotleft4 {
--webkit-transform: rotate(-4deg);
--moz-transform: rotate(-4deg);
--ms-transform: rotate(-4deg);
--o-transform: rotate(-4deg);
-}
-
-
-.rotright1 {
--webkit-transform: rotate(1deg);
--moz-transform: rotate(1deg);
--ms-transform: rotate(1deg);
--o-transform: rotate(1deg);
-}
-
-.rotright2 {
--webkit-transform: rotate(2deg);
--moz-transform: rotate(2deg);
--ms-transform: rotate(2deg);
--o-transform: rotate(2deg);
-}
-
-.rotright3 {
--webkit-transform: rotate(3deg);
--moz-transform: rotate(3deg);
--ms-transform: rotate(3deg);
--o-transform: rotate(3deg);
-}
-
-.rotright4 {
--webkit-transform: rotate(4deg);
--moz-transform: rotate(4deg);
--ms-transform: rotate(4deg);
--o-transform: rotate(4deg);
-}
-
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 451303338..30b9ba64c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -7,21 +7,13 @@
 
 /* bootstrap variables */
 
-:root {
-	--bs-border-radius: $radius;
-	--bs-highlight-bg: var(--bs-warning);
-}
 
 [data-bs-theme=light] {
-	--bs-link-color: $link_color;
-	--bs-link-hover-color: $link_hover_color;
 	--hz-body-bg: $bgcolor;
 	--hz-body-bg-image: url('$background_image');
 }
 
 [data-bs-theme=dark] {
-	--bs-link-color: $link_color_dark;
-	--bs-link-hover-color: $link_hover_color_dark;
 	--hz-body-bg: $bgcolor_dark;
 	--hz-body-bg-image: url('$background_image_dark');
 }
@@ -34,10 +26,6 @@
 	background-color: $nav_bg_dark !important;
 }
 
-.btn {
-	--bs-btn-border-radius: $radius;
-}
-
 
 /* generals */
 
@@ -46,13 +34,10 @@ html {
 }
 
 body {
-	font-size: 0.9rem;
 	background-color: var(--hz-body-bg);
 	background-image: var(--hz-body-bg-image);
 	background-attachment: fixed;
 	background-size: cover;
-	color: var(--bs-body-color);
-	margin: 0;
 }
 
 aside#region_1 {
@@ -87,30 +72,31 @@ main {
 	height: 100vh;
 	background: rgba(0, 0, 0, .3);
 	cursor: pointer;
+	z-index: 1010;
 }
 
 h1, .h1 {
-	font-size: 2rem;
+	font-size: 2.1rem;
 }
 
 h2, .h2 {
-	font-size: 1.6rem;
+	font-size: 1.7rem;
 }
 
 h3, .h3 {
-	font-size: 1.2rem;
+	font-size: 1.3rem;
 }
 
 h4, .h4 {
-	font-size: 1.05rem;
+	font-size: 1.15rem;
 }
 
 h5, .h5 {
-	font-size: 0.9rem;
+	font-size: 1rem;
 }
 
 h6, .h6 {
-	font-size: 0.75rem;
+	font-size: 0.85rem;
 }
 
 .navbar-banner {
@@ -155,7 +141,7 @@ a:focus,
 }
 
 input, optgroup, select, textarea {
-	font-size: 0.9rem !important;
+	font-size: 1rem !important;
 }
 
 input[type=text], textarea {
@@ -459,7 +445,7 @@ footer {
 
 .photo,
 .contact-block-img {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 #side-bar-photos-albums {
@@ -472,7 +458,7 @@ footer {
 
 .profile-match-photo img,
 .directory-photo-img {
-	border-radius: $radius;
+	border-radius: var(--bs-border-radius);
 }
 
 .profile-match-photo img {
@@ -744,7 +730,7 @@ div.jGrowl div.jGrowl-notification {
 
 .jslider .jslider-scale ins {
 	color: #333;
-	font-size: 0.9rem;
+	font-size: 1rem;
 	width: 100px;
 	text-align: center;
 }
@@ -962,17 +948,14 @@ img.mail-conv-sender-photo {
 	background-color: var(--bs-body-bg);
 	border: 1px solid var(--bs-border-color);
 	border-radius: var(--bs-border-radius);
-
 }
 
-
-
 #profile-jot-text::-webkit-input-placeholder {
-	font-size: 1.2rem;
+	font-size: 1.3rem;
 }
 
 #profile-jot-text::-moz-placeholder {
-	font-size: 1.2rem;
+	font-size: 1.3rem;
 }
 
 #profile-jot-text:focus::-webkit-input-placeholder {
@@ -1061,14 +1044,6 @@ img.mail-conv-sender-photo {
 	height: $reply_photo;
 }
 
-.wall-item-content,
-.mail-conv-body,
-.page-body,
-.chat-item-text,
-.chat-item-text-self {
-	font-size: 1rem;
-}
-
 .comment-edit-text {
 	border: 1px solid var(--bs-border-color);
 	border-radius: var(--bs-border-radius);
@@ -1155,16 +1130,16 @@ img.mail-conv-sender-photo {
 }
 
 .menu-img-2 {
-	height: 2.3rem;
-	width: 2.3rem;
+	height: 2.5rem;
+	width: 2.5rem;
 	margin-right: .5rem;
 	border-radius: var(--bs-border-radius);
 	float: left;
 }
 
 .menu-img-1 {
-	height: 1.1rem;
-	width: 1.1rem;
+	height: 1.3rem;
+	width: 1.3rem;
 	border-radius: var(--bs-border-radius);
 }
 
@@ -1199,6 +1174,7 @@ img.mail-conv-sender-photo {
 	border: 1px solid var(--bs-border-color);
 	border-radius: var(--bs-border-radius);
 	margin-bottom: 1.5rem;
+	font-size: 1.1rem;
 }
 
 .section-title-wrapper {
@@ -1236,32 +1212,32 @@ img.mail-conv-sender-photo {
 
 .section-content-success-wrapper {
 	padding: 21px 10px;
-	color: #155724;
-	background-color: #d4edda;
+	color: var(--bs-success-text-emphasis);
+	background-color: var(--bs-success-bg-subtle);
 	border-bottom: 3px solid var(--bs-body-bg);
 	text-align: center;
 }
 
 .section-content-info-wrapper {
 	padding: 21px 10px;
-	color: #0c5460;
-	background-color: #d1ecf1;
+	color: var(--bs-info-text-emphasis);
+	background-color: var(--bs-info-bg-subtle);
 	border-bottom: 3px solid var(--bs-body-bg);
 	text-align: center;
 }
 
 .section-content-warning-wrapper {
 	padding: 21px 10px;
-	color: #856404;
-	background-color: #fff3cd;
+	color: var(--bs-warning-text-emphasis);
+	background-color: var(--bs-warning-bg-subtle);
 	border-bottom: 3px solid var(--bs-body-bg);
 	text-align: center;
 }
 
 .section-content-danger-wrapper {
 	padding: 21px 10px;
-	color: #721c24;
-	background-color: #f8d7da;
+	color: var(--bs-danger-text-emphasis);
+	background-color: var(--bs-danger-bg-subtle);
 	border-bottom: 3px solid var(--bs-body-bg);
 	text-align: center;
 }
@@ -1354,12 +1330,7 @@ main.fullscreen .section-content-wrapper-np {
 
 /* bootstrap overrides */
 
-.form-control {
-	border-radius: $radius;
-}
-
 blockquote {
-	font-size: 1rem;
 	font-style: italic;
 	border-left: 3px solid var(--bs-border-color);
 	padding: 1em 0px 1em 1.5em;
@@ -1447,7 +1418,6 @@ dl.bb-dl > dd > li {
 .bootstrap-tagsinput input {
 	height: 2.5rem;
 	margin: 0;
-	max-width: 30%;
 }
 
 .bootstrap-tagsinput {
@@ -1674,3 +1644,5 @@ dl.bb-dl > dd > li {
 		transform: translateX(80vw);
 	}
 }
+
+