Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: vincentwoo/inapp
base: 9b9a7de3a7
...
head fork: vincentwoo/inapp
compare: 99ebffe853
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 14 additions and 11 deletions.
  1. +1 −1  css/kd_components.css
  2. +3 −5 css/style.css
  3. +10 −5 index.html
View
2  css/kd_components.css
@@ -4158,7 +4158,7 @@ Component: Scrollbars
}
::-webkit-scrollbar {
- width: 16px;
+ width: 10px;
height: 16px;
}
View
8 css/style.css
@@ -2,6 +2,9 @@ a, a:link {
color: #1155CC;
text-decoration: none;
}
+h3 {
+ font-weight: bold;
+}
* {
margin: 0;
padding: 0;
@@ -212,11 +215,6 @@ body {
overflow: auto;
}
- #notlogged p {
- padding-top: 15px;
- font-weight: bold;
- }
-
#showinstruments_one p {
font-weight: bold;
}
View
15 index.html
@@ -149,6 +149,8 @@
function addInstrumentDone() {
if ($('#showinstruments_one').is(':visible')) {
scrollTo($('#showinstruments_one'), $('#showinstruments_multi'), appendInstrument);
+ } else if ($('#newuser').is(':visible')) {
+ scrollTo($('#newuser'), $('#showinstruments_one'), appendInstrument);
}
else appendInstrument();
}
@@ -166,15 +168,16 @@
}
function loginDone() {
-
+ scrollTo($('#notlogged'), $('#newuser'));
}
function scrollTo(current, target, callback) {
var right = $('#right');
+ right.css('height', right.outerHeight() + 'px');
+ target.css('height', right.outerHeight() + 'px');
+ setTimeout(function(){
right.css('-webkit-transition-property', 'height, left');
target.show();
- target.css('height', right.outerHeight() + 'px');
- console.log(target.css('height'));
right.animate({
scrollTop: target.offset().top - right.offset().top + right.scrollTop() - 15
},
@@ -186,9 +189,10 @@
setTimeout(function() {
right.css('-webkit-transition-property', 'left');
right.css('height', 'auto');
- callback();
+ if (callback) callback();
}, 500);
});
+ }, 250);
}
</script>
</head>
@@ -316,6 +320,7 @@
To ensure your security, you must log in to Google Wallet.<br /><br />Please click the button below to log in.
</p>
<div class="kd-button kd-button-submit loginbutton" style="float: right; margin: 10px">Log In in a new window</div>
+ <div style="clear: both"></div>
</div>
<div id="newuser">
@@ -329,7 +334,7 @@
Add card in a new window
</div>
</div>
-
+ <div style="clear: both"></div>
</div>
<div id="showinstruments_one">

No commit comments for this range

Something went wrong with that request. Please try again.