com web/php: Merge remote-tracking branch 'webarto/master': include/header.inc styles/theme-base.css
| From: | Adam Harvey | Date: | Wed, 20 Nov 2013 22:14:25 +0000 |
| Subject: | com web/php: Merge remote-tracking branch 'webarto/master': include/header.inc styles/theme-base.css | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-17089@lists.php.net to get a copy of this message | ||
Commit: 1573282c4c9a6d4d92fde8197e44f15679fd63f3
Author: Adam Harvey <aharvey@php.net> Wed, 20 Nov 2013 14:14:25 -0800
Parents: 73d9faf6ae981a769d79173c8ce56ff39691b0fb 4e744e64402d9dfe4aae1913416838e822fb0281
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=1573282c4c9a6d4d92fde8197e44f15679fd63f3
Log:
Merge remote-tracking branch 'webarto/master'
* webarto/master:
Fix FF 1px nav space and IE logo border
Changed paths:
MM include/header.inc
MM styles/theme-base.css
Diff:
diff --cc include/header.inc
index d60a2f6,35fc4c5..c107b98
--- a/include/header.inc
+++ b/include/header.inc
@@@ -39,8 -39,8 +39,8 @@@ if (isset($shortname) && $shortname)
<?php endforeach ?>
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,400italic,600italic|Source+Code+Pro&subset=latin,latin-ext'
rel='stylesheet' type='text/css'>
- <link rel="stylesheet" type="text/css" href="<?php echo
$STATIC_ROOT ?>styles/theme-base.css?t=20131120a" media="screen" />
- <link rel="stylesheet" type="text/css" href="<?php echo
$STATIC_ROOT ?>styles/theme-base.css" media="screen" />
- <link rel="stylesheet" type="text/css" href="<?php echo
$STATIC_ROOT ?>styles/theme-medium.css" media="screen" />
++ <link rel="stylesheet" type="text/css" href="<?php echo
$STATIC_ROOT ?>styles/theme-base.css?t=20131120b" media="screen" />
+ <link rel="stylesheet" type="text/css" href="<?php echo
$STATIC_ROOT ?>styles/theme-medium.css?t=20131120" media="screen" />
<?php
if(isset($config['css']) && is_array($config['css'])):