Skip to content

Commit cd9b316

Browse files
committed
WIP: New Admin UI
1 parent cf6b73c commit cd9b316

8 files changed

Lines changed: 55 additions & 13 deletions

File tree

core/app/assets/stylesheets/refinery/components/_layout.sass

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
body
2-
background-color: #f0f2f5
2+
background-color: $base_light_color
33
font-family: Helvetica
44
color: $text_base_color
55

@@ -38,7 +38,6 @@ body
3838

3939
a
4040
color: $base_color
41-
font-size: 0.9em
4241

4342
.hidden
4443
display: none
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#records:not(.tree) {
2+
ul {
3+
border-collapse: collapse;
4+
display: table;
5+
list-style: none;
6+
margin: 0;
7+
padding: 0;
8+
width: 100%;
9+
10+
li {
11+
display: table-row;
12+
border-bottom: 1px solid $line_separator_light_colour;
13+
color: $text_base_color;
14+
font-size: 0.9em;
15+
16+
span {
17+
display: table-cell;
18+
padding: 0.5em;
19+
}
20+
21+
&:last-child {
22+
border-bottom: none;
23+
}
24+
25+
&:hover {
26+
background-color: $base_light_color;
27+
}
28+
29+
.actions {
30+
a {
31+
float: right;
32+
margin: 0.3em 0.15em;
33+
}
34+
}
35+
}
36+
}
37+
}

core/app/assets/stylesheets/refinery/components/_sortable_list.sass

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#sortable_list {
2+
.reordering {
3+
> li {
4+
cursor: move;
5+
}
6+
}
7+
}

core/app/assets/stylesheets/refinery/components/_switch_locale_picker.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
border-bottom: 2px solid transparent;
1212
color: $text_light_color;
1313
display: block;
14-
font-size: 0.9em;
14+
font-size: 0.85em;
1515
padding: 0 0 0.8em;
1616
text-decoration: none;
1717

core/app/assets/stylesheets/refinery/components/_tree.sass

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,5 @@
5252

5353
a
5454
float: right
55+
font-size: 0.9em
5556
margin: 0.3em 0.15em

core/app/assets/stylesheets/refinery/global/_colours.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ $action_border_colour: $icon_locale_colour;
2121
// $icon_add_colour: #7fff00; // chartreuse
2222

2323
$base_color: #25a9f4; // blue
24-
$base_light_color: #E4EEFD;
24+
$base_light_color: #f0f2f5;
2525
$text_base_color: #282C2F; // grey
2626
$text_light_color: #6D727B;
2727

@@ -31,4 +31,5 @@ $main_menu_base_color: #666A70;
3131
$main_menu_base_light_color: white;
3232
$main_menu_accent_color: #25a9f4;
3333

34-
$line_separator_colour: #c4cdd5;
34+
$line_separator_colour: #c4cdd5;
35+
$line_separator_light_colour: #ebeef0;

core/app/assets/stylesheets/refinery/refinery.sass

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
@import "neat"
44

5-
@import 'global/grid_settings'
65
@import 'global/colours'
6+
@import 'global/grid_settings'
77

88
@import 'font-awesome-sprockets', 'font-awesome'
99

@@ -12,8 +12,8 @@
1212
@import 'mixins/form_action'
1313
@import 'mixins/icon_base'
1414
@import 'mixins/icon'
15-
@import 'mixins/rounded'
1615
@import 'mixins/panel'
16+
@import 'mixins/rounded'
1717

1818
//@import 'plugins/ui'
1919
@@ -26,6 +26,7 @@
2626
@import 'grid/desktop'
2727

2828
@import 'components/actions'
29+
@import 'components/flash'
2930
@import 'components/form'
3031
@import 'components/form_actions'
3132
@import 'components/labels'
@@ -34,10 +35,10 @@
3435
@import 'components/main_menu'
3536
@import 'components/page_parts'
3637
@import 'components/page_parts_controls'
37-
@import 'components/flash'
38+
@import 'components/records'
3839
@import 'components/sortable_list'
39-
@import 'components/tree'
4040
@import 'components/switch_locale_picker'
41+
@import 'components/tree'
4142

4243
@import 'pages/grid/desktop'
4344
@import 'pages/components/form'

0 commit comments

Comments
 (0)