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

Jump to bottom

Update Form Runner and Form Builder Page to use Bootstrap 5 #5583

Open
wants to merge 12 commits into
base: wip-1670-bootstrap-5
Choose a base branch
from
Open

Update Form Runner and Form Builder Page to use Bootstrap 5 #5583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8c08945
initial commit for test
tiz170 Dec 22, 2022
dc79ae8
revoke
tiz170 Dec 22, 2022
664fcea
fix the width of the container to show the toolbox completely
tiz170 Dec 29, 2022
5cb68c5
fix box shadow color of the grid
tiz170 Dec 29, 2022
0465b34
fix the width of the form setting dialog
tiz170 Dec 29, 2022
708bee4
fix the size of the ‘Apply’ button
tiz170 Dec 29, 2022
e8abf91
align tabs vertically
tiz170 Dec 29, 2022
8b392d5
fix the nav tabs styling under Control Settings
tiz170 Dec 29, 2022
6719838
fix the text overflow under View Options
tiz170 Jan 1, 2023
24ee6b4
fix input field width under Control Settings
tiz170 Jan 1, 2023
3a72755
fix font size and weight under About this Form
tiz170 Jan 1, 2023
10b38bb
fix legend and table styling
tiz170 Jan 4, 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
91 changes: 80 additions & 11 deletions form-runner/jvm/src/main/assets/apps/fr/style/form-runner-bootstrap5-override.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

.orbeon {

& legend {
font-size: 13px;
border-bottom: 1px solid #e5e5e5;
}

// disable input bar
.orbeon input[disabled], .orbeon select[disabled], .orbeon textarea[disabled], .orbeon input[readonly], .orbeon select[readonly], .orbeon textarea[readonly] {
cursor: not-allowed;
background-color: #eee;
}

input:not([type='checkbox']):not([type='radio']), output, .xforms-control.xforms-select1.xforms-incremental, .xforms-control.xforms-select1.xforms-incremental > select,
input:not([type='checkbox']):not([type='radio']), output, .xforms-control.xforms-select1.xforms-incremental > select,
.xforms-control.xforms-readonly.xforms-incremental.xforms-static .xforms-field, .xforms-control.xforms-incremental.xforms-readonly.xforms-static pre {
height: 28px;
}
Expand Down Expand Up @@ -283,8 +288,15 @@
margin-top: 5px;
}

// todo: still need a background image
.yui-panel-container input[type="radio"], .yui-panel-container input[type="checkbox"] {
margin-top: 3px;
// border-radius: 50%;
// appearance: none;
// width: 1em;
// height: 1em;
// background-color: #0d6efd;
// border-color: #0d6efd;
}

// form controls > Image and File Attachments
Expand Down Expand Up @@ -420,6 +432,18 @@
}

// form builder: form settings
.xforms-switch .fr-section-content.xforms-group .xbl-component.xbl-fr-grid-single .fr-grid.fr-editable .fr-grid-body .fr-grid-td.fb-selected {
box-shadow: 0 0 5px 3px #aaccee !important;
}

.fb-dialog-form-settings.xforms-dialog.xforms-dialog-modal {
width: 898px;
}

.fr-dialog-buttons .xforms-control.xforms-trigger .btn {
min-width: unset;
}

// General Settings
.fb-dialog-form-settings-fields.xbl-component.xbl-fr-tabbable {
font-size: 14px;
Expand All @@ -441,7 +465,6 @@
.nav-tabs .nav-item:not(.active) .nav-link:hover {
border-color: #eee #eee #ddd;
background-color: #eee;
height: 38px;
}

.nav-tabs .nav-item .nav-link {
Expand All @@ -452,15 +475,6 @@
// Form Options
.fb-settings-mode-edit .fb-dialog-form-settings-fields .tab-content .fb-dialog-form-settings-options {
height: 560px;

.xforms-group .input-group.xforms-help-popover-control {
display: flex;
flex-wrap: nowrap;

.xbl-fr-number-visible-input.xforms-input-input {
max-width: none;
}
}
}

.navbar {
Expand All @@ -470,4 +484,59 @@
}
}
}

.xforms-group .input-group.xforms-help-popover-control {
display: flex;
flex-wrap: nowrap;

.xbl-fr-number-visible-input.xforms-input-input {
max-width: none;
}
}

// Control Settings
.tab-content .tab-pane .xbl-component.xbl-fr-tabbable .tabs-left {
&>.nav-tabs>li>a {
margin-bottom: 3px;
}

.nav.nav-tabs {
flex-direction: column;
border-right: 1px solid #ddd;
border-bottom: unset;

.nav-item .nav-link {
transition: unset;
}

.nav-item.active .nav-link {
border-right: 1px solid white;
margin-right: -2px;
border-bottom: 1px solid #ddd;
border-top-right-radius: unset;
border-bottom-left-radius: 4px;
}

.nav-item:not(.active) {
.nav-link:hover, .nav-link:focus {
border-color: #eee;
border-top-right-radius: unset;
border-bottom-left-radius: 4px;
}
}
}
}

// About this Form
.fb-dialog-form-settings .fb-dialog-form-settings-info > .fb-dialog-form-settings-info-stats table tbody th {
font-weight: normal;
}

.table-condensed {
th, td {
padding: 4px 5px;
border-top: 1px solid #ddd;
border-bottom: unset;
}
}
}
8 changes: 4 additions & 4 deletions form-runner/jvm/src/main/assets/xbl/orbeon/tabbable/tabbable.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

@import (reference) "../../../apps/fr/style/form-runner-common";

.container.fr-view .fb-main {
left: 245px;
}

.fb-toolbox .fb-toolbox-inside .xbl-component.xbl-fr-tabbable .nav-tabs {
li:first-child {
margin-right: 2px;
Expand Down Expand Up @@ -82,10 +86,6 @@
}
}

.tab-content .tab-pane .fb-tools .xforms-group > legend {
border-bottom: 1px solid #e5e5e5;
}

.fr-tabbable-add {
padding: 0 5px;
margin: 10px;
Expand Down
2 changes: 1 addition & 1 deletion import-sample-data-to-demo.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
def main(username: String, password: String): Unit = {

val root = os.pwd / os.RelPath("data/orbeon/fr")
val crudEndPoint = "https://demo.orbeon.com/demo/fr/service/persistence/crud/"
val crudEndPoint = "http://localhost:8080/orbeon/fr/service/persistence/crud/"

os.walk(root) filter
(os.isFile) filterNot
Expand Down