Merge pull request #2409 from GluuFederation/gluu-core-bom_issues_38_…

…4.5.4 feat(gluu-core-bom): fix design for bootstrap 5
GluuFederation · Dec 18, 2023 · 08bb16c · 08bb16c
2 parents d8f2150 + ca2feaa
commit 08bb16c
Show file tree

Hide file tree

Showing 9 changed files with 15,360 additions and 8,148 deletions.
diff --git a/server/src/main/resources/META-INF/resources/bootstrap.min.js b/server/src/main/resources/META-INF/resources/bootstrap.min.js
diff --git a/server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml b/server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
@@ -222,8 +222,8 @@ select {
     display: block !important;
     -ms-flex-wrap: wrap;
     flex-wrap: wrap;
-    margin-right: -15px;
-    margin-left: -15px;
+    margin-right: 1px;
+    margin-left: 1px;
 }
 
 .nav-tabs-custom>.nav-tabs>li>a.active {
@@ -358,14 +358,77 @@ body {
     padding: 15px 12px !important;
 }
 .row>* {
-    flex-shrink: 0;
-    width: 100%;
+    flex-shrink: 0;<!--
+    width: 100%;-->
     max-width: 100%;
     padding-right: unset !important;
     padding-left: unset !important;
     margin-top: var(--bs-gutter-y);
 }
 
+@media (min-width: 1200px){
+.col-lg-6 {
+    width: 50%;
+}}
+
+@media (min-width: 1200px){
+.col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9 {
+    float: left;
+}}
+@media (min-width: 768px){
+.col-sm-6 {
+    width: 25%;
+}}
+
+@media (min-width: 768px) {
+  .col-md-12 {
+    flex: 0 0 auto;
+    width: 100%;
+  }
+  }
+
+.main-header .sidebar-toggle {
+  float: left;
+  background-color: transparent;
+  background-image: none;
+  padding: 8px 8px;
+  font-family: fontAwesome;
+}
+
+@media (min-width: 1200px){
+.col-lg-6 {
+    width: 50%;
+}}
+
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+    position: relative;
+    min-height: 1px;
+    <!--padding-right: 15px !important;-->
+    <!--padding-left: 15px !important;-->
+}
+
+.form-control {
+    display: block;
+    width: 100%;
+    height: 34px;
+    padding: 6px 12px;
+    font-size: 14px;
+    line-height: 1.42857143;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+    -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+    -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
+}
+
         </style>
     </h:head>
     <h:body styleClass="skin-green">

diff --git a/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml b/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
@@ -238,7 +238,7 @@
 								<b:panel title="oxTrust Logo/Favicon" look="primary"
 									iconAwesome="fa-sliders">
 									<div class="row">
-										<div class="col-sm-6 col-lg-6">
+										<div class="col-sm-6 col-lg-6" style="padding-right: 15px !important;">
 											<b:panel id="oxTrustLogoPanelId" title="Current oxTrust Logo"
 												look="success" collapsible="true" collapsed="true">
 												<div class="row">
@@ -296,7 +296,7 @@
 								<b:panel title="oxAuth Logo/Favicon" look="primary"
 									iconAwesome="fa-sliders">
 									<div class="row">
-										<div class="col-sm-6 col-lg-6">
+										<div class="col-sm-6 col-lg-6" style="padding-right: 15px !important;>
 											<b:panel id="oxAuthLogoPanelId" title="Current oxAuth Logo"
 												look="success" collapsible="true" collapsed="true">
 												<div class="row">