Skip to content

[ticket/14976] Convert all ems to px #4626

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

Merged
marc1706 merged 15 commits into from
Oct 15, 2017
Merged

[ticket/14976] Convert all ems to px #4626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
980a9a6
[ticket/14976] Start converting ems
hanakin Jan 8, 2017
725805e
[ticket/14976] Some more em conversions
hanakin Jan 8, 2017
dbf1987
[ticket/14976] more em converstions and size fixes
hanakin Jan 9, 2017
3b5fa30
[ticket/14976] Fix icon line-height
hanakin Jan 9, 2017
3652a9c
[ticket/14976] More conversions
hanakin Jan 9, 2017
036d00f
[ticket/14976] Some cleanup
hanakin Jan 9, 2017
a3372e6
[ticket/14976] Fix linting
hanakin Feb 22, 2017
c51b613
[ticket/14976] Allow px line-heights for prosilver
hanakin Feb 22, 2017
f268e07
[ticket/14976] fix common.css and ignore normalize
hanakin Mar 9, 2017
8a312b0
[ticket/14976] fix errors
hanakin Mar 9, 2017
4ddc9a8
[ticket/14976] more fixes in content.css
hanakin Mar 9, 2017
f7baa94
[ticket/14976] Fix content.css
hanakin Mar 9, 2017
a408180
[ticket/14976] fix errors
hanakin May 13, 2017
dbcd54d
[ticket/14976] refactor fieldset.fields1 dd
hanakin Oct 13, 2017
b7c3318
[ticket/14976] fix error
hanakin Oct 13, 2017
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
2 changes: 1 addition & 1 deletion .stylelintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"declaration-empty-line-before": "never",

"declaration-property-unit-blacklist": {
"line-height": ["rem", "px", "em", "%"]
"line-height": ["rem", "em", "%"]
},
"declaration-property-unit-whitelist": {
"height": ["px", "%", "vh"],
Expand Down
16 changes: 8 additions & 8 deletions phpBB/styles/prosilver/theme/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
}
*/

/* Define your base font-size here; most elements will inherit this. */

/*
* 1. Define your base font-size here (16px), most elements will inherit this.
* 2. 24px (This is now our magic number; all subsequent margin-bottoms and
* line-heights want to be a multiple of this number in order to maintain
* vertical rhythm.)
*/
html {
font-size: 16px; /* Assuming 16px... */

/* 24px (This is now our magic number; all subsequent margin-bottoms and
line-heights want to be a multiple of this number in order to maintain
vertical rhythm.) */
line-height: 1.5;
font-size: 16px; /* [1] */
line-height: 1.5; /* [2] */
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}

Expand Down
26 changes: 15 additions & 11 deletions phpBB/styles/prosilver/theme/bidi.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/* -------------------------------------------------------------- */
/* stylelint-disable selector-max-compound-selectors */
/* stylelint-disable selector-no-qualifying-type */
/* stylelint-disable declaration-property-unit-whitelist */

/**
* common.css
Expand Down Expand Up @@ -196,8 +195,9 @@
text-align: right;
}

/* Not used anywhere maybe deprecated? */
.rtl table.table1 thead .autocol {
padding-right: 1em;
padding-right: 10px;
padding-left: 0;
}

Expand Down Expand Up @@ -295,6 +295,11 @@
margin-left: 5px;
}

.rtl .topic-poster {
float: right;
padding-left: 6px;
}

/* Action Bar styles
---------------------------------------- */
.rtl .action-bar .button {
Expand Down Expand Up @@ -513,7 +518,7 @@ li.breadcrumbs span:first-child > a {
---------------------------------------- */
.rtl .content ul,
.rtl .content ol {
margin-right: 3em;
margin-right: 40px;
margin-left: 0;
}

Expand All @@ -535,12 +540,12 @@ li.breadcrumbs span:first-child > a {

/* Quote block */
.rtl blockquote {
margin: 0.5em 25px 0 1px;
margin: 5px 25px 0 1px;
}

/* Nested quotes */
.rtl blockquote blockquote {
margin: 0.5em 15px 0 1px;
margin: 5px 15px 0 1px;
}

/* Username/source of quoter */
Expand Down Expand Up @@ -697,7 +702,7 @@ li.breadcrumbs span:first-child > a {
}

.rtl .cp-main .panel ol {
margin-right: 2em;
margin-right: 22px;
margin-left: 0;
}

Expand Down Expand Up @@ -820,7 +825,7 @@ li.breadcrumbs span:first-child > a {

.rtl option {
padding-right: 0;
padding-left: 1em;
padding-left: 11px;
}

.rtl label {
Expand Down Expand Up @@ -849,7 +854,7 @@ li.breadcrumbs span:first-child > a {
.rtl fieldset.fields1 dd {
border-right-width: 0;
border-left-width: 1px;
margin-right: 15em;
margin-right: 165px;
margin-left: 0;
}

Expand All @@ -862,7 +867,7 @@ li.breadcrumbs span:first-child > a {
.rtl fieldset.fields2 dd {
border-right-width: 0;
border-left-width: 1px;
margin-right: 16em;
margin-right: 176px;
margin-left: 0;
}

Expand Down Expand Up @@ -902,7 +907,7 @@ li.breadcrumbs span:first-child > a {
.rtl fieldset.display-actions {
text-align: left;
padding-right: 0;
padding-left: 1em;
padding-left: 11px;
}

.rtl fieldset.display-actions label {
Expand Down Expand Up @@ -985,4 +990,3 @@ li.breadcrumbs span:first-child > a {
}

/* stylelint-enable selector-no-qualifying-type */
/* stylelint-enable declaration-property-unit-whitelist */
6 changes: 1 addition & 5 deletions phpBB/styles/prosilver/theme/buttons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
$Buttons
/* -------------------------------------------------------------- */

/* stylelint-disable declaration-property-unit-whitelist */

.button {
font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica;
font-size: 13px;
Expand Down Expand Up @@ -156,7 +154,7 @@
}

.post-buttons .dropdown a {
font-size: 1.2em;
font-size: 13px;
text-align: right;
display: block;
}
Expand Down Expand Up @@ -207,5 +205,3 @@ ul.linklist.bulletin > li.small-icon:before {
padding-right: 19px;
padding-left: 0;
}

/* stylelint-enable declaration-property-unit-whitelist */
Loading