Skip to content

Commit

Permalink
Merge pull request #2404 from GluuFederation/revert-2403-gluu-core-bo…
Browse files Browse the repository at this point in the history 
…m_issues_38_4.5.3

Revert "Merge pull request #2402 from GluuFederation/gluu-core-bom_issues_38"
  • Loading branch information
@yurem @shekhar16
yurem authored and shekhar16 committed Dec 21, 2023
1 parent ef1e97b commit d2201ea
Show file tree
Hide file tree
Showing 11 changed files with 8,138 additions and 15,513 deletions.
12 changes: 6 additions & 6 deletions server/src/main/resources/META-INF/resources/bootstrap.min.js
View file

Large diffs are not rendered by default.

217 changes: 0 additions & 217 deletions server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,218 +217,6 @@ select {
min-height: 550px;
}

.row {
display: -ms-flexbox;
display: block !important;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
margin-right: 1px;
margin-left: 1px;
}

.nav-tabs-custom>.nav-tabs>li>a.active {
border-top-color: #3c8dbc !important;
}

.nav-tabs-custom>.nav-tabs>li>a {
border-top: 3px solid transparent;
margin-bottom: -2px;
margin-right: 5px;
}
.navbar {
position: relative;
display: -ms-flexbox;
display: block !important;
padding: 0.5rem 1rem;
}
.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li>a:hover {
background: transparent;
margin: inherit !important;
}
a {
text-decoration: none !important;
}
.collapse.in {
display: block !important;
}
.collapse {
display: none !important;
}
.navbar-nav {
--bs-nav-link-padding-x: 0;
--bs-nav-link-padding-y: 0.5rem;
--bs-nav-link-font-weight: ;
--bs-nav-link-color: var(--bs-navbar-color);
--bs-nav-link-hover-color: var(--bs-navbar-hover-color);
--bs-nav-link-disabled-color: var(--bs-navbar-disabled-color);
display: flex;
flex-direction: unset !important;
padding-left: 0;
margin-bottom: 0;
list-style: none;
}

.table {
--bs-table-color-type: initial;
--bs-table-bg-type: initial;
--bs-table-color-state: initial;
--bs-table-bg-state: initial;
--bs-table-color: unset !important;
--bs-table-bg: unset !important;
--bs-table-border-color: var(--bs-border-color);
--bs-table-accent-bg: transparent;
--bs-table-striped-color: var(--bs-emphasis-color);
--bs-table-striped-bg: rgba(var(--bs-emphasis-color-rgb), 0.05);
--bs-table-active-color: var(--bs-emphasis-color);
--bs-table-active-bg: rgba(var(--bs-emphasis-color-rgb), 0.1);
--bs-table-hover-color: var(--bs-emphasis-color);
--bs-table-hover-bg: rgba(var(--bs-emphasis-color-rgb), 0.075);
width: 100%;
margin-bottom: 1rem;
vertical-align: top;
border-color: var(--bs-table-border-color);
}

.row {
--bs-gutter-x: 1.5rem;
--bs-gutter-y: 0;
display: flex;
flex-wrap: wrap;
margin-top: calc(-1 * var(--bs-gutter-y));
}
body {
font-family: 'Source Sans Pro','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 500;
overflow-x: hidden;
overflow-y: auto;
}
body {
margin: 0;
font-family: Arial, Verdana, sans-serif;
font-size: 14px !important;
font-weight: var(--bs-body-font-weight);
line-height: var(--bs-body-line-height);
color: var(--bs-body-color);
text-align: var(--bs-body-text-align);
background-color: var(--bs-body-bg);
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: transparent;
}

.card {
--bs-card-spacer-y: 1rem;
--bs-card-spacer-x: 1rem;
--bs-card-title-spacer-y: 0.5rem;
--bs-card-title-color: ;
--bs-card-subtitle-color: ;
--bs-card-border-width: none !important;
--bs-card-border-color: var(--bs-border-color-translucent);
--bs-card-border-radius: var(--bs-border-radius);
--bs-card-box-shadow: ;
--bs-card-inner-border-radius: calc(var(--bs-border-radius) - (var(--bs-border-width)));
--bs-card-cap-padding-y: 0.5rem;
--bs-card-cap-padding-x: 1rem;
--bs-card-cap-bg: rgba(var(--bs-body-color-rgb), 0.03);
--bs-card-cap-color: ;
--bs-card-height: ;
--bs-card-color: ;
--bs-card-bg: var(--bs-body-bg);
--bs-card-img-overlay-padding: 1rem;
--bs-card-group-margin: 0.75rem;
position: relative;
display: flex;
flex-direction: column;
min-width: 0;
height: var(--bs-card-height);
color: var(--bs-body-color);
word-wrap: break-word;
background-color: var(--bs-card-bg);
background-clip: border-box;
border: var(--bs-card-border-width) solid var(--bs-card-border-color);
border-radius: var(--bs-card-border-radius);
}

.card-header {
background: #fff;
border-top-left-radius: 4px !important;
border-top-right-radius: 4px !important;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
border: 1px solid #ccc;
padding: 15px 12px !important;
}
.row>* {
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">
Expand Down Expand Up @@ -462,10 +250,6 @@ body {
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/js/bootstrap.min.js"
type="text/javascript"></script>

<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/js/bootstrap.bundle.min.js"
type="text/javascript"></script>
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/app.min.js"
type="text/javascript"></script>
Expand All @@ -485,7 +269,6 @@ body {
$.blockUI.defaults.message = $('div.gluuBusyIndicator')
$.blockUI.defaults.fadeIn = 0
$.blockUI.defaults.fadeOut = 0

</script>
<div class="footer"></div>
</h:body>
Expand Down
12 changes: 1 addition & 11 deletions server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,6 @@
.configurationSheet{
border: 1px solid #999;
}

.nav-tabs-custom>.nav-tabs>li>a.active {
border-top-color: #3c8dbc !important;
}

.nav-tabs-custom>.nav-tabs>li>a {
border-top: 3px solid transparent;
margin-bottom: -2px;
margin-right: 5px;
}
</h:outputStylesheet>

<h:outputStylesheet>
Expand Down Expand Up @@ -85,7 +75,7 @@
if (event.which == '13') {
event.preventDefault();
}
});
});
</h:outputScript>
<h:form id="organizationForm" autocomplete="off">
<div class="row" style="margin: 1px;">
Expand Down
3 changes: 2 additions & 1 deletion server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<h5 class="mb-0">
<a class="accordion-toggle in" data-toggle="collapse"
href="#collapseOne#{gluufn:hashCode(_customScript.name)}"
aria-expanded="true" aria-controls="collapseOne#{gluufn:hashCode(_customScript.name)}">
aria-expanded="true" aria-controls="collapseOne">
#{(_customScript.name == null) ?
msgs['customScript.newscript'] : _customScript.name } </a>
</h5>
Expand All @@ -94,6 +94,7 @@
<div id="collapseOne#{gluufn:hashCode(_customScript.name)}"
class="#{_customScript.dn != null ? 'collapse' : 'collapse in'}"
role="tabpanel" aria-labelledby="headingOne"
data-parent="#accordion"
expanded="#{_customScript.dn == null}">
<h:panelGroup layout="block" class="card-body">
<a4j:commandLink value="Delete Script" immediate="true"
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/webapp/home.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<div class="chart-responsive">
<!-- Authentication Requests Chart Canvas -->
<canvas height="185" id="authenticationRequestsChart"
style="width: 1260px; height: 385px;" width="703" />
style="width: 703px; height: 185px;" width="703" />
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit d2201ea

Please sign in to comment.