Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2014-09-10 21:22:53 +0400
committerdiosmosis <benaka@piwik.pro>2014-09-12 00:04:31 +0400
commita36e45c0c90a3544d329391409273201c98dcf38 (patch)
tree22a745467fd39dfdb1494c738d3c0d7c371d598c
parent10fddfbc96b55e6196815c48f880792e8bdc696c (diff)
Refs #5976, fix CSS changes for widgetized reports.
-rw-r--r--plugins/CoreHome/stylesheets/dataTable/_dataTable.less159
-rw-r--r--plugins/Morpheus/stylesheets/theme.less6
2 files changed, 79 insertions, 86 deletions
diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
index e3131469a3..4eb0d11467 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -285,104 +285,101 @@ table.dataTable img {
padding-bottom: 4px;
}
-#content {
-
- .dataTableFeatures {
- &.expanded {
- .dataTableFooterIcons {
- display: block;
- }
-
- .expandDataTableFooterDrawer {
- display: none;
- }
+.dataTableFeatures {
+ &.expanded {
+ .dataTableFooterIcons {
+ display: block;
}
- &.hasEvolution {
- .dataTableFooterIcons {
- margin-top: 17px;
- }
- .expandDataTableFooterDrawer {
- margin-top: 20px;
- }
+ .expandDataTableFooterDrawer {
+ display: none;
}
+ }
+ &.hasEvolution {
+ .dataTableFooterIcons {
+ margin-top: 17px;
+ }
.expandDataTableFooterDrawer {
- display: block;
- margin-top: 5px;
- margin-bottom: -1px;
- margin-left: auto;
- margin-right: auto;
- background-color: @theme-color-background-base;
- border: 1px solid @theme-color-background-tinyContrast;
- height: 7px;
- width: 70px;
- -webkit-border-bottom-left-radius: 10px;
- -webkit-border-bottom-right-radius: 10px;
- -moz-border-radius-bottomleft: 10px;
- -moz-border-radius-bottomright: 10px;
- border-bottom-left-radius: 10px;
- border-bottom-right-radius: 10px;
- line-height: 0px;
-
- img {
- margin-bottom: 0px;
- line-height: 0px;
- }
+ margin-top: 20px;
}
}
- div:not(#dashboard) .dataTableFeatures {
- border-bottom: 1px solid @theme-color-background-tinyContrast;
+ .expandDataTableFooterDrawer {
+ display: block;
+ margin-top: 5px;
+ margin-bottom: -1px;
+ margin-left: auto;
+ margin-right: auto;
+ background-color: @theme-color-background-base;
+ border: 1px solid @theme-color-background-tinyContrast;
+ height: 7px;
+ width: 70px;
+ -webkit-border-bottom-left-radius: 10px;
+ -webkit-border-bottom-right-radius: 10px;
+ -moz-border-radius-bottomleft: 10px;
+ -moz-border-radius-bottomright: 10px;
+ border-bottom-left-radius: 10px;
+ border-bottom-right-radius: 10px;
+ line-height: 0px;
+
+ img {
+ margin-bottom: 0px;
+ line-height: 0px;
+ }
}
+}
- .dataTableFooterIcons {
+div:not(#dashboard) .dataTableFeatures {
+ border-bottom: 1px solid @theme-color-background-tinyContrast;
+}
- display: none;
- margin-top: 5px;
- height: auto;
+.dataTableFooterIcons {
- div {
- padding-bottom: 2px;
- }
+ display: none;
+ margin-top: 5px;
+ height: auto;
- .foldDataTableFooterDrawer {
- display: block;
- padding-bottom: 0px;
- margin-bottom: -1px;
- margin-top: 0px;
- margin-left: auto;
- margin-right: auto;
- background-color: @theme-color-background-base;
- border: 1px solid @theme-color-background-tinyContrast;
- -webkit-border-top-left-radius: 10px;
- -webkit-border-top-right-radius: 10px;
- -moz-border-radius-topleft: 10px;
- -moz-border-radius-topright: 10px;
- border-top-left-radius: 10px;
- border-top-right-radius: 10px;
+ div {
+ padding-bottom: 2px;
+ }
+
+ .foldDataTableFooterDrawer {
+ display: block;
+ padding-bottom: 0px;
+ margin-bottom: -1px;
+ margin-top: 0px;
+ margin-left: auto;
+ margin-right: auto;
+ background-color: @theme-color-background-base;
+ border: 1px solid @theme-color-background-tinyContrast;
+ -webkit-border-top-left-radius: 10px;
+ -webkit-border-top-right-radius: 10px;
+ -moz-border-radius-topleft: 10px;
+ -moz-border-radius-topright: 10px;
+ border-top-left-radius: 10px;
+ border-top-right-radius: 10px;
+ line-height: 0px;
+ height: 7px;
+ width: 70px;
+ clear: both;
+
+ img {
+ margin-top: 2px;
+ margin-bottom: 0px;
line-height: 0px;
- height: 7px;
- width: 70px;
- clear: both;
-
- img {
- margin-top: 2px;
- margin-bottom: 0px;
- line-height: 0px;
- }
}
+ }
- .controls {
- clear: left;
- padding: 0px 0px 15px;
- text-align: left;
- color: #333;
- }
+ .controls {
+ clear: left;
+ padding: 0px 0px 15px;
+ text-align: left;
+ color: #333;
}
}
-#dashboard .dataTableFeatures {
+#dashboard .dataTableFeatures,.widget .dataTableFeatures {
.expandDataTableFooterDrawer {
-webkit-border-top-left-radius: 10px;
-webkit-border-top-right-radius: 10px;
@@ -418,10 +415,10 @@ table.dataTable img {
}
.dataTableFooterIcons {
- height: 20px;
+ min-height: 20px;
white-space: nowrap;
font-size: 10px;
- padding: 6px 5px;
+ padding: 6px 5px 0px;
border-top: 1px solid #B6B0A6;
}
diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
index 53743c3aa0..4b0b3d0020 100644
--- a/plugins/Morpheus/stylesheets/theme.less
+++ b/plugins/Morpheus/stylesheets/theme.less
@@ -497,14 +497,10 @@ table.dataTable .dataTableRowActions {
}
.dataTableFooterIcons {
- padding: 6px 8px;
+ padding: 6px 8px 0px;
border-top: 1px solid @color-silver-l80;
}
-#content .dataTableFooterIcons {
- padding: 6px 8px 0px;
-}
-
div.sparkline {
display: block;
width: 100%;