diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 76e291d4112..6c7f37620f3 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -544,24 +544,6 @@ $.extend(DataTable.prototype, UIControl.prototype, {
handleSort: function (domElem) {
var self = this;
- function getSortImageSrc() {
- var imageSortSrc = false;
- if (currentIsSubDataTable) {
- if (self.param.filter_sort_order == 'asc') {
- imageSortSrc = 'plugins/Zeitgeist/images/sort_subtable_asc.png';
- } else {
- imageSortSrc = 'plugins/Zeitgeist/images/sort_subtable_desc.png';
- }
- } else {
- if (self.param.filter_sort_order == 'asc') {
- imageSortSrc = 'plugins/Zeitgeist/images/sortasc.png';
- } else {
- imageSortSrc = 'plugins/Zeitgeist/images/sortdesc.png';
- }
- }
- return imageSortSrc;
- }
-
if (self.props.enable_sort) {
$('.sortable', domElem).off('click.dataTableSort').on('click.dataTableSort',
function () {
@@ -574,7 +556,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
if (self.param.filter_sort_column) {
// are we in a subdatatable?
var currentIsSubDataTable = $(domElem).parent().hasClass('cellSubDataTable');
- var imageSortSrc = getSortImageSrc();
+ var imageSortClassType = currentIsSubDataTable ? 'sortSubtable' : ''
var imageSortWidth = 16;
var imageSortHeight = 16;
@@ -585,7 +567,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
// adding an image and the class columnSorted to the TD
$("th#" + self.param.filter_sort_column + ' #thDIV', domElem).parent()
.addClass('columnSorted')
- .prepend('');
+ .prepend('
');
}
},
diff --git a/plugins/Morpheus/stylesheets/general/_forms.less b/plugins/Morpheus/stylesheets/general/_forms.less
index 80b3eb88927..31b5cd72f49 100644
--- a/plugins/Morpheus/stylesheets/general/_forms.less
+++ b/plugins/Morpheus/stylesheets/general/_forms.less
@@ -25,8 +25,8 @@ button[type="button"],
cursor: pointer;
border: 0px !important;
&:hover {
- background: #ff9600 !important;
- background-color: #ff9600 !important;
+ background: @theme-color-brand !important;
+ background-color: @theme-color-brand !important;
}
em {
@@ -137,7 +137,7 @@ button[type="button"],
content: '';
border-left: 4px solid transparent;
border-right: 4px solid transparent;
- border-bottom: 5px solid #d4291f;
+ border-bottom: 5px solid @theme-color-brand;
border-top-color: transparent;
position: absolute;
top: 1px;
diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
index b9fbda35386..fdbf4532ae2 100644
--- a/plugins/Morpheus/stylesheets/theme.less
+++ b/plugins/Morpheus/stylesheets/theme.less
@@ -394,6 +394,30 @@ table.dataTable {
.sortIcon {
margin-top: -1px;
}
+
+ .sortIconContainerAsc .sortIcon {
+ margin-top: -6px;
+ }
+
+ .sortIconContainer.sortSubtable {
+ color: @theme-color-text-light;
+ }
+
+ .sortIconContainerAsc .sortIcon:after {
+ content: " \25B2";
+ border-bottom: 5px solid @theme-color-brand;
+ border-top: 0px;
+ }
+
+ .sortIcon:after {
+ content: " \25BC";
+ font-size: 1px;
+ color: @theme-color-brand;
+ border-left: 4px solid rgba(0, 0, 0, 0);
+ border-right: 4px solid rgba(0, 0, 0, 0);
+ border-top: 5px solid @theme-color-brand;
+ }
+
}
}
}
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.less b/plugins/MultiSites/angularjs/dashboard/dashboard.less
index 72ae656ecf1..042f5ac2cca 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.less
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.less
@@ -160,21 +160,58 @@
}
.heading {
- display: inline-block;
+ display: inline;
margin-top: 4px;
}
+
+ #evolution_selector {
+ margin: 0px;
+ margin-top: -3px;
+ }
+
+ .multisites_asc,
.multisites_desc {
- width: 16px;
- height: 13px;
+ float: none;
display: inline-block;
- background-image: url(plugins/Zeitgeist/images/sortdesc.png);
+ vertical-align: top;
+ margin: 0px;
+ margin-left: 6px;
+ margin-top: -1px;
+ }
+
+ #evolution {
+ .multisites_asc,
+ .multisites_desc {
+ margin-right: 6px;
+ margin-left: 0px;
+ }
+ .evolution {
+ vertical-align: top;
+ }
}
+
.multisites_asc {
- width: 16px;
- height: 13px;
- display: inline-block;
- background-image: url(plugins/Zeitgeist/images/sortasc.png);
+ margin-top: -7px;
+ vertical-align: top;
}
+
+ .multisites_desc:after {
+ content: " \25BC";
+ font-size: 1px;
+ color: @theme-color-brand;
+ border-left: 4px solid rgba(0, 0, 0, 0);
+ border-right: 4px solid rgba(0, 0, 0, 0);
+ border-top: 5px solid @theme-color-brand;
+ }
+ .multisites_asc:after {
+ content: " \25BC";
+ font-size: 1px;
+ color: @theme-color-brand;
+ border-left: 4px solid rgba(0, 0, 0, 0);
+ border-right: 4px solid rgba(0, 0, 0, 0);
+ border-bottom: 5px solid @theme-color-brand;
+ }
+
div.sparkline {
float:none;
}
diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less
index 7bdd92e8fa0..82312fcb1c4 100644
--- a/plugins/SegmentEditor/stylesheets/segmentation.less
+++ b/plugins/SegmentEditor/stylesheets/segmentation.less
@@ -396,11 +396,6 @@ div.scrollable {
text-decoration: none;
}
-.segment-element .segment-top a.dropdown {
- padding: 0 17px 0 0;
- background: url(plugins/Zeitgeist/images/sort_subtable_desc.png) 100% -2px no-repeat;
-}
-
.segment-element .segment-footer {
background: #eae8e3;
border-top: 1px solid #a9a399;
@@ -701,4 +696,28 @@ a.metric_category {
.segment-element.anchorRight {
right:-1px;
left:auto;
-}
\ No newline at end of file
+}
+
+.available_segments {
+ display: inline-block;
+ width: 160px;
+}
+
+.available_segments a.dropdown,
+.segment-element .segment-top a.dropdown {
+ padding: 0 17px 0 0;
+ background: none !important;
+}
+
+.available_segments a.dropdown:after,
+.segment-element .segment-top a.dropdown:after {
+ content: " \25BC";
+ font-size: 0px;
+ color: @theme-color-brand;
+ border-left: 4px solid rgba(0, 0, 0, 0);
+ border-right: 4px solid rgba(0, 0, 0, 0);
+ border-top: 5px solid @theme-color-brand;
+ margin-left: 7px;
+ display: inline-block;
+ vertical-align: sub;
+}
diff --git a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
index a409ef1506d..647303faa72 100644
--- a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
+++ b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
@@ -87,12 +87,41 @@ div.ui-state-highlight {
padding: 0;
}
+.ui-datepicker-header .ui-icon-circle-triangle-w,
+.ui-datepicker-header .ui-icon-circle-triangle-e {
+ content: " \25BC";
+ font-size: 1px;
+ color: @theme-color-brand;
+ border-top: 4px solid rgba(0, 0, 0, 0);
+ border-bottom: 4px solid rgba(0, 0, 0, 0);
+ border-left: 5px solid @theme-color-brand;
+ margin-left: 7px;
+ display: inline-block;
+ vertical-align: sub;
+ background: none !important;
+ height: auto;
+ width: auto;
+}
+
.ui-datepicker-header .ui-icon-circle-triangle-w {
- background: url(plugins/Zeitgeist/images/datepicker_arr_l.png) no-repeat 5px 4px !important;
+ border-left: 0px;
+ border-right: 5px solid @theme-color-brand;
}
-.ui-datepicker-header .ui-icon-circle-triangle-e {
- background: url(plugins/Zeitgeist/images/datepicker_arr_r.png) no-repeat 6px 4px !important;
+.ui-datepicker-prev {
+ background: none !important;
+ left: 5px !important;
+ top: 3px !important;
+}
+.ui-datepicker-next {
+ background: none !important;
+ right: 2px !important;
+ top: 3px !important;
+}
+
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
+ margin-left: -5px;
+ margin-top: -5px;
}
.ui-datepicker .ui-datepicker-next-hover,