Permalink
Browse files

Rolled back half-finished Helper options page changes.

  • Loading branch information...
dmarmor committed Jul 15, 2017
1 parent 3bf0a47 commit 53c78555cd6d326fd478e7a31585ceeef5e7c2e1
Showing with 17 additions and 60 deletions.
  1. +3 −3 helper/src/background.js
  2. +6 −41 helper/src/options.css
  3. +8 −16 helper/src/options.html
View
@@ -90,11 +90,11 @@ ssbBG.startup = function() {
ssbBG.contextMenuCreate('epichrome', 'separator1',
undefined, ['link'], 'separator');
ssbBG.contextMenuCreate('epichrome', 'urlThisAppNewWindow',
'Open in New App Window (⇧-click)', ['link']);
'Open in New App Window (X⇧-click)', ['link']);
ssbBG.contextMenuCreate('epichrome', 'urlThisAppNewTab',
'Open in New Tab (⌘-click)', ['link']);
'Open in New Tab (X⌘-click)', ['link']);
ssbBG.contextMenuCreate('epichrome', 'urlThisAppSameTab',
'Open in Same Window (⌘⇧-click)', ['link']);
'Open in Same Window (X⌘⇧-click)', ['link']);
ssbBG.contextMenuCreate('epichrome', 'separator2',
undefined, ['link'], 'separator');
ssbBG.contextMenuCreate('epichrome', 'windowSwitch',
View
@@ -20,18 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* $$$ COLORS $$$ */
/* grey: #b3b3b3 */
/* red: # */
/* green: #679d6f */
/* blue: # */
/* yellow: #feeb7f */
/* $$$ CHROME COLORS */
/* BLUE: #5b9dd3 */
/* YELLOW: #fdd800 */
/* GREEN: #5bc15b */
/* RED: #ec5547 */
/* OVERALL STYLES */
@@ -42,7 +30,6 @@ body {
.invisible {
display: none;
<div id="setup_tab" class="tab_button"></div>
}
button {
@@ -57,7 +44,7 @@ button {
top: 0;
width: 100%;
position: fixed;
background-color: #e0e0e0;
background-color: #d3d3d3;
z-index: 1000;
}
#title img {
@@ -73,7 +60,6 @@ button {
left: 90px;
top: 30px;
transform: translate(0, -50%);
font-weight: bold;
}
@@ -112,8 +98,8 @@ button {
width: 100%;
top: 65px;
transition: top .2s;
/* box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(0,0,0,0.15); */
background-color: #a6d9a9;
box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(0,0,0,0.15);
background-color: #f0f0f0;
}
.working #button_bar {
top: 10px;
@@ -187,9 +173,9 @@ button {
#dialog_bar {
padding-top: 1.5em;
padding-bottom: 1.5em;
background: #f8f8f8;
background: white;
color: #333;
display: none;
box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(0,0,0,0.15);
}
.dialog #dialog_bar {
display: block;
@@ -276,31 +262,10 @@ button {
display: inline;
}
/* $$$ TESTING */
#tab_bar {
height: 100%;
top: 115px;
width: 150px;
position: fixed;
background-color: #9bc4e5;
z-index: 998;
}
#tab_bar .tab_button {
vertical-align: middle;
height: 50px;
padding-left: 50px;
}
#tab_bar .tab_button.active {
background: white;
}
#tab_bar .tab_button a {
align: right;
position: relative;
}
/* MAIN FORM CONTAINER */
#container {
left: 150px;
margin-left: 50px;
margin-top: 135px;
width: 502px;
View
@@ -25,7 +25,7 @@
<html>
<head>
<title>Epichrome Options</title>
<title>Epichrome Runtime - Options</title>
<link rel="stylesheet" type="text/css" href="options-chrome.css" />
<link rel="stylesheet" type="text/css" href="options.css" />
</head>
@@ -34,7 +34,7 @@
<!-- FLOATING TITLE BOX -->
<div id="title">
<img src="icon48.png" /><h1>Epichrome Options</h1>
<img src="icon48.png" /><h1>Epichrome Runtime Options</h1>
<!-- working bar -->
<div id="working"></div>
@@ -101,18 +101,10 @@ <h4>This extension helps it work more like a true app:</h4>
<button id="dialog_button3">Button 3</button>
</div><!-- dialog_bar -->
</div><!-- button_bar -->
<div id="tab_bar">
<div id="tab_bar_overlay"></div>
<div id="setup_tab" class="tab_button active"><a href="#">Setup</a></div>
<div id="options_tab" class="tab_button">Options</div>
<div id="rules_tab" class="tab_button">Rules</div>
</div><!-- tab_bar -->
<div id="container">
<!-- overlay to dim controls when dialog bar is visible -->
<!-- overlay containing dialog box -->
<div id="overlay"></div>
<!-- options form -->
@@ -183,7 +175,7 @@ <h4 class="section-header">Rules for handling links in this app</h4>
<option value="false" selected="selected">This app</option>
<option value="true">Default browser</option>
</select>
<!-- rule delete button -->
<span title="Delete this rule">
<svg class="delete-button rule-element" version="1.1" x="0px" y="0px" width="16px" height="16px">
@@ -245,11 +237,11 @@ <h4 class="section-header">Rules for handling incoming links from other apps</h4
<div class="divider"></div>
<h4 class="section-header">Toggle Address Bar</h4>
<h4 class="section-header">Main window type</h4>
<!-- sendIncomingToMainTab checkbox -->
<div id="window_switch_message">
<p>You can toggle any window between app-style and tab-style (in case you need access to the address bar or toolbar) with the context menu (right click anywhere on the page), or by hitting <strong>&#8984;-&#8679;-L</strong>.</p>
<p>You can switch the main window between app-style and tab-style (in case you need access to the address bar or toolbar). You can use the context menu (right click anywhere on the page), or hit <strong>&#8984;-&#8679;-L</strong>.</p>
<p>Note that the page itself must have focus for the hot-key to work. If you have text selected in the address bar, for instance, it won't work.</p>
</div><!-- window_switch_message -->
</div><!-- main_tab_options -->

0 comments on commit 53c7855

Please sign in to comment.