From 19ab4737b89780acd3d8238f102e633bdfe2a387 Mon Sep 17 00:00:00 2001 From: Caleb Spare Date: Mon, 20 Aug 2012 00:02:21 -0700 Subject: Clean up the font stacks --- options/options.html | 2 +- test_harnesses/automated.html | 2 +- vimium.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/options/options.html b/options/options.html index 93a402fb..1178c42e 100644 --- a/options/options.html +++ b/options/options.html @@ -10,7 +10,7 @@ @@ -89,12 +182,12 @@ -

Vimium - Options

- +
Vimium options
+
@@ -110,11 +203,6 @@ - - - @@ -197,7 +285,7 @@ command. - + @@ -208,20 +296,23 @@ Vimium will match against these patterns when using the "navigate to the next page" command. - +
Scroll step size - px + px
- Advanced options » -
Custom key
mappings		 @@ -122,7 +210,7 @@
Enter commands to remap your keys. Available commands:
-
+
map j scrollDown
unmap j
unmapAll
@@ -143,7 +231,7 @@ The characters placed next to each link after typing "F" to enter link hinting mode.
- +
- - + Show advanced options… +
+ + +

-
- To view all available shortcuts, type ? to show the Vimium help dialog. -
+ -- cgit v1.2.3 From 73f9ce8bf6d97f5605611d531500220baf1864ed Mon Sep 17 00:00:00 2001 From: Caleb Spare Date: Mon, 20 Aug 2012 03:21:26 -0700 Subject: [Options] Styling help for the 'examples' hint text. --- options/options.html | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/options/options.html b/options/options.html index a0a12d43..e0b3d33d 100644 --- a/options/options.html +++ b/options/options.html @@ -12,7 +12,7 @@ body { font: 14px "DejaVu Sans", "Arial", sans-serif; color: #303942; - width: 640px; + width: 680px; margin: 10px auto; } a, a:visited { color: #15c; } @@ -71,6 +71,15 @@ label:hover { color: black; } + pre, code, .code { + font-family: Monaco, Consolas, "Liberation Mono", Courier, monospace; + } + pre { + margin: 5px; + border-left: 1px solid #eee; + padding-left: 5px; + + } textarea { /* Horizontal resizing is pretty screwy-looking. */ resize: vertical; @@ -86,7 +95,8 @@ } .example { font-size: 12px; - color: #979CA0; + line-height: 16px; + color: #979ca0; margin-left: 20px; } .caption { @@ -106,18 +116,17 @@ margin-right: 3px; } textarea#excludedUrls { + margin-top: 5px; width: 490px; min-height: 100px; } textarea#userDefinedLinkHintCss { width: 100%;; min-height: 100px; - /* Monospace font stack for code. */ - font-family: Monaco, Consolas, "Liberation Mono", Courier, monospace; } textarea#keyMappings { width: 100%; - min-height: 120px; + min-height: 135px; } input#previousPatterns, input#nextPatterns { width: 100%; @@ -144,8 +153,8 @@ } .help { position: absolute; - right: -280px; - width: 280px; + right: -320px; + width: 320px; } tr.advancedOption { display: none; @@ -210,13 +219,12 @@
Enter commands to remap your keys. Available commands:
-
- map j scrollDown
- unmap j
- unmapAll
- " this is a comment
- # this is also a comment
-
+ 
+map j scrollDown
+unmap j
+unmapAll
+" this is a comment
+# this is also a comment
Show available commands.
@@ -244,7 +252,7 @@ default styles. - + -- cgit v1.2.3 From 87933b347c8d97c8867b3b4099b0f2d76cb221eb Mon Sep 17 00:00:00 2001 From: Caleb Spare Date: Mon, 20 Aug 2012 03:30:08 -0700 Subject: [Options] Get rid of the scroll overlay effect. This just doesn't look good with the hint text on the right. --- options/options.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/options/options.html b/options/options.html index e0b3d33d..99762fc7 100644 --- a/options/options.html +++ b/options/options.html @@ -26,10 +26,6 @@ border-bottom: 1px solid #eee; padding: 20px 0 15px 0; width: 495px; - position: fixed; - top: 0; - background-image: -webkit-linear-gradient(white, white 40%, rgba(255, 255, 255, 0.92)); - z-index: 2; } button { -webkit-user-select: none; @@ -86,7 +82,6 @@ } table { position: relative; - margin-top: 60px; border-spacing: 0 25px; } #optionsTableWrapper { -- cgit v1.2.3 From c4aff59212595cfe11bd87f5bda4591b5a2401ef Mon Sep 17 00:00:00 2001 From: Caleb Spare Date: Mon, 20 Aug 2012 03:50:48 -0700 Subject: [Options] Code cleanup including some Mac OS tweaks. --- options/options.html | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/options/options.html b/options/options.html index 99762fc7..54cc7290 100644 --- a/options/options.html +++ b/options/options.html @@ -17,9 +17,6 @@ } a, a:visited { color: #15c; } a:active { color: #052577; } - table { - font-size: 14px; - } header { font-size: 18px; font-weight: normal; @@ -39,6 +36,7 @@ text-shadow: 0 1px 0 #f0f0f0; height: 24px; font-size: 12px; + padding: 0 10px; } button:hover { background-image: -webkit-linear-gradient(#f0f0f0, #f0f0f0 38%, #e0e0e0); @@ -60,9 +58,6 @@ } input[type="checkbox"] { -webkit-user-select: none; - /* Line up checkbox text with checkbox. Annoying hack. */ - position: relative; - top: 1px; } label:hover { color: black; @@ -76,11 +71,15 @@ padding-left: 5px; } + input, textarea { + box-sizing: border-box; + } textarea { /* Horizontal resizing is pretty screwy-looking. */ resize: vertical; } table { + font-size: 14px; position: relative; border-spacing: 0 25px; } @@ -151,9 +150,7 @@ right: -320px; width: 320px; } - tr.advancedOption { - display: none; - } + tr.advancedOption { display: none; } input:read-only { background-color: #eee; color: #666; -- cgit v1.2.3 From 531f184b7a416c2df20f9ece1cebf82042c0d9eb Mon Sep 17 00:00:00 2001 From: Caleb Spare Date: Mon, 20 Aug 2012 03:51:06 -0700 Subject: [Options] Remove unused CSS. --- options/options.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/options/options.html b/options/options.html index 54cc7290..a1ab4a26 100644 --- a/options/options.html +++ b/options/options.html @@ -83,10 +83,6 @@ position: relative; border-spacing: 0 25px; } - #optionsTableWrapper { - width: 490px; - border: 1px solid red; - } .example { font-size: 12px; line-height: 16px; -- cgit v1.2.3 From 4d4b8888b9c6c5ff848a6dc857fed66d389ebd66 Mon Sep 17 00:00:00 2001 From: Caleb Spare Date: Mon, 20 Aug 2012 04:00:21 -0700 Subject: [Options] Make width settings uniform. --- options/options.html | 240 +++++++++++++++++++++++++-------------------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/options/options.html b/options/options.html index a1ab4a26..f4264331 100644 --- a/options/options.html +++ b/options/options.html @@ -13,16 +13,17 @@ font: 14px "DejaVu Sans", "Arial", sans-serif; color: #303942; width: 680px; - margin: 10px auto; + margin: 0 auto; } a, a:visited { color: #15c; } a:active { color: #052577; } + div#wrapper { width: 500px; } header { font-size: 18px; font-weight: normal; border-bottom: 1px solid #eee; padding: 20px 0 15px 0; - width: 495px; + width: 100%; } button { -webkit-user-select: none; @@ -79,9 +80,10 @@ resize: vertical; } table { + width: 100%; font-size: 14px; position: relative; - border-spacing: 0 25px; + border-spacing: 0 23px; } .example { font-size: 12px; @@ -107,7 +109,7 @@ } textarea#excludedUrls { margin-top: 5px; - width: 490px; + width: 100%; min-height: 100px; } textarea#userDefinedLinkHintCss { @@ -130,17 +132,13 @@ width: 1px; white-space: nowrap; } - #buttonsPanel { - /* This should match the width of #excludedUrls + 5px of padding to move the buttons to the right. */ - width: 495px; - } + #buttonsPanel { width: 100%; } #advancedOptions { line-height: 24px; } - #buttonContainer { - float: right; - } - #showHelpDialogMessage { - width: 495px; + #buttonContainer { float: right; } + #buttonContainer button:last-child { + margin-right: 0; } + #showHelpDialogMessage { width: 100%; } .help { position: absolute; right: -320px; @@ -179,136 +177,138 @@ -
Vimium options
- - - - - - - + + + + + + + + + +
Scroll step size - px -
- Excluded URLs
+
+
Vimium options
+ + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + - - - - + + + + - -
Scroll step size + px +
+ Excluded URLs
+
+
+ e.g. http*://mail.google.com/*
+ This will disable Vimium on Gmail.

+ Enter one URL per line.
+
+
+ +
Custom key
mappings
- e.g. http*://mail.google.com/*
- This will disable Vimium on Gmail.

- Enter one URL per line.
-
-
- -
Custom key
mappings		 -
-
- - Enter commands to remap your keys. Available commands:
- 
+                
+                Enter commands to remap your keys. Available commands:

+                
 map j scrollDown
 unmap j
 unmapAll
 " this is a comment
 # this is also a comment

-              Show available commands.
+                Show available commands.
+
- - -
Characters used
for link hints		 + +
Characters used
for link hints		 +
+
+ The characters placed next to each link after typing "F" to enter link hinting mode. +
+
+ +
CSS for link hints
- The characters placed next to each link after typing "F" to enter link hinting mode. + The CSS used to style the characters next to each link hint.

+ Note: these styles are used in addition to and take precedence over Vimium's + default styles.
- -
CSS for link hints -
-
- The CSS used to style the characters next to each link hint.

- Note: these styles are used in addition to and take precedence over Vimium's - default styles. -
-
- -
-
-
- After typing "F" to enter link hinting mode, this option lets you type the text of a link - to select it. -
-
- -
-
-
- The Heads-Up Display appears when typing into text boxes. -
-
- -
Previous Patterns + +
- Vimium will match against these patterns when using the "navigate to the previous page" - command. + After typing "F" to enter link hinting mode, this option lets you type the text of a link + to select it.
- -
Next Patterns + +
- Vimium will match against these patterns when using the "navigate to the next page" command. + The Heads-Up Display appears when typing into text boxes.
- -
+ +
Previous Patterns +
+
+ Vimium will match against these patterns when using the "navigate to the previous page" + command. +
+
+ +
Next Patterns +
+
+ Vimium will match against these patterns when using the "navigate to the next page" command. +
+
+ +
-
- Show advanced options… -
- - +
+ Show advanced options… +
+ + +
-
-
+
- + +
-- cgit v1.2.3 From 6827543daefbc0e052e7f7374873c3e326fa1ccb Mon Sep 17 00:00:00 2001 From: Caleb Spare Date: Mon, 20 Aug 2012 04:00:47 -0700 Subject: [Options] Get rid of Consolas in mono stack --- options/options.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/options.html b/options/options.html index f4264331..4a616328 100644 --- a/options/options.html +++ b/options/options.html @@ -64,7 +64,7 @@ color: black; } pre, code, .code { - font-family: Monaco, Consolas, "Liberation Mono", Courier, monospace; + font-family: Consolas, "Liberation Mono", Courier, monospace; } pre { margin: 5px; -- cgit v1.2.3