Skip to content

Commit

Permalink
remove font awesome pro dependency - use only font awesome free
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Hilger committed Jun 30, 2019
1 parent 11235e6 commit 2a10098
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dist/js/field.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"@fortawesome/fontawesome-pro": "^5.4.0",
"@fortawesome/fontawesome-free": "^5.9.0",
"@fortawesome/fontawesome-svg-core": "^1.2.19",
"@fortawesome/free-solid-svg-icons": "^5.9.0",
"@fortawesome/vue-fontawesome": "^0.1.6",
"cross-env": "^5.0.0",
"laravel-mix": "^1.0",
"laravel-nova": "^1.0"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.5",
"@fortawesome/pro-regular-svg-icons": "^5.4.0",
"@fortawesome/vue-fontawesome": "^0.1.1",
"i": "^0.3.6",
"npm": "^6.4.1",
"tiptap": "^1.8.0",
"tiptap-extensions": "^1.8.0",
"tiptap": "^1.19.1",
"tiptap-extensions": "^1.19.1",
"vue": "^2.5.0",
"vue-truncate-collapsed": "^2.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/FormField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export default {
box-sizing: border-box;
vertical-align: top;
margin-right: 8px;
font-weight: 400;
font-weight: 700;
}
.tiptap-button-container {
Expand Down
8 changes: 4 additions & 4 deletions resources/js/components/buttons/LinkButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@click="setLinkUrl(commands.link, null)"
type="button"
>
<font-awesome-icon :icon="['far', 'times-circle']">
<font-awesome-icon :icon="['fas', 'times-circle']">
</font-awesome-icon>
</button>
</form>
Expand All @@ -52,7 +52,7 @@
]"
@click="showLinkMenu(getMarkAttrs('link'))"
>
<font-awesome-icon :icon="['far', 'link']">
<font-awesome-icon :icon="['fas', 'link']">
</font-awesome-icon>
</button>

Expand All @@ -73,7 +73,7 @@
]"
@click="setLinkUrl(commands.link, null)"
>
<font-awesome-icon :icon="['far', 'unlink']">
<font-awesome-icon :icon="['fas', 'unlink']">
</font-awesome-icon>
</button>
</span>
Expand All @@ -82,7 +82,7 @@
<script>
import { library } from '@fortawesome/fontawesome-svg-core'
import { faLink, faUnlink, faTimesCircle } from '@fortawesome/pro-regular-svg-icons'
import { faLink, faUnlink, faTimesCircle } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
library.add(faLink, faUnlink, faTimesCircle)
Expand Down
8 changes: 4 additions & 4 deletions resources/js/components/buttons/NormalButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@
]"
@click="commands[buttonKey]"
>
<font-awesome-icon v-if="buttonKey == 'bullet_list'" :icon="['far', 'list-ul']">
<font-awesome-icon v-if="buttonKey == 'bullet_list'" :icon="['fas', 'list-ul']">
</font-awesome-icon>

<font-awesome-icon v-if="buttonKey == 'ordered_list'" :icon="['far', 'list-ol']">
<font-awesome-icon v-if="buttonKey == 'ordered_list'" :icon="['fas', 'list-ol']">
</font-awesome-icon>

<font-awesome-icon v-if="buttonKey == 'blockquote'" :icon="['far', 'quote-right']">
<font-awesome-icon v-if="buttonKey == 'blockquote'" :icon="['fas', 'quote-right']">
</font-awesome-icon>
</button>
</template>

<script>
import { library } from '@fortawesome/fontawesome-svg-core'
import { faCode, faListUl, faListOl, faQuoteRight } from '@fortawesome/pro-regular-svg-icons'
import { faCode, faListUl, faListOl, faQuoteRight } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
library.add(faCode, faListUl, faListOl, faQuoteRight)
Expand Down

0 comments on commit 2a10098

Please sign in to comment.