Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Controlgroup height and default font-family #8516

Closed
wants to merge 3 commits into from
Closed

Controlgroup height and default font-family #8516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
531c47b
Icons: Use margin instead of bottom offset for vertical icon position
jaspermdegroot Sep 1, 2016
35639f4
Core: Also unset moz-focus-inner border for input elements
jaspermdegroot Sep 1, 2016
ed60a2a
Theme: Set system font as default font
jaspermdegroot Sep 1, 2016
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
13 changes: 5 additions & 8 deletions css/structure/jquery.mobile.core.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,7 @@ div.ui-mobile-viewport {
height: 22px;
line-height: inherit;
vertical-align: middle;
position: relative;
bottom: 2px;
margin-top: -2px;
}
.ui-widget-icon-block {
display: block;
Expand All @@ -290,7 +289,6 @@ div.ui-mobile-viewport {
text-indent: 100%;
white-space: nowrap;
overflow: hidden;
bottom: auto;
top: 50%;
left: 50%;
}
Expand All @@ -303,14 +301,12 @@ div.ui-mobile-viewport {

/* Float icons helper classes */
.ui-widget-icon-floatbeginning {
bottom: auto;
float: left;
margin-right: 1em;
margin: 1px 1em 0 0;
}
.ui-widget-icon-floatend {
bottom: auto;
float: right;
margin-left: 1em;
margin: 1px 0 0 1em;
}

/* Button elements and input buttons */
Expand All @@ -331,7 +327,8 @@ input.ui-button-inline,
width: auto;
}
/* Firefox adds a 1px border in a button element. We negate this to make sure they have the same height as other buttons in controlgroups. */
button.ui-button::-moz-focus-inner {
button.ui-button::-moz-focus-inner,
input.ui-button::-moz-focus-inner {
border: 0;
}
button.ui-button-icon-only,
Expand Down
2 changes: 1 addition & 1 deletion css/themes/default/jquery.mobile.theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ button,
.ui-button {
font-size: 1em;
line-height: 1.3;
font-family: sans-serif /*{global-font-family}*/;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Arial, sans-serif /*{global-font-family}*/;
}
legend,
.ui-textinput-text input,
Expand Down