8000 Upgrade to Active Admin 0.2.1 · brusmax/demo.activeadmin.info@e23a0b4 · GitHub
[go: up one dir, main page]
Skip to content

Commit e23a0b4

Browse files
pcreuxpcreux
committed
Upgrade to Active Admin 0.2.1
1 parent 1978f18 commit e23a0b4

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ source 'http://rubygems.org'
33
gem 'rails', '3.0.6'
44
gem 'sqlite3-ruby', :require => 'sqlite3'
55
gem 'nifty-generators'
6-
gem "activeadmin", :git => "git://github.com/gregbell/active_admin"
6+
gem "activeadmin", '>=0.2.1'
77
gem "faker"
8-
98
gem 'newrelic_rpm', '3.0.0'
109
gem 'hoptoad_notifier', '2.4.9'
1110

‎Gemfile.lock

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
GIT
2-
remote: git://github.com/gregbell/active_admin
3-
revision: cfbbee7efc0da75620ce531e8f8226c4edf554cc
4-
specs:
5-
activeadmin (0.1.1)
6-
devise (>= 1.1.2)
7-
formtastic (>= 1.1.0)
8-
haml (>= 3.0.18)
9-
inherited_views
10-
meta_search (>= 0.9.2)
11-
rails (>= 3.0.0)
12-
will_paginate (>= 3.0.pre2)
13-
141
GEM
152
remote: http://rubygems.org/
163
specs:
@@ -28,6 +15,14 @@ GEM
2815
rack-mount (~> 0.6.14)
2916
rack-test (~> 0.5.7)
3017
tzinfo (~> 0.3.23)
18+
activeadmin (0.2.1)
19+
devise (>= 1.1.2)
20+
formtastic (>= 1.1.0)
21+
haml (>= 3.0.18)
22+
inherited_views
23+
meta_search (>= 0.9.2)
24+
rails (>= 3.0.0)
25+
will_paginate (>= 3.0.pre2)
3126
activemodel (3.0.6)
3227
activesupport (= 3.0.6)
3328
builder (~> 2.1.2)
@@ -121,7 +116,7 @@ PLATFORMS
121116
ruby
122117

123118
DEPENDENCIES
124-
activeadmin!
119+
activeadmin (>= 0.2.1)
125120
faker
126121
hoptoad_notifier (= 2.4.9)
127122
mechanize

‎public/stylesheets/admin/active_admin.css

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* Active Admin CSS */
22
span.icon {
3-
vertical-align: middle; }
3+
vertical-align: middle;
4+
display: inline-block; }
45

56
span.icon svg {
67
vertical-align: baseline; }
@@ -1366,6 +1367,8 @@ table.dashboard {
13661367
-webkit-box-shadow: none;
13671368
background: none;
13681369
width: 150px;
1370+
font-size: 0.9em;
1371+
padding-left: 0;
13691372
text-transform: uppercase;
13701373
color: #5e6469;
13711374
text-shadow: white 0 1px 0; }
@@ -1375,6 +1378,9 @@ table.dashboard {
13751378
text-transform: uppercase;
13761379
letter-spacing: 0.2em; }
13771380

1381+
.sidebar_section .attributes_table th {
1382+
width: 50px; }
1383+
13781384
.status {
13791385
background: #cacaca;
13801386
color: #fff;

0 commit comments

Comments
 (0)
0