diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css
index 77eaf253e9..8e20885378 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css
@@ -1,8 +1,13 @@
-.udiv[data-role="controlgroup"], fieldset[data-role="controlgroup"] {
+div[data-role="controlgroup"], fieldset[data-role="controlgroup"] {
padding: 0;
margin: .5em 0;
+ clear: both;
}
+ div[data-role="controlgroup"] + *, fieldset[data-role="controlgroup"] + * {
+ clear: both;
+ }
+
*[data-role="controlgroup"].ui-mini .ui-btn-icon-notext,
*[data-role="controlgroup"] .ui-mini.ui-btn-icon-notext {
font-size: inherit;
@@ -24,26 +29,22 @@
list-style: none;
}
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn,
-div[data-role="controlgroup"][data-type="horizontal"] li > .ui-btn,
-div[data-role="controlgroup"][data-type="horizontal"] .ui-checkbox,
-div[data-role="controlgroup"][data-type="horizontal"] .ui-radio,
-div[data-role="controlgroup"][data-type="horizontal"].ui-select {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn,
+*[data-role="controlgroup"][data-type="horizontal"] li > .ui-btn,
+*[data-role="controlgroup"][data-type="horizontal"] .ui-checkbox,
+*[data-role="controlgroup"][data-type="horizontal"] .ui-radio,
+*[data-role="controlgroup"][data-type="horizontal"].ui-select {
float: left;
clear: none;
}
-div[data-role="controlgroup"][data-type="horizontal"] input[type="radio"] {
- display: none;
-}
-
-div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn,
+*[data-role="controlgroup"][data-type="horizontal"] button.ui-btn,
*[data-role="controlgroup"] .ui-btn-icon-notext {
width: auto;
}
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn-icon-notext,
-div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn-icon-notext,
+*[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext {
width: 1.5em;
}
@@ -56,18 +57,22 @@ div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext
border-bottom-width: 0;
}
- *[data-role="controlgroup"]:not([data-type="horizontal"]) .ui-checkbox:last-child .ui-btn {
- border-bottom-width: 1px;
- }
+*[data-role="controlgroup"]:not([data-type="horizontal"]) .ui-checkbox:last-child .ui-btn {
+ border-bottom-width: 1px;
+}
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn {
border-right-width: 0;
}
- div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
+ *[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
border-right-width: 1px;
}
+*[data-role="controlgroup"][data-type="horizontal"] .ui-radio:last-child label {
+ border-right-width: 1px;
+}
+
*[data-role="controlgroup"] .ui-btn-corner-all,
*[data-role="controlgroup"] .ui-btn.ui-corner-all {
-webkit-border-radius: 0;
@@ -82,14 +87,14 @@ div[data-role="controlgroup"][data-type="horizontal"] .ui-btn {
border-radius: inherit;
}
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:first-child {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn:first-child {
-webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit;
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
}
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-bottom-right-radius: inherit;
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 94b0436bab..421dba23d3 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -449,7 +449,7 @@ paper-input label, paper-textarea label {
}
.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .fieldDescription {
- color: #858585;
+ color: #ccc;
}
.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .fieldDescription {
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 96b3528c04..1129b6e016 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -18,7 +18,7 @@