Index: lams_central/web/css/components.css =================================================================== diff -u -r3baf170a0e1ad705fc7a813c51322ab16707c45d -ra92b50b99f081e14a2af12a814e6760bcedc3db6 --- lams_central/web/css/components.css (.../components.css) (revision 3baf170a0e1ad705fc7a813c51322ab16707c45d) +++ lams_central/web/css/components.css (.../components.css) (revision a92b50b99f081e14a2af12a814e6760bcedc3db6) @@ -243,6 +243,12 @@ font-size: 1rem; } +.bbox_body div.cke_textarea_inline { + border: 0.1rem solid #DFDCE9; + border-radius: 1rem; + color: black; +} + .bbox_body input.form-control::placeholder { color: #989EAC; } @@ -404,7 +410,7 @@ padding: 0; } -.switch input+label { +.switch input ~ label { position: relative; min-width: calc(calc(2.375rem * .8) * 2); border-radius: calc(2.375rem * .8); @@ -418,7 +424,7 @@ text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem); } -.switch input+label::before, .switch input+label::after { +.switch input ~ label::before, .switch input ~ label::after { content: ''; position: absolute; top: 0; @@ -428,14 +434,14 @@ display: block; } -.switch input+label::before { +.switch input ~ label::before { right: 0; background-color: #dee2e6; border-radius: calc(2.375rem * .8); transition: 0.2s all; } -.switch input+label::after { +.switch input ~ label::after { top: 2px; left: 2px; width: calc(calc(2.375rem * .8) - calc(2px * 2)); @@ -445,73 +451,73 @@ transition: 0.2s all; } -.switch input:checked+label::before { +.switch input:checked ~ label::before { background-color: #7fdaa1; } -.switch input:checked+label::after { +.switch input:checked ~ label::after { margin-left: calc(2.375rem * .8); } -.switch input:focus+label::before { +.switch input:focus ~ label::before { outline: none; box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25); } -.switch input:disabled+label { +.switch input:disabled ~ label { color: #868e96; cursor: not-allowed; } -.switch input:disabled+label::before { +.switch input:disabled ~ label::before { background-color: #e9ecef; } .switch.switch-sm { font-size: 1rem; } -.switch.switch-sm input+label { +.switch.switch-sm input ~ label { min-width: calc(calc(1.9375rem * .8) * 2); height: calc(1.9375rem * .8); line-height: calc(1.9375rem * .8); text-indent: calc(calc(calc(1.9375rem * .8) * 2) + .5rem); } -.switch.switch-sm input+label::before { +.switch.switch-sm input ~ label::before { width: calc(calc(1.9375rem * .8) * 2); } -.switch.switch-sm input+label::after { +.switch.switch-sm input ~ label::after { width: calc(calc(1.9375rem * .8) - calc(2px * 2)); height: calc(calc(1.9375rem * .8) - calc(2px * 2)); } -.switch.switch-sm input:checked+label::after { +.switch.switch-sm input:checked ~ label::after { margin-left: calc(1.9375rem * .8); } .switch.switch-lg { font-size: 1.25rem; } -.switch.switch-lg input+label { +.switch.switch-lg input ~ label { min-width: calc(calc(3rem * .8)* 2); height: calc(3rem * .8); line-height: calc(3rem * .8); text-indent: calc(calc(calc(3rem * .8) * 2) + .5rem); } -.switch.switch-lg input+label::before { +.switch.switch-lg input ~ label::before { width: calc(calc(3rem * .8)* 2); } -.switch.switch-lg input+label::after { +.switch.switch-lg input ~ label::after { width: calc(calc(3rem * .8) - calc(2px * 2)); height: calc(calc(3rem * .8) - calc(2px * 2)); } -.switch.switch-lg input:checked+label::after { +.switch.switch-lg input:checked ~ label::after { margin-left: calc(3rem * .8); } Index: lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag =================================================================== diff -u -r4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7 -ra92b50b99f081e14a2af12a814e6760bcedc3db6 --- lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag (.../Dropdown.tag) (revision 4db761ac22cb30c958b4a1fc5e9cb6c1a9f42ff7) +++ lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag (.../Dropdown.tag) (revision a92b50b99f081e14a2af12a814e6760bcedc3db6) @@ -8,15 +8,18 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ attribute name="name" required="true" rtexprvalue="true" %> <%@ attribute name="labelKey" required="true" rtexprvalue="true" %> <%@ attribute name="id" required="false" rtexprvalue="true" %> +<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %> <%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %> <%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %> +
- + + + + + + + + + +
\ No newline at end of file Index: lams_tool_assessment/web/WEB-INF/tags/Switch.tag =================================================================== diff -u -r1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1 -ra92b50b99f081e14a2af12a814e6760bcedc3db6 --- lams_tool_assessment/web/WEB-INF/tags/Switch.tag (.../Switch.tag) (revision 1cb9d25feee29b24d2e09b9f4886b2ab00dcc5e1) +++ lams_tool_assessment/web/WEB-INF/tags/Switch.tag (.../Switch.tag) (revision a92b50b99f081e14a2af12a814e6760bcedc3db6) @@ -8,17 +8,20 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ attribute name="name" required="true" rtexprvalue="true" %> <%@ attribute name="labelKey" required="true" rtexprvalue="true" %> <%@ attribute name="checked" required="false" rtexprvalue="true" %> <%@ attribute name="id" required="false" rtexprvalue="true" %> +<%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %> <%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %> <%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %> +
- + + + + + + + + +
\ No newline at end of file