diff --git a/README.md b/README.md index 59bac174..3a678f29 100644 --- a/README.md +++ b/README.md @@ -40,12 +40,10 @@ LOOT's UI relies on a few web libraries: * [Marked](https://github.com/chjj/marked) * [RequireJS](http://requirejs.org/) -These dependencies are most easily managed using [Bower](http://bower.io/), and are built for distribution using [Vulcanize](https://github.com/Polymer/vulcanize). +These dependencies are most easily managed using [Bower](http://bower.io/), and are built for distribution using [Vulcanize](https://github.com/Polymer/vulcanize) (v0.7.1+, earlier versions break LOOT's templates). To install Bower and Vulcanize, first install [Node](http://nodejs.org/), and run `npm install -g bower vulcanize` from the command line (on Windows, it needs to be the Node command prompt). Once they are installed, fetch and build the dependencies by running `bower install ./ && vulcanize -o index.html report.html` from inside this repository's `resources/report` folder (this command doesn't need to be run through Node). -**Note:** There is currently a bug in Vulcanize (#97) that prevents it from correctly building the dependencies, so some manual editing is required to add `` and `` elements back into the row templates originally found in `resources/report/html/editable-table.html`. - ## Packaging Releases Installer and zip archive releases for the main LOOT application can be handled by running the scripts `installer.nsi` and `archive.py` in the `src` folder respectively. The installer script requires [NSIS 3](http://nsis.sourceforge.net/), while the archive script requires [Python](http://www.python.org/) (2 or 3). The installer and archive files are created in the `build/` folder, relative to the repository root. diff --git a/resources/icon.ico b/resources/icon.ico index a281a644..bd01b92f 100644 Binary files a/resources/icon.ico and b/resources/icon.ico differ diff --git a/resources/icon.svg b/resources/icon.svg new file mode 100644 index 00000000..ae687dc0 --- /dev/null +++ b/resources/icon.svg @@ -0,0 +1,571 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/report/bower.json b/resources/report/bower.json index 717766b1..bbb880af 100644 --- a/resources/report/bower.json +++ b/resources/report/bower.json @@ -32,6 +32,7 @@ "paper-progress": "Polymer/paper-progress#~0.5.0", "core-animated-pages": "Polymer/core-animated-pages#~0.5.1", "paper-toast": "Polymer/paper-toast#~0.5.1", - "core-list": "WrinklyNinja/core-list#51e27f42c86a91cbbe0933f618b2e82905dda83a" + "core-list": "WrinklyNinja/core-list#51e27f42c86a91cbbe0933f618b2e82905dda83a", + "core-dropdown": "kysonic/core-dropdown#b2e3b0f37afec1f1447060d7988fb271f46566c2" } } diff --git a/resources/report/css/overrides.css b/resources/report/css/overrides.css index 17ab7e57..e72b2014 100644 --- a/resources/report/css/overrides.css +++ b/resources/report/css/overrides.css @@ -1,5 +1,10 @@ /* These styles override Polymer's own internal styling for certain elements. */ +/* The following stops the main toolbar from overshadowing into the drawer. */ +#container::shadow #drawer { + z-index: 1; +} + /* The following is for setting the size of the drawer in narrow mode. */ #container::shadow .narrow-layout #drawer { width: 50% !important; @@ -50,11 +55,11 @@ html /deep/ paper-item[disabled] { } /* These overrides change the colour of the tab ink effect and their underline. */ -#mainToolbar paper-tabs::shadow #selectionBar { +paper-tabs::shadow #selectionBar { background-color: white; height: 4px; } -#mainToolbar paper-tab::shadow #ink { +paper-tab::shadow #ink { color: #f1f1f1; } @@ -102,4 +107,9 @@ html /deep/ paper-item > core-icon { /* This makes checkboxes have the same padding as icons in lists. */ html /deep/ paper-checkbox::shadow #checkboxLabel { padding-left: 1em; +} + +/* This makes the medium-tall toolbars 2x the 56px height, rather than the 64px height. */ +html /deep/ core-toolbar.medium-tall { + height: 112px; } \ No newline at end of file diff --git a/resources/report/css/style.css b/resources/report/css/style.css index 25ace30f..3b0419a9 100644 --- a/resources/report/css/style.css +++ b/resources/report/css/style.css @@ -30,23 +30,24 @@ body { background:#f8f8f8; height: 100%; } -#mainToolbar { +core-toolbar { background: #4285f4; color: white; - width: 99.99vw; /* Fix for scollbars when LOOT is run through Mod Organiser. */ height: 56px; } +#mainToolbar { + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26); + z-index: 1; +} #mainToolbar paper-dropdown { color: black; } -#sidebarTabs { - width: calc(33% - 68px); -} - div[drawer] > core-tooltip { margin: 0 12px; } div[drawer] { + background: white; + box-shadow: rgba(0, 0, 0, 0.0980392) 0px 2px 4px, rgba(0, 0, 0, 0.0980392) 0px 0px 3px; z-index: 1; } #main { @@ -54,6 +55,7 @@ div[drawer] { overflow-x: hidden; position: relative; z-index: 0; + height: calc(100% - 56px); } #cardsNav { margin: 0; @@ -74,17 +76,11 @@ paper-item > a { #searchBox { display: block; } -#container { - position: fixed; - top: 56px; - height: calc(100% - 56px); -} section { background:white; overflow:hidden; margin:1em; - box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26); padding:1em; position: relative; border-top-left-radius: 2px; diff --git a/resources/report/html/loot-plugin-card.html b/resources/report/html/loot-plugin-card.html index b564bcc3..660b41ab 100644 --- a/resources/report/html/loot-plugin-card.html +++ b/resources/report/html/loot-plugin-card.html @@ -132,7 +132,7 @@ loot-clear-metadata
- +
@@ -140,13 +140,13 @@ loot-clear-metadata
- + - + - + diff --git a/resources/report/html/loot-plugin-editor.html b/resources/report/html/loot-plugin-editor.html index 144e5c25..8e1b66aa 100644 --- a/resources/report/html/loot-plugin-editor.html +++ b/resources/report/html/loot-plugin-editor.html @@ -15,7 +15,7 @@ loot-editor-close - + @@ -36,6 +36,12 @@ loot-editor-close #activeTick { color: green; } + #accept { + color: #4285f4; + } + #cancel { + color: red; + } /* Content styling. */ h1 { @@ -57,7 +63,7 @@ loot-editor-close } /* Editor input styling. */ - #editor > div > paper-checkbox, #editor > div > core-tooltip { + #main > paper-checkbox, #main > core-tooltip { display: table; } #enableEdits { @@ -81,7 +87,7 @@ loot-editor-close border-collapse: collapse; width: 100%; } - table:not(.core-selected) { + table:not(.core-selected), #main:not(.core-selected) { display: none; } td input { @@ -112,7 +118,7 @@ loot-editor-close /* Misc Styling. */ core-toolbar { - background: white; + background: #f1f1f1; height: 56px; } core-toolbar > h1, core-toolbar > span { @@ -122,21 +128,15 @@ loot-editor-close #buttons { text-align: right; } - main { + #main { padding: 1em; } - main > core-tooltip, main > paper-checkbox { - display: table; - } core-icon { vertical-align: inherit !important; } #tableTabs { border: 2px solid #f1f1f1; } - paper-tabs { - background: #f1f1f1; - } /* These overrides change the colour of the tab ink effect and their underline. */ paper-tabs::shadow #selectionBar { background-color: #4285f4; @@ -145,117 +145,118 @@ loot-editor-close color: #4285f4; } - - + +

{{data.name}}

{{data.version}} {{data.computed.crc}} - + - + -
-
- - - + + -
-
Priority Value
- - - + + + + + Main + Load After + Requirements + Incompatibilities + Messages + Bash Tags + Dirty Info + Locations + + + +
+ + + + +
+
Priority Value
+ + + +
-
- - Load After - Requirements - Incompatibilities - Messages - Bash Tags - Dirty Info - Locations - - - - - - - - - - -
FilenameDisplay NameCondition
Add new row...
- - - - - - - - -
FilenameDisplay NameCondition
Add new row...
- - - - - - - - -
FilenameDisplay NameCondition
Add new row...
- - - - - - - - -
TypeContentConditionLanguage
Add new row...
- - - - - - - - -
Add/RemoveBash TagCondition
Add new row...
- - - - - - - - -
CRCITM CountDeleted ReferencesDeleted NavmeshesCleaning Utility
Add new row...
- - - - - - - - -
URLVersion
Add new row...
-
-
-
- Apply - Cancel -
-
+ + + + + + + + +
FilenameDisplay NameCondition
Add new row...
+ + + + + + + + +
FilenameDisplay NameCondition
Add new row...
+ + + + + + + + +
FilenameDisplay NameCondition
Add new row...
+ + + + + + + + +
TypeContentConditionLanguage
Add new row...
+ + + + + + + + +
Add/RemoveBash TagCondition
Add new row...
+ + + + + + + + +
CRCITM CountDeleted ReferencesDeleted NavmeshesCleaning Utility
Add new row...
+ + + + + + + + +
URLVersion
Add new row...
+ diff --git a/resources/report/html/loot-plugin-item.html b/resources/report/html/loot-plugin-item.html index 34c76de4..86284c6e 100644 --- a/resources/report/html/loot-plugin-item.html +++ b/resources/report/html/loot-plugin-item.html @@ -28,10 +28,10 @@ - + - +
diff --git a/resources/report/js/script.js b/resources/report/js/script.js index a355e1af..a90de494 100644 --- a/resources/report/js/script.js +++ b/resources/report/js/script.js @@ -1174,7 +1174,11 @@ function initVars() { document.getElementById('cardsNav').lastElementChild.data = loot.game.plugins; document.getElementById('main').lastElementChild.data = loot.game.plugins; - closeProgressDialog(); + setTimeout(function() { + document.getElementById('cardsNav').lastElementChild.updateSize(); + closeProgressDialog(); + }, 100); + return ''; }).catch(processCefError); } diff --git a/resources/report/report.html b/resources/report/report.html index e269ed7e..d2c36d5c 100644 --- a/resources/report/report.html +++ b/resources/report/report.html @@ -40,73 +40,14 @@ - - - - -
- - - Redate Plugins - - - - Clear All User Metadata - - - - Copy Content - - - - Refresh Content - - - - - Settings - - - - - View Documentation - - - - Open Debug Log Location - - - - About - - - - - Quit - -
-
-
- - - Plugins - Filters - - - - - - - - - - - - - -
+ + + Plugins + Filters + +
@@ -143,77 +84,140 @@
- +
-
-
-

Summary

- - - - - - - - - - - -
Masterlist RevisionN/A
Masterlist DateN/A
- - - - - - - - - - - - - - - -
Warnings0
Errors0
Total Messages0
- - - - - - - - - - - - - - - -
Active Plugins0
Dirty Plugins0
Total Plugins0
-
-
-

General Messages

- -
- - - - +
+ + + + + + + + + + + + + + + + + +
+ + + Redate Plugins + + + + Clear All User Metadata + + + + Copy Content + + + + Refresh Content + + + + + Settings + + + + + View Documentation + + + + Open Debug Log Location + + + + About + + + + + Quit + +
+
+
+
+
+
+

Summary

+ + + + + + + + + + + +
Masterlist RevisionN/A
Masterlist DateN/A
+ + + + + + + + + + + + + + + +
Warnings0
Errors0
Total Messages0
+ + + + + + + + + + + + + + + +
Active Plugins0
Dirty Plugins0
Total Plugins0
+
+
+

General Messages

+
    + +
+
+ + + + +
@@ -258,7 +262,7 @@ along with LOOT. If not, see <http://www.gnu.org/licenses/>.
- +