Просмотр исходного кода

replace feather icons with tabler icons

codecalm 5 лет назад
Родитель
Сommit
4100ea4d34

+ 1 - 1
.editorconfig

@@ -6,7 +6,7 @@ indent_style=tab
 tab_width=3
 tab_width=3
 max_line_length=off
 max_line_length=off
 
 
-[*.{rb,yml,scss}]
+[*.{rb,yml,scss,json}]
 indent_style=space
 indent_style=space
 indent_size=2
 indent_size=2
 
 

+ 2 - 2
_config.yml

@@ -130,11 +130,11 @@ variants:
   - name: success
   - name: success
     icon: check
     icon: check
   - name: info
   - name: info
-    icon: info
+    icon: info-circle
   - name: warning
   - name: warning
     icon: alert-triangle
     icon: alert-triangle
   - name: danger
   - name: danger
-    icon: x-octagon
+    icon: alert-circle
 
 
 button-variants:
 button-variants:
   primary:
   primary:

+ 4 - 2
package.json

@@ -17,6 +17,7 @@
     "lint": "npm-run-all --parallel js-lint css-lint",
     "lint": "npm-run-all --parallel js-lint css-lint",
     "clean": "rm -rf tmp-dist && mkdir tmp-dist && mkdir tmp-dist/css && mkdir tmp-dist/js",
     "clean": "rm -rf tmp-dist && mkdir tmp-dist && mkdir tmp-dist/css && mkdir tmp-dist/js",
     "clean-build": "rm -rf dist && mkdir dist && mkdir dist/css && mkdir dist/js && mkdir dist/img",
     "clean-build": "rm -rf dist && mkdir dist && mkdir dist/css && mkdir dist/js && mkdir dist/img",
+    "copy-icons": "rm -f pages/_includes/svg/*.svg && cp node_modules/tabler-icons/icons/*.svg pages/_includes/svg/",
     "css": "npm-run-all css-compile",
     "css": "npm-run-all css-compile",
     "css-build": "npm-run-all css-compile css-prefix-build css-minify-build",
     "css-build": "npm-run-all css-compile css-prefix-build css-minify-build",
     "css-compile": "node build/scss-compile.js",
     "css-compile": "node build/scss-compile.js",
@@ -37,7 +38,7 @@
     "js-lint": "eslint --cache --cache-location .cache/.eslintcache js build/",
     "js-lint": "eslint --cache --cache-location .cache/.eslintcache js build/",
     "js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap",
     "js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap",
     "js-compile-bundle": "rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap",
     "js-compile-bundle": "rollup --environment BUNDLE:true --config build/rollup.config.js --sourcemap",
-    "svg-svgo": "svgo -f svg/fe --pretty && svgo -f svg/brand --pretty",
+    "svg-svgo": "svgo -f svg/brand --pretty",
     "unused-files": "node build/unused-files.js"
     "unused-files": "node build/unused-files.js"
   },
   },
   "repository": {
   "repository": {
@@ -105,6 +106,7 @@
     "stylelint": "13.2.1",
     "stylelint": "13.2.1",
     "stylelint-config-twbs-bootstrap": "2.0.1",
     "stylelint-config-twbs-bootstrap": "2.0.1",
     "svgo": "1.3.2",
     "svgo": "1.3.2",
+    "tabler-icons": "1.3.1",
     "terser": "4.6.7",
     "terser": "4.6.7",
     "yaml": "1.8.3"
     "yaml": "1.8.3"
   },
   },
@@ -114,7 +116,7 @@
     "@fullcalendar/interaction": "4.4.0",
     "@fullcalendar/interaction": "4.4.0",
     "@fullcalendar/list": "4.4.0",
     "@fullcalendar/list": "4.4.0",
     "@fullcalendar/timegrid": "4.4.0",
     "@fullcalendar/timegrid": "4.4.0",
-    "apexcharts": "3.17.0",
+    "apexcharts": "3.17.1",
     "autosize": "4.0.2",
     "autosize": "4.0.2",
     "bootstrap": "twbs/bootstrap#74afe14",
     "bootstrap": "twbs/bootstrap#74afe14",
     "countup.js": "2.0.4",
     "countup.js": "2.0.4",

+ 1 - 1
pages/_data/commits.yml

@@ -140,7 +140,7 @@
   short_hash: c3fa502
   short_hash: c3fa502
   author: XhmikosR
   author: XhmikosR
   date: Thu Nov 7 11:20:12 2019 +0200
   date: Thu Nov 7 11:20:12 2019 +0200
-  description: "dashboard/index.html: update feather-icons to v4.24.1 (#29651)"
+  description: "dashboard/index.html: update tabler-icons to v4.24.1 (#29651)"
 
 
 - hash: 1d30e05cafd986b1ca067edd20570899b0ad9e94
 - hash: 1d30e05cafd986b1ca067edd20570899b0ad9e94
   short_hash: 1d30e05
   short_hash: 1d30e05

+ 282 - 140
pages/_data/icons.yml

@@ -384,52 +384,120 @@ bootstrap:
   - bootstrap/x-octagon-fill
   - bootstrap/x-octagon-fill
   - bootstrap/x-square
   - bootstrap/x-square
   - bootstrap/x-square-fill
   - bootstrap/x-square-fill
-fe:
+tabler:
   - activity
   - activity
-  - airplay
+  - ad
+  - adjustments
+  - alarm
   - alert-circle
   - alert-circle
-  - alert-octagon
   - alert-triangle
   - alert-triangle
   - align-center
   - align-center
-  - align-justify
+  - align-justified
   - align-left
   - align-left
   - align-right
   - align-right
   - anchor
   - anchor
   - aperture
   - aperture
   - archive
   - archive
+  - arrow-back
+  - arrow-back-up
+  - arrow-bar-down
+  - arrow-bar-left
+  - arrow-bar-right
+  - arrow-bar-up
+  - arrow-down
   - arrow-down-circle
   - arrow-down-circle
   - arrow-down-left
   - arrow-down-left
+  - arrow-down-left-circle
   - arrow-down-right
   - arrow-down-right
-  - arrow-down
-  - arrow-left-circle
+  - arrow-down-right-circle
+  - arrow-forward
+  - arrow-forward-up
   - arrow-left
   - arrow-left
-  - arrow-right-circle
+  - arrow-left-circle
+  - arrow-narrow-down
+  - arrow-narrow-left
+  - arrow-narrow-right
+  - arrow-narrow-up
   - arrow-right
   - arrow-right
+  - arrow-right-circle
+  - arrow-up
   - arrow-up-circle
   - arrow-up-circle
   - arrow-up-left
   - arrow-up-left
+  - arrow-up-left-circle
   - arrow-up-right
   - arrow-up-right
-  - arrow-up
-  - at-sign
+  - arrow-up-right-circle
+  - arrows-diagonal
+  - arrows-diagonal-2
+  - arrows-horizontal
+  - arrows-maximize
+  - arrows-minimize
+  - arrows-sort
+  - arrows-vertical
+  - artboard
+  - at
+  - atom
   - award
   - award
-  - bar-chart-2
-  - bar-chart
-  - battery-charging
+  - backspace
+  - ban
+  - bandage
   - battery
   - battery
-  - bell-off
+  - battery-1
+  - battery-2
+  - battery-3
+  - battery-4
+  - battery-charging
+  - bed
   - bell
   - bell
+  - bike
   - bluetooth
   - bluetooth
   - bold
   - bold
-  - book-open
+  - bolt
   - book
   - book
   - bookmark
   - bookmark
+  - border-all
+  - border-bottom
+  - border-horizontal
+  - border-inner
+  - border-left
+  - border-none
+  - border-outer
+  - border-radius
+  - border-right
+  - border-top
+  - border-vertical
   - box
   - box
   - briefcase
   - briefcase
+  - brightness
+  - brightness-down
+  - brightness-up
+  - bucket
+  - bug
+  - building
+  - building-arch
+  - building-bridge
+  - building-bridge-2
+  - building-church
+  - building-hospital
+  - building-store
+  - bulb
+  - bulb-off
+  - calculator
   - calendar
   - calendar
-  - camera-off
+  - calendar-event
   - camera
   - camera
+  - caret-down
+  - caret-left
+  - caret-right
+  - caret-up
+  - cash
   - cast
   - cast
-  - check-circle
-  - check-square
+  - chart-area
+  - chart-area-line
+  - chart-bar
+  - chart-candle
+  - chart-donut
+  - chart-line
+  - chart-pie
   - check
   - check
   - chevron-down
   - chevron-down
   - chevron-left
   - chevron-left
@@ -441,22 +509,29 @@ fe:
   - chevrons-up
   - chevrons-up
   - chrome
   - chrome
   - circle
   - circle
+  - circle-check
+  - circle-minus
+  - circle-plus
+  - circle-x
   - clipboard
   - clipboard
+  - clipboard-check
+  - clipboard-list
+  - clipboard-x
   - clock
   - clock
-  - cloud-drizzle
-  - cloud-lightning
-  - cloud-off
+  - cloud
+  - cloud-download
   - cloud-rain
   - cloud-rain
   - cloud-snow
   - cloud-snow
-  - cloud
+  - cloud-storm
+  - cloud-upload
   - code
   - code
-  - codepen
-  - codesandbox
-  - coffee
+  - coin
+  - color-swatch
   - columns
   - columns
   - command
   - command
   - compass
   - compass
   - copy
   - copy
+  - copyright
   - corner-down-left
   - corner-down-left
   - corner-down-right
   - corner-down-right
   - corner-left-down
   - corner-left-down
@@ -465,202 +540,269 @@ fe:
   - corner-right-up
   - corner-right-up
   - corner-up-left
   - corner-up-left
   - corner-up-right
   - corner-up-right
-  - cpu
   - credit-card
   - credit-card
   - crop
   - crop
-  - crosshair
+  - currency-dollar
+  - currency-euro
+  - cut
+  - dashboard
   - database
   - database
-  - delete
+  - device-desktop
+  - device-floppy
+  - device-gamepad
+  - device-laptop
+  - device-mobile
+  - device-mobile-vibration
+  - device-speaker
+  - device-tablet
+  - device-tv
+  - devices
+  - diamond
+  - dice
+  - directions
+  - disabled
   - disc
   - disc
-  - dollar-sign
-  - download-cloud
+  - dots
+  - dots-circle-horizontal
+  - dots-diagonal
+  - dots-diagonal-2
+  - dots-vertical
   - download
   - download
+  - drag-drop
+  - drag-drop-2
   - droplet
   - droplet
-  - edit-2
-  - edit-3
   - edit
   - edit
+  - egg
+  - eraser
+  - exposure
   - external-link
   - external-link
-  - eye-off
   - eye
   - eye
-  - facebook
-  - fast-forward
-  - feather
-  - figma
+  - face-id
+  - file
+  - file-check
+  - file-download
+  - file-invoice
   - file-minus
   - file-minus
+  - file-music
   - file-plus
   - file-plus
+  - file-shredder
   - file-text
   - file-text
-  - file
-  - film
+  - file-x
   - filter
   - filter
   - flag
   - flag
+  - flip-horizontal
+  - flip-vertical
+  - floppy-disk
+  - focus
+  - folder
   - folder-minus
   - folder-minus
   - folder-plus
   - folder-plus
-  - folder
-  - frown
+  - folder-x
+  - folders
+  - frame
+  - friends
+  - gauge
+  - ghost
   - gift
   - gift
   - git-branch
   - git-branch
   - git-commit
   - git-commit
+  - git-compare
+  - git-fork
   - git-merge
   - git-merge
   - git-pull-request
   - git-pull-request
-  - github
-  - gitlab
+  - glass
+  - glass-full
   - globe
   - globe
   - grid
   - grid
-  - hard-drive
+  - grid-dots
   - hash
   - hash
   - headphones
   - headphones
+  - headset
   - heart
   - heart
-  - help-circle
-  - hexagon
+  - help
   - home
   - home
-  - image
+  - home-2
+  - ice-cream
+  - id
   - inbox
   - inbox
-  - info
-  - instagram
+  - indent-decrease
+  - indent-increase
+  - infinity
+  - info-circle
+  - info-square
   - italic
   - italic
   - key
   - key
-  - layers
+  - layers-difference
+  - layers-intersect
+  - layers-subtract
+  - layers-union
   - layout
   - layout
-  - life-buoy
-  - link-2
+  - layout-2
+  - layout-align-bottom
+  - layout-align-center
+  - layout-align-left
+  - layout-align-middle
+  - layout-align-right
+  - layout-align-top
+  - layout-bottombar
+  - layout-columns
+  - layout-distribute-horizontal
+  - layout-distribute-vertical
+  - layout-navbar
+  - layout-rows
+  - layout-sidebar
+  - layout-sidebar-right
+  - lego
+  - lifebuoy
+  - line-height
   - link
   - link
-  - linkedin
   - list
   - list
-  - loader
+  - list-check
+  - live-photo
+  - location
   - lock
   - lock
-  - log-in
-  - log-out
+  - lock-open
+  - magnet
   - mail
   - mail
-  - map-pin
+  - mail-opened
+  - man
   - map
   - map
-  - maximize-2
+  - map-2
+  - map-pin
   - maximize
   - maximize
-  - meh
   - menu
   - menu
+  - message
+  - message-2
   - message-circle
   - message-circle
-  - message-square
-  - mic-off
-  - mic
-  - minimize-2
+  - message-dots
+  - messages
+  - microphone
   - minimize
   - minimize
-  - minus-circle
-  - minus-square
   - minus
   - minus
-  - monitor
+  - mood-confuzed
+  - mood-happy
+  - mood-neutral
+  - mood-sad
+  - mood-smile
+  - mood-tongue
   - moon
   - moon
-  - more-horizontal
-  - more-vertical
-  - mouse-pointer
-  - move
+  - mouse
+  - movie
+  - mug
   - music
   - music
-  - navigation-2
-  - navigation
-  - octagon
+  - news
+  - note
+  - notebook
+  - notes
+  - notification
+  - omega
   - package
   - package
+  - paint
+  - palette
   - paperclip
   - paperclip
-  - pause-circle
-  - pause
-  - pen-tool
-  - percent
+  - parking
+  - pencil
+  - phone
   - phone-call
   - phone-call
-  - phone-forwarded
   - phone-incoming
   - phone-incoming
-  - phone-missed
-  - phone-off
   - phone-outgoing
   - phone-outgoing
-  - phone
-  - pie-chart
-  - play-circle
-  - play
-  - plus-circle
-  - plus-square
+  - phone-pause
+  - photo
+  - pillow
+  - plane
+  - plane-arrival
+  - plane-departure
   - plus
   - plus
-  - pocket
+  - point
   - power
   - power
+  - presentation
   - printer
   - printer
-  - radio
-  - refresh-ccw
-  - refresh-cw
+  - prompt
+  - puzzle
+  - qrcode
+  - record-mail
+  - recycle
+  - refresh
+  - registered
   - repeat
   - repeat
-  - rewind
-  - rotate-ccw
-  - rotate-cw
+  - repeat-once
+  - rotate
+  - rotate-clockwise
+  - route
+  - router
   - rss
   - rss
-  - save
+  - ruler
   - scissors
   - scissors
   - search
   - search
+  - selector
   - send
   - send
   - server
   - server
   - settings
   - settings
-  - share-2
+  - shape
   - share
   - share
-  - shield-off
   - shield
   - shield
-  - shopping-bag
+  - shield-check
+  - shield-x
   - shopping-cart
   - shopping-cart
-  - shuffle
-  - sidebar
-  - skip-back
-  - skip-forward
-  - slack
-  - slash
-  - sliders
-  - smartphone
-  - smile
-  - speaker
+  - sitemap
+  - sort-ascending
+  - sort-descending
   - square
   - square
+  - square-check
+  - square-minus
+  - square-plus
+  - square-x
+  - stack
   - star
   - star
-  - stop-circle
+  - sticker
+  - strikethrough
+  - subscript
+  - sum
   - sun
   - sun
-  - sunrise
-  - sunset
-  - tablet
+  - superscript
+  - switch
+  - switch-horizontal
+  - switch-vertical
+  - table
   - tag
   - tag
   - target
   - target
-  - terminal
-  - thermometer
-  - thumbs-down
-  - thumbs-up
+  - temperature
+  - temperature-celsius
+  - temperature-fahrenheit
+  - template
+  - test-pipe
+  - thumb-down
+  - thumb-up
+  - ticket
   - toggle-left
   - toggle-left
   - toggle-right
   - toggle-right
-  - trash-2
+  - tool
   - trash
   - trash
-  - trello
   - trending-down
   - trending-down
   - trending-up
   - trending-up
   - triangle
   - triangle
-  - truck
-  - tv
-  - twitter
-  - type
-  - umbrella
+  - trophy
   - underline
   - underline
-  - unlock
-  - upload-cloud
+  - unlink
   - upload
   - upload
+  - urgent
+  - user
   - user-check
   - user-check
   - user-minus
   - user-minus
   - user-plus
   - user-plus
   - user-x
   - user-x
-  - user
-  - users
-  - video-off
-  - video
-  - voicemail
-  - volume-1
-  - volume-2
-  - volume-x
+  - viewfinder
+  - virus
   - volume
   - volume
-  - watch
-  - wifi-off
+  - volume-2
+  - volume-3
+  - wallet
   - wifi
   - wifi
-  - wind
-  - x-circle
-  - x-octagon
-  - x-square
+  - wifi-0
+  - wifi-1
+  - wifi-2
+  - woman
+  - world
   - x
   - x
-  - youtube
-  - zap-off
-  - zap
   - zoom-in
   - zoom-in
   - zoom-out
   - zoom-out

+ 1 - 1
pages/_data/menu.yml

@@ -6,7 +6,7 @@ home:
 forms:
 forms:
   url: form-elements.html
   url: form-elements.html
   title: Form elements
   title: Form elements
-  icon: check-square
+  icon: checkbox
 
 
 base:
 base:
   title: Base
   title: Base

+ 3 - 4
pages/_docs/buttons.md

@@ -1,6 +1,5 @@
 ---
 ---
 title: Buttons
 title: Buttons
-icon: fe fe-plus-square
 description: Use button styles that best suit your designs and encourage users to take the desired actions. You can customize the button's properties to improve the user experience of your website or system, changing the size, shape, color and many more.
 description: Use button styles that best suit your designs and encourage users to take the desired actions. You can customize the button's properties to improve the user experience of your website or system, changing the size, shape, color and many more.
 bootstrap-link: components/buttons/
 bootstrap-link: components/buttons/
 done: true
 done: true
@@ -207,11 +206,11 @@ Add the `.btn-icon` class to remove unnecessary padding from your button and use
 
 
 {% capture code %}
 {% capture code %}
 {% include ui/button.html icon="activity" color="primary" icon-only=true %}
 {% include ui/button.html icon="activity" color="primary" icon-only=true %}
-{% include ui/button.html icon="github" color="github" icon-only=true %}
+{% include ui/button.html icon="brand/github" color="github" icon-only=true %}
 {% include ui/button.html icon="bell" color="success" icon-only=true %}
 {% include ui/button.html icon="bell" color="success" icon-only=true %}
 {% include ui/button.html icon="star" color="warning" icon-only=true %}
 {% include ui/button.html icon="star" color="warning" icon-only=true %}
-{% include ui/button.html icon="trash-2" color="danger" icon-only=true %}
-{% include ui/button.html icon="bar-chart" color="purple" icon-only=true %}
+{% include ui/button.html icon="trash" color="danger" icon-only=true %}
+{% include ui/button.html icon="chart-bar" color="purple" icon-only=true %}
 {% include ui/button.html icon="git-merge" color="secondary" icon-only=true %}
 {% include ui/button.html icon="git-merge" color="secondary" icon-only=true %}
 {% endcapture %}
 {% endcapture %}
 {% include example.html code=code wrapper="btn-list" centered=true %}
 {% include example.html code=code wrapper="btn-list" centered=true %}

+ 1 - 1
pages/_docs/form-elements.md

@@ -282,7 +282,7 @@ Add an icon link which you want to display at the end of your input control to v
 {% capture code %}
 {% capture code %}
 <div class="mb-3">
 <div class="mb-3">
 	<label class="form-label">Input with appended icon links</label>
 	<label class="form-label">Input with appended icon links</label>
-	{% include ui/form/input-group.html append-button="x:Clear search,sliders:Search settings,bell:Add notification" flat=true %}
+	{% include ui/form/input-group.html append-button="x:Clear search,adjustments:Search settings,bell:Add notification" flat=true %}
 </div>
 </div>
 {% endcapture %}
 {% endcapture %}
 {% include example.html code=code %}
 {% include example.html code=code %}

+ 1 - 1
pages/_includes/cards/company-employees.html

@@ -23,7 +23,7 @@
 					<div class="progress-bar bg-{{ forloop.index | random_number: 30, 90 | number_color }}" role="progressbar" style="width: {{ forloop.index | random_number: 30, 90 }}%"></div>
 					<div class="progress-bar bg-{{ forloop.index | random_number: 30, 90 | number_color }}" role="progressbar" style="width: {{ forloop.index | random_number: 30, 90 }}%"></div>
 				</div>
 				</div>
 			</td>
 			</td>
-			<td><a href="" class="text-muted">{% include ui/icon.html icon="more-horizontal" %}</a></td>
+			<td><a href="" class="text-muted">{% include ui/icon.html icon="dots" %}</a></td>
 		</tr>
 		</tr>
 		{% endfor %}
 		{% endfor %}
 	</table>
 	</table>

+ 1 - 1
pages/_includes/cards/music/tracks-list.html

@@ -25,7 +25,7 @@
 				</div>
 				</div>
 				<div class="col-auto">
 				<div class="col-auto">
 					<div class="dropdown">
 					<div class="dropdown">
-						<a href="#" class="link-secondary" data-toggle="dropdown">{% include ui/icon.html icon="more-horizontal" %}</a>
+						<a href="#" class="link-secondary" data-toggle="dropdown">{% include ui/icon.html icon="dots" %}</a>
 						{% include ui/dropdown-menu.html right=true %}
 						{% include ui/dropdown-menu.html right=true %}
 					</div>
 					</div>
 				</div>
 				</div>

Некоторые файлы не были показаны из-за большого количества измененных файлов