Skip to content

Commit

Permalink
Add changes for Mark II image
Browse files Browse the repository at this point in the history
Add changes made by Marco in building the Mark 2 image, plus
enhancing the .gitignore to exclude build system generated files.
  • Loading branch information
penrods committed Jan 23, 2019
1 parent 89b3cab commit 15d803d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
.installed
build-testing/
lottie-qml/

build/CMakeCache.txt
build/CMakeFiles/
build/Makefile
build/applets/
build/cmake_install.cmake
build/config-mycroft.h
build/containments/
build/import/
build/install_manifest.txt
build/mycroft-gui-app
build/mycroft-gui-app_autogen/
build/mycroft-gui-core-loader
build/org.mycroft.mark2-look-and-feel-metadata.json
build/org.mycroft.mark2.appdata.xml
build/prefix.sh
build/qml.qrc.depends
build/qrc_qml.cpp
build/regenerateindex.sh

2 changes: 1 addition & 1 deletion containments/mark2/contents/ui/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Item {
anchors.fill: parent
Kirigami.Theme.colorSet: Kirigami.Theme.Complementary

topPadding: panel.dragMargin
// topPadding: panel.dragMargin
}

Controls.Button {
Expand Down

0 comments on commit 15d803d

Please sign in to comment.