Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

event groups export fix and event group dropdown arrow fix #1605

Merged
merged 2 commits into from
Nov 2, 2020
Merged

event groups export fix and event group dropdown arrow fix #1605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd53e9
select dropdown arrow with background
itsiprikshit Nov 1, 2020
84abb75
dont export edit
itsiprikshit Nov 1, 2020
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
6 changes: 4 additions & 2 deletions frontend/express/public/javascripts/countly/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4747,7 +4747,8 @@ window.EventsBlueprintView = countlyView.extend({
"sClass": 'shrink right',
"sWidth": '100px',
"bSortable": false,
"bSearchable": false
"bSearchable": false,
"noExport": true
}
];
this.eventGroupsTable = $('.event-groups-table').dataTable($.extend({}, $.fn.dataTable.defaults, {
Expand Down Expand Up @@ -5213,7 +5214,8 @@ window.EventsBlueprintView = countlyView.extend({
"sClass": 'shrink right',
"sWidth": '100px',
"bSortable": false,
"bSearchable": false
"bSearchable": false,
"noExport": true
},
];

Expand Down
31 changes: 31 additions & 0 deletions frontend/express/public/stylesheets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3808,3 +3808,34 @@ p.error_message_div {
#eb-event-desc-input {
display: block;
}

.cly-select .drop-icn {
width: 12px;
height: 12px;
background-color: #444;
justify-content: center;
align-items: center;
border-radius: 4px;
overflow: hidden;
font-size: 0;
display: flex;
opacity: .8;
position: absolute;
right: 8px;
top: 7px;
}

.cly-select .drop-icn:before {
font-family: "Ionicons";
content: "\f123";
font-size: 9px;
color: #fff;
}

.cly-select.active .drop-icn:before {
content: "\f126";
}

.cly-select:hover .drop-icn {
background-color: #2FA732;
}
4 changes: 2 additions & 2 deletions frontend/express/views/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ <h3 data-index="{{value.index}}">{{value.title}}</h3>
<div class="text-container">
<div class="text"><span data-localize="events.blueprint-events-show.all"></span></div>
</div>
<div class="right combo"></div>
<div class="drop-icn"></div>
</div>
<div id="event-filter-types" class="select-items square">
<div data-value="all" class="segmentation-option item"><span data-localize="events.blueprint-events-show.all"></span></div>
Expand Down Expand Up @@ -1229,7 +1229,7 @@ <h3 data-index="{{value.index}}">{{value.title}}</h3>
<div class="text-container">
<div class="text"><span data-localize="events.blueprint-event-group-show.all"></span></div>
</div>
<div class="right combo"></div>
<div class="drop-icn"></div>
</div>
<div id="event-group-filter-types" class="select-items square">
<div data-value="all" class="segmentation-option item"><span data-localize="events.blueprint-event-group-show.all"></span></div>
Expand Down