Skip to content

Commit

Permalink
Closes #1556: Updated arrow position; Removed wrong & unecessary <th>…
Browse files Browse the repository at this point in the history
… in filemanager (fixes position and table display in modal); Updated button icon color on selected row
  • Loading branch information
TheMaaarc committed Dec 5, 2017
1 parent b354ead commit a952a8c
Show file tree
Hide file tree
Showing 8 changed files with 294 additions and 367 deletions.
2 changes: 1 addition & 1 deletion modules/admin/src/resources/dist/css/admin.css

Large diffs are not rendered by default.

556 changes: 278 additions & 278 deletions modules/admin/src/resources/dist/js/main.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions modules/admin/src/resources/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions modules/admin/src/resources/scss/components/_filemanager.scss
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@
height: 0;
opacity: 0;
position: absolute;
right: 360px;
right: 390px;
top: 50%;
transform: translateY(-50%);
transition: 0s ease-in-out opacity;
width: 0;

.modal & {
right: 318px;
right: 334px;
}
}

Expand All @@ -154,7 +154,7 @@
background-color: theme-color(primary);
color: color(white);

.material-icons {
.custom-color-icon {
color: color(white);
}
}
Expand Down
1 change: 1 addition & 0 deletions modules/admin/src/resources/scss/components/_luya.scss
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ body.browser-safari {
@media (min-width: $mobile-nav-breakpoint) {
}
}

.mainnav-link {
display: block;
}
Expand Down
3 changes: 1 addition & 2 deletions modules/admin/src/views/layouts/_angulardirectives.php
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@
<i class="material-icons">done_all</i>
</span>
</th>
<th ng-if="selectedFileFromParent" style="width:15px;"></th>
<th></th><!-- image thumbnail / file icon -->
<th>
<span ng-if="sortField!='name' && sortField!='-name'" ng-click="changeSortField('-name')"><?= Admin::t('layout_filemanager_col_name'); ?></span>
Expand Down Expand Up @@ -335,7 +334,7 @@

<td class="text-center" ng-click="toggleSelection(file)" tooltip tooltip-image-url="{{file.thumbnailMedium.source}}" tooltip-disabled="!file.isImage">
<span ng-if="file.isImage"><img class="responsive-img filmanager-thumb" ng-src="{{file.thumbnail.source}}" /></span>
<span ng-if="!file.isImage"><i class="material-icons">attach_file</i></span>
<span ng-if="!file.isImage"><i class="material-icons custom-color-icon">attach_file</i></span>
</td>
<td ng-click="toggleSelection(file)">{{file.name | truncateMiddle: 30}}</td>
<td ng-click="toggleSelection(file)">{{file.extension}}</td>
Expand Down
10 changes: 5 additions & 5 deletions modules/cms/src/admin/resources/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 0 additions & 73 deletions scripts/compileStyles.sh

This file was deleted.

0 comments on commit a952a8c

Please sign in to comment.