Skip to content

Commit 408fdb3

Browse files
mattvaguegregbell
authored andcommitted
General style updates
1 parent 31a7031 commit 408fdb3

32 files changed

+563
-388
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ require File.expand_path('../spec/support/detect_rails_version', __FILE__)
66

77
rails_version = ENV['RAILS'] || detect_rails_version || "3.1.0"
88
gem 'rails', rails_version
9+
gem 'bourbon'
910

1011
case rails_version
1112
when /^3\.0/
Lines changed: 18 additions & 339 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* Active Admin CSS */
22

3+
// Bourbon and it's awesome mixins
4+
@import "bourbon";
35

46
// Reset Away!
57
@include global-reset;
@@ -12,6 +14,21 @@
1214
@import "active_admin/components/flash_messages";
1315
@import "active_admin/components/date_picker";
1416
@import "active_admin/components/tables";
17+
@import "active_admin/components/blank_slates";
18+
@import "active_admin/components/breadcrumbs";
19+
@import "active_admin/components/buttons";
20+
@import "active_admin/components/grid";
21+
@import "active_admin/components/links";
22+
@import "active_admin/components/pagination";
23+
@import "active_admin/components/panels";
24+
@import "active_admin/components/scopes";
25+
@import "active_admin/components/status_tags";
26+
@import "active_admin/components/table_tools";
27+
@import "active_admin/pages/dashboard";
28+
@import "active_admin/pages/logged_out";
29+
@import "active_admin/structure/footer";
30+
@import "active_admin/structure/main_structure";
31+
@import "active_admin/structure/title_bar";
1532

1633
body {
1734
font-family: Helvetica, Arial, sans-serif;
@@ -21,342 +38,4 @@ body {
2138
margin: 0;
2239
padding: 0;
2340
color: $text-color;
24-
}
25-
26-
// ----------------------------------- Page Title Bar
27-
#title_bar {
28-
@include section-header;
29-
@include clearfix;
30-
@include box-sizing(border-box);
31-
display: table;
32-
width: 100%;
33-
position: relative;
34-
margin: 0;
35-
padding: 10px $horizontal-page-margin;
36-
37-
#titlebar_left, #titlebar_right {
38-
height: 50px;
39-
vertical-align: middle;
40-
display: table-cell;
41-
}
42-
43-
#titlebar_right {
44-
text-align: right;
45-
}
46-
47-
h2 {
48-
margin: 0;
49-
padding: 0;
50-
font-size: 2.6em;
51-
font-weight: bold;
52-
}
53-
54-
.action_items {
55-
a {
56-
@include light-button;
57-
@include icon(#777, 0.8em);
58-
@include gradient(#f9f9f9, #dddbdb);
59-
display: inline-block;
60-
padding: .8em 1.5em .7em 1.5em;
61-
border: 1px solid #f8f8f8;
62-
span.icon { vertical-align: bottom; margin-right: 4px;}
63-
&:hover{ @include icon-color(#000); }
64-
}
65-
}
66-
}
67-
68-
// ----------------------------------- Main Structure
69-
70-
#wrapper {
71-
display: table;
72-
width: 100%;
73-
}
74-
75-
#active_admin_content {
76-
margin: 0;
77-
padding: 25px $horizontal-page-margin;
78-
79-
#main_content_wrapper {
80-
float: left;
81-
width: 100%;
82-
83-
#main_content{
84-
margin-right: 300px;
85-
}
86-
}
87-
88-
&.without_sidebar #main_content_wrapper #main_content{ margin-right: 0; }
89-
90-
#sidebar {
91-
float: left;
92-
width: $sidebar-width;
93-
margin-left: -$sidebar-width;
94-
}
95-
}
96-
97-
// ----------------------------------- Footer
98-
#footer {
99-
padding: 30px 30px;
100-
font-size: 0.8em;
101-
clear: both;
102-
103-
p {
104-
padding-top: 10px
105-
}
106-
}
107-
108-
// ----------------------------------- Links
109-
a, a:link, a:visited {
110-
color: $link-color;
111-
text-decoration: underline;
112-
}
113-
a:hover { text-decoration: none; }
114-
115-
// ----------------------------------- Buttons
116-
117-
td, p {
118-
@include icon(#B3BCC1, 0.8em);
119-
span.icon { margin: 0 3px; }
120-
}
121-
122-
a.member_link {
123-
margin-right: 7px;
124-
white-space: nowrap;
125-
}
126-
127-
a.button, input[type=submit] { @include dark-button; }
128-
129-
// ----------------------------------- Breadcrumbs
130-
.breadcrumb {
131-
display: block;
132-
font-size: 0.9em;
133-
font-weight: normal;
134-
line-height: 1.0em;
135-
margin-bottom: 12px;
136-
text-transform: uppercase;
137-
138-
a, a:link {
139-
color: #8a949e ;
140-
text-decoration: none;
141-
}
142-
143-
a:hover { text-decoration: underline; }
144-
145-
.breadcrumb_sep {
146-
margin: 0 2px;
147-
color: #aab2ba;
148-
}
149-
}
150-
151-
// ----------------------------------- Sections & Panels
152-
// Helper class to apply to elements to make them sections
153-
.section, .panel{ @include section; }
154-
155-
// ----------------------------------- Blank Slate
156-
157-
.blank_slate_container {
158-
clear: both;
159-
text-align: center;
160-
161-
.blank_slate {
162-
@include rounded;
163-
-webkit-font-smoothing: antialiased;
164-
border: 1px dashed #DADADA;
165-
color: #AAA;
166-
display: inline-block;
167-
font-size: 1.2em;
168-
font-weight: bold;
169-
padding: 14px 25px;
170-
text-align: center;
171-
172-
small {
173-
display: block;
174-
font-size: 0.9em;
175-
font-weight: normal;
176-
}
177-
}
178-
}
179-
180-
.admin_dashboard .blank_slate_container .blank_slate {
181-
margin-top: 40px;
182-
margin-bottom: 40px;
183-
}
184-
185-
.with_sidebar .blank_slate_container .blank_slate {
186-
margin-top: 80px;
187-
}
188-
189-
// ----------------------------------- Sidebar Sections
190-
.sidebar_section { @include section; }
191-
192-
// -------------------------------------- Pagination
193-
.pagination_information {
194-
float: right;
195-
margin-bottom: 5px;
196-
font-size: 0.95em;
197-
color: #b3bcc1;
198-
b { color: #5c6469; }
199-
}
200-
201-
.paginated_collection_contents {
202-
clear: both;
203-
}
204-
205-
.pagination {
206-
display: inline;
207-
font-size: 0.9;
208-
margin-left: 10px;
209-
210-
a { @include light-button; }
211-
span.page.current { @include default-button; }
212-
a, span.page.current {
213-
@include rounded(0px);
214-
margin-right: 4px;
215-
padding: 2px 5px;
216-
}
217-
span.page.current { padding-left: 7px; }
218-
}
219-
220-
// -------------------------------------- Index Footer (Under Table)
221-
#index_footer { padding-top: 5px; text-align: right; font-size: 0.85em; }
222-
223-
224-
225-
.index_content { clear: both; }
226-
227-
// -------------------------------------- Index as Grid
228-
table.index_grid td { border: none; background: none; padding: 0 20px 20px 0; margin: 0;}
229-
230-
231-
// -------------------------------------- Logged Out
232-
body.logged_out {
233-
background: #e8e9ea;
234-
235-
#content_wrapper{
236-
width: 500px;
237-
margin: 70px auto;
238-
#active_admin_content {
239-
@include shadow;
240-
background: #fff;
241-
padding: 13px 30px;
242-
}
243-
}
244-
245-
h2 {
246-
@include section-header;
247-
@include primary-gradient;
248-
@include text-shadow(#000);
249-
color: #fff;
250-
margin: -13px -30px 20px -30px;
251-
}
252-
253-
#login {
254-
/* Login Form */
255-
form {
256-
fieldset {
257-
@include no-shadow;
258-
background: none;
259-
padding: 0;
260-
li { padding: 10px 0; }
261-
262-
input[type=text], input[type=email], input[type=password] {
263-
width: 70%;
264-
}
265-
&.buttons { margin-left: 20%; }
266-
margin-bottom: 0;
267-
}
268-
}
269-
270-
a { float: right; margin-top: -32px; }
271-
}
272-
273-
}
274-
275-
// -------------------------------------- Dashboard
276-
table.dashboard {
277-
width: 100%;
278-
td { border-bottom: none; }
279-
.dashboard_section { @include section; }
280-
}
281-
282-
283-
// -------------------------------------- Resource Attributes Table
284-
.attributes_table { overflow: hidden; }
285-
286-
.attributes_table table {
287-
th, td {
288-
padding: 8px $cell-horizontal-padding 6px $cell-horizontal-padding;
289-
vertical-align: top;
290-
border-bottom: 1px solid #e8e8e8;
291-
}
292-
th {
293-
@include no-shadow;
294-
@include no-gradient;
295-
width: 150px;
296-
font-size: 0.9em;
297-
padding-left: 0;
298-
text-transform: uppercase;
299-
color: $primary-color;
300-
@include text-shadow;
301-
}
302-
td {
303-
.empty {
304-
color: #bbb;
305-
font-size: 0.8em;
306-
text-transform: uppercase;
307-
letter-spacing: 0.2em;
308-
}
309-
}
310-
}
311-
312-
.sidebar_section .attributes_table th { width: 50px; }
313-
314-
315-
// -------------------------------------- Status Tags
316-
.status {
317-
background: darken($secondary-color, 15%);
318-
color: #fff;
319-
text-transform: uppercase;
320-
letter-spacing: 0.15em;
321-
padding: 3px 5px 2px 5px;
322-
font-size: 0.8em;
323-
324-
&.ok, &.published, &.complete, &.completed, &.green { background: #8daa92; }
325-
&.warn, &.warning, &.orange { background: #e29b20; }
326-
&.error, &.errored, &.red { background: #d45f53; }
327-
328-
329-
}
330-
331-
332-
// -------------------------------------- Scopes
333-
.scopes {
334-
float: left;
335-
margin-bottom: 10px;
336-
font-size: 1.0em;
337-
338-
.scope {
339-
padding: 4px 8px 3px 8px;
340-
margin-right: 4px;
341-
a { text-decoration: none; font-weight: bold; color: #888; }
342-
a:hover { text-decoration: underline; ; }
343-
&.selected {
344-
@include rounded(5px);
345-
@include inset-shadow(0,1px,0,#ccc);
346-
@include text-shadow;
347-
background: #efefef;
348-
color: #666;
349-
em { font-weight: bold; font-style: normal;
350-
}
351-
}
352-
.count{ color: #aaa; font-size: 0.9em; }
353-
}
354-
.scopes_seperator { display: none; }
355-
}
356-
357-
// -------------------------------------- Columns
358-
.columns {
359-
clear: both;
360-
padding: 0;
361-
.column { float: left; }
362-
}
41+
}

0 commit comments

Comments
 (0)