diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-10 15:27:06 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-10 15:27:06 -0700 |
| commit | 0b56390e320fbad7d3873b5e7db35af958e89386 (patch) | |
| tree | 91619fb4919c9af4127c953843ecc466f08a2efb | |
| parent | 63f327853a4c270ccf8362c01efb707e89b982d6 (diff) | |
| parent | 9c223cdd88a6c4687b8a58c84ad9c7770a5e78ca (diff) | |
| download | forums-0b56390e320fbad7d3873b5e7db35af958e89386.tar forums-0b56390e320fbad7d3873b5e7db35af958e89386.tar.gz forums-0b56390e320fbad7d3873b5e7db35af958e89386.tar.bz2 forums-0b56390e320fbad7d3873b5e7db35af958e89386.tar.xz forums-0b56390e320fbad7d3873b5e7db35af958e89386.zip | |
Merge pull request #1571 from bantu/ticket/11345
[ticket/11345] Better font for buttons
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/simple_header.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/buttons.css | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 0b0c7a4172..6ca5c86fa4 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -25,6 +25,7 @@ --> <link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" /> +<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF --> <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> <link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 08b212363e..c5dfbc2f8f 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -8,6 +8,7 @@ <title>{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}</title> <link href="{T_THEME_PATH}/print.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="print" title="printonly" /> +<!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF --> <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> <link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 9336dd09f8..3860869501 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -27,7 +27,8 @@ border-radius: 4px; background: transparent none 0 0 repeat-x; padding: 2px 22px 2px 8px; - font-family: Verdana, Arial, Helvetica; + font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; + font-weight: 600; position: relative; text-decoration: none !important; outline-style: none !important; diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 9e3d29bec2..08123fd9e8 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1124,4 +1124,3 @@ input.disabled { .notification_list .pointer_inner { border-bottom-color: #F1F8FF; } - |