Mirror
/
nuTensor
mirror of https://github.com/geekprojects/nuTensor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix #990

pull/2/head
Raymond Hill 7 years ago
parent
fde72e4f2a
commit
62d06792f1
No known key found for this signature in database GPG Key ID: 25E1490B761470C2
12 changed files with 73 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/about.html
  2. 1
      src/css/codemirror.css
  3. 19
      src/css/dashboard-common.css
  4. 24
      src/css/dashboard.css
  5. 4
      src/css/raw-settings.css
  6. 6
      src/css/user-rules.css
  7. 3
      src/hosts-files.html
  8. 2
      src/js/dashboard.js
  9. 35
      src/js/user-rules.js
  10. 5
      src/raw-settings.html
  11. 9
      src/settings.html
  12. 3
      src/user-rules.html

18
src/about.html
View File

@ -13,8 +13,9 @@ ul {
</head> </head>
<body> <body>
<div class="body">
<h2>uMatrix <span id="aboutVersion"></span></h2>
<h3>uMatrix <span id="aboutVersion"></span></h3>
<ul> <ul>
<li><span id="aboutStorageUsed"></span><br> <li><span id="aboutStorageUsed"></span><br>
<li>&nbsp; <li>&nbsp;
@ -35,7 +36,7 @@ ul {
<li><a href="https://github.com/Swatinem/diff" target="_blank">An implementation of Myers' diff algorithm</a> by <a href="https://github.com/Swatinem">Arpad Borsos</a> <li><a href="https://github.com/Swatinem/diff" target="_blank">An implementation of Myers' diff algorithm</a> by <a href="https://github.com/Swatinem">Arpad Borsos</a>
</ul> </ul>
<h2 data-i18n="aboutUserDataHeader"></h2>
<h3 data-i18n="aboutUserDataHeader"></h3>
<div> <div>
<p><button type="button" id="backupUserDataButton" data-i18n="aboutBackupButton"></button> <p><button type="button" id="backupUserDataButton" data-i18n="aboutBackupButton"></button>
<button type="button" id="restoreUserDataButton" data-i18n="aboutRestoreButton"></button> <button type="button" id="restoreUserDataButton" data-i18n="aboutRestoreButton"></button>
@ -44,12 +45,15 @@ ul {
<p><button type="button" id="resetUserDataButton" data-i18n="aboutResetButton"></button> <p><button type="button" id="resetUserDataButton" data-i18n="aboutResetButton"></button>
</div> </div>
<span style="display: none;" data-i18n="aboutStorageUsed"></span>
<span style="display: none;" data-i18n="aboutBackupFilename"></span>
<span style="display: none;" data-i18n="aboutRestoreConfirm"></span>
<span style="display: none;" data-i18n="aboutRestoreError"></span>
<span style="display: none;" data-i18n="aboutResetConfirm"></span>
</div><!-- end of div.body -->
<div style="display: none;">
<span data-i18n="aboutStorageUsed"></span>
<span data-i18n="aboutBackupFilename"></span>
<span data-i18n="aboutRestoreConfirm"></span>
<span data-i18n="aboutRestoreError"></span>
<span data-i18n="aboutResetConfirm"></span>
</div>
<script src="js/vapi-common.js"></script> <script src="js/vapi-common.js"></script>
<script src="js/vapi-client.js"></script> <script src="js/vapi-client.js"></script>

1
src/css/codemirror.css
View File

@ -5,7 +5,6 @@
position: relative; position: relative;
} }
.CodeMirror { .CodeMirror {
border: 1px solid #ddd;
box-sizing: border-box; box-sizing: border-box;
flex-grow: 1; flex-grow: 1;
height: 100%; height: 100%;

19
src/css/dashboard-common.css
View File

@ -3,27 +3,14 @@ body {
box-sizing: border-box; box-sizing: border-box;
color: #000; color: #000;
margin: 0; margin: 0;
padding: 0 0.5em 0.5em 0.5em;
padding: 0;
font: 14px/1.4 sans-serif; font: 14px/1.4 sans-serif;
} }
body > *:first-child { body > *:first-child {
margin-top: 0; margin-top: 0;
} }
h2, h3 {
margin: 1em 0;
font-family: sans-serif;
}
h2 {
font-size: 18px;
}
h2:nth-of-type(1) {
margin-top: 0;
}
h3 {
font-size: 16px;
}
h2 + * {
padding: 0;
div.body {
padding: 0 0.5em 0.5em 0.5em;
} }
html.ltr h2 + * { html.ltr h2 + * {
margin: 0 0 0 1em; margin: 0 0 0 1em;

24
src/css/dashboard.css
View File

@ -1,21 +1,19 @@
body { body {
margin: 0;
border: 0; border: 0;
padding: 0;
display: flex;
flex-direction: column;
font: 15px sans-serif; font: 15px sans-serif;
position: relative;
width: 100vw;
height: 100vh; height: 100vh;
margin: 0;
overflow: hidden; overflow: hidden;
padding: 0;
width: 100vw;
} }
#dashboard-nav { #dashboard-nav {
margin: 0;
border: 0; border: 0;
margin: 0;
padding: 0; padding: 0;
position: absolute;
top: 0;
width: 100vw; width: 100vw;
height: 50px;
z-index: 10; z-index: 10;
} }
#dashboard-nav-widgets { #dashboard-nav-widgets {
@ -55,13 +53,11 @@ body {
background-color: white; background-color: white;
} }
iframe { iframe {
margin: 0;
border: 0;
padding: 0;
background-color: transparent; background-color: transparent;
border: 0;
flex-grow: 1;
margin: 0;
overflow: auto; overflow: auto;
position: absolute;
top: 50px;
padding: 0;
width: 100%; width: 100%;
height: calc(100% - 50px);
} }

4
src/css/raw-settings.css
View File

@ -1,8 +1,10 @@
body {
div.body {
box-sizing: border-box;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100vh; height: 100vh;
justify-content: space-between; justify-content: space-between;
overflow: hidden;
} }
p { p {
margin: 0.5em 0; margin: 0.5em 0;

6
src/css/user-rules.css
View File

@ -1,4 +1,4 @@
body {
html {
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
} }
@ -22,7 +22,7 @@ body {
} }
#diff .ruleActions h3 { #diff .ruleActions h3 {
font-weight: normal; font-weight: normal;
margin: 0.5em 0;
margin: 0 0 0.5em 0;
} }
#ruleFilter { #ruleFilter {
direction: ltr; direction: ltr;
@ -70,7 +70,7 @@ body[dir="rtl"] #commitButton:before {
.codeMirrorContainer { .codeMirrorContainer {
box-sizing: border-box; box-sizing: border-box;
padding: 0 0 0.5em 0;
padding: 0;
} }
.CodeMirror-merge, .CodeMirror-merge-pane, .CodeMirror-merge .CodeMirror { .CodeMirror-merge, .CodeMirror-merge-pane, .CodeMirror-merge .CodeMirror {
box-sizing: border-box; box-sizing: border-box;

3
src/hosts-files.html
View File

@ -9,6 +9,7 @@
</head> </head>
<body> <body>
<div class="body">
<p> <p>
<button id="buttonApply" class="custom important reloadAll disabled" data-i18n="hostsFilesApplyChanges"></button> <button id="buttonApply" class="custom important reloadAll disabled" data-i18n="hostsFilesApplyChanges"></button>
@ -61,6 +62,8 @@
</ul> </ul>
</div> </div>
</div><!-- end of div.body -->
<script src="js/vapi-common.js"></script> <script src="js/vapi-common.js"></script>
<script src="js/vapi-client.js"></script> <script src="js/vapi-client.js"></script>
<script src="js/udom.js"></script> <script src="js/udom.js"></script>

2
src/js/dashboard.js
View File

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
uMatrix - a Chromium browser extension to black/white list requests.
uMatrix - a browser extension to black/white list requests.
Copyright (C) 2014-2018 Raymond Hill Copyright (C) 2014-2018 Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify

35
src/js/user-rules.js
View File

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
uMatrix - a Chromium browser extension to block requests.
uMatrix - a browser extension to block requests.
Copyright (C) 2014-2018 Raymond Hill Copyright (C) 2014-2018 Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@ -32,22 +32,37 @@
// Move to dashboard-common.js if needed // Move to dashboard-common.js if needed
(function() { (function() {
if ( document.querySelector('.vfill-available') === null ) { return; }
var timer;
var resize = function() {
let timer;
let resize = function() {
timer = undefined; timer = undefined;
let prect = document.body.getBoundingClientRect();
let child = document.querySelector('.vfill-available'); let child = document.querySelector('.vfill-available');
if ( child === null ) { return; }
let prect = document.documentElement.getBoundingClientRect();
let crect = child.getBoundingClientRect(); let crect = child.getBoundingClientRect();
let height = Math.max(prect.bottom - crect.top, 80);
child.style.height = height + 'px';
let cssHeight = Math.max(prect.bottom - crect.top, 80) + 'px';
if ( child.style.height !== cssHeight ) {
child.style.height = cssHeight;
if ( typeof mergeView !== 'undefined' ) {
mergeView.leftOriginal().refresh();
mergeView.editor().refresh();
}
}
}; };
resize();
window.addEventListener('resize', function() {
let resizeAsync = function(delay) {
if ( timer === undefined ) { if ( timer === undefined ) {
timer = vAPI.setTimeout(resize, 66);
timer = vAPI.setTimeout(
resize,
typeof delay === 'number' ? delay : 66
);
} }
};
window.addEventListener('resize', resizeAsync);
var observer = new MutationObserver(resizeAsync);
observer.observe(document.querySelector('.body'), {
childList: true,
subtree: true
}); });
resizeAsync(1);
})(); })();
/******************************************************************************/ /******************************************************************************/

5
src/raw-settings.html
View File

@ -10,12 +10,17 @@
</head> </head>
<body> <body>
<div class="body">
<p><span data-i18n="rawSettingsWarning"></span> <a class="fa info important" href="https://github.com/gorhill/uMatrix/wiki/Raw-settings" target="_blank">&#xf05a;</a> <p><span data-i18n="rawSettingsWarning"></span> <a class="fa info important" href="https://github.com/gorhill/uMatrix/wiki/Raw-settings" target="_blank">&#xf05a;</a>
</p> </p>
<p><button id="rawSettingsApply" class="custom important" type="button" disabled="true" data-i18n="genericApplyChanges"></button>&ensp; <p><button id="rawSettingsApply" class="custom important" type="button" disabled="true" data-i18n="genericApplyChanges"></button>&ensp;
</p> </p>
<textarea id="rawSettings" dir="auto" spellcheck="false"></textarea> <textarea id="rawSettings" dir="auto" spellcheck="false"></textarea>
</div><!-- end of div.body -->
<script src="js/vapi-common.js"></script> <script src="js/vapi-common.js"></script>
<script src="js/vapi-client.js"></script> <script src="js/vapi-client.js"></script>
<script src="js/udom.js"></script> <script src="js/udom.js"></script>

9
src/settings.html
View File

@ -30,8 +30,9 @@ ul > li.separator {
</head> </head>
<body> <body>
<div class="body">
<h2 data-i18n="settingsMatrixConvenienceHeader"></h2>
<h3 data-i18n="settingsMatrixConvenienceHeader"></h3>
<ul> <ul>
<li><input id="iconBadgeEnabled" type="checkbox" data-setting-bool> <li><input id="iconBadgeEnabled" type="checkbox" data-setting-bool>
<label data-i18n="settingsIconBadgeEnabled" for="iconBadgeEnabled"></label> <label data-i18n="settingsIconBadgeEnabled" for="iconBadgeEnabled"></label>
@ -49,7 +50,7 @@ ul > li.separator {
<input id="noTooltips" type="checkbox" data-setting-bool> <input id="noTooltips" type="checkbox" data-setting-bool>
<label data-i18n="settingsMatrixNoTooltips" for="noTooltips"></label> <label data-i18n="settingsMatrixNoTooltips" for="noTooltips"></label>
</ul> </ul>
<h2 data-i18n="settingsMatrixDisplayHeader"></h2>
<h3 data-i18n="settingsMatrixDisplayHeader"></h3>
<ul> <ul>
<li><span data-i18n="settingsMatrixDisplayTextSizePrompt"></span>&ensp;&minus;<input id="displayTextSize" type="range" min="12" max="18" value="14" style="margin:0 0.2em;vertical-align:bottom;">&plus; <li><span data-i18n="settingsMatrixDisplayTextSizePrompt"></span>&ensp;&minus;<input id="displayTextSize" type="range" min="12" max="18" value="14" style="margin:0 0.2em;vertical-align:bottom;">&plus;
<li class="separator"> <li class="separator">
@ -60,7 +61,7 @@ ul > li.separator {
<input id="colorBlindFriendly" type="checkbox" data-setting-bool> <input id="colorBlindFriendly" type="checkbox" data-setting-bool>
<label data-i18n="settingsMatrixDisplayColorBlind" for="colorBlindFriendly"></label> <label data-i18n="settingsMatrixDisplayColorBlind" for="colorBlindFriendly"></label>
</ul> </ul>
<h2 data-i18n="privacyPageName"></h2>
<h3 data-i18n="privacyPageName"></h3>
<ul> <ul>
<li> <li>
<input id="deleteCookies" type="checkbox" data-setting-bool><label data-i18n="privacyDeleteBlockedCookiesPrompt" for="deleteCookies"></label> <input id="deleteCookies" type="checkbox" data-setting-bool><label data-i18n="privacyDeleteBlockedCookiesPrompt" for="deleteCookies"></label>
@ -110,6 +111,8 @@ ul > li.separator {
<div class="whatisthis-expandable para" data-i18n="privacyProcessHyperlinkAuditingHelp"></div> <div class="whatisthis-expandable para" data-i18n="privacyProcessHyperlinkAuditingHelp"></div>
</ul> </ul>
</div><!-- end of div.body -->
<script src="js/vapi-common.js"></script> <script src="js/vapi-common.js"></script>
<script src="js/vapi-client.js"></script> <script src="js/vapi-client.js"></script>
<script src="js/udom.js"></script> <script src="js/udom.js"></script>

3
src/user-rules.html
View File

@ -15,9 +15,12 @@
</head> </head>
<body> <body>
<div class="body">
<div id="cloudWidget" class="hide" data-cloud-entry="myRulesPane"></div> <div id="cloudWidget" class="hide" data-cloud-entry="myRulesPane"></div>
</div><!-- end of div.body -->
<!-- <p data-i18n="userRulesFormatHint"></p> --> <!-- <p data-i18n="userRulesFormatHint"></p> -->
<div id="diff"> <div id="diff">
<div class="tools"> <div class="tools">

Write Preview
Loading…
Cancel
Save