Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gluu core bom issues 38 #2402

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Gluu core bom issues 38 #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02914ab
feat(gluu-core-bom): update jquery and bootstrap for oxtrust
shekhar16 Nov 20, 2023
f33d32b
feat(gluu-core-bom): update jquery and bootstrap for oxtrust
shekhar16 Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions server/src/main/resources/META-INF/resources/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

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

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

.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;
}

</style>
</h:head>
<h:body styleClass="skin-green">
Expand Down
12 changes: 11 additions & 1 deletion server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@
.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 @@ -75,7 +85,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: 1 addition & 2 deletions server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml
View file
Open in desktop
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">
aria-expanded="true" aria-controls="collapseOne#{gluufn:hashCode(_customScript.name)}">
#{(_customScript.name == null) ?
msgs['customScript.newscript'] : _customScript.name } </a>
</h5>
Expand All @@ -94,7 +94,6 @@
<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
Open in desktop
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: 703px; height: 185px;" width="703" />
style="width: 1260px; height: 385px;" width="703" />
</div>
</div>
</div>
Expand Down
Loading
Loading