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.

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

Use icon tag instead of font awesome icon #2537

Merged
merged 18 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
### Fixed 🐞

- Fix delta values of secondary metrics not shown in delta mode within attribute side bar [#2539](https://github.com/MaibornWolff/codecharta/issues/2539).
- Use icon tag instead of font awesome icon [#2537](https://github.com/MaibornWolff/codecharta/pull/2537).

### Chore 👨‍💻 👩‍💻

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
md-container-class="ribbonBarDropdown"
ng-disabled="$ctrl.noEdgesAvailable()"
>
<md-select-header>
<md-select-header class="search-bar">
<i class="fa fa-search search-icon"></i>
<input
id="edge-metric-selector"
class="metric-search"
ng-model="$ctrl._viewModel.searchTerm"
type="text"
placeholder="&#xF002; Metric (highest value)"
placeholder="Metric (highest value)"
ng-keydown="$event.stopPropagation()"
ng-change="$ctrl.filterMetricData()"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
md-on-open="$ctrl.focusInputField('area-metric')"
md-container-class="ribbonBarDropdown"
>
<md-select-header>
<md-select-header class="search-bar">
<i class="fa fa-search search-icon"></i>
<input
id="area-metric-selector"
class="metric-search area-metric"
ng-model="$ctrl._viewModel.searchTerm"
type="text"
placeholder="&#xF002; Metric (highest value)"
placeholder="Metric (highest value)"
ng-keydown="$event.stopPropagation()"
ng-change="$ctrl.filterMetricData()"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
md-on-open="$ctrl.focusInputField('color-metric')"
md-container-class="ribbonBarDropdown"
>
<md-select-header>
<md-select-header class="search-bar">
<i class="fa fa-search search-icon"></i>
<input
id="color-metric-selector"
class="metric-search color-metric"
ng-model="$ctrl._viewModel.searchTerm"
type="text"
placeholder="&#xF002; Metric (highest value)"
placeholder="Metric (highest value)"
ng-keydown="$event.stopPropagation()"
ng-change="$ctrl.filterMetricData()"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,26 +79,45 @@ edge-chooser-component {
display: initial;
}

.search-bar {
i,
input {
background-color: #f5f5f5;
padding: 10px;
border: none;
border-bottom: solid 2px;
border-color: rgba(0, 0, 0, 0.12);
}
}

.search-bar:focus-within {
i,
input {
border-color: rgb(0, 150, 136);
color: rgb(0, 150, 136);
}
}

.search-icon {
position: absolute;
left: 0;
width: 12%;
height: $optionHeight - 8 + px;
top: 8px;
box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.2);
}

.metric-search {
display: block;
position: fixed;
top: 8px;
width: 100%;
padding: 10px;
left: 12%;
width: 88%;
height: $optionHeight - 8 + px;
outline: none;
border: none;
border-bottom: solid 2px;
border-color: rgba(0, 0, 0, 0.12);
background-color: #f5f5f5;
font-family: Arial, FontAwesome, sans-serif;
font-size: 11pt;
box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.2) !important;

&:focus {
Shivan-997 marked this conversation as resolved.
Show resolved Hide resolved
border-color: rgb(0, 150, 136);
color: rgb(0, 150, 136);
}
box-shadow: 5px 1px 5px 0 rgba(0, 0, 0, 0.2);
}

md-content.option-group {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
md-on-open="$ctrl.focusInputField('distribution-metric')"
md-container-class="distributionBarDropdown"
>
<md-select-header>
<md-select-header class="search-bar">
<i class="fa fa-search search-icon"></i>
<input
id="distribution-metric-selector"
class="metric-search distribution-metric"
ng-model="$ctrl._viewModel.searchTerm"
type="text"
placeholder="&#xF002; Metric (highest value)"
placeholder="Metric (highest value)"
ng-keydown="$event.stopPropagation()"
ng-change="$ctrl.filterMetricData()"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
md-on-open="$ctrl.focusInputField('height-metric')"
md-container-class="ribbonBarDropdown"
>
<md-select-header>
<md-select-header class="search-bar">
<i class="fa fa-search search-icon"></i>
<input
id="height-metric-selector"
class="metric-search height-metric"
ng-model="$ctrl._viewModel.searchTerm"
type="text"
placeholder="&#xF002; Metric (highest value)"
placeholder="Metric (highest value)"
ng-keydown="$event.stopPropagation()"
ng-change="$ctrl.filterMetricData()"
/>
Expand Down