Skip to content

Commit

Permalink
Merge branch 'master' into feature/simple-onboarding
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianignacio5
brianignacio5 committed Oct 29, 2020
2 parents 76ca0e6 + f0dc281 commit 5beadff
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 65 deletions.
4 changes: 0 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -808,10 +808,6 @@
"webpack": "webpack --mode production"
},
"devDependencies": {
"@fortawesome/fontawesome-free": "^5.9.0",
"@fortawesome/fontawesome-svg-core": "^1.2.21",
"@fortawesome/free-solid-svg-icons": "^5.10.1",
"@fortawesome/vue-fontawesome": "^0.1.6",
"@types/follow-redirects": "^1.8.0",
"@types/fs-extra": "^8.0.1",
"@types/glob": "^7.1.1",
Expand Down
1 change: 0 additions & 1 deletion src/views/commons/espCommons.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@charset "utf-8";
@import "~bulma/bulma";
@import "~@fortawesome/fontawesome-free/css/all.css";
@import "~vscode-codicons/dist/codicon";

html,
Expand Down
34 changes: 17 additions & 17 deletions src/views/size/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ <h1 class="title is-size-5-mobile" v-html="title"></h1>
v-on:click="flashClicked"
v-bind:disabled="isFlashing"
>
<span class="icon is-small">
<i class="fas fa-bolt"></i>
<span class="icon">
<i class="codicon codicon-symbol-event"></i>
</span>
&nbsp; Flash
</button>
Expand All @@ -35,8 +35,8 @@ <h1 class="title is-size-5-mobile" v-html="title"></h1>
title="Retry"
v-on:click="retryClicked"
>
<span class="icon is-small">
<i class="fas fa-redo"></i>
<span class="icon">
<i class="codicon codicon-refresh"></i>
</span>
</button>
</p>
Expand Down Expand Up @@ -131,8 +131,8 @@ <h1 class="title is-size-5-mobile" v-html="title"></h1>
<div class="columns is-vcentered has-text-centered is-mobile">
<div class="column is-1-tablet is-2-mobile is-clipped">
<div>
<span class="icon is-medium is-hidden-mobile">
<i class="fas fa-lg fa-memory"></i>
<span class="icon is-large is-hidden-mobile">
<i class="codicon codicon-server is-size-3"></i>
</span>
<strong style="vertical-align: super;">DRAM</strong>
</div>
Expand All @@ -159,8 +159,8 @@ <h1 class="title is-size-5-mobile" v-html="title"></h1>
<div class="columns is-vcentered has-text-centered is-mobile">
<div class="column is-1-tablet is-2-mobile is-clipped">
<div>
<span class="icon is-medium is-hidden-mobile">
<i class="fas fa-lg fa-microchip"></i>
<span class="icon is-large is-hidden-mobile">
<i class="codicon codicon-screen-normal is-size-3"></i>
</span>
<strong style="vertical-align: super;">IRAM</strong>
</div>
Expand Down Expand Up @@ -197,8 +197,8 @@ <h1 class="title is-size-5-mobile" v-html="title"></h1>
placeholder="Search"
v-model="searchText"
/>
<span class="icon is-small is-right">
<i class="fas fa-search"></i>
<span class="icon is-right">
<i class="codicon codicon-search"></i>
</span>
</p>
</div>
Expand All @@ -212,9 +212,9 @@ <h1 class="title is-size-5-mobile" v-html="title"></h1>
v-on:click="toggleArchiveFileInfoTable(archiveName)"
>
<div class="column is-hidden-mobile">
<div>
<div class="control">
<span class="icon is-large">
<i class="fas fa-lg fa-file-archive"></i>
<i class="codicon codicon-file-zip is-size-3"></i>
</span>
</div>
</div>
Expand Down Expand Up @@ -294,18 +294,18 @@ <h1 class="title is-size-5-mobile" v-html="title"></h1>
<div v-if="archiveInfo.files" class="column">
<div v-if="!archiveInfo.isFileInfoVisible">
<span class="icon is-large is-hidden-mobile">
<i class="fas fa-lg fa-angle-down"></i>
<i class="codicon codicon-chevron-down"></i>
</span>
<span class="icon is-small is-hidden-tablet">
<i class="fas fa-angle-down"></i>
<i class="codicon codicon-chevron-down"></i>
</span>
</div>
<div v-else>
<span class="icon is-large is-hidden-mobile">
<i class="fas fa-lg fa-angle-up"></i>
<i class="codicon codicon-chevron-up"></i>
</span>
<span class="icon is-large is-hidden-tablet">
<i class="fas fa-angle-up"></i>
<span class="icon is-small is-hidden-tablet">
<i class="codicon codicon-chevron-up"></i>
</span>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/views/tracing/components/CallStack.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
v-model="filter.functionName"
/>
<span class="icon is-small is-left">
<i class="fas fa-search"></i>
<i class="codicon codicon-search"></i>
</span>
</div>
<div class="control">
<button class="button" @click="reverseCallStack">
<span class="icon is-small">
<i class="fas fa-history"></i>
<i class="codicon codicon-history"></i>
</span>
<span>Reverse Call Stack</span>
</button>
Expand All @@ -39,13 +39,13 @@
<button class="button" @click="collapseOrExpandCalls()">
<template v-if="isExpanded">
<span class="icon is-small">
<i class="fas fa-caret-square-up"></i>
<i class="codicon codicon-triangle-up"></i>
</span>
<span>Collapse All</span>
</template>
<template v-else>
<span class="icon is-small">
<i class="fas fa-caret-square-down"></i>
<i class="codicon codicon-triangle-down"></i>
</span>
<span>Expand All</span>
</template>
Expand Down
8 changes: 4 additions & 4 deletions src/views/tracing/components/LeakList.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
v-model="filter.functionName"
/>
<span class="icon is-small is-left">
<i class="fas fa-search"></i>
<i class="codicon codicon-search"></i>
</span>
</div>
<div class="control">
<button class="button" @click="reverseCallStack">
<span class="icon is-small">
<i class="fas fa-history"></i>
<i class="codicon codicon-history"></i>
</span>
<span>Reverse Call Stack</span>
</button>
Expand All @@ -24,13 +24,13 @@
<button class="button" @click="collapseOrExpandCalls()">
<template v-if="isExpanded">
<span class="icon is-small">
<i class="fas fa-caret-square-up"></i>
<i class="codicon codicon-triangle-up"></i>
</span>
<span>Collapse All</span>
</template>
<template v-else>
<span class="icon is-small">
<i class="fas fa-caret-square-down"></i>
<i class="codicon codicon-triangle-down"></i>
</span>
<span>Expand All</span>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/views/tracing/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1 class="title is-size-5 is-size-6-mobile" v-html="title"></h1>
<div class="level-left">
<div class="level-item">
<span class="icon">
<i class="fas fa-file-medical-alt"></i>
<i class="codicon codicon-pulse is-size-3"></i>
</span>
</div>
<div class="level-item">
Expand Down
39 changes: 5 additions & 34 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,10 @@
chalk "^2.0.0"
js-tokens "^4.0.0"

"@fortawesome/fontawesome-common-types@^0.2.30":
version "0.2.30"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.30.tgz#2f1cc5b46bd76723be41d0013a8450c9ba92b777"
integrity sha512-TsRwpTuKwFNiPhk1UfKgw7zNPeV5RhNp2Uw3pws+9gDAkPGKrtjR1y2lI3SYn7+YzyfuNknflpBA1LRKjt7hMg==

"@fortawesome/fontawesome-free@^5.9.0":
version "5.14.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.14.0.tgz#a371e91029ebf265015e64f81bfbf7d228c9681f"
integrity sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA==

"@fortawesome/fontawesome-svg-core@^1.2.21":
version "1.2.30"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.30.tgz#f56dc6791861fe5d1af04fb8abddb94658c576db"
integrity sha512-E3sAXATKCSVnT17HYmZjjbcmwihrNOCkoU7dVMlasrcwiJAHxSKeZ+4WN5O+ElgO/FaYgJmASl8p9N7/B/RttA==
dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.30"

"@fortawesome/free-solid-svg-icons@^5.10.1":
version "5.14.0"
resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.14.0.tgz#970453f5e8c4915ad57856c3a0252ac63f6fec18"
integrity sha512-M933RDM8cecaKMWDSk3FRYdnzWGW7kBBlGNGfvqLVwcwhUPNj9gcw+xZMrqBdRqxnSXdl3zWzTCNNGEtFUq67Q==
dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.30"

"@fortawesome/vue-fontawesome@^0.1.6":
version "0.1.10"
resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz#eeeec1e4e8850bed0468f938292b06cda793bf34"
integrity sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==

"@interactjs/types@1.9.22":
version "1.9.22"
resolved "https://registry.yarnpkg.com/@interactjs/types/-/types-1.9.22.tgz#1504d3170b062555b03ee8eb954ae653b7f614e2"
integrity sha512-GMMMCYE+FPrKCOOOqQ/ImpqLyinb6e8psw9MR9ymTJxnkmJMKrY/GDC/187PVxpWdtSqW+GibkeRfUCOv6vFjg==
"@interactjs/types@1.9.19":
version "1.9.19"
resolved "https://registry.yarnpkg.com/@interactjs/types/-/types-1.9.19.tgz#f096eb395ca190995c083497c755b65be0a88677"
integrity sha512-PcaY5MmQTH5eiI525d57eB+/OH6V7utU5FfkbjfvYdFV2dE8NXjYlKiXOy7G0/Y08PyXPhge60TFaYOMYqmIUQ==

"@types/follow-redirects@^1.8.0":
version "1.13.0"
Expand Down Expand Up @@ -4795,7 +4766,7 @@ postcss@7.0.21:
source-map "^0.6.1"
supports-color "^6.1.0"

postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
version "7.0.32"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
Expand Down

0 comments on commit 5beadff

Please sign in to comment.