gui: Update to Font Awesome v5 #4889
Conversation
|
@calmh can you help with the two open points? |
|
How so, what do you want me to do? |
|
Regarding daterangepicker: I only see |
|
What's the purpose of the upgrade, if we have to manually patch dependencies? |
|
Update: daterangepicker has a new release and the script is no longer dependent on Bootstrap or Font Awesome |
|
Great, now I wasted 1 hour of my life trying to merge my files with current master. 😠 |
|
I think your PR might have been based on a quite old revision of master, as it looks like there are merge conflicts on unrelated Go files. If you can't sort it out by rebasing I'd create a new branch from (current) master and cherry-pick your change commits to it. |
|
ok, PR good to go |
gui/default/index.html
Outdated
| </button> | ||
| <button type="button" class="btn btn-default btn-sm" ng-click="restoreVersions.show(folder.id)" ng-if="folder.versioning.type"> | ||
| <span class="fa fa-undo"></span> <span translate>Versions</span> | ||
| <span class="fas fa-undo"></span> <span translate>Restore</span> | ||
| </button> |
There was a problem hiding this comment.
Why the word change here?
There was a problem hiding this comment.
In my opinion "Restore" is better suited because it describes what the button does and it is an action like "Pause", "Resume" and "Edit"
There was a problem hiding this comment.
This still has not been addressed.
|
Conflicts and one comment. |
|
Well the versions text should be in a separate PR as this is about the font update. |
|
done! |
|
So I need to take it for a spin at some point I am by a computer which is probably tomorrow |
* master: gui: Disable rescan button while scanning (fixes syncthing#4977) (syncthing#4979) test: Add another variant of API timeout to skip when benchmarking gui, man: Update docs & translations build: Use commit date as assets change date script: Use source data from environment when generating assets lib/scanner: Copy execute bits from previous version on Windows (fixes syncthing#4969) (syncthing#4970) lib/watchaggregator: Speedup propagation of removals (fixes syncthing#4953) (syncthing#4955) gui: Update to Font Awesome v5 (syncthing#4889) lib/watchaggregator: Prevent race on config update (syncthing#4938) lib/db: Update global count when removing the previous global version (syncthing#4968) gui: Check if folder exists in folderLabel (fixes syncthing#4965) (syncthing#4966) lib/model: Move String method to folder (syncthing#4964) gui, man: Update docs & translations lib/model: Refactor override implementation into sendOnlyFolder lib/model: Refactor folderScanner into folder
st-review
added
the
frozen-due-to-age
Update to Font Awesome v5 for more icons and bugfixes