diff --git a/local_modules/styles/mixins.less b/local_modules/styles/mixins.less index c669a9572..b46bbea09 100644 --- a/local_modules/styles/mixins.less +++ b/local_modules/styles/mixins.less @@ -8,3 +8,23 @@ max-width: @containerMaxWidth; box-sizing: border-box; } + +.base-reset { + margin: 0; + padding: 0; + border: none; + background: none; + font: inherit; + -webkit-appearance: none; + appearance: none; +} + +.italic-font { + color: @colorGrey; + font-style: italic; +} + +.sorting-button { + &:extend(.italic-font, .base-reset); + cursor: pointer; +} \ No newline at end of file diff --git a/local_modules/styles/variables.less b/local_modules/styles/variables.less index 3863f2b4c..a43acb7cb 100644 --- a/local_modules/styles/variables.less +++ b/local_modules/styles/variables.less @@ -5,3 +5,4 @@ @containerMaxWidth: 1200px; @containerGap: 15px; @breakpoint: 600px; +@colorGrey: #666; diff --git a/playwright/snapshots/SubscriptionList/subscriptionlist--defualt.png b/playwright/snapshots/SubscriptionList/subscriptionlist--defualt.png index dbf37bacd..c60e328d3 100644 Binary files a/playwright/snapshots/SubscriptionList/subscriptionlist--defualt.png and b/playwright/snapshots/SubscriptionList/subscriptionlist--defualt.png differ diff --git a/playwright/snapshots/SubscriptionList/subscriptionlist--few-channels-for-subscription.png b/playwright/snapshots/SubscriptionList/subscriptionlist--few-channels-for-subscription.png index 7dad513a7..cda50cdc9 100644 Binary files a/playwright/snapshots/SubscriptionList/subscriptionlist--few-channels-for-subscription.png and b/playwright/snapshots/SubscriptionList/subscriptionlist--few-channels-for-subscription.png differ diff --git a/playwright/snapshots/SubscriptionList/subscriptionlist--with-disabled-item.png b/playwright/snapshots/SubscriptionList/subscriptionlist--with-disabled-item.png index a3e3dde1d..dfcface81 100644 Binary files a/playwright/snapshots/SubscriptionList/subscriptionlist--with-disabled-item.png and b/playwright/snapshots/SubscriptionList/subscriptionlist--with-disabled-item.png differ diff --git a/playwright/snapshots/SubscriptionList/subscriptionlist--with-many-tags.png b/playwright/snapshots/SubscriptionList/subscriptionlist--with-many-tags.png index 48884aa67..fc46acd71 100644 Binary files a/playwright/snapshots/SubscriptionList/subscriptionlist--with-many-tags.png and b/playwright/snapshots/SubscriptionList/subscriptionlist--with-many-tags.png differ diff --git a/src/Components/EventList/EventList.less b/src/Components/EventList/EventList.less index b09ad8a0e..1a3b7845b 100644 --- a/src/Components/EventList/EventList.less +++ b/src/Components/EventList/EventList.less @@ -15,7 +15,7 @@ } .header { - color: #666; + color: @colorGrey; font-style: italic; } @@ -44,7 +44,7 @@ .curr-value { width: 70px; font-size: 12px; - color: #666; + color: @colorGrey; } .prev-value { diff --git a/src/Components/Footer/Footer.less b/src/Components/Footer/Footer.less index 710504a56..bd45901c4 100644 --- a/src/Components/Footer/Footer.less +++ b/src/Components/Footer/Footer.less @@ -5,7 +5,7 @@ padding-top: 40px; padding-bottom: 40px; background-color: #efefef; - color: #666; + color: @colorGrey; } .container { diff --git a/src/Components/MetricList/MetricList.less b/src/Components/MetricList/MetricList.less index 010600be3..eda5ff38d 100644 --- a/src/Components/MetricList/MetricList.less +++ b/src/Components/MetricList/MetricList.less @@ -81,7 +81,7 @@ padding: 0; border: none; background: none; - color: #666; + color: @colorGrey; font: inherit; font-style: italic; -webkit-appearance: none; diff --git a/src/Components/Mobile/MobileTagSelectorPage/MobileTagSelectorPage.less b/src/Components/Mobile/MobileTagSelectorPage/MobileTagSelectorPage.less index d9e487e17..1673704d6 100644 --- a/src/Components/Mobile/MobileTagSelectorPage/MobileTagSelectorPage.less +++ b/src/Components/Mobile/MobileTagSelectorPage/MobileTagSelectorPage.less @@ -2,7 +2,7 @@ .no-result { padding: 30px; - color: #666; + color: @colorGrey; text-align: center; } diff --git a/src/Components/Mobile/MobileTriggerListPage/MobileTriggerListPage.less b/src/Components/Mobile/MobileTriggerListPage/MobileTriggerListPage.less index 768e10c99..52a393a6c 100644 --- a/src/Components/Mobile/MobileTriggerListPage/MobileTriggerListPage.less +++ b/src/Components/Mobile/MobileTriggerListPage/MobileTriggerListPage.less @@ -37,3 +37,9 @@ } } + +.empty-triggers { + padding: 30; + color: @colorGrey; + text-align: center; +} diff --git a/src/Components/Mobile/MobileTriggerListPage/MobileTriggerListPage.tsx b/src/Components/Mobile/MobileTriggerListPage/MobileTriggerListPage.tsx index 7795468cb..0b7840204 100644 --- a/src/Components/Mobile/MobileTriggerListPage/MobileTriggerListPage.tsx +++ b/src/Components/Mobile/MobileTriggerListPage/MobileTriggerListPage.tsx @@ -54,9 +54,7 @@ export default class MobileTriggerListPage extends React.Component
{triggers != null && triggers.length === 0 && ( -
- No results :-( -
+
No results :-(
)} {triggers != null && triggers.map((trigger) => ( diff --git a/src/Components/Mobile/Styles/variables.less b/src/Components/Mobile/Styles/variables.less index 93699e1cf..5d2d82bc0 100644 --- a/src/Components/Mobile/Styles/variables.less +++ b/src/Components/Mobile/Styles/variables.less @@ -12,3 +12,5 @@ @no-data-color: noDataColor; @primary-divider-color: #ddd; + +@colorGrey: #666; diff --git a/src/Components/NotificationList/NotificationList.less b/src/Components/NotificationList/NotificationList.less index 15bf4c47b..c90220c31 100644 --- a/src/Components/NotificationList/NotificationList.less +++ b/src/Components/NotificationList/NotificationList.less @@ -8,11 +8,6 @@ margin-top: 5px; } -.header { - color: #666; - font-style: italic; -} - .timestamp { width: 15%; } @@ -61,6 +56,6 @@ } .no-result { - color: #666; + color: @colorGrey; text-align: center; } diff --git a/src/Components/NotificationList/NotificationList.tsx b/src/Components/NotificationList/NotificationList.tsx index 39fba24ae..cf6db915c 100644 --- a/src/Components/NotificationList/NotificationList.tsx +++ b/src/Components/NotificationList/NotificationList.tsx @@ -54,7 +54,7 @@ export default function NotificationList(props: Props): React.ReactElement { <> {ConfirmModal} -
+
Timestamp
State
Trigger
diff --git a/src/Components/PatternList/PatternList.less b/src/Components/PatternList/PatternList.less index c2283a990..09f231ec7 100644 --- a/src/Components/PatternList/PatternList.less +++ b/src/Components/PatternList/PatternList.less @@ -23,24 +23,12 @@ } } -.header { - color: #666; - font-style: italic; -} - .name { width: calc(~'100% - 240px'); &.clicked { - margin: 0; - padding: 0; - border: none; - background: none; - color: inherit; - font: inherit; + &:extend(.base-reset); text-align: left; - -webkit-appearance: none; - appearance: none; cursor: pointer; } } @@ -49,15 +37,7 @@ .metric-counter, .control { width: 80px; - margin: 0; - padding: 0; - border: none; - background: none; - color: #666; - font: inherit; - font-style: italic; - -webkit-appearance: none; - appearance: none; + &:extend(.sorting-button); } .info { diff --git a/src/Components/PatternList/PatternList.tsx b/src/Components/PatternList/PatternList.tsx index 74243e6be..a2cc598ba 100644 --- a/src/Components/PatternList/PatternList.tsx +++ b/src/Components/PatternList/PatternList.tsx @@ -27,7 +27,7 @@ export default function PatternList(props: Props): React.ReactElement { const sortingIcon = sortingDown ? : ; return (
-
+
Pattern