Skip to content
Extraits de code Groupes Projets
Valider 6bf528f0 rédigé par Matthieu Napoli's avatar Matthieu Napoli
Parcourir les fichiers

Merge pull request #7950 from piwik/fix-widgets-design 

Removed inconsistencies of widget styling
parents 2b9eea0b 2961557b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
plugins/CoreHome/stylesheets/zen-mode.less
+ 0
− 11
Voir le fichier @ 6bf528f0
......@@ -4,14 +4,6 @@
display: block;
}
.widget {
border-color: @color-silver-l85;
.widgetTop {
border-color: @color-silver-l85;
}
}
/* DATATABLES */
table.dataTable {
......@@ -92,9 +84,6 @@
margin-left: 13px;
}
.widgetContent .jqplot-graph {
margin-top: 6px;
}
}
.dataTableFeatures .expandDataTableFooterDrawer {
......
plugins/Dashboard/Dashboard.php
+ 1
− 0
Voir le fichier @ 6bf528f0
......@@ -214,6 +214,7 @@ class Dashboard extends \Piwik\Plugin
{
$stylesheets[] = "plugins/CoreHome/stylesheets/dataTable.less";
$stylesheets[] = "plugins/Dashboard/stylesheets/dashboard.less";
$stylesheets[] = "plugins/Dashboard/stylesheets/widget.less";
}
public function deleteDashboardLayout($userLogin)
......
plugins/Dashboard/stylesheets/dashboard.less
+ 0
− 72
Voir le fichier @ 6bf528f0
......@@ -39,24 +39,6 @@
}
}
.widget {
background: @theme-color-background-base;
border: 1px solid #bbb6ad;
border-radius: 4px;
overflow: hidden;
font-size: 14px;
z-index: 1;
h3 {
font-size: 15px;
margin: 0;
font-weight: normal;
color: #0D0D0D;
text-shadow: none;
padding: 15px 15px 10px;
}
}
.hover {
border: 2px dashed #E3E3E3;
}
......@@ -73,35 +55,6 @@
margin-left: 5px;
}
.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;
}
.widget p {
margin-left: 10px;
}
.widgetTop {
cursor: move;
font-size: 10pt;
font-weight: normal;
padding-bottom: 4px;
}
.widgetNameOffScreen {
overflow: hidden;
width:1px;
height:1px;
}
// Overriding some dataTable css for better dashboard display
.widget .dataTableWrapper {
width: 100% !important;
......@@ -111,12 +64,6 @@
}
}
.widgetTop .button {
cursor: pointer;
float: right;
margin: 6px 6px 0 0;
}
.ui-confirm {
display: none;
width: 630px;
......@@ -179,11 +126,6 @@
display: none;
}
.widgetLoading {
cursor: wait;
text-align: center;
}
.widgetLoading, .widgetLoadingError, .dimensionLoadingError {
padding: 10px;
font-size: 10pt;
......@@ -496,20 +438,6 @@ 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;
......
plugins/Dashboard/stylesheets/widget.less 0 → 100644
+ 108
− 0
Voir le fichier @ 6bf528f0
.widget {
.font-default(13px, 18px);
background: @theme-color-background-base;
border: 1px solid @color-silver-l85;
.border-radius();
.box-shadow-1(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: #0D0D0D;
text-shadow: none;
padding: 15px 15px 10px;
}
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;
border-bottom: 1px solid @color-silver-l85;
h3 {
.font-default(15px, 18px);
color: @theme-color-widget-title-text;
}
.button {
margin: 16px 8px 0 0;
opacity: 0.8;
visibility: hidden;
display:none;
cursor: pointer;
float: right;
}
}
// TODO those 2 should probably be simplified eventually...
.widgetTop:hover .button {
visibility: visible;
}
.widgetTop.widgetTopHover .button {
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;
}
}
.widget.hiddenContent .widgetTop.widgetTopHover {
.button#minimise,.button#refresh {
display:none;
}
}
plugins/Morpheus/stylesheets/theme.less
+ 0
− 55
Voir le fichier @ 6bf528f0
......@@ -557,48 +557,6 @@ div.sparkline {
z-index: 1;
}
.widget {
background: @theme-color-background-base;
border: 1px solid @color-silver-l80;
.border-radius();
.font-default(13px, 18px);
.box-shadow-1(0 1px 1px rgba(204,204,204,.5));
h2 {
font-weight: normal;
}
&.default {
margin-left: 0;
margin-right: 0;
.widgetTop {
cursor: default !important;
}
}
.widgetTop {
background: @theme-color-widget-title-background;
border-bottom: 1px solid @color-silver-l80;
h3 {
.font-default(15px, 18px);
color: @theme-color-widget-title-text;
}
}
.widgetText {
padding: 10px;
}
.pk-emptyDataTable {
.font-default(12px, 16px);
text-transform: none;
}
.dataTableFooterIcons {
border-top: 1px solid @color-silver-l80;
}
}
.dataTableSearchPattern {
background: none;
height: auto;
......@@ -834,19 +792,6 @@ div.sparkline {
}
}
.widgetTop .button {
margin: 16px 8px 0 0;
}
.widget .widgetTop:hover .button {
visibility: visible;
}
.widget .widgetTop .button {
opacity: 0.8;
visibility: hidden;
}
.annotationView {
.font-default(10px, 12px);
text-transform: uppercase;
......
plugins/VisitsSummary/stylesheets/datatable.less
+ 4
− 5
Voir le fichier @ 6bf528f0
#dashboard .visitsSummaryReportTitle {
margin-left: 0px;
padding-left: 10px;
border-top: 1px solid #ccc
#dashboard .visitsSummaryReportTitle, .widget .visitsSummaryReportTitle {
margin-left: 0;
padding-left: 10px;
border-top: 1px solid #ccc
}
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter