Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2008-11-04 18:41:21 +0300
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2008-11-04 18:41:21 +0300
commitbf0b36f26c6765767f97bc383cce913c8e93f37f (patch)
treee6f82098767b727978dbd90b2dd76067dfee682c
parent8308d787c43b4de65c3a729e038b3462d9206e36 (diff)
- trying to look better in chrome
-rw-r--r--plugins/CoreHome/templates/calendar.js3
-rw-r--r--plugins/CoreHome/templates/js_css_includes.tpl1
-rw-r--r--plugins/CoreHome/templates/logo.tpl3
-rw-r--r--plugins/CoreHome/templates/period_select.tpl1
-rw-r--r--plugins/CoreHome/templates/styles.css4
-rw-r--r--plugins/LanguagesManager/templates/languages.tpl1
-rw-r--r--themes/default/common.css1
7 files changed, 7 insertions, 7 deletions
diff --git a/plugins/CoreHome/templates/calendar.js b/plugins/CoreHome/templates/calendar.js
index ab2f94eb39..8a5b20ef1b 100644
--- a/plugins/CoreHome/templates/calendar.js
+++ b/plugins/CoreHome/templates/calendar.js
@@ -133,6 +133,7 @@ function formatDate(date)
}
$(document).ready(function(){
+
$("#calendar").calendar({
onSelect: updateDate,
showOtherMonths: true,
@@ -168,5 +169,7 @@ $(document).ready(function(){
_pk_translate('CoreHome_MonthDecemeber')]
},
currentDate);
+
+ $("#calendar").hide();
}
);
diff --git a/plugins/CoreHome/templates/js_css_includes.tpl b/plugins/CoreHome/templates/js_css_includes.tpl
index b2e8645faa..ec05930fdf 100644
--- a/plugins/CoreHome/templates/js_css_includes.tpl
+++ b/plugins/CoreHome/templates/js_css_includes.tpl
@@ -21,6 +21,7 @@
<link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/menu.css" />
<link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/datatable.css" />
<link rel="stylesheet" type="text/css" href="plugins/Dashboard/templates/dashboard.css" />
+<link rel="stylesheet" type="text/css" href="libs/jquery/jquery-calendar.css" />
{postEvent name="template_js_import"}
{postEvent name="template_css_import"}
diff --git a/plugins/CoreHome/templates/logo.tpl b/plugins/CoreHome/templates/logo.tpl
index 4b49d150bb..faedc223f4 100644
--- a/plugins/CoreHome/templates/logo.tpl
+++ b/plugins/CoreHome/templates/logo.tpl
@@ -1,7 +1,6 @@
<span id="logo">
<a href="index.php" title="Piwik # Open Source Web Analytics" style="text-decoration: none;">
<span style="color: rgb(245, 223, 114);">P</span><span style="color: rgb(241, 175, 108);">i</span><span style="color: rgb(241, 117, 117);">w</span><span style="color: rgb(155, 106, 58);">i</span><span style="color: rgb(107, 50, 11);">k</span>
- {if $currentModule != 'CoreHome'}<span style="padding-left:1em;font-size: 20pt; letter-spacing: -1pt; color: rgb(107, 50, 11);">&rsaquo; {$currentPluginName}{/if}
-</span>
+ {if $currentModule != 'CoreHome'}<span style="padding-left:1em;font-size: 20pt; letter-spacing: -1pt; color: rgb(107, 50, 11);">&rsaquo; {$currentPluginName}</span>{/if}
</a>
</span> \ No newline at end of file
diff --git a/plugins/CoreHome/templates/period_select.tpl b/plugins/CoreHome/templates/period_select.tpl
index b65cc6205d..4b2e13a568 100644
--- a/plugins/CoreHome/templates/period_select.tpl
+++ b/plugins/CoreHome/templates/period_select.tpl
@@ -2,7 +2,6 @@
<script type="text/javascript" src="libs/jquery/jquery-calendar.js"></script>
<script type="text/javascript" src="plugins/CoreHome/templates/calendar.js"></script>
<script type="text/javascript" src="plugins/CoreHome/templates/date.js"></script>
-<link rel="stylesheet" type="text/css" href="libs/jquery/jquery-calendar.css" />
<span id="periodString">
<span id="date"><img src='plugins/CoreHome/templates/images/more_date.gif' style="vertical-align:middle" alt="" /> {$prettyDate}</span> -&nbsp;
diff --git a/plugins/CoreHome/templates/styles.css b/plugins/CoreHome/templates/styles.css
index ed8054402c..29092b0c64 100644
--- a/plugins/CoreHome/templates/styles.css
+++ b/plugins/CoreHome/templates/styles.css
@@ -1,7 +1,3 @@
-#title {
- align: left;
-}
-
h1 {
font-size: 2em;
color: #0F1B2E;
diff --git a/plugins/LanguagesManager/templates/languages.tpl b/plugins/LanguagesManager/templates/languages.tpl
index a8f9a56a8d..ee4a6d32cb 100644
--- a/plugins/LanguagesManager/templates/languages.tpl
+++ b/plugins/LanguagesManager/templates/languages.tpl
@@ -15,6 +15,7 @@
$(document).ready(function() {
$("#languageSelection").fdd2div({CssClassName:"formDiv"});
$("#languageSelection").show();
+ $("#languageSelection ul").hide();
});</script>
{/literal}
</span>
diff --git a/themes/default/common.css b/themes/default/common.css
index bd31b943d2..65894f505d 100644
--- a/themes/default/common.css
+++ b/themes/default/common.css
@@ -101,6 +101,7 @@ a {
float: left;
height: 22px;
padding-left: 10px;
+ width:550px; /* when this is not set, wrong display in safari/chrome? */
}
#topLeftBar, #topRightBar {
font-family: arial, sans-serif !important;