Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 46 additions & 13 deletions plugins/CoreHome/stylesheets/selector.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@_selector-button_padding: 8px 16px;
@_selector-button_inner-half-gap: 8px;
@_selector-button_color-background: @theme-color-background-contrast;
@_selector-button_color-background-hover: @theme-color-background-contrast;
@_selector-button_border: 1px solid @theme-color-border;
Expand Down Expand Up @@ -43,18 +44,10 @@
color: @theme-color-text;
font-variant: tabular-nums;

&:has(.icon-chevron-down) {
flex-direction: row-reverse;
}

&:focus {
outline: none;
}

&:focus-visible {
outline: 2px solid @theme-color-focus-ring;
}

&.activityIndicator {
background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat 9px 9px;

Expand Down Expand Up @@ -85,9 +78,9 @@

&.expanded,
&.editing,
&:hover,
&:focus,
&:focus-within {
&:hover:not(.periodSelector-withPrevNext),
&:focus:not(.periodSelector-withPrevNext),
&:focus-within:not(.periodSelector-withPrevNext) {
border: @_selector-button_border-active;

span.title,
Expand All @@ -101,22 +94,62 @@
/* Period selector specific: left & right arrows */

.move-period {
position: relative;
padding: @_selector-button_padding;
background-color: @_selector-button_color-background;

&::before {
content: '';
position: absolute;
inset: -1px;
border: 1px solid transparent;

pointer-events: none;
}

&:hover::before,
&:focus-visible::before {
border-color: @theme-color-focus-ring;
}
}

.move-period-prev {
padding-right: 0;
padding-right: @_selector-button_inner-half-gap;
border-radius: @_selector-button_border-radius 0 0 @_selector-button_border-radius;

&::before {
border-radius: @_selector-button_border-radius 0 0 @_selector-button_border-radius;
}
}

.move-period-next {
padding-left: 0;
padding-left: @_selector-button_inner-half-gap;
border-radius: 0 @_selector-button_border-radius @_selector-button_border-radius 0;

&::before {
border-radius: 0 @_selector-button_border-radius @_selector-button_border-radius 0;
}
}

&.periodSelector-withPrevNext .title {
border-radius: 0;
padding-left: @_selector-button_inner-half-gap;
padding-right: @_selector-button_inner-half-gap;

&::before {
content: '';
position: absolute;
inset: -1px;
border: 1px solid transparent;
border-radius: @_selector-button_border-radius;

pointer-events: none;
}

&:hover::before,
&:focus-visible::before {
border-color: @theme-color-focus-ring;
}
}
}

Expand Down
60 changes: 30 additions & 30 deletions plugins/CoreHome/vue/dist/CoreHome.umd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plugins/CoreHome/vue/dist/CoreHome.umd.min.js

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions plugins/CoreHome/vue/src/PeriodSelector/PeriodSelector.less
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,6 @@
border: none;
cursor: pointer;

&:hover {
color: @color-green-matomo;
}

&:disabled {
color: @color-silver;
cursor: auto;
Expand Down
8 changes: 4 additions & 4 deletions plugins/CoreHome/vue/src/SiteSelector/SiteSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
v-tooltips
:title="selectorLinkTitle"
>
<span
class="icon icon-chevron-down"
:class="{'iconHidden': isLoading, 'collapsed': !showSitesList}"
/>
<span>
<span
v-text="displayedModelValue?.name || firstSiteName"
Expand All @@ -42,6 +38,10 @@
class="placeholder"
>{{ placeholder }}</span>
</span>
<span
class="icon icon-chevron-down"
:class="{'iconHidden': isLoading, 'collapsed': !showSitesList}"
/>
</a>
<div
v-show="showSitesList"
Expand Down
4 changes: 2 additions & 2 deletions plugins/Dashboard/stylesheets/dashboard.less
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,6 @@ div.widgetpreview-preview {
}

[vue-entry="Dashboard.DashboardSettings"] {
display: flex;
gap: 8px;
// Display its children (.piwikSelector) as direct children of .top_controls
display: contents;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion plugins/Overlay/stylesheets/overlay.css
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ body .ui-tooltip.overlayTooltip {
}

.top_controls {
display: none;
display: none !important;
}

.overlay-sidebar-container {
Expand Down
Loading
Loading