diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-17 16:02:47 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-17 16:02:47 +0200 |
| commit | 1b354ae468443f165b1c4665ce458a08684e2869 (patch) | |
| tree | ab05f4642c7620e14d88da02eaaff9feb7c4be12 /phpBB | |
| parent | ef890e3363547a0b8f99f7036265e1c072809b0c (diff) | |
| parent | a259d61f576d92194d13771e5b7edb3c1c977743 (diff) | |
| download | forums-1b354ae468443f165b1c4665ce458a08684e2869.tar forums-1b354ae468443f165b1c4665ce458a08684e2869.tar.gz forums-1b354ae468443f165b1c4665ce458a08684e2869.tar.bz2 forums-1b354ae468443f165b1c4665ce458a08684e2869.tar.xz forums-1b354ae468443f165b1c4665ce458a08684e2869.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/theme/buttons.css | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 19 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/cp.css | 6 |
3 files changed, 12 insertions, 16 deletions
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index f9a520369e..a816c7f7f2 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -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; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 7b17c58698..c126b9e3c2 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -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; } @@ -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; } @@ -811,7 +810,6 @@ fieldset.fields1 dl.pmlist dd.recipients { ---------------------------------------- */ .pagination { float: right; - font-size: 11px; margin-top: 3px; text-align: right; width: auto; @@ -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; @@ -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; } @@ -1213,7 +1210,7 @@ ul.linklist:after, } .notification_list p.notification-time { - font-size: 10px; + font-size: 0.9em; margin: 0; text-align: right; } @@ -1229,7 +1226,7 @@ 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 { @@ -1237,7 +1234,7 @@ ul.linklist:after, } .notification_list p.notifications_time { - font-size: 10px !important; + font-size: 0.9em !important; } .notification_text { @@ -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; } diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 81b6d9bf64..8a223f653f 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -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 { @@ -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; } |