Skip to content

Commit

Permalink
WIP: New Admin UI
Browse files Browse the repository at this point in the history
  • Loading branch information
bricesanchez committed Dec 17, 2018
1 parent ae79b6b commit fd36fd7
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 13 deletions.
3 changes: 1 addition & 2 deletions core/app/assets/stylesheets/refinery/components/_layout.sass
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body
background-color: #f0f2f5
background-color: $base_light_color
font-family: Helvetica
color: $text_base_color

Expand Down Expand Up @@ -38,7 +38,6 @@ body

a
color: $base_color
font-size: 0.9em

.hidden
display: none
37 changes: 37 additions & 0 deletions core/app/assets/stylesheets/refinery/components/_records.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#records:not(.tree) {
ul {
border-collapse: collapse;
display: table;
list-style: none;
margin: 0;
padding: 0;
width: 100%;

li {
display: table-row;
border-bottom: 1px solid $line_separator_light_colour;
color: $text_base_color;
font-size: 0.9em;

span {
display: table-cell;
padding: 0.5em;
}

&:last-child {
border-bottom: none;
}

&:hover {
background-color: $base_light_color;
}

.actions {
a {
float: right;
margin: 0.3em 0.15em;
}
}
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#sortable_list {
.reordering {
> li {
cursor: move;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
border-bottom: 2px solid transparent;
color: $text_light_color;
display: block;
font-size: 0.9em;
font-size: 0.85em;
padding: 0 0 0.8em;
text-decoration: none;

Expand Down
1 change: 1 addition & 0 deletions core/app/assets/stylesheets/refinery/components/_tree.sass
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,5 @@

a
float: right
font-size: 0.9em
margin: 0.3em 0.15em
5 changes: 3 additions & 2 deletions core/app/assets/stylesheets/refinery/global/_colours.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $action_border_colour: $icon_locale_colour;
// $icon_add_colour: #7fff00; // chartreuse

$base_color: #25a9f4; // blue
$base_light_color: #E4EEFD;
$base_light_color: #f0f2f5;
$text_base_color: #282C2F; // grey
$text_light_color: #6D727B;

Expand All @@ -31,4 +31,5 @@ $main_menu_base_color: #666A70;
$main_menu_base_light_color: white;
$main_menu_accent_color: #25a9f4;

$line_separator_colour: #c4cdd5;
$line_separator_colour: #c4cdd5;
$line_separator_light_colour: #ebeef0;
9 changes: 5 additions & 4 deletions core/app/assets/stylesheets/refinery/refinery.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

@import "neat"

@import 'global/grid_settings'
@import 'global/colours'
@import 'global/grid_settings'

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

Expand All @@ -12,8 +12,8 @@
@import 'mixins/form_action'
@import 'mixins/icon_base'
@import 'mixins/icon'
@import 'mixins/rounded'
@import 'mixins/panel'
@import 'mixins/rounded'

//@import 'plugins/ui'
Expand All @@ -26,6 +26,7 @@
@import 'grid/desktop'

@import 'components/actions'
@import 'components/flash'
@import 'components/form'
@import 'components/form_actions'
@import 'components/labels'
Expand All @@ -34,10 +35,10 @@
@import 'components/main_menu'
@import 'components/page_parts'
@import 'components/page_parts_controls'
@import 'components/flash'
@import 'components/records'
@import 'components/sortable_list'
@import 'components/tree'
@import 'components/switch_locale_picker'
@import 'components/tree'

@import 'pages/grid/desktop'
@import 'pages/components/form'
Expand Down

0 comments on commit fd36fd7

Please sign in to comment.