update Piwik to version 2.16 (fixes #91)
This commit is contained in:
oliver
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -1,86 +1,29 @@
|
|||
#dashboard {
|
||||
margin: 0 -7px;
|
||||
margin: 0 -6px;
|
||||
}
|
||||
|
||||
#root>.top_controls {
|
||||
margin-left:15px;
|
||||
margin-right:15px;
|
||||
}
|
||||
.top_controls {
|
||||
position: relative;
|
||||
height: 32px;
|
||||
clear: left;
|
||||
#standalone #dashboard {
|
||||
margin: -10px -6px 0;
|
||||
}
|
||||
|
||||
@media all and (max-width: 749px) {
|
||||
.top_controls {
|
||||
height: auto;
|
||||
|
||||
#dashboard {
|
||||
.col {
|
||||
min-height: 100px;
|
||||
// Customize Bootstrap gutter between columns
|
||||
padding-right: 6px;
|
||||
padding-left: 6px;
|
||||
|
||||
>.sortable {
|
||||
padding: 5px 0 8px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.top_controls #periodString,
|
||||
.top_controls .dashboardSettings,
|
||||
.top_controls #segmentEditorPanel {
|
||||
position: static;
|
||||
margin: 0 0 10px;
|
||||
float: none;
|
||||
}
|
||||
}
|
||||
|
||||
#dashboardWidgetsArea {
|
||||
padding-bottom: 100px;
|
||||
}
|
||||
|
||||
.col {
|
||||
float: left;
|
||||
min-height: 100px;
|
||||
}
|
||||
|
||||
.col.width-100 {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.col.width-75 {
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
.col.width-67 {
|
||||
width: 66.67%;
|
||||
}
|
||||
|
||||
.col.width-50 {
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.col.width-40 {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.col.width-33 {
|
||||
width: 33.33%;
|
||||
}
|
||||
|
||||
.col.width-30 {
|
||||
width: 30%;
|
||||
}
|
||||
|
||||
.col.width-25 {
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.hover {
|
||||
border: 2px dashed #E3E3E3;
|
||||
}
|
||||
|
||||
.widget {
|
||||
background: #fff;
|
||||
border: 1px solid #bbb6ad;
|
||||
margin: 10px 7px;
|
||||
border-radius: 4px;
|
||||
overflow: hidden;
|
||||
font-size: 14px;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.widgetHover {
|
||||
border: 1px solid #aba494;
|
||||
}
|
||||
|
|
@ -93,65 +36,22 @@
|
|||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.widgetContent.hidden {
|
||||
position: absolute;
|
||||
top: -5000px;
|
||||
}
|
||||
|
||||
.widgetContent.loading {
|
||||
opacity: 0.5;
|
||||
background: url(plugins/Zeitgeist/images/loading-blue.gif) no-repeat top right;
|
||||
}
|
||||
|
||||
.widget h2 {
|
||||
font-size: 1.2em;
|
||||
margin-left: 10px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.widget p {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.widgetTop {
|
||||
background: #b5b0a7 url(plugins/Zeitgeist/images/dashboard_h_bg.png) repeat-x 0 0;
|
||||
cursor: move;
|
||||
font-size: 10pt;
|
||||
font-weight: bold;
|
||||
padding-bottom: 4px;
|
||||
}
|
||||
|
||||
.widgetTopHover {
|
||||
background: #C4BBAD url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0;
|
||||
}
|
||||
|
||||
.widgetName {
|
||||
font-size: 18px;
|
||||
padding: 2px 0 0 10px;
|
||||
font-weight: normal;
|
||||
color: #fff;
|
||||
text-shadow: 1px 1px 2px #7e7363;
|
||||
}
|
||||
|
||||
// Overriding some dataTable css for better dashboard display
|
||||
.widget .dataTableWrapper {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.widgetTop .button {
|
||||
cursor: pointer;
|
||||
float: right;
|
||||
margin: 6px 6px 0 0;
|
||||
table * {
|
||||
// Because of Bootstrap
|
||||
box-sizing: content-box;
|
||||
}
|
||||
}
|
||||
|
||||
.ui-confirm {
|
||||
display: none;
|
||||
width: 630px;
|
||||
background: #fff;
|
||||
color: #444;
|
||||
background: @theme-color-background-base;
|
||||
color: @theme-color-text-light;
|
||||
cursor: default;
|
||||
font-size: 12px !important;
|
||||
font-family: Arial, Verdana, Arial, Helvetica, sans-serif;
|
||||
border-radius: 4px;
|
||||
padding: 20px 10px;
|
||||
border-radius: 4px;
|
||||
|
|
@ -178,7 +78,6 @@
|
|||
}
|
||||
|
||||
.ui-dialog-buttonset input[type=button], .ui-dialog-buttonset button {
|
||||
background: #B5B0A7 url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important;
|
||||
color: #fff !important;
|
||||
border: 0 !important;
|
||||
font-size: 12px !important;
|
||||
|
|
@ -208,13 +107,26 @@
|
|||
display: none;
|
||||
}
|
||||
|
||||
.widgetLoading {
|
||||
cursor: wait;
|
||||
.widgetLoading, .widgetLoadingError, .dimensionLoadingError {
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
font-size: 10pt;
|
||||
}
|
||||
|
||||
.widgetLoadingError {
|
||||
.alert.alert-danger {
|
||||
border: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.widgetLoadingError, .dimensionLoadingError {
|
||||
color: @theme-color-brand;
|
||||
text-align: left;
|
||||
a {
|
||||
color: @theme-color-brand;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
|
||||
#closeMenuIcon {
|
||||
float: right;
|
||||
margin: 3px;
|
||||
|
|
@ -231,10 +143,8 @@
|
|||
z-index: 120;
|
||||
background: #f7f7f7;
|
||||
border: 1px solid #e4e5e4;
|
||||
padding: 5px 10px 6px 10px;
|
||||
border-radius: 4px;
|
||||
color: #444;
|
||||
font-size: 14px;
|
||||
color: @theme-color-text-light;
|
||||
cursor: pointer;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
|
@ -244,12 +154,13 @@
|
|||
border-color: #a9a399;
|
||||
}
|
||||
|
||||
.dashboardSettings.visible {
|
||||
.dashboardSettings.expanded {
|
||||
z-index: 1020; /* More than .jqplot-seriespicker-popover (1010) */
|
||||
min-width: 800px;
|
||||
}
|
||||
|
||||
.dashboardSettings > span {
|
||||
background: url(plugins/Zeitgeist/images/sort_subtable_desc.png) right center no-repeat;
|
||||
background: url(plugins/Morpheus/images/sort_subtable_desc.png) right center no-repeat;
|
||||
padding-right: 20px;
|
||||
display: block;
|
||||
}
|
||||
|
|
@ -260,10 +171,9 @@
|
|||
float: left;
|
||||
}
|
||||
|
||||
.dashboardSettings.visible ul.submenu {
|
||||
.dashboardSettings.expanded ul.submenu {
|
||||
display: block;
|
||||
list-style: square outside none;
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
||||
.dashboardSettings > ul.submenu > li {
|
||||
|
|
@ -272,7 +182,7 @@
|
|||
}
|
||||
|
||||
.dashboardSettings > ul.submenu > li:hover {
|
||||
color: #e87500;
|
||||
color:@theme-color-link;
|
||||
}
|
||||
|
||||
#changeDashboardLayout h2 {
|
||||
|
|
@ -319,31 +229,24 @@
|
|||
#columnPreview .width-100 {
|
||||
width: 120px;
|
||||
}
|
||||
|
||||
#columnPreview .width-75 {
|
||||
width: 90px;
|
||||
}
|
||||
|
||||
#columnPreview .width-67 {
|
||||
width: 80.4px;
|
||||
}
|
||||
|
||||
#columnPreview .width-50 {
|
||||
width: 60px;
|
||||
}
|
||||
|
||||
#columnPreview .width-40 {
|
||||
width: 48px;
|
||||
}
|
||||
|
||||
#columnPreview .width-33 {
|
||||
width: 40px;
|
||||
}
|
||||
|
||||
#columnPreview .width-30 {
|
||||
width: 36px;
|
||||
}
|
||||
|
||||
#columnPreview .width-25 {
|
||||
width: 30px;
|
||||
}
|
||||
|
|
@ -364,7 +267,7 @@
|
|||
|
||||
ul.widgetpreview-widgetlist,
|
||||
ul.widgetpreview-categorylist {
|
||||
color: #5d5342;
|
||||
color: @theme-color-text-light;
|
||||
list-style: none;
|
||||
font-size: 11px;
|
||||
line-height: 20px;
|
||||
|
|
@ -384,7 +287,7 @@ ul.widgetpreview-widgetlist li {
|
|||
}
|
||||
|
||||
.widgetpreview-base li.widgetpreview-choosen {
|
||||
background: #e4e2d7 url(plugins/Zeitgeist/images/arr_r.png) no-repeat right 6px;
|
||||
background: #e4e2d7 url(plugins/Morpheus/images/arr_r.png) no-repeat right 6px;
|
||||
color: #255792;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
|
@ -425,7 +328,7 @@ div.widgetpreview-preview {
|
|||
font-weight: normal;
|
||||
padding-top: 10px;
|
||||
margin-left: 10px;
|
||||
color: #5D5342;
|
||||
color: @theme-color-text-light;
|
||||
list-style: none;
|
||||
font-size: 11px;
|
||||
line-height: 20px;
|
||||
|
|
@ -435,11 +338,16 @@ div.widgetpreview-preview {
|
|||
.dashboardSettings .submenu ul li {
|
||||
line-height: 20px;
|
||||
padding: 0 25px 0 5px;
|
||||
color: #444;
|
||||
color: @theme-color-text-light;
|
||||
}
|
||||
|
||||
.dashboardSettings .submenu ul li:hover {
|
||||
color: #e87500;
|
||||
color: @theme-color-link;
|
||||
}
|
||||
|
||||
.dashboardSettings .submenu li[disabled],
|
||||
.dashboardSettings .submenu li[disabled]:hover {
|
||||
color: #d3d3d3;
|
||||
}
|
||||
|
||||
.dashboardSettings .widgetpreview-widgetlist {
|
||||
|
|
@ -456,8 +364,8 @@ div.widgetpreview-preview {
|
|||
display: none;
|
||||
}
|
||||
|
||||
.dashboardSettings.visible .widgetpreview-widgetlist,
|
||||
.dashboardSettings.visible .widgetpreview-preview {
|
||||
.dashboardSettings.expanded .widgetpreview-widgetlist,
|
||||
.dashboardSettings.expanded .widgetpreview-preview {
|
||||
display: block;
|
||||
}
|
||||
|
||||
|
|
@ -499,6 +407,10 @@ div.widgetpreview-preview {
|
|||
float: left;
|
||||
}
|
||||
|
||||
#dashboardWidgetsArea {
|
||||
margin-top: -5px;
|
||||
}
|
||||
|
||||
@media all and (max-width: 749px) {
|
||||
#dashboardWidgetsArea {
|
||||
padding-right: 7px;
|
||||
|
|
@ -519,22 +431,18 @@ div.widgetpreview-preview {
|
|||
|
||||
}
|
||||
|
||||
.widgetTop .button {
|
||||
display:none;
|
||||
}
|
||||
|
||||
.widgetTop.widgetTopHover .button {
|
||||
display:block;
|
||||
}
|
||||
|
||||
.widget.hiddenContent .widgetTop.widgetTopHover {
|
||||
.button#minimise,.button#refresh {
|
||||
display:none;
|
||||
}
|
||||
}
|
||||
|
||||
.ui-dialog .widget {
|
||||
.button#close,.button#maximise {
|
||||
display:none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.ui-button, .ui-dialog-titlebar-close {
|
||||
.btn;
|
||||
color: @theme-color-brand-contrast !important;
|
||||
background-color: @theme-color-brand !important;
|
||||
&:hover {
|
||||
background: none;
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,17 +45,10 @@ body {
|
|||
}
|
||||
|
||||
#Dashboard > ul > li:hover,
|
||||
#Dashboard > ul > li:hover a,
|
||||
#Dashboard > ul > li.sfHover,
|
||||
#Dashboard > ul > li.sfHover a {
|
||||
#Dashboard > ul > li:hover a {
|
||||
color: #e87500;
|
||||
}
|
||||
|
||||
#Dashboard > ul > li.sfHover,
|
||||
#Dashboard > ul > li.sfHover a {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.top_controls > #Dashboard,
|
||||
.top_controls > #periodString,
|
||||
.top_controls > .dashboardSettings {
|
||||
|
|
|
|||
130
www/analytics/plugins/Dashboard/stylesheets/widget.less
Normal file
130
www/analytics/plugins/Dashboard/stylesheets/widget.less
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
.widget {
|
||||
.font-default(13px, 18px);
|
||||
background: @theme-color-widget-background;
|
||||
border: 1px solid @theme-color-widget-border;
|
||||
box-shadow: 0 1px 1px rgba(204,204,204,.5);
|
||||
overflow: hidden;
|
||||
z-index: 1;
|
||||
|
||||
h2 {
|
||||
font-weight: normal;
|
||||
border-bottom: none;
|
||||
margin: 0;
|
||||
padding: 12px 10px 7px;
|
||||
}
|
||||
h3 {
|
||||
font-weight: normal;
|
||||
font-size: 15px;
|
||||
margin: 0;
|
||||
color: @theme-color-text;
|
||||
text-shadow: none;
|
||||
padding: 15px 15px 10px 12px;
|
||||
}
|
||||
p {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
&.default {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
.widgetTop {
|
||||
cursor: default !important;
|
||||
}
|
||||
}
|
||||
|
||||
.widgetTop {
|
||||
cursor: move;
|
||||
font-size: 10pt;
|
||||
font-weight: normal;
|
||||
padding-bottom: 4px;
|
||||
background: @theme-color-widget-title-background;
|
||||
h3 {
|
||||
.font-default(15px, 18px);
|
||||
color: @theme-color-widget-title-text;
|
||||
}
|
||||
.button {
|
||||
margin: 16px 8px 0 0;
|
||||
opacity: 0.8;
|
||||
cursor: pointer;
|
||||
float: right;
|
||||
}
|
||||
.buttons {
|
||||
float: right;
|
||||
position: absolute;
|
||||
padding-left: 50px;
|
||||
right: 8px;
|
||||
display: none;
|
||||
color: @theme-color-widget-title-text;
|
||||
background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
|
||||
background: -webkit-linear-gradient(left,rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
|
||||
background: linear-gradient(to right, rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='@{theme-color-widget-title-background}',GradientType=1 );
|
||||
}
|
||||
|
||||
&:hover .buttons {
|
||||
display:block;
|
||||
}
|
||||
}
|
||||
|
||||
.widgetText {
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.pk-emptyDataTable {
|
||||
.font-default(12px, 16px);
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
.dataTableFooterIcons {
|
||||
border-top: 1px solid @color-silver-l85;
|
||||
}
|
||||
|
||||
.widgetContent .jqplot-graph {
|
||||
margin-top: 6px;
|
||||
}
|
||||
|
||||
.widgetContent.hidden {
|
||||
position: absolute;
|
||||
top: -5000px;
|
||||
height: 1000px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.widgetContent.loading {
|
||||
opacity: 0.5;
|
||||
background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat top right;
|
||||
}
|
||||
|
||||
.widgetLoading {
|
||||
cursor: wait;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.widgetNameOffScreen {
|
||||
overflow: hidden;
|
||||
width:1px;
|
||||
height:1px;
|
||||
}
|
||||
|
||||
.card {
|
||||
margin: 0px;
|
||||
border-radius: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
.widget.hiddenContent .widgetTop.widgetTopHover {
|
||||
.button#minimise,.button#refresh {
|
||||
display:none;
|
||||
}
|
||||
}
|
||||
|
||||
.widget table.dataTable tr td {
|
||||
background-color: @theme-color-widget-background;
|
||||
}
|
||||
|
||||
.dataTable table.dataTable tr td {
|
||||
background-color: @theme-color-widget-background;
|
||||
}
|
||||
|
||||
.bar-graph-colors[data-name=grid-background] {
|
||||
color: @theme-color-widget-background !important;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue