-
+
+ {this.renderRequestGroupRow(null)}
+ {requestGroups.map(requestGroup => this.renderRequestGroupRow(requestGroup))}
+
+
-
- {this.renderRequestGroupRow(null)}
- {requestGroups.map(requestGroup => this.renderRequestGroupRow(requestGroup))}
-
)
diff --git a/app/components/dropdowns/RequestGroupActionsDropdown.js b/app/components/dropdowns/RequestGroupActionsDropdown.js
index f3342aa79..06184497f 100644
--- a/app/components/dropdowns/RequestGroupActionsDropdown.js
+++ b/app/components/dropdowns/RequestGroupActionsDropdown.js
@@ -15,11 +15,6 @@ class RequestGroupActionsDropdown extends Component {
- -
-
-
-
+
+
button {
diff --git a/app/css/components/header.scss b/app/css/components/header.scss
index 10d2d2349..ce869cfa8 100644
--- a/app/css/components/header.scss
+++ b/app/css/components/header.scss
@@ -2,7 +2,6 @@
.header {
height: $line-height-md;
- line-height: $line-height-md;
flex-shrink: 0;
.header__content {
diff --git a/app/css/components/toast.scss b/app/css/components/toast.scss
new file mode 100644
index 000000000..a868cca22
--- /dev/null
+++ b/app/css/components/toast.scss
@@ -0,0 +1,31 @@
+@import '../constants/dimensions';
+@import '../constants/colors';
+
+.toast {
+ position: absolute;
+ z-index: 100;
+ bottom: $padding-md;
+ right: $padding-md;
+ background: $bg-light;
+ color: $font-light-bg;
+ box-shadow: 0 0 1rem rgba(0, 0, 0, 0.2);
+
+ .toast__message,
+ .toast__action {
+ padding: $padding-sm $padding-md;
+ height: auto;
+ }
+
+ .toast__message {
+ border-right: 1px solid $hl-md;
+ }
+
+ .toast__action {
+ color: $font-light-bg;
+
+ &:hover {
+ color: $font-super-light-bg;
+ background: rgba(0, 0, 0, 0.05);
+ }
+ }
+}
diff --git a/app/css/constants/colors.scss b/app/css/constants/colors.scss
index b98dfb928..f34acd630 100644
--- a/app/css/constants/colors.scss
+++ b/app/css/constants/colors.scss
@@ -7,7 +7,8 @@ $bg-super-dark: #292a26;
$color-brand: #7D70CC;
/* Font Colors */
-$font-light-bg: #555;
+$font-light-bg: #444;
+$font-super-light-bg: #555;
$font-dark-bg: #ddd;
$font-super-dark-bg: #c8c8c8;
$font-primary-bg: #eee;
@@ -84,6 +85,6 @@ $info: #52adc1;
.bg-super-light {
background: $bg-super-light;
&, a, textarea, input, button {
- color: $font-light-bg;
+ color: $font-super-light-bg;
}
}
diff --git a/app/css/constants/dimensions.scss b/app/css/constants/dimensions.scss
index 1d1908de0..e1f2c5352 100644
--- a/app/css/constants/dimensions.scss
+++ b/app/css/constants/dimensions.scss
@@ -20,11 +20,14 @@ $line-height-md: 4rem;
$line-height-sm: $line-height-md * 0.75;
/* Sidebar */
-$sidebar-width: 20rem;
+$sidebar-width: 19rem;
/* Borders */
-$radius-sm: 1px;
-$radius-md: 2px;
+$radius-sm: 0.1rem;
+$radius-md: 0.2rem;
+
+/* Dropdowns */
+$dropdown-min-width: 15rem;
/* Modals */
$modal-width: 50rem;
diff --git a/app/css/index.scss b/app/css/index.scss
index 379f1a78d..2185b1648 100644
--- a/app/css/index.scss
+++ b/app/css/index.scss
@@ -21,3 +21,4 @@
@import 'components/scrollbars';
@import 'components/dropdown';
@import 'components/modal';
+@import 'components/toast';
diff --git a/app/css/layout/base.scss b/app/css/layout/base.scss
index 9fd58590f..084c15eb6 100644
--- a/app/css/layout/base.scss
+++ b/app/css/layout/base.scss
@@ -3,7 +3,6 @@
html {
font-family: 'Open Sans', sans-serif;
- font-size: $font-size;
}
html, body, #root {
@@ -94,10 +93,6 @@ i.fa {
}
}
-.stock-height {
- height: $line-height-md;
-}
-
.section:not(:last-child) {
.section__header {
diff --git a/app/css/layout/sidebar.scss b/app/css/layout/sidebar.scss
index bae5e988a..f3849fe95 100644
--- a/app/css/layout/sidebar.scss
+++ b/app/css/layout/sidebar.scss
@@ -56,6 +56,10 @@
width: 100%;
position: relative;
+ .tag {
+ padding-left: 0;
+ }
+
&.sidebar__item--active {
color: $font-dark-bg;
@@ -90,11 +94,15 @@
border-top: 0;
}
- ul ul .sidebar__item__row > button {
+ ul .sidebar__item__row > button {
padding-left: $padding-md !important;
}
- ul ul ul .sidebar__item__row > button {
+ ul ul .sidebar__item__row > button {
padding-left: $padding-md * 2 !important;
}
+
+ ul ul ul .sidebar__item__row > button {
+ padding-left: $padding-md * 3 !important;
+ }
}
diff --git a/app/css/reset.scss b/app/css/reset.scss
index af0a8742d..455d98f0e 100644
--- a/app/css/reset.scss
+++ b/app/css/reset.scss
@@ -18,7 +18,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
}
body {
- line-height: 1;
+ line-height: normal;
}
ol, ul {
@@ -44,4 +44,4 @@ q {
table {
border-collapse: collapse;
border-spacing: 0;
-}
\ No newline at end of file
+}