Skip to content

Commit 2ef4085

Browse files
author
Mattia Roccoberton
committed
Style improvements
1 parent a9233ff commit 2ef4085

2 files changed

Lines changed: 91 additions & 38 deletions

File tree

app/assets/stylesheets/activeadmin_blaze_theme/theme.scss

Lines changed: 90 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $fg-table-link: #eee !default;
1919
// other variables
2020
$form-padding: 10px !default;
2121
$inputs-spacing: 10px !default;
22-
$height-inputs: 28px !default;
22+
$height-inputs: 26px !default;
2323
$text-shadow: #000 !default;
2424

2525
// active_admin theme styles
@@ -34,41 +34,6 @@ body.active_admin {
3434
box-shadow: initial;
3535
text-shadow: $text-shadow 0 1px 0;
3636
}
37-
.compact_titlebar {
38-
padding-top: 0;
39-
padding-bottom: 0;
40-
.breadcrumb {
41-
float: left;
42-
font-size: 1em;
43-
line-height: initial;
44-
margin: 0;
45-
padding: 0;
46-
}
47-
#page_title {
48-
font-size: 2em;
49-
}
50-
#titlebar_left, #titlebar_right {
51-
height: 36px;
52-
}
53-
}
54-
.sidebar_left {
55-
#main_content_wrapper {
56-
float: right;
57-
width: calc( 100% - 300px );
58-
#main_content {
59-
margin-right: 0;
60-
}
61-
}
62-
#sidebar {
63-
margin-left: 0;
64-
}
65-
}
66-
table.scoll_cells {
67-
th, td {
68-
max-width: 200px;
69-
overflow: scroll;
70-
}
71-
}
7237

7338
// forms
7439
form {
@@ -87,6 +52,7 @@ body.active_admin {
8752
background-color: $bg-inputs;
8853
display: inline-block;
8954
height: $height-inputs;
55+
padding: 1px 6px;
9056
}
9157
input[type='radio'] {
9258
margin-right: 0.4em;
@@ -99,9 +65,15 @@ body.active_admin {
9965
min-width: 200px;
10066
width: 30%;
10167
}
68+
select {
69+
padding: 1px 2px;
70+
}
10271
select[multiple], textarea {
10372
height: auto;
10473
}
74+
textarea {
75+
padding: 6px;
76+
}
10577
.selectize-input {
10678
line-height: $height-inputs;
10779
padding-left: 8px;
@@ -149,6 +121,17 @@ body.active_admin {
149121

150122
// filter forms
151123
&.filter_form {
124+
.filter_form_field {
125+
> input, > select, .separator, .seperator {
126+
float: left;
127+
}
128+
> label {
129+
padding-top: 8px;
130+
}
131+
.separator, .seperator {
132+
line-height: $height-inputs;
133+
}
134+
}
152135
.filter_form_field.filter_date_range {
153136
input[type='datetime-local'],
154137
input[type='email'],
@@ -165,6 +148,10 @@ body.active_admin {
165148
.filter_form_field.select_and_search select {
166149
background-color: $bg-inputs;
167150
}
151+
.buttons {
152+
clear: both;
153+
padding-top: 14px;
154+
}
168155
}
169156

170157
// fieldsets
@@ -449,6 +436,13 @@ body.active_admin {
449436
}
450437

451438
// sidebars
439+
#sidebar {
440+
background: #efefef;
441+
padding: 0 15px;
442+
.sidebar_section {
443+
margin-bottom: 20px;
444+
}
445+
}
452446
.sidebar_section {
453447
@extend .c-card;
454448
@extend .u-high;
@@ -477,6 +471,7 @@ body.active_admin {
477471
background-image: none;
478472
border: 0 none !important;
479473
color: $fg-box-title;
474+
margin-bottom: 0;
480475
padding: 8px 11px;
481476
text-shadow: $text-shadow 0 1px 0;
482477
}
@@ -564,6 +559,7 @@ body.active_admin {
564559
// title bar
565560
#title_bar {
566561
background-image: none;
562+
box-shadow: none;
567563
.action_items span.action_item {
568564
> a,
569565
> .dropdown_menu > a {
@@ -582,6 +578,7 @@ body.active_admin {
582578

583579
// main content
584580
#main_content {
581+
padding: 30px 0 15px 20px;
585582
> .panel {
586583
@extend .c-card;
587584
@extend .u-high;
@@ -603,6 +600,11 @@ body.active_admin {
603600
}
604601
}
605602

603+
// admin content
604+
#active_admin_content {
605+
padding: 0;
606+
}
607+
606608
// dialogs
607609
.ui-dialog > .ui-dialog-buttonpane button.ui-button {
608610
@extend .button-base;
@@ -614,8 +616,13 @@ body.active_admin {
614616

615617
// footer
616618
#footer {
617-
padding: 10px 0 0 0;
619+
bottom: 0;
620+
position: absolute;
618621
text-align: center;
622+
width: 100%;
623+
> p {
624+
padding: 0;
625+
}
619626
}
620627

621628
// misc
@@ -643,4 +650,50 @@ body.active_admin {
643650
#active_admin_comment_body {
644651
width: 100%;
645652
}
653+
654+
// optional customizations
655+
.compact_titlebar {
656+
padding-top: 0;
657+
padding-bottom: 0;
658+
.breadcrumb {
659+
float: left;
660+
font-size: 1em;
661+
line-height: initial;
662+
margin: 0;
663+
padding: 0;
664+
> a, > a:link, > a:visited, > a:active {
665+
opacity: 0.5;
666+
}
667+
}
668+
#page_title {
669+
display: inline-block;
670+
float: left;
671+
font-size: 1em;
672+
// font-size: 2em;
673+
line-height: initial;
674+
margin-left: 5px;
675+
}
676+
#titlebar_left, #titlebar_right {
677+
height: 36px;
678+
}
679+
}
680+
.sidebar_left {
681+
#main_content_wrapper {
682+
float: right;
683+
width: calc( 100% - 300px );
684+
#main_content {
685+
margin-right: 0;
686+
padding: 35px 30px 35px 0;
687+
}
688+
}
689+
#sidebar {
690+
margin-left: 0;
691+
}
692+
}
693+
table.scoll_cells {
694+
th, td {
695+
max-width: 200px;
696+
overflow: scroll;
697+
}
698+
}
646699
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ActiveAdminBlazeTheme
2-
VERSION = '0.2.4'
2+
VERSION = '0.2.6'
33
end

0 commit comments

Comments
 (0)