Skip to content

Commit

Permalink
Merge pull request phpbb#3649 from callumacrae/ticket/13879
Browse files Browse the repository at this point in the history
[ticket/13879] Replaced px with em where appropriate.
  • Loading branch information
marc1706 committed Jun 17, 2015
2 parents 8b28881 + 8b6c6e7 commit a259d61
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
3 changes: 1 addition & 2 deletions phpBB/styles/prosilver/theme/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
cursor: pointer;
display: inline-block;
height: 18px;
line-height: 18px;
font-size: 13px;
font-size: 1.2em;
white-space: nowrap;
border: 1px solid transparent;
border-radius: 4px;
Expand Down
19 changes: 8 additions & 11 deletions phpBB/styles/prosilver/theme/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,9 @@ ul.linklist li.responsive-menu {
ul.linklist li.responsive-menu a.responsive-menu-link {
display: inline-block;
margin: 0 5px;
font-size: 16px;
position: relative;
width: 16px;
line-height: 20px;
line-height: 1.2em;
text-decoration: none;
}

Expand Down Expand Up @@ -799,7 +798,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
/* Action-bars (container for post/reply buttons, pagination, etc.)
---------------------------------------- */
.action-bar {
font-size: 11px;
font-size: 1.1em;
margin: 4px 0;
}

Expand All @@ -811,7 +810,6 @@ fieldset.fields1 dl.pmlist dd.recipients {
---------------------------------------- */
.pagination {
float: right;
font-size: 11px;
margin-top: 3px;
text-align: right;
width: auto;
Expand Down Expand Up @@ -841,7 +839,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
display: block;
font-size: 0.9em;
font-weight: normal;
line-height: 13px;
line-height: 1.4em;
min-width: 10px;
padding: 3px;
text-align: center;
Expand Down Expand Up @@ -1156,12 +1154,11 @@ ul.linklist:after,
.dropdown-extended .header {
padding: 0 10px;
font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 11px;
font-weight: bold;
text-align: left;
text-shadow: 1px 1px 1px white;
text-transform: uppercase;
line-height: 30px;
line-height: 3em;
border-bottom: 1px solid;
border-radius: 5px 5px 0 0;
}
Expand Down Expand Up @@ -1213,7 +1210,7 @@ ul.linklist:after,
}

.notification_list p.notification-time {
font-size: 10px;
font-size: 0.9em;
margin: 0;
text-align: right;
}
Expand All @@ -1229,15 +1226,15 @@ ul.linklist:after,

.notification_list p.notifications_title {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size: 13px !important;
font-size: 1.2em !important;
}

.notification_list p.notifications_title strong {
font-weight: bold;
}

.notification_list p.notifications_time {
font-size: 10px !important;
font-size: 0.9em !important;
}

.notification_text {
Expand All @@ -1260,7 +1257,7 @@ ul.linklist:after,
}

#quick-links a.responsive-menu-link:before {
font-size: 16px;
font-size: 1.6em;
line-height: 16.5px;
}

Expand Down
6 changes: 3 additions & 3 deletions phpBB/styles/prosilver/theme/cp.css
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ ul.cplist {
float: left;
font-size: 1em;
font-weight: bold;
line-height: 14px;
line-height: 1.4em;
}

#tabs .tab > a, #minitabs .tab > a {
Expand Down Expand Up @@ -172,10 +172,10 @@ ul.cplist {

.responsive-tab > a.responsive-tab-link {
display: block;
font-size: 16px;
font-size: 1.6em;
position: relative;
width: 16px;
line-height: 14px;
line-height: 0.9em;
text-decoration: none;
}

Expand Down

0 comments on commit a259d61

Please sign in to comment.