From fd36fd76b80a9f93f227f2102711a6516ec53354 Mon Sep 17 00:00:00 2001 From: Brice Sanchez Date: Sun, 16 Dec 2018 21:17:38 -0500 Subject: [PATCH] WIP: New Admin UI --- .../refinery/components/_layout.sass | 3 +- .../refinery/components/_records.scss | 37 +++++++++++++++++++ .../refinery/components/_sortable_list.sass | 4 -- .../refinery/components/_sortable_list.scss | 7 ++++ .../components/_switch_locale_picker.scss | 2 +- .../refinery/components/_tree.sass | 1 + .../stylesheets/refinery/global/_colours.scss | 5 ++- .../assets/stylesheets/refinery/refinery.sass | 9 +++-- 8 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 core/app/assets/stylesheets/refinery/components/_records.scss delete mode 100644 core/app/assets/stylesheets/refinery/components/_sortable_list.sass create mode 100644 core/app/assets/stylesheets/refinery/components/_sortable_list.scss diff --git a/core/app/assets/stylesheets/refinery/components/_layout.sass b/core/app/assets/stylesheets/refinery/components/_layout.sass index 11ea170ac7..5b5707d1db 100644 --- a/core/app/assets/stylesheets/refinery/components/_layout.sass +++ b/core/app/assets/stylesheets/refinery/components/_layout.sass @@ -1,5 +1,5 @@ body - background-color: #f0f2f5 + background-color: $base_light_color font-family: Helvetica color: $text_base_color @@ -38,7 +38,6 @@ body a color: $base_color - font-size: 0.9em .hidden display: none \ No newline at end of file diff --git a/core/app/assets/stylesheets/refinery/components/_records.scss b/core/app/assets/stylesheets/refinery/components/_records.scss new file mode 100644 index 0000000000..7c71351a15 --- /dev/null +++ b/core/app/assets/stylesheets/refinery/components/_records.scss @@ -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; + } + } + } + } +} \ No newline at end of file diff --git a/core/app/assets/stylesheets/refinery/components/_sortable_list.sass b/core/app/assets/stylesheets/refinery/components/_sortable_list.sass deleted file mode 100644 index 1201d952ed..0000000000 --- a/core/app/assets/stylesheets/refinery/components/_sortable_list.sass +++ /dev/null @@ -1,4 +0,0 @@ -#sortable_list.reordering, -.sortable_list.reordering - > li - cursor: move diff --git a/core/app/assets/stylesheets/refinery/components/_sortable_list.scss b/core/app/assets/stylesheets/refinery/components/_sortable_list.scss new file mode 100644 index 0000000000..609f488844 --- /dev/null +++ b/core/app/assets/stylesheets/refinery/components/_sortable_list.scss @@ -0,0 +1,7 @@ +#sortable_list { + .reordering { + > li { + cursor: move; + } + } +} \ No newline at end of file diff --git a/core/app/assets/stylesheets/refinery/components/_switch_locale_picker.scss b/core/app/assets/stylesheets/refinery/components/_switch_locale_picker.scss index 5e1b58a4bb..9ff2228db9 100644 --- a/core/app/assets/stylesheets/refinery/components/_switch_locale_picker.scss +++ b/core/app/assets/stylesheets/refinery/components/_switch_locale_picker.scss @@ -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; diff --git a/core/app/assets/stylesheets/refinery/components/_tree.sass b/core/app/assets/stylesheets/refinery/components/_tree.sass index 6e19b64552..ee1d3ac294 100644 --- a/core/app/assets/stylesheets/refinery/components/_tree.sass +++ b/core/app/assets/stylesheets/refinery/components/_tree.sass @@ -52,4 +52,5 @@ a float: right + font-size: 0.9em margin: 0.3em 0.15em \ No newline at end of file diff --git a/core/app/assets/stylesheets/refinery/global/_colours.scss b/core/app/assets/stylesheets/refinery/global/_colours.scss index 9b07aa28c4..e067d228a2 100644 --- a/core/app/assets/stylesheets/refinery/global/_colours.scss +++ b/core/app/assets/stylesheets/refinery/global/_colours.scss @@ -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; @@ -31,4 +31,5 @@ $main_menu_base_color: #666A70; $main_menu_base_light_color: white; $main_menu_accent_color: #25a9f4; -$line_separator_colour: #c4cdd5; \ No newline at end of file +$line_separator_colour: #c4cdd5; +$line_separator_light_colour: #ebeef0; \ No newline at end of file diff --git a/core/app/assets/stylesheets/refinery/refinery.sass b/core/app/assets/stylesheets/refinery/refinery.sass index 40f332634f..511a4113a0 100644 --- a/core/app/assets/stylesheets/refinery/refinery.sass +++ b/core/app/assets/stylesheets/refinery/refinery.sass @@ -2,8 +2,8 @@ @import "neat" -@import 'global/grid_settings' @import 'global/colours' +@import 'global/grid_settings' @import 'font-awesome-sprockets', 'font-awesome' @@ -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' @@ -26,6 +26,7 @@ @import 'grid/desktop' @import 'components/actions' +@import 'components/flash' @import 'components/form' @import 'components/form_actions' @import 'components/labels' @@ -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'