Permalink
Browse files

pulling in code.google.com changes

  • Loading branch information...
1 parent c6422f6 commit bb77904419cdd4741ddbda70006642d9fc725019 @ebidel ebidel committed Jun 28, 2012
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -10,7 +10,7 @@ body {
font-family: Helvetica, Arial, sans-serif;
font-size: 13px;
line-height: 18px;
- min-width: 1200px;
+ min-width: 975px;
padding: 20px;
}
@@ -279,12 +279,10 @@ input[type=text].form-error{
width: 0;
}
-#file1-container {
- float: left;
-}
-
+#file1-container,
#file2-container {
- float: right;
+ float: left;
+ position: relative;
}
.input-container {
@@ -316,25 +314,99 @@ input[type=text].form-error{
padding-top: 5px;
}
-.file-diff {
+#arrow-container {
+ float: left;
+ height: 575px;
+ margin-top: 36px;
+ overflow: hidden;
+ position: relative;
+ width: 40px;
+}
+
+#arrow-container.arrow-edit {
+ opacity: 0;
+}
+
+#arrow-container .arrow {
+ background: url('../img/arrow-right.png') center no-repeat;
+ background-size: auto 95px;
+ height: 16px;
+ opacity: 0;
+}
+
+#arrow-container .undo {
+ background: url('../img/undo.svg') right no-repeat;
+ height: 16px;
+ opacity: 0;
+}
+
+#arrow-container .visible {
+ cursor: pointer;
+ opacity: 1;
+}
+
+#plus-container {
+ display: none;
+ float: left;
+ height: 575px;
+ margin-right: 2px;
+ margin-top: 36px;
+ overflow: hidden;
+ position: relative;
+ width: 16px;
+ z-index: 10;
+}
+
+#plus-container div {
+ border: 1px solid #999;
+ color: #999;
+ font-size: 18px;
+ height: 14px;
+ opacity: 0;
+ text-align: center;
+ width: 14px;
+}
+
+#plus-container div.plus,
+#plus-container div.minus {
+ cursor: pointer;
+ opacity: 1;
+}
+
+#plus-container div.plus:after {
+ content: "+";
+}
+
+#plus-container div.minus:after {
+ content: "-";
+}
+
+.file-diff,
+textarea {
background: #fafafa;
border: 1px solid #999;
float: left;
font-family: monospace;
font-size: 12px;
- height: 600px;
+ height: 585px;
line-height: 16px;
margin-bottom: 10px;
margin-top: 10px;
overflow: auto;
white-space: nowrap;
- width: 550px;
+ width: 455px;
+}
+
+div.button.edit,
+div.button.done{
+ float: right;
}
.file-diff div {
float: left;
min-height: 16px;
position: relative;
+ white-space: nowrap;
width: 100%;
}
@@ -379,8 +451,15 @@ input[type=text].form-error{
width: 35px;
}
+.file-diff div div.text,
+.file-diff div div.left-text {
+ position: absolute;
+ left: 36px;
+}
+
.file-diff div span {
float: left;
+ position: relative;
}
.file-diff div span.ins {
@@ -399,6 +478,25 @@ input[type=text].form-error{
display: none;
}
+#file1-container .file-diff div.fix,
+#file2-container .file-diff div.fix {
+ background: none;
+}
+
+#file1-container .file-diff div.fix span.del {
+ background: none;
+}
+
+#file2-container .file-diff div.fix span.ins {
+ display: none;
+}
+
+#file2-container .file-diff div.fix span.del {
+ display: block;
+ background: none;
+}
+
+
.hidden {
display: none;
}
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="21px" height="21px" viewBox="0 0 21 21" overflow="visible" enable-background="new 0 0 21 21"
+ xml:space="preserve">
+<defs>
+</defs>
+<path d="M10.5,7C8.566,7,6.531,8.098,5.097,9.597L3,7.5V14h6.5l-2.259-2.259C8.125,10.747,9.904,9.1,12,9.1
+ c2.434,0,4.656,1.041,6,3.9C17,9,14,7,10.5,7z"/>
+<rect opacity="0" fill="#4387FD" width="21" height="21"/>
+</svg>
View
Binary file not shown.
Binary file not shown.
View
@@ -6,8 +6,8 @@
function onLaunched(launchData) {
chrome.appWindow.create('main.html', {
- width: 1250,
- height: 790
+ width: 1024,
+ height: 768
});
}
Oops, something went wrong.

0 comments on commit bb77904

Please sign in to comment.