Skip to content

Commit 72b9eba

Browse files
committed
Fix large index tables overflow; fix typo scrollable_cells; optional ckeditor width fix
1 parent cc7c13c commit 72b9eba

3 files changed

Lines changed: 41 additions & 47 deletions

File tree

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,15 @@ $text-shadow: #000 !default;
7070

7171
```css
7272
// scrollable table cells
73-
.index_content table {
74-
@extend .scoll_cells;
73+
body.active_admin .index_content table {
74+
@extend .scrollable_cells;
75+
}
76+
```
77+
78+
```css
79+
// fix ckeditor width
80+
body.active_admin .cke {
81+
@extend .ckeditor_width_fix
7582
}
7683
```
7784

app/assets/stylesheets/activeadmin_blaze_theme/theme.scss

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -547,41 +547,9 @@ body.active_admin {
547547
text-align: center;
548548
}
549549
}
550-
// .index_table {
551-
// @extend .c-table;
552-
// // @extend .c-table--striped;
553-
// // @extend .c-table--condensed;
554-
// > thead {
555-
// @extend .c-table__head;
556-
// > tr {
557-
// @extend .c-table__row;
558-
// @extend .c-table__row--heading;
559-
// > th {
560-
// @extend .c-table__cell;
561-
// margin-bottom: 0;
562-
// &.col-selectable > div {
563-
// margin-left: auto;
564-
// margin-right: auto;
565-
// }
566-
// }
567-
// }
568-
// }
569-
// > tbody {
570-
// @extend .c-table__body;
571-
// border-left: 1px solid $fg-table-borders;
572-
// border-right: 1px solid $fg-table-borders;
573-
// > tr {
574-
// @extend .c-table__row;
575-
// > td {
576-
// @extend .c-table__cell;
577-
// &.col-selectable > div {
578-
// margin-left: auto;
579-
// margin-right: auto;
580-
// }
581-
// }
582-
// }
583-
// }
584-
// }
550+
.index_as_table {
551+
overflow-x: scroll;
552+
}
585553
.panel_contents table tr:last-child {
586554
> td, > th {
587555
border-bottom: 0 none;
@@ -721,6 +689,30 @@ body.active_admin {
721689
width: 100%;
722690
}
723691

692+
// boolean values
693+
.status_tag {
694+
min-width: 30px;
695+
display: inline-block;
696+
text-align: center;
697+
&.no {
698+
background-color: $color-error;
699+
}
700+
&.yes {
701+
background-color: $color-success;
702+
}
703+
}
704+
705+
// misc
706+
#active_admin_content.without_sidebar #main_content_wrapper #main_content {
707+
width: 100%;
708+
}
709+
#wrapper {
710+
display: block;
711+
min-height: 100vh;
712+
padding-bottom: 40px; // footer height
713+
position: relative;
714+
}
715+
724716
// optional customizations
725717
.compact_titlebar {
726718
white-space: initial;
@@ -738,19 +730,14 @@ body.active_admin {
738730
margin-left: 0;
739731
}
740732
}
741-
table.scoll_cells {
733+
table.scrollable_cells {
742734
th, td {
743735
max-width: 200px;
744736
overflow: scroll;
745737
}
746738
}
747-
748-
#active_admin_content.without_sidebar #main_content_wrapper #main_content {
749-
width: 100%;
750-
}
751-
#wrapper {
752-
min-height: 100vh;
753-
padding-bottom: 40px; // footer height
754-
position: relative;
739+
.ckeditor_width_fix {
740+
display: inline-block;
741+
width: calc(80% - 22px);
755742
}
756743
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ActiveAdminBlazeTheme
2-
VERSION = '0.4.2'
2+
VERSION = '0.4.4'
33
end

0 commit comments

Comments
 (0)