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.

Sign up for GitHub

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

Jump to bottom

Merge new box-model code into QtWebEngine conversion #3618

Closed
wants to merge 20 commits into from
Closed

Merge new box-model code into QtWebEngine conversion #3618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cfbeb0e
timeline: Fix id for ruler markers container
ferdnyc Jul 20, 2020
39aff20
Timeline: box-sizing, width:100% for track DIVs
ferdnyc Jul 20, 2020
aa081c4
Timeline: Unify border-handling, fix object sizing
ferdnyc Jul 20, 2020
c5683f6
Merge branch 'develop' into box-model
ferdnyc Jul 20, 2020
21cde98
Timeline: Shared CSS class styles all menu icons
ferdnyc Jul 21, 2020
bda8e86
CSS fixes to appease Codacy
ferdnyc Jul 21, 2020
6328779
timeline: Don't interpolate getThumbPath in ng-show
ferdnyc Jul 21, 2020
bc24a64
Move tlMultiSelect directive to separate file
ferdnyc Jul 22, 2020
438f22a
Move ng-cloak styling to HTML head
ferdnyc Jul 22, 2020
0b155e8
Eliminate getFooStyle() JS functions in ng-class
ferdnyc Jul 22, 2020
013791b
More CSS fixes
ferdnyc Jul 23, 2020
18c0210
timeline: Remove transition hover effect JS
ferdnyc Jul 23, 2020
c5d56e1
Merge branch 'new-webengine-support' into webengine-box-model
ferdnyc Jul 23, 2020
5b92dd1
timeline CSS: Format, fix ordering of rules
ferdnyc Jul 23, 2020
ae87a50
multiselect.js: Comment-declare globals
ferdnyc Jul 23, 2020
3a71845
Make SVG first default for razor, update styling
ferdnyc Jul 28, 2020
5d8a1f6
Merge remote-tracking branch 'upstream/new-webengine-support' into we…
ferdnyc Jul 28, 2020
17ffd01
Fix order of hover styling in CSS
ferdnyc Jul 30, 2020
4e25b39
Razor tool: Update cursor images + CSS, add debug
ferdnyc Jul 31, 2020
3423bf7
Remove razor-tool icon from resource file
ferdnyc Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/images/Humanity/actions/custom/razor_line_with_razor.png
View file
Open in desktop

This file was deleted.

242 changes: 0 additions & 242 deletions src/images/Humanity/actions/custom/razor_line_with_razor.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/images/openshot.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
</qresource>
<qresource prefix="/icons">
<file>Humanity/actions/custom/arrow.png</file>
<file>Humanity/actions/custom/razor_line_with_razor.png</file>
<file>Humanity/actions/custom/snapshot.png</file>
<file>Humanity/actions/custom/snap.png</file>
<file>Humanity/actions/custom/add_marker.png</file>
Expand Down
Loading