loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-startup-crash' into dev

Browse Source
This commit is contained in:
Oliver Hamlet
2016-11-25 17:31:42 +00:00
parent 97c8802a20 3ab35ea59f
commit b5a491b921
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -82,7 +82,7 @@ set(LIBGIT2_LIBRARIES "${BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_
ExternalProject_Add(libloadorder
PREFIX "external"
DEPENDS libespm
URL "https://github.com/WrinklyNinja/libloadorder/archive/9.5.3.tar.gz"
URL "https://github.com/WrinklyNinja/libloadorder/archive/9.5.4.tar.gz"
CMAKE_ARGS -DBOOST_INCLUDEDIR=${Boost_INCLUDE_DIR} -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME}
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target loadorder --config $(CONFIGURATION)
INSTALL_COMMAND "")
bower.json
+27 -27
View File
@@ -7,34 +7,34 @@
"bower_components"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.6.0",
"iron-icons": "PolymerElements/iron-icons#^1.0.0",
"polymer": "Polymer/polymer#1.7.0",
"iron-icons": "PolymerElements/iron-icons#1.2.0",
"iron-list": "loot/iron-list#patched-for-loot",
"iron-pages": "PolymerElements/iron-pages#^1.0.0",
"neon-animation": "PolymerElements/neon-animation#^1.0.0",
"iron-pages": "PolymerElements/iron-pages#1.0.8",
"neon-animation": "PolymerElements/neon-animation#1.2.4",
"paper-autocomplete": "ellipticaljs/paper-autocomplete#v1.1.0",
"paper-button": "PolymerElements/paper-button#^1.0.0",
"paper-checkbox": "PolymerElements/paper-checkbox#^1.0.0",
"paper-dialog": "PolymerElements/paper-dialog#^1.0.0",
"paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#^1.0.0",
"paper-drawer-panel": "PolymerElements/paper-drawer-panel#^1.0.0",
"paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#^1.0.0",
"paper-icon-button": "PolymerElements/paper-icon-button#^1.0.0",
"paper-input": "PolymerElements/paper-input#^1.0.0",
"paper-item": "PolymerElements/paper-item#^1.0.0",
"paper-listbox": "PolymerElements/paper-listbox#^1.1.1",
"paper-menu": "PolymerElements/paper-menu#^1.0.0",
"paper-menu-button": "PolymerElements/paper-menu-button#^1.0.0",
"paper-progress": "PolymerElements/paper-progress#^1.0.0",
"paper-tabs": "PolymerElements/paper-tabs#^1.0.0",
"paper-toast": "PolymerElements/paper-toast#^1.0.0",
"paper-toggle-button": "PolymerElements/paper-toggle-button#^1.0.0",
"paper-toolbar": "PolymerElements/paper-toolbar#^1.0.0",
"paper-tooltip": "PolymerElements/paper-tooltip#^1.0.0",
"Jed": "SlexAxton/Jed#^1.1.1",
"jed-gettext-parser": "^1.0.0",
"marked": "^0.3.2",
"lodash": "^4.3.0",
"octokat": "^0.4.18"
"paper-button": "PolymerElements/paper-button#1.0.14",
"paper-checkbox": "PolymerElements/paper-checkbox#1.4.1",
"paper-dialog": "PolymerElements/paper-dialog#1.1.0",
"paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#1.1.5",
"paper-drawer-panel": "PolymerElements/paper-drawer-panel#1.0.10",
"paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#1.4.2",
"paper-icon-button": "PolymerElements/paper-icon-button#1.1.4",
"paper-input": "PolymerElements/paper-input#1.1.22",
"paper-item": "PolymerElements/paper-item#1.2.1",
"paper-listbox": "PolymerElements/paper-listbox#1.1.2",
"paper-menu": "PolymerElements/paper-menu#1.2.2",
"paper-menu-button": "PolymerElements/paper-menu-button#1.5.2",
"paper-progress": "PolymerElements/paper-progress#1.0.11",
"paper-tabs": "PolymerElements/paper-tabs#1.7.0",
"paper-toast": "PolymerElements/paper-toast#1.3.0",
"paper-toggle-button": "PolymerElements/paper-toggle-button#1.2.1",
"paper-toolbar": "PolymerElements/paper-toolbar#1.1.7",
"paper-tooltip": "PolymerElements/paper-tooltip#1.1.3",
"Jed": "SlexAxton/Jed#1.1.1",
"jed-gettext-parser": "1.0.0",
"marked": "0.3.6",
"lodash": "4.17.2",
"octokat": "0.4.18"
}
}
src/gui/html/elements/loot-dropdown-menu.html
+1 -1
View File
@@ -27,7 +27,7 @@ it a <select>-like API. This means:
}
:host(.dark) paper-dropdown-menu {
--paper-input-container-underline: {
background-color: var(--dark-theme-divider-color);
border-color: var(--dark-theme-divider-color);
};
--paper-input-container-underline-disabled: {
border-color: var(--dark-theme-divider-color);
src/gui/html/elements/loot-search-toolbar.html
+1 -1
View File
@@ -24,7 +24,7 @@ loot-search-end: Fired when the close button is clicked.
--paper-input-container-input-color: var(--dark-theme-text-color);
--paper-input-container-color: var(--dark-theme-secondary-color);
--paper-input-container-underline: {
background-color: var(--dark-theme-divider-color);
border-color: var(--dark-theme-divider-color);
};
display: block;
src/gui/html/index.html
+2 -2
View File
@@ -117,10 +117,10 @@
text-overflow: ellipsis;
};
--paper-input-container-underline: {
background-color: var(--divider-color);
border-color: var(--divider-color);
};
--paper-input-container-underline-focus: {
background-color: var(--accent-color);
border-color: var(--accent-color);
};
paper-menu-button {