7:43 a.m.
This is the difference between this patchset and the previous one (v1):
- Do not change the indentation level in "ui/css/theme-default/topbar.css";
that file contains a @media block, therefore the properties defined inside
of it have another indentation level (8 spaces). That case was not
considered by the sed regular expression that generated this patch.
7:43 a.m.
New subject: [PATCH] Change all CSS files indentation to 4 spaces
In order to make the code more consistent, all CSS files should use the
same indentation level.
Use 4 spaces to indent the CSS properties.
Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com>
---
ui/css/theme-default/button.css | 10 +++++-----
ui/css/theme-default/line-chart.css | 6 +++---
ui/css/theme-default/popover.css | 14 +++++++-------
ui/css/theme-default/storage.css | 24 ++++++++++++------------
ui/css/theme-default/template_add.css | 4 ++--
5 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css
index c7ed3f6..304f4f4 100644
--- a/ui/css/theme-default/button.css
+++ b/ui/css/theme-default/button.css
@@ -80,7 +80,7 @@
}
.btn.loading .icon {
- background: url(../images/theme-default/icon-load.png) center center no-repeat;
+ background: url(../images/theme-default/icon-load.png) center center no-repeat;
}
.btn .text {
@@ -125,7 +125,7 @@
background: #f3f3f3;
background: -moz-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc
100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f3f3f3),
color-stop(50%, #dddddd),
- color-stop(51%, #d8d8d8), color-stop(100%, #cccccc));
+ color-stop(51%, #d8d8d8), color-stop(100%, #cccccc));
background: -webkit-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%,
#cccccc 100%);
background: -o-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc
100%);
background: -ms-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc
100%);
@@ -137,7 +137,7 @@
.btn-tool:hover {
box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 2px 2px 2px rgba(0, 0, 0, .25)
inset, -3px -3px 3px rgba(0, 0, 0, .25)
- inset;
+ inset;
}
/* Generated at http://colorzilla.com/gradient-editor/ */
@@ -373,8 +373,8 @@
line-height: 38px;
padding: 0 20px;
color: #EEE;
- border-radius: 8px;
- font-size: 13px;
+ border-radius: 8px;
+ font-size: 13px;
}
.btn-normal:not([disabled]):hover {
diff --git a/ui/css/theme-default/line-chart.css b/ui/css/theme-default/line-chart.css
index 4fc0e2e..5bb61e2 100644
--- a/ui/css/theme-default/line-chart.css
+++ b/ui/css/theme-default/line-chart.css
@@ -1,13 +1,13 @@
.chart-container {
- background: black;
+ background: black;
}
.line-chart {
- overflow: hidden;
+ overflow: hidden;
}
.line-chart .background {
- fill: black;
+ fill: black;
}
.line-chart text {
diff --git a/ui/css/theme-default/popover.css b/ui/css/theme-default/popover.css
index 95eb183..63f09cb 100644
--- a/ui/css/theme-default/popover.css
+++ b/ui/css/theme-default/popover.css
@@ -75,18 +75,18 @@
.actionsheet {
background: rgb(238, 238, 238);
background: -moz-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204,
1) 10px, rgba(204, 204, 204, 1) 96%,
- rgba(165, 165, 165, 1) 100%);
+ rgba(165, 165, 165, 1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(238,
238, 238, 1)),
- color-stop(10px, rgba(204, 204, 204, 1)), color-stop(96%, rgba(204, 204, 204,
1)),
- color-stop(100%, rgba(165, 165, 165, 1)));
+ color-stop(10px, rgba(204, 204, 204, 1)), color-stop(96%, rgba(204, 204, 204, 1)),
+ color-stop(100%, rgba(165, 165, 165, 1)));
background: -webkit-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204,
204, 1) 10px, rgba(204, 204, 204, 1)
- 96%, rgba(165, 165, 165, 1) 100%);
+ 96%, rgba(165, 165, 165, 1) 100%);
background: -o-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1)
10px, rgba(204, 204, 204, 1) 96%,
- rgba(165, 165, 165, 1) 100%);
+ rgba(165, 165, 165, 1) 100%);
background: -ms-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204,
1) 10px, rgba(204, 204, 204, 1) 96%,
- rgba(165, 165, 165, 1) 100%);
+ rgba(165, 165, 165, 1) 100%);
background: linear-gradient(to bottom, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204,
1) 10px, rgba(204, 204, 204, 1)
- 96%, rgba(165, 165, 165, 1) 100%);
+ 96%, rgba(165, 165, 165, 1) 100%);
padding: 10px 10px 0 10px;
}
diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css
index d81dc75..3eb3321 100644
--- a/ui/css/theme-default/storage.css
+++ b/ui/css/theme-default/storage.css
@@ -66,13 +66,13 @@
background: #ffffff;
background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff),
- color-stop(100%, #e5e5e5));
+ color-stop(100%, #e5e5e5));
background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%);
background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%);
background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%);
background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',
- endColorstr='#e5e5e5', GradientType=0);
+ endColorstr='#e5e5e5', GradientType=0);
border: 1px solid #ccc;
color: #333;
-moz-border-top-left-radius: 8px;
@@ -212,7 +212,7 @@
.status-dot {
background: #72AA00;
background: linear-gradient(to bottom, #BFD255 0%, #8EB92A 50%, #72AA00 51%, #9ECB2D
- 100%) repeat scroll 0 0 transparent;
+ 100%) repeat scroll 0 0 transparent;
border: 1px solid #72AA00;
border-radius: 13px;
box-shadow: 3px 3px 3px #FFFFFF, -3px -3px 3px #DDDDDD;
@@ -282,7 +282,7 @@
.inactive {
background: #E80501;
background: linear-gradient(to bottom, #E88692 0%, #E84845 50%, #E80501 51%, #E84845
- 100%) repeat scroll 0 0 transparent;
+ 100%) repeat scroll 0 0 transparent;
border: 1px solid #FF340C;
}
@@ -300,7 +300,7 @@
.detail-view-icon {
background: url(../images/large_details_icon.png) no-repeat center
- center;
+ center;
height: 30px;
width: 42px;
}
@@ -458,21 +458,21 @@
.list-storage .storage-li[data-stat="active"]>.handle>.arrow-down {
background: url(../images/theme-default/arrow-down.png) no-repeat center
- center;
+ center;
height: 52px;
width: 45px;
}
.list-storage .storage-li[data-stat="inactive"]>.handle>.arrow-down {
background: url(../images/theme-default/arrow-down-disable.png) no-repeat center
- center;
+ center;
height: 52px;
width: 45px;
}
.arrow-up {
background: url(../images/theme-default/arrow-up.png) no-repeat center
- center;
+ center;
height: 52px;
width: 45px;
}
@@ -489,22 +489,22 @@
.volume-default {
background: url(../images/theme-default/icon-volume-default.png)
- no-repeat center center;
+ no-repeat center center;
}
.icon-raw {
background: url(../images/theme-default/icon-raw.png) no-repeat center
- center;
+ center;
}
.icon-qcow2 {
background: url(../images/theme-default/icon-qcow2.png) no-repeat center
- center;
+ center;
}
.icon-iso {
background: url(../images/theme-default/icon-iso.png) no-repeat center
- center;
+ center;
}
.host-partition {
diff --git a/ui/css/theme-default/template_add.css
b/ui/css/theme-default/template_add.css
index 46cf56b..e392fe9 100644
--- a/ui/css/theme-default/template_add.css
+++ b/ui/css/theme-default/template_add.css
@@ -284,6 +284,6 @@
}
#iso-more-loading {
- background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px center
no-repeat;
- padding: 0 20px 0 26px;
+ background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px center
no-repeat;
+ padding: 0 20px 0 26px;
}
--
1.8.4.2
9:59 a.m.
New subject: [PATCH] Change all CSS files indentation to 4 spaces
On 01/17/2014 11:43 AM, Crístian Viana wrote:
In order to make the code more consistent, all CSS files should use
the
same indentation level.
Use 4 spaces to indent the CSS properties.
Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com>
---
ui/css/theme-default/button.css | 10 +++++-----
ui/css/theme-default/line-chart.css | 6 +++---
ui/css/theme-default/popover.css | 14 +++++++-------
ui/css/theme-default/storage.css | 24 ++++++++++++------------
ui/css/theme-default/template_add.css | 4 ++--
5 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css
index c7ed3f6..304f4f4 100644
--- a/ui/css/theme-default/button.css
+++ b/ui/css/theme-default/button.css
@@ -80,7 +80,7 @@
}
.btn.loading .icon {
- background: url(../images/theme-default/icon-load.png) center center no-repeat;
+ background: url(../images/theme-default/icon-load.png) center center no-repeat;
}
.btn .text {
@@ -125,7 +125,7 @@
background: #f3f3f3;
background: -moz-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc
100%);
background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #f3f3f3), color-stop(50%, #dddddd),
- color-stop(51%, #d8d8d8), color-stop(100%, #cccccc));
+ color-stop(51%, #d8d8d8), color-stop(100%, #cccccc));
In this case, the second line is a continuation of the first one. So I
suggest to indent it as following:
background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #f3f3f3), color-stop(50%, #dddddd),
color-stop(51%, #d8d8d8), color-stop(100%, #cccccc));
background: -webkit-linear-gradient(top, #f3f3f3 0%, #dddddd
50%, #d8d8d8 51%, #cccccc 100%);
background: -o-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc
100%);
background: -ms-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc
100%);
@@ -137,7 +137,7 @@
.btn-tool:hover {
box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 2px 2px 2px rgba(0, 0, 0, .25)
inset, -3px -3px 3px rgba(0, 0, 0, .25)
- inset;
+ inset;
Same here and for all other occurrences.
}
/* Generated at http://colorzilla.com/gradient-editor/ */
@@ -373,8 +373,8 @@
line-height: 38px;
padding: 0 20px;
color: #EEE;
- border-radius: 8px;
- font-size: 13px;
+ border-radius: 8px;
+ font-size: 13px;
}
.btn-normal:not([disabled]):hover {
diff --git a/ui/css/theme-default/line-chart.css b/ui/css/theme-default/line-chart.css
index 4fc0e2e..5bb61e2 100644
--- a/ui/css/theme-default/line-chart.css
+++ b/ui/css/theme-default/line-chart.css
@@ -1,13 +1,13 @@
.chart-container {
- background: black;
+ background: black;
}
.line-chart {
- overflow: hidden;
+ overflow: hidden;
}
.line-chart .background {
- fill: black;
+ fill: black;
}
.line-chart text {
diff --git a/ui/css/theme-default/popover.css b/ui/css/theme-default/popover.css
index 95eb183..63f09cb 100644
--- a/ui/css/theme-default/popover.css
+++ b/ui/css/theme-default/popover.css
@@ -75,18 +75,18 @@
.actionsheet {
background: rgb(238, 238, 238);
background: -moz-linear-gradient(top, rgba(238, 238, 238, 1)
0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%,
- rgba(165, 165, 165, 1) 100%);
+ rgba(165, 165, 165, 1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,
rgba(238, 238, 238, 1)),
- color-stop(10px, rgba(204, 204, 204, 1)), color-stop(96%, rgba(204, 204, 204,
1)),
- color-stop(100%, rgba(165, 165, 165, 1)));
+ color-stop(10px, rgba(204, 204, 204, 1)), color-stop(96%, rgba(204, 204, 204, 1)),
+ color-stop(100%, rgba(165, 165, 165, 1)));
background: -webkit-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204,
204, 1) 10px, rgba(204, 204, 204, 1)
- 96%, rgba(165, 165, 165, 1) 100%);
+ 96%, rgba(165, 165, 165, 1) 100%);
background: -o-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204,
1) 10px, rgba(204, 204, 204, 1) 96%,
- rgba(165, 165, 165, 1) 100%);
+ rgba(165, 165, 165, 1) 100%);
background: -ms-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204,
1) 10px, rgba(204, 204, 204, 1) 96%,
- rgba(165, 165, 165, 1) 100%);
+ rgba(165, 165, 165, 1) 100%);
background: linear-gradient(to bottom, rgba(238, 238, 238, 1) 0%, rgba(204, 204,
204, 1) 10px, rgba(204, 204, 204, 1)
- 96%, rgba(165, 165, 165, 1) 100%);
+ 96%, rgba(165, 165, 165, 1) 100%);
padding: 10px 10px 0 10px;
^
}
diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css
index d81dc75..3eb3321 100644
--- a/ui/css/theme-default/storage.css
+++ b/ui/css/theme-default/storage.css
@@ -66,13 +66,13 @@
background: #ffffff;
background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,
#ffffff),
- color-stop(100%, #e5e5e5));
+ color-stop(100%, #e5e5e5));
^
background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5
100%);
background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%);
background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%);
background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%);
filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',
- endColorstr='#e5e5e5', GradientType=0);
+ endColorstr='#e5e5e5', GradientType=0);
^
border: 1px solid #ccc;
color: #333;
-moz-border-top-left-radius: 8px;
@@ -212,7 +212,7 @@
.status-dot {
background: #72AA00;
background: linear-gradient(to bottom, #BFD255 0%, #8EB92A 50%, #72AA00 51%,
#9ECB2D
- 100%) repeat scroll 0 0 transparent;
+ 100%) repeat scroll 0 0 transparent;
^
border: 1px solid #72AA00;
border-radius: 13px;
box-shadow: 3px 3px 3px #FFFFFF, -3px -3px 3px #DDDDDD;
@@ -282,7 +282,7 @@
.inactive {
background: #E80501;
background: linear-gradient(to bottom, #E88692 0%, #E84845 50%, #E80501 51%,
#E84845
- 100%) repeat scroll 0 0 transparent;
+ 100%) repeat scroll 0 0 transparent;
^
border: 1px solid #FF340C;
}
@@ -300,7 +300,7 @@
.detail-view-icon {
background: url(../images/large_details_icon.png) no-repeat center
- center;
+ center;
height: 30px;
width: 42px;
}
@@ -458,21 +458,21 @@
.list-storage .storage-li[data-stat="active"]>.handle>.arrow-down {
background: url(../images/theme-default/arrow-down.png) no-repeat center
- center;
+ center;
^
height: 52px;
width: 45px;
}
.list-storage .storage-li[data-stat="inactive"]>.handle>.arrow-down {
background: url(../images/theme-default/arrow-down-disable.png) no-repeat center
- center;
+ center;
^
height: 52px;
width: 45px;
}
.arrow-up {
background: url(../images/theme-default/arrow-up.png) no-repeat center
- center;
+ center;
^
height: 52px;
width: 45px;
}
@@ -489,22 +489,22 @@
.volume-default {
background: url(../images/theme-default/icon-volume-default.png)
- no-repeat center center;
+ no-repeat center center;
^
}
.icon-raw {
background: url(../images/theme-default/icon-raw.png) no-repeat center
- center;
+ center;
^
}
.icon-qcow2 {
background: url(../images/theme-default/icon-qcow2.png) no-repeat center
- center;
+ center;
^
}
.icon-iso {
background: url(../images/theme-default/icon-iso.png) no-repeat center
- center;
+ center;
^
}
.host-partition {
diff --git a/ui/css/theme-default/template_add.css
b/ui/css/theme-default/template_add.css
index 46cf56b..e392fe9 100644
--- a/ui/css/theme-default/template_add.css
+++ b/ui/css/theme-default/template_add.css
@@ -284,6 +284,6 @@
}
#iso-more-loading {
- background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px center
no-repeat;
- padding: 0 20px 0 26px;
+ background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px center
no-repeat;
+ padding: 0 20px 0 26px;
}
10:41 a.m.
New subject: [PATCH] Change all CSS files indentation to 4 spaces
Am 20-01-2014 13:59, schrieb Aline Manera:
> background: -webkit-gradient(linear, left top, left bottom,
> color-stop(0%, #f3f3f3), color-stop(50%, #dddddd),
> - color-stop(51%, #d8d8d8), color-stop(100%, #cccccc));
> + color-stop(51%, #d8d8d8), color-stop(100%, #cccccc));
In this case, the second line is a continuation of the first one. So I
suggest to indent it as following:
background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #f3f3f3), color-stop(50%, #dddddd),
color-stop(51%, #d8d8d8), color-stop(100%, #cccccc));
You're right, the second line is a continuation of the first one, the
patch ignored that. But we need to set a maximum line length, otherwise
we can also merge those two lines into one. Should we keep the maximum
length at 80 for the CSS files as well? I'll send another patch fixing
those issues.
3745
days inactive
3749
days old
3 comments
2 participants
participants (2)
-
Aline Manera -
Crístian Viana