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.

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

Fixes #24717: The font weight of labels is too low #5602

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ techniqueTab model technique creation ui =
]
, div [ class "row form-group" ] [
label [ for "techniqueDocumentation", class "col-sm-12 control-label" ] [
span [ class "text-fit" ] [ text "Documentation" ]
span [ class "fw-normal" ] [ text "Documentation" ]
, img [ class "markdown-icon tooltip-icon", src ( model.contextPath ++ "/images/markdown-mark-solid.svg" ) ] []
]
, div [ class "col-md-8" ] [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class DirectiveEditForm(

val versionSelect = if (isADirectiveCreation) {
<div id="version" class="row wbBaseField form-group">
<label for="version" class="col-sm-12 wbBaseFieldLabel"><span class="text-fit"><b>Technique version</b></span></label>
<label for="version" class="col-sm-12 wbBaseFieldLabel">Technique version</label>
<div class="col-sm-12"><input name="version" class="form-control" readonly="" value={
directive.techniqueVersion.serialize
}/></div>
Expand Down Expand Up @@ -538,7 +538,7 @@ class DirectiveEditForm(
}
override val displayHtml: NodeSeq = {
<div>
<b>Priority</b>
Priority
<span>
<span class="ruddericon fa fa-question-circle" data-bs-toggle="tooltip" title={tooltipContent}></span>
</span>
Expand Down Expand Up @@ -604,7 +604,7 @@ class DirectiveEditForm(
|""".stripMargin
}
<label class="wbBaseFieldLabel">
<b>Policy mode</b>
Policy mode
<span>
<span class="ruddericon fa fa-question-circle" data-bs-toggle="tooltip" title={tooltipContent}></span>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ class NodeGroupForm(
</div>
</div>
& "group-cfeclasses" #> <div class="form-group">
<label class="wbBaseFieldLabel toggle-cond cond-hidden" onclick="$(this).toggleClass('cond-hidden')"><span class="text-fit">Agent conditions</span><i class="fa fa-chevron-down"></i></label>
<label class="wbBaseFieldLabel toggle-cond cond-hidden fw-normal" onclick="$(this).toggleClass('cond-hidden')">Agent conditions<i class="fa fa-chevron-down"></i></label>
<div class="well" id={s"cfe-${nodeGroup.id.serialize}"}>
{RuleTarget.toCFEngineClassName(nodeGroup.id.serialize)}<br/>
{RuleTarget.toCFEngineClassName(nodeGroup.name)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class TechniqueCategoryEditForm(
)(
<div class="wbBaseField">
<field-errors></field-errors>
<label for={id} class="wbBaseFieldLabel threeCol textright"><b><field-label></field-label></b></label>
<label for={id} class="wbBaseFieldLabel threeCol textright"><field-label></field-label></label>
<field-input></field-input>
<field-infos></field-infos>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class RuleCategoryPopup(
case None => NodeSeq.Empty
case Some(c) =>
<div class="row form-group">
<label class="wbBaseFieldLabel"><b>Rudder ID</b></label>
<label class="wbBaseFieldLabel">Rudder ID</label>
<input class="form-control" type="text" value={c.id.value} disabled="true"/>
</div>
}) &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ abstract class RudderBaseField extends BaseField {
// override the field name look
override def displayNameHtml: Box[NodeSeq] = {
validations match {
case Nil => Some(<span class="text-fit">{displayName}</span>)
case _ => Some(<b>{displayName}</b>)
case Nil => Some(<span class="fw-normal">{displayName}</span>)
case _ => Some(<span>{displayName}</span>)
}
}
// optionnaly override validate to add validation functions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ $modal-md: 600px;
.form-group{
margin-bottom: 10px;
label{
font-weight: 500;
font-weight: 700;
}
}
// --- NAV & TABS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -457,12 +457,6 @@ pre.json-beautify code.elmsh {
#priority select.form-select,#version select.form-select{
width: auto;
}
.text-bold .text-fit{
font-weight: bold !important;
}
label.text-fit{
font-weight:normal !important;
}

#isDisabled .btn-sm {
width:auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1186,11 +1186,6 @@ button.buttonMargin {
display: none !important;
}


label span.text-fit{
font-weight: normal !important;
}

.bs-text-danger{
color:#DA291C;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h1>
Here comes the shortDescription field
</div>
<div id="longDescriptionFieldMarkdownContainer">
<label><span class="text-fit">Description</span>
<label class="fw-normal">Description
<i class="fa fa-pencil text-primary cursorPointer half-opacity edit-description-icon" onmouseenter="toggleOpacity(this)" title="Edit description" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i>
</label>
<div class="markdown">
Expand All @@ -139,7 +139,7 @@ <h1>
Here comes the longDescription field
</div>
<div id="longDescriptionFieldMarkdownPreviewContainer" class="col-md-6 ps-2">
<label><span class="text-fit">Preview</span></label>
<label class="fw-normal">Preview</label>
<div id="longDescriptionFieldPreviewMarkdown" class="markdown"></div>
</div>
</div>
Expand All @@ -149,7 +149,7 @@ <h1>
<div id="techniqueDescription"></div>
</div>

<div id="priority">
<div id="priority" class="mt-3">
Here come the priority field
</div>
<div class="wbBaseField form-group">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ <h3 class="box-title"><i id="changeIconRule" class="fa fa-gear"></i> Rule</h3>
Here comes the shortDescription field
</div>
<div id="longDescriptionFieldMarkdownContainer">
<label class="wbBaseFieldLabel"><span class="text-fit">Description</span>
<label class="wbBaseFieldLabel fw-normal">Description
<i class="fa fa-pencil text-primary cursorPointer half-opacity" onmouseenter="toggleOpacity(this)" title="Edit description" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i>
</label>
<div class="markdown">
Expand All @@ -176,7 +176,7 @@ <h3 class="box-title"><i id="changeIconRule" class="fa fa-gear"></i> Rule</h3>
Here comes the longDescription field
</div>
<div id="longDescriptionFieldMarkdownPreviewContainer" class="wbBaseField col-sm-6 row">
<label class="col-sm-12 row wbBaseFieldLabel"><span class="text-fit">Preview</span></label>
<label class="col-sm-12 row wbBaseFieldLabel fw-normal">Preview</label>
<div id="longDescriptionFieldPreviewMarkdown" class=" col-sm-12 row markdown"></div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h1>
<group-pendingchangerequest></group-pendingchangerequest>
<group-name></group-name>
<div id="longDescriptionFieldMarkdownContainer" class="form-group">
<label><span class="text-fit">Description</span>
<label class="fw-normal">Description
<lift:authz role="group_write">
<i class="fa fa-pencil text-primary cursorPointer half-opacity" onmouseenter="toggleOpacity(this)" title="Edit description" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i>
</lift:authz>
Expand All @@ -90,7 +90,7 @@ <h1>
Here comes the longDescription field
</div>
<div id="longDescriptionFieldMarkdownPreviewContainer" class="col-6 ps-2">
<label><span class="text-fit">Preview</span></label>
<label class="fw-normal">Preview</label>
<div id="longDescriptionFieldPreviewMarkdown" class="markdown"></div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</li>
</ul>
<div class="wbBaseField form-group">
<label class="text-fit mb-1">Match the criteria below with this operand:</label>
<label class="fw-normal mb-1">Match the criteria below with this operand:</label>
<div class="switch">
<span class="radio-inline" id="composition"></span>
</div>
Expand Down