Skip to content

Commit 3fa30b7

Browse files
Awk34Awk34
committed
Merge pull request #1046 from kingcody/style/fix-indention
style(app): fix inconsistent indention
2 parents 041f214 + 059b00b commit 3fa30b7

File tree

4 files changed

+51
-51
lines changed

4 files changed

+51
-51
lines changed

‎app/templates/client/app/app(css).css

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,43 @@
44
*/
55

66
@font-face {
7-
font-family: 'Glyphicons Halflings';
8-
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot');
9-
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
10-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
11-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
12-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
7+
font-family: 'Glyphicons Halflings';
8+
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot');
9+
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
10+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
11+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
12+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
1313
}<% } %>
1414

1515
/**
1616
*Font Awesome Fonts
1717
*/
1818

1919
@font-face {
20-
font-family: 'FontAwesome';
21-
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?v=4.1.0');
22-
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
23-
url('../bower_components/font-awesome/fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'),
24-
url('../bower_components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
25-
url('../bower_components/font-awesome/fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
26-
font-weight: normal;
27-
font-style: normal;
20+
font-family: 'FontAwesome';
21+
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?v=4.1.0');
22+
src: url('../bower_components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'),
23+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'),
24+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'),
25+
url('../bower_components/font-awesome/fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg');
26+
font-weight: normal;
27+
font-style: normal;
2828
}
2929

3030
/**
3131
* App-wide Styles
3232
*/
3333

3434
.browsehappy {
35-
margin: 0.2em 0;
36-
background: #ccc;
37-
color: #000;
38-
padding: 0.2em 0;
35+
margin: 0.2em 0;
36+
background: #ccc;
37+
color: #000;
38+
padding: 0.2em 0;
3939
}
4040
<% if(!filters.bootstrap) { %>
4141
/* Responsive: Portrait tablets and up */
4242
@media screen and (min-width: 768px) {
43-
.container {
44-
max-width: 730px;
45-
}
46-
}<% } %>
43+
.container {
44+
max-width: 730px;
45+
}
46+
}<% } %>

‎app/templates/client/app/app(less).less

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
*/
1010

1111
.browsehappy {
12-
margin: 0.2em 0;
13-
background: #ccc;
14-
color: #000;
15-
padding: 0.2em 0;
12+
margin: 0.2em 0;
13+
background: #ccc;
14+
color: #000;
15+
padding: 0.2em 0;
1616
}
1717
<% if(!filters.bootstrap) { %>
1818
/* Responsive: Portrait tablets and up */
1919
@media screen and (min-width: 768px) {
20-
.container {
21-
max-width: 730px;
22-
}
20+
.container {
21+
max-width: 730px;
22+
}
2323
}
2424
<% } %>
2525
// injector
2626
@import 'account/login/login.less';
2727
@import 'admin/admin.less';
2828
@import 'main/main.less';
29-
// endinjector
29+
// endinjector

‎app/templates/client/app/app(sass).scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ $fa-font-path: "/bower_components/font-awesome/fonts";
99
*/
1010

1111
.browsehappy {
12-
margin: 0.2em 0;
13-
background: #ccc;
14-
color: #000;
15-
padding: 0.2em 0;
12+
margin: 0.2em 0;
13+
background: #ccc;
14+
color: #000;
15+
padding: 0.2em 0;
1616
}
1717
<% if(!filters.bootstrap) { %>
1818
/* Responsive: Portrait tablets and up */
1919
@media screen and (min-width: 768px) {
20-
.container {
21-
max-width: 730px;
22-
}
20+
.container {
21+
max-width: 730px;
22+
}
2323
}
2424
<% } %>
2525
// Component styles are injected through grunt
2626
// injector
2727
@import 'account/login/login.scss';
2828
@import 'admin/admin.scss';
2929
@import 'main/main.scss';
30-
// endinjector
30+
// endinjector

‎app/templates/client/app/app(stylus).styl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
//
77

88
@font-face
9-
font-family: 'Glyphicons Halflings'
10-
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot')
11-
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
12-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
13-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
14-
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
9+
font-family: 'Glyphicons Halflings'
10+
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot')
11+
src: url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
12+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'),
13+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'),
14+
url('../bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
1515
<% } %>
1616
//
1717
// Font Awesome Fonts
@@ -32,19 +32,19 @@
3232
//
3333

3434
.browsehappy
35-
background #ccc
36-
color #000
37-
margin 0.2em 0
38-
padding 0.2em 0
35+
background #ccc
36+
color #000
37+
margin 0.2em 0
38+
padding 0.2em 0
3939
<% if(!filters.bootstrap) { %>
4040
// Responsive: Portrait tablets and up
4141
@media screen and (min-width: 768px)
42-
.container
43-
max-width 730px
42+
.container
43+
max-width 730px
4444
<% } %>
4545
// Component styles are injected through grunt
4646
// injector
4747
@import "account/login/login"
4848
@import "admin/admin"
4949
@import "main/main"
50-
// endinjector
50+
// endinjector

0 commit comments

Comments
 (0)