Skip to content

Commit 960a08b

Browse files
committed
whitespace cleanup
1 parent 3e57bc7 commit 960a08b

File tree

152 files changed

+519
-519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+519
-519
lines changed

.yardopts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
lib/**/*.rb
1+
lib/**/*.rb
22
--protected
33
--no-private
44
--asset docs/images:images
55
-
6-
README.rdoc
6+
README.rdoc
77
CHANGELOG.md
88
docs/**/*.md

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ application locales. [#1775][] by [@caifara][]
292292

293293
### Upgrade Notes
294294

295-
If you're running on Rails 3.0.x, make sure to run `rails generate active_admin:assets`
295+
If you're running on Rails 3.0.x, make sure to run `rails generate active_admin:assets`
296296
since we've changed both the CSS and JS files.
297297

298298
### Deprecations
@@ -315,7 +315,7 @@ since we've changed both the CSS and JS files.
315315
### Enhancements
316316

317317
* [#428][]: Paginated Collection now supports `:param_name` and `:download_links`.
318-
These two additions allow you to use the `paginated_collection` component multiple
318+
These two additions allow you to use the `paginated_collection` component multiple
319319
times on show screens. ([@samvincent][])
320320
* [#527][]: Refactored all form helpers to use Formtastic 2([@ebeigarts][])
321321
* [#551][]: Dashboards can now be conditionally displayed using `:if` ([@samvincent][])
@@ -327,7 +327,7 @@ since we've changed both the CSS and JS files.
327327
* [#638][]: Add `:label` option to `status_tag` component ([@fbuenemann][])
328328
* [#644][]: Added proper I18n support to pagination ([@fbuenemann][])
329329
* [#689][]: Scopes preserve title when provided as a string ([@macfanatic][])
330-
* [#711][]: Styles update. Now sexier and more refined design. Redesigned Scopes. Split
330+
* [#711][]: Styles update. Now sexier and more refined design. Redesigned Scopes. Split
331331
css into smaller files. ([@mattvague][])
332332
* [#741][]: Default media type of css is now "all" instead of "screen" ([@sftsang][])
333333
* [#751][]: Pagination numbers work with a custom `[@per_page][]` ([@DMajrekar][])
@@ -346,8 +346,8 @@ since we've changed both the CSS and JS files.
346346

347347
### Dependencies
348348

349-
* [#468][]: Removed vendored jQuery. Now depends on the jquery-rails gem. If you're
350-
running Rails 3.0.x (no asset pipeline), make sure to run
349+
* [#468][]: Removed vendored jQuery. Now depends on the jquery-rails gem. If you're
350+
running Rails 3.0.x (no asset pipeline), make sure to run
351351
`rails generate active_admin:assets` to generate the correct files. ([@gregbell][])
352352
* [#527][]: Active Admin now requires Formtastic 2.0 or greater ([@ebeigarts][])
353353
* [#711][]: Active admin now depends on Bourbon > 1.0.0. If you're using Rails

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ working on):
2828

2929
### 3. Get the test suite running
3030

31-
Active Admin is a gem that many people and businesses rely on for managing data
31+
Active Admin is a gem that many people and businesses rely on for managing data
3232
in their production applications. Bugs are not cool. Although we're not perfect,
3333
we pride ourselves on writing well tested code. I hope you do too :)
3434

@@ -96,7 +96,7 @@ browser, you're ready to test it against multiple versions of Rails.
9696
$> rake test:major_supported_rails
9797

9898
This command runs the cukes and specs against a couple of major versions of
99-
Rails. We will run this command when we review your pull request, if this
99+
Rails. We will run this command when we review your pull request, if this
100100
rake task isn't passing, the pull request will not be merged in.
101101

102102

app/assets/images/active_admin/index_list_icons/block_icon.svg

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

app/assets/images/active_admin/index_list_icons/grid_icon.svg

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

app/assets/stylesheets/active_admin/_forms.css.scss

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ form {
44
ul, ol, li, fieldset, legend, input, textarea, select, p { margin:0; padding:0; }
55
ol, ul { list-style: none }
66

7-
fieldset {
8-
border: 0;
7+
fieldset {
8+
border: 0;
99
padding: 10px 0;
1010
margin-bottom: 20px;
1111

@@ -37,43 +37,43 @@ form {
3737
}
3838
}
3939

40-
ol > li > li label {
41-
line-height:100%;
42-
padding-top:0;
43-
input {
44-
line-height:100%;
45-
vertical-align:middle;
40+
ol > li > li label {
41+
line-height:100%;
42+
padding-top:0;
43+
input {
44+
line-height:100%;
45+
vertical-align:middle;
4646
margin-top:-0.1em;
4747
}
4848
}
4949
}
5050

5151
/* Nested Fieldsets and Legends */
5252
fieldset > ol > li {
53-
fieldset {
54-
position:relative;
53+
fieldset {
54+
position:relative;
5555
padding: 0;
5656
margin-bottom: 0;
5757

58-
legend {
59-
position:absolute;
60-
width:95%;
61-
padding-top:0.1em;
62-
left: 0px;
63-
font-size: 100%;
58+
legend {
59+
position:absolute;
60+
width:95%;
61+
padding-top:0.1em;
62+
left: 0px;
63+
font-size: 100%;
6464
font-weight: normal;
6565
span { position:absolute; }
6666
&.label label { position:absolute; }
6767
}
6868

69-
ol {
70-
float:left;
71-
width:74%;
72-
margin:0;
73-
padding:0 0 0 20%;
69+
ol {
70+
float:left;
71+
width:74%;
72+
margin:0;
73+
padding:0 0 0 20%;
7474

7575
li {
76-
padding:0;
76+
padding:0;
7777
border:0;
7878
}
7979
}
@@ -89,7 +89,7 @@ form {
8989
@include sans-family;
9090
outline: none;
9191
padding: 8px $text-input-horizontal-padding 7px;
92-
92+
9393
&:focus {
9494
border: 1px solid #99a2aa;
9595
@include shadow(0,0,4px,#99a2aa);
@@ -99,31 +99,31 @@ form {
9999
fieldset > ol > li {
100100

101101
/* Hints */
102-
p.inline-hints {
102+
p.inline-hints {
103103
font-size: 0.95em;
104104
font-style: italic;
105-
color:#666;
106-
margin: 0.5em 0 0 20%;
105+
color:#666;
106+
margin: 0.5em 0 0 20%;
107107
}
108108

109109
/* Date and Time Fields */
110110
&.date, &.time, &.datetime, &.date_select {
111111
fieldset ol li {
112-
float:left; width:auto; margin:0 0.5em 0 0;
112+
float:left; width:auto; margin:0 0.5em 0 0;
113113
label { display: none; }
114114
input { display:inline; margin:0; padding:0; }
115115
}
116116
}
117117

118118
/* Check Boxes or Radio fields */
119119
&.check_boxes, &.radio {
120-
fieldset ol {
120+
fieldset ol {
121121
margin-bottom:-0.6em;
122-
li {
123-
margin:0.1em 0 0.5em 0;
124-
label {
125-
float:none;
126-
width:100%;
122+
li {
123+
margin:0.1em 0 0.5em 0;
124+
label {
125+
float:none;
126+
width:100%;
127127
input { margin-right:0.2em; }
128128
}
129129
}
@@ -133,26 +133,26 @@ form {
133133
/* Boolean Field */
134134
&.boolean {
135135
height: 1.1em;
136-
label {
136+
label {
137137
width: 80%;
138-
padding-left:20%;
139-
padding-right: 10px;
138+
padding-left:20%;
139+
padding-right: 10px;
140140
text-transform: none !important;
141141
font-weight: normal;
142142
input { margin:0 0.5em 0 0.2em; }
143143
}
144144
}
145145

146146
/* Errors */
147-
p.inline-errors {
147+
p.inline-errors {
148148
color: $error-color;
149149
font-weight: bold;
150-
margin:0.3em 0 0 20%;
150+
margin:0.3em 0 0 20%;
151151
}
152-
ul.errors {
152+
ul.errors {
153153
color: $error-color;
154-
margin:0.5em 0 0 20%;
155-
list-style:square;
154+
margin:0.5em 0 0 20%;
155+
list-style:square;
156156
li { padding:0; border:none; display:list-item; }
157157
}
158158

@@ -164,32 +164,32 @@ form {
164164
}
165165

166166
/* semantic_errors */
167-
ul.errors {
167+
ul.errors {
168168
background: lighten($error-color, 60%);
169169
@include rounded(4px);
170170
color: $error-color;
171171
font-weight: bold;
172172
margin-bottom: 10px;
173173
padding: 10px;
174-
list-style:square;
174+
list-style:square;
175175
li { margin-left:15px; padding:0; border:none; display:list-item; }
176176
}
177177

178178
/* Buttons */
179-
179+
180180
input[type=submit] {
181181
@include dark-button;
182182
cursor: pointer;
183-
183+
184184
}
185-
185+
186186
.buttons, .actions {
187-
margin-top: 15px;
187+
margin-top: 15px;
188188
input[type=submit] { margin-right: 10px; }
189189
}
190-
190+
191191
fieldset.buttons li, fieldset.actions li {
192-
float:left;
192+
float:left;
193193
padding: 0;
194194

195195
&.cancel {
@@ -201,11 +201,11 @@ form {
201201

202202
}
203203

204-
// -------------------------------------- Sidebar Forms
204+
// -------------------------------------- Sidebar Forms
205205

206206
$sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
207207

208-
.sidebar_section {
208+
.sidebar_section {
209209

210210
label {
211211
display: block;
@@ -218,7 +218,7 @@ $sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
218218
select {
219219
width: $sidebar-inner-content-width;
220220
}
221-
221+
222222
input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea {
223223
width: $sidebar-inner-content-width - ($text-input-horizontal-padding * 2);
224224
}
@@ -238,9 +238,9 @@ $date-range-filter-input-width: ($sidebar-inner-content-width / 2) - $filter-fie
238238

239239
form.filter_form {
240240
.filter_form_field {
241-
margin-bottom: 10px;
241+
margin-bottom: 10px;
242242
clear: both;
243-
243+
244244
&.filter_numeric {
245245
input[type=text] {
246246
margin-left: $filter-field-seperator-width + 4;
@@ -250,11 +250,11 @@ form.filter_form {
250250
width: $side-by-side-filter-select-width;
251251
}
252252
}
253-
253+
254254
&.filter_check_boxes {
255255
label { margin-bottom: 3px; }
256-
.check_boxes_wrapper label {
257-
font-weight: normal;
256+
.check_boxes_wrapper label {
257+
font-weight: normal;
258258
margin-bottom: 3px;
259259
text-transform: none;
260260
font-size: 1.0em;
@@ -268,7 +268,7 @@ form.filter_form {
268268
text-align: center;
269269
width: $filter-field-seperator-width;
270270
}
271-
271+
272272
input[type=text] {
273273
background: #fff url(active_admin_image_path('datepicker/datepicker-input-icon.png')) no-repeat 100% 7px;
274274
padding-right: $date-range-filter-input-right-padding;

0 commit comments

Comments
 (0)