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:
authorsgiehl <stefangiehl@gmail.com>2012-05-19 01:18:03 +0400
committersgiehl <stefangiehl@gmail.com>2012-05-19 01:18:03 +0400
commit51641fdc5c1841af4c84b1010aa183ae960be2f3 (patch)
tree656af171edc305f99b0960b873d67ad220062f9c
parentd838d79dbaa1b90aff7a4d4c142781f3077ade97 (diff)
optimized several css statements
git-svn-id: http://dev.piwik.org/svn/trunk@6272 59fd770c-687e-43c8-a1e3-f5a4ff64c105
-rw-r--r--plugins/CoreHome/templates/datatable.css4
-rw-r--r--plugins/CoreUpdater/templates/update_welcome.tpl5
-rw-r--r--plugins/Installation/templates/install.css5
-rw-r--r--plugins/Live/templates/visitorLog.tpl9
-rw-r--r--plugins/Login/templates/login.css3
-rw-r--r--plugins/MultiSites/templates/styles.css4
-rw-r--r--tests/lib/jsdoc-toolkit/templates/jsdoc/static/default.css3
-rw-r--r--themes/default/common.css33
-rw-r--r--themes/default/simple_structure.css3
-rw-r--r--themes/default/styles.css5
10 files changed, 30 insertions, 44 deletions
diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css
index 743657a269..1ceac6f8a1 100644
--- a/plugins/CoreHome/templates/datatable.css
+++ b/plugins/CoreHome/templates/datatable.css
@@ -146,9 +146,7 @@ table.dataTable td.columnodd {
}
table.dataTable td.labeleven {
- background: #F9FAFA;
- background-image: url(images/bullet2.gif);
- background-repeat: no-repeat;
+ background: #F9FAFA url(images/bullet2.gif) no-repeat;
}
table.dataTable td.labelodd {
diff --git a/plugins/CoreUpdater/templates/update_welcome.tpl b/plugins/CoreUpdater/templates/update_welcome.tpl
index ad7be091e1..410266e9d7 100644
--- a/plugins/CoreUpdater/templates/update_welcome.tpl
+++ b/plugins/CoreUpdater/templates/update_welcome.tpl
@@ -84,9 +84,8 @@
<style type="text/css">
code {
background-color:#F0F7FF;
- border-color:#00008B;
- border-style:dashed dashed dashed solid;
- border-width:1px 1px 1px 5px;
+ border: 1px dashed #00008B;
+ border-left: 5px solid;
direction:ltr;
display:block;
margin:2px 2px 20px;
diff --git a/plugins/Installation/templates/install.css b/plugins/Installation/templates/install.css
index 93590cd488..7b90120b22 100644
--- a/plugins/Installation/templates/install.css
+++ b/plugins/Installation/templates/install.css
@@ -146,9 +146,8 @@ p.nextStep a {
}
td {
- border-color:#FFFFFF rgb(198, 205, 216) rgb(198, 205, 216) rgb(198, 205, 216) ;
- border-style:solid;
- border-width:1px;
+ border: 1px solid rgb(198, 205, 216);
+ border-top-color: #FFF;
color:#203276;
padding:0.5em 0.5em 0.5em 0.8em;
}
diff --git a/plugins/Live/templates/visitorLog.tpl b/plugins/Live/templates/visitorLog.tpl
index 74f1fb71df..046ca13ccf 100644
--- a/plugins/Live/templates/visitorLog.tpl
+++ b/plugins/Live/templates/visitorLog.tpl
@@ -293,15 +293,14 @@
{literal}
<style type="text/css">
- hr {
+hr {
background:none repeat scroll 0 0 transparent;
- border-color:-moz-use-text-color -moz-use-text-color #EEEEEE;
- border-style:none none solid;
- border-width:0 0 1px;
+ border: 0 none -moz-use-text-color;
+ border-bottom: 1px solid #EEEEEE;
color:#CCCCCC;
margin:0 2em 0.5em;
padding:0 0 0.5em;
- }
+}
</style>
{/literal}
diff --git a/plugins/Login/templates/login.css b/plugins/Login/templates/login.css
index 48e1f80f87..1123898e87 100644
--- a/plugins/Login/templates/login.css
+++ b/plugins/Login/templates/login.css
@@ -53,8 +53,7 @@ form p {
#login {
width: 292px;
- margin: 7em auto;
- margin-top: 20px;
+ margin: 20px auto 7em;
}
#login_error,.message {
diff --git a/plugins/MultiSites/templates/styles.css b/plugins/MultiSites/templates/styles.css
index de3d76528f..d7695d8970 100644
--- a/plugins/MultiSites/templates/styles.css
+++ b/plugins/MultiSites/templates/styles.css
@@ -11,9 +11,7 @@
font-size:15px;
}
.indicator {
- background-image: url("../images/loading-blue.gif");
- background-position: center;
- background-repeat: no-repeat;
+ background: url("../images/loading-blue.gif") no-repeat center;
height: 20px;
width: 60px;
margin: auto;
diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/static/default.css b/tests/lib/jsdoc-toolkit/templates/jsdoc/static/default.css
index 97e021ef63..7481a2e802 100644
--- a/tests/lib/jsdoc-toolkit/templates/jsdoc/static/default.css
+++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/static/default.css
@@ -123,8 +123,7 @@ td.attributes, .fixedFont
.summaryTable td.nameDescription, .description
{
line-height: 15px;
- padding: 4px;
- padding-left: 4px;
+ padding: 4px;
}
.summaryTable { margin-bottom: 8px; }
diff --git a/themes/default/common.css b/themes/default/common.css
index 84a2badbe6..9a57645624 100644
--- a/themes/default/common.css
+++ b/themes/default/common.css
@@ -12,7 +12,7 @@ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abb
abbr {
border-bottom: 1px dotted;
}
-form {margin: 0px; }
+form {margin: 0; }
body {
line-height: 1.33;
background-color: white;
@@ -48,7 +48,7 @@ br.clearAll {
}
br.clear, div.clear{
clear:both;
- height:0px;
+ height:0;
overflow:hidden;
}
@@ -155,7 +155,7 @@ a {
#periodString .period-type label{
font-size:12px;
display:inline-block;
- padding: 2px 0px 3px 0;
+ padding: 2px 0 3px 0;
vertical-align:top;
}
@@ -232,7 +232,7 @@ a {
}
.sites_autocomplete label{
display:inline-block;
- padding:7px 12px 6px 0px;
+ padding:7px 12px 6px 0;
float:left;
}
@@ -391,10 +391,9 @@ a {
border-spacing:0;
}
.tableForm td {
- border-color:#FFF #C6CDD8 #C6CDD8 #C6CDD8;
- border-style:solid;
+ border: 1px solid #C6CDD8;
+ border-top: 10px #FFF;
padding:0.5em 0.5em 0.5em 0.8em;
- border-width:10px 1px 1px 1px;
color:#203276;
}
.tableForm input {
@@ -451,9 +450,9 @@ div.ui-state-highlight {
.ui-datepicker{
border: 1px solid #fff!important;
- border-radius:0px!important;
- -moz-border-radius:0px!important;
- -webkit-border-radius:0px!important;
+ border-radius:0!important;
+ -moz-border-radius:0!important;
+ -webkit-border-radius:0!important;
font-size:11px!important;
padding:0!important;
width:160px!important;
@@ -462,9 +461,9 @@ div.ui-state-highlight {
.ui-datepicker-header{
background:#847b6d url(images/dashboard_h_bg_hover.png) repeat-x 0 0!important;
color:#fff!important;
- border-radius:0px!important;
- -moz-border-radius:0px!important;
- -webkit-border-radius:0px!important;
+ border-radius:0!important;
+ -moz-border-radius:0!important;
+ -webkit-border-radius:0!important;
}
.ui-datepicker select {
padding:0;
@@ -551,9 +550,8 @@ input, select, textarea {
margin-bottom:3px;
}
input[disabled] {
- background:none;
- background-color:#E9E9E9;
- font-style:italic;
+ background: #E9E9E9 none;
+ font-style:italic;
}
select {
@@ -573,8 +571,7 @@ select {
border:0;
background:#847b6d url(images/dashboard_h_bg_hover.png) repeat-x 0 0;
float:right;
- margin:12px 0 0 0;
- margin-bottom:10px;
+ margin:12px 0 10px 0;
}
/* on admin screen, Save button aligned on the left */
.admin .submit {
diff --git a/themes/default/simple_structure.css b/themes/default/simple_structure.css
index b3f85f2ff5..b7fe94df6d 100644
--- a/themes/default/simple_structure.css
+++ b/themes/default/simple_structure.css
@@ -7,8 +7,7 @@
font-family: Arial, Georgia, "Times New Roman", Times, serif;
padding: 1em 2em;
width:780px;
- margin:auto;
- margin-top: 30px;
+ margin: 30px auto auto;
-moz-border-radius: 12px;
-webkit-border-radius: 12px;
}
diff --git a/themes/default/styles.css b/themes/default/styles.css
index 726dd2ec6a..17ef281a67 100644
--- a/themes/default/styles.css
+++ b/themes/default/styles.css
@@ -31,9 +31,8 @@
code {
background-color:#F6F9F9;
- border-color:#3B3BB5;
- border-style:dashed dashed dashed solid;
- border-width:1px 1px 1px 5px;
+ border: 1px dashed #3B3BB5;
+ border-left: 5px solid;
direction:ltr;
display:table;
font-size:100%;