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

Fixes #24176: Directive parameters UI details changed since bootstrap 5 #5400

Merged
merged 1 commit into from
Feb 19, 2024
Merged

Fixes #24176: Directive parameters UI details changed since bootstrap 5 #5400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ $link-color : $rudder-txt-link;
$nav-underline-border-width : 0.2rem;
$nav-underline-link-active-color: $rudder-txt-primary;

$input-font-size-sm: 12px; // previous bootstrap 3 value VS 0.85rem default in bootstrap 5

@import "../../node_modules/bootstrap/scss/bootstrap";

/* --- BUTTONS
Expand Down Expand Up @@ -124,4 +126,17 @@ $nav-underline-link-active-color: $rudder-txt-primary;
font-weight: normal;
border-bottom-color: $rudder-txt-link;
}
}
// -- CHECKBOX/RADIO OVERRIDE
.checkbox, .radio {
& {
position: relative;
display: block;
margin-top: 10px;
margin-bottom: 10px;
}

& label {
cursor: pointer;
}
Comment on lines +130 to +141
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those are declared in bootstrap 3, disappeared completely in bootstrap 5 😐

}
14 changes: 13 additions & 1 deletion ...c/main/style/rudder/rudder-directives.css → .../main/style/rudder/rudder-directives.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,19 @@
color: #13be7e;
}
/* === PARAMETERS === */
.input-feature {
&:first-child {
& > .btn, & > .dropdown-toggle {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
}
}

.directiveAddGroup{
margin-top: 15px;
}

.directive-input-group .btn-group.input-feature .btn.dropdown-toggle {
border-radius: 4px 4px 0 0;
margin-bottom: -1px;
Expand Down Expand Up @@ -315,8 +325,10 @@
height: 31px;
}


/* === TECHNIQUE === */
#versionTable > thead > tr > th:last-child,
#versionTable > tbody > tr > td:last-child{
display: table-cell !important;
}
}

10 changes: 0 additions & 10 deletions webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ div.intro div ul {
margin-left:10px;
}

td.directiveVarValue > input {
width: 500px;
}

.compositionCheckbox input {
margin-left : 5px;
vertical-align: middle;
Expand Down Expand Up @@ -248,12 +244,6 @@ input.deleteNetwork * {
margin-top: 5px;
}

.variableDefinition > span,
.variableDefinition td,
.variableDefinition input {
vertical-align: middle;
}

.wbBaseFieldLabel .tw-bs .ruddericon {
top: -2px;
}
Expand Down
26 changes: 12 additions & 14 deletions ...sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/directiveInput.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,35 @@

<input-text>
<div class="directive-input-group">
<div class="input-group input-group-sm text-section col-xs-12">
<div class="input-feature">
<button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" type="button"> <span class="prefix-selected">Text</span> <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a onclick="updatePrefix(this, '')" >Text </a></li>
<li><a onclick="updatePrefix(this, 'evaljs:')" >JS </a></li>
</ul>
</div>
<div class="input-group input-group-sm text-section col-12">
<button class="btn btn-default lh-1 dropdown-toggle" data-bs-toggle="dropdown" type="button"> <span class="prefix-selected">Text</span> <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a class="dropdown-item" onclick="updatePrefix(this, '')" >Text </a></li>
<li><a class="dropdown-item" onclick="updatePrefix(this, 'evaljs:')" >JS </a></li>
</ul>
<input class="form-control monospace-font" type="text" oninput="updateResult(this);"/>
</div>
</div>
</input-text>

<input-textarea>
<div class="directive-input-group">
<div class="input-group input-group-sm text-section col-xs-12">
<div class="input-group input-group-sm text-section d-table col-12">
<div class="btn-group btn-group-sm input-feature">
<button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" type="button"> <span class="prefix-selected">Text</span> <span class="caret"></span></button>
<button class="btn btn-default lh-1 dropdown-toggle" data-bs-toggle="dropdown" type="button"> <span class="prefix-selected">Text</span> <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a onclick="updatePrefix(this, '')" >Text </a></li>
<li><a onclick="updatePrefix(this, 'evaljs:')" >JS </a></li>
<li><a class="dropdown-item" onclick="updatePrefix(this, '')" >Text </a></li>
<li><a class="dropdown-item" onclick="updatePrefix(this, 'evaljs:')" >JS </a></li>
</ul>
</div>
<textarea class="form-control textarea monospace-font" oninput="updateResult(this);" ></textarea>
<textarea class="form-control textarea monospace-font w-100 mx-0" oninput="updateResult(this);" ></textarea>
</div>
</div>
</input-textarea>

<input-shared>
<div class="directive-input-group">
<div class="input-group input-group-sm col-xs-12 rect-padding">
<div class="input-group input-group-sm col-12 rect-padding">
<button class="btn btn-default browserFile" type="button" id="browserFile" onclick="">
<span class="fa fa-folder-open"></span>
</button>
Expand Down