diff --git a/edit.html b/edit.html
index fcf842f..6dcaa16 100644
--- a/edit.html
+++ b/edit.html
@@ -78,6 +78,7 @@
@@ -137,6 +138,37 @@ Notice:
If you want to save image to another google account, please clear the authentication in awesome screenshot and sign out your google account in google.com. clear Authentication .
+
+
+
+
Image Link (share via MSN, GTalk, etc.)
+
+
+
+
+
Save image as a file.
Save
diff --git a/images/imgur.png b/images/imgur.png
new file mode 100644
index 0000000..3d2f3b9
Binary files /dev/null and b/images/imgur.png differ
diff --git a/javascripts/edit.js b/javascripts/edit.js
index b50b07a..cbcbca3 100644
--- a/javascripts/edit.js
+++ b/javascripts/edit.js
@@ -97,9 +97,9 @@ function prepareEditArea(req) {
imageHeight = editH;
showCtx.drawImage(
this,
- centerOffX * getDevicePixelRatio(),
- centerOffY * getDevicePixelRatio(),
- imageWidth * getDevicePixelRatio(),
+ centerOffX * getDevicePixelRatio(),
+ centerOffY * getDevicePixelRatio(),
+ imageWidth * getDevicePixelRatio(),
imageHeight * getDevicePixelRatio(),
0, 0,
imageWidth, imageHeight
@@ -127,8 +127,8 @@ function prepareEditArea(req) {
} else {
editW = imageWidth / getDevicePixelRatio();
}
- editH = lastH ?
- (imageHeight / getDevicePixelRatio()) * (numTilesY - 1) + (lastH / getDevicePixelRatio()) :
+ editH = lastH ?
+ (imageHeight / getDevicePixelRatio()) * (numTilesY - 1) + (lastH / getDevicePixelRatio()) :
(imageHeight / getDevicePixelRatio()) * (numTilesY - 1);
updateEditArea();
updateShowCanvas();
@@ -607,6 +607,11 @@ function save() {
$("#gdrive-share-link").hide();
$("#gdrive-save-form").show();
+
+ $("#imgur-share-link").hide();
+ $("#imgur-error").hide();
+ $("#imgur-error").clear();
+ $("#imgur-upload-form").show();
}
});
var c = "";
@@ -1709,6 +1714,163 @@ SavePage.saveToGdrive = function() {
});
};
+SavePage.uploadToImgurAnon = function() {
+ var baseURL = "https://api.imgur.com/3/";
+ var clientID = "63eca6c00cd1ff0";
+ $("#imgur-upload-form").hide("fast").after($('Uploading
'));
+ $.ajax({
+ url: baseURL + "image",
+ type: "POST",
+ headers: {
+ "Authorization": "Client-ID " + clientID
+ },
+ data: {
+ type: "base64",
+ title: $("#imgur-image-name").val(),
+ image: SavePage.getImageSrc(),
+ },
+ success: function(response) {
+ console.log(response);
+ var link = response ["data"] ["link"];
+ $("#imgur-image-link").val(link);
+ $("#imgur-share-link").show();
+ $(".loader").remove();
+ },
+ error: function(response) {
+ var errorCode = response ["status"];
+ console.log("Status of imgur upload: " + errorCode);
+ $(".loader").remove();
+ $("#imgur-error").append("Sorry, but a " + errorCode +
+ " error was encountered.
").show();
+
+ // Imgur rate limit was hit
+ if (errorCode === 429) {
+ $("#imgur-error").append("It appears you've hit the rate " +
+ " limit for uploading to Imgur. Please " +
+ " wait before trying to upload again.
");
+ }
+ }
+ });
+}
+
+SavePage.authorizeImgur = function() {
+ var clientID = "63eca6c00cd1ff0";
+ var authParams = {
+ client_id: clientID,
+ response_type: "token",
+ state: "imgur-auth"
+ };
+ chrome.identity.launchWebAuthFlow({
+ url: "https://api.imgur.com/oauth2/authorize?" + $.param(authParams),
+ interactive: true
+ }, function(redirect_url) {
+ redirect_url = redirect_url.replace(/https:\/\/.*#/,"");
+
+ // Taken from https://api.imgur.com/oauth2
+ var params = {};
+ var regex = /([^&=]+)=([^&]*)/g, m;
+ while (m = regex.exec(redirect_url)) {
+ params[decodeURIComponent(m[1])] = decodeURIComponent(m[2]);
+ }
+ console.log(params);
+
+ // Proceed with uploading screenshots
+ SavePage.uploadToImgurAuthorized(params ["access_token"], params ["refresh_token"]);
+
+ // Store the user name, access and refresh tokens in localStorage
+ chrome.storage.local.set({
+ imgur_user: params ["account_username"],
+ imgur_access_token: params ["access_token"],
+ imgur_refresh_token: params ["refresh_token"]
+ });
+ });
+}
+
+SavePage.uploadToImgurAuthorized = function(accessToken, refreshToken) {
+ var baseURL = "https://api.imgur.com/3/";
+ var clientID = "63eca6c00cd1ff0";
+
+ /* Sends the upload request to Imgur
+ ** 401 error: Asks for a new accessToken and tries again
+ ** 403 error: Attempts to reauthenticate user (SavePage.authorizeImgur())
+ ** Anything else, gives up.
+ */
+ var uploadRequest = function(token, haveRefreshedToken) {
+ $.ajax({
+ url: baseURL + "image",
+ type: "POST",
+ headers: {
+ "Authorization": "Bearer " + token
+ },
+ data: {
+ type: "base64",
+ title: $("#imgur-image-name").val(),
+ image: SavePage.getImageSrc(),
+ },
+ success: function(response) {
+ console.log(response);
+ var link = response ["data"] ["link"];
+ $("#imgur-image-link").val(link);
+ $("#imgur-share-link").show();
+ $(".loader").remove();
+ },
+ error: function(reqObject, textStatus, errorThrown) {
+
+ // 401 error suggests that the accessToken may need to be refreshed
+ if (!haveRefreshedToken && reqObject.status === 401) {
+ refreshAccessToken();
+ }
+
+ // 403 error means that the user withdrew our access; needs to be
+ // reauthenticated
+ else if (reqObject.status === 403) {
+ SavePage.authorizeImgur();
+ }
+ else {
+ $(".loader").remove();
+ $("div#imgur-error").empty().append(
+ "Sorry, but a " + reqObject.status + " error occurred, " +
+ "which means " + errorThrown + "
"
+ ).show();
+ console.log("Status of imgur upload: " + textStatus + " | " + errorThrown);
+ }
+ }
+ });
+ };
+
+ // Used to obtain a new accessToken
+ var refreshAccessToken = function() {
+ console.log("Refreshing token...");
+ $.ajax({
+ url: "https://api.imgur.com/oauth2/token",
+ type: "POST",
+ data: {
+ refresh_token: refreshToken,
+ client_id: clientID,
+ grant_type: "refresh_token",
+
+ // Bad idea, but I'm not aware of any way to solve this problem
+ client_secret: "a9651f5d33fce621510a5f83ef7e7e00e1f02641",
+ },
+ success: function(response) {
+ chrome.storage.local.set({
+ "imgur_access_token": response ["access_token"],
+ "imgur_refresh_token" : response ["refresh_token"]
+ });
+ uploadRequest(response ["access_token"], true);
+ },
+ error: function(reqObject, textStatus, errorThrown) {
+ $(".loader").remove();
+ $("div#imgur-error").empty().append(
+ "Could not refresh access token
"
+ ).show();
+ }
+ });
+ };
+ uploadRequest(accessToken, false);
+ $("#imgur-upload-form").hide("fast").after($('Uploading
'));
+}
+
SavePage.saveLocal=function(){
function a(a,b,c){
function d(a){return a.charCodeAt(0)};
@@ -1775,6 +1937,7 @@ SavePage.initSaveOption = function(){
$(".diigo .saveForm input[name=title]").val(tabtitle);
$("#gdrive-image-name").val(tabtitle);
$("#gdrive-user p span").bind("click",function(){$("#notice").show()});
+ $("#imgur-image-name").val(tabtitle);
chrome.identity.getProfileUserInfo(function(userInfo) {
$("#gdrive-user").show();
@@ -1853,6 +2016,39 @@ SavePage.initSaveOption = function(){
$("#saveOptionList li.sgdrive span").text("");
});
+ $("#imgurOption").click(function() {
+ chrome.storage.local.get("imgur_user", function(r) {
+ var user = r ["imgur_user"];
+ if (user === undefined) {
+ $("span#imgur-user").text("Not signed in");
+ $("span#imgur-auth-save-button").text("Connect and Save");
+ }
+ else {
+ $("span#imgur-user").text(r ["imgur_user"]);
+ }
+ });
+ });
+
+ $("#imgur-anon-save-button").click(function() {
+ SavePage.uploadToImgurAnon();
+ $("#imgur-upload-form").hide();
+ });
+
+ $("#imgur-auth-save-button").click(function() {
+ var tokens = ["imgur_access_token", "imgur_refresh_token"];
+ chrome.storage.local.get(tokens, function(r) {
+
+ // User needs to sign in with Imgur first
+ if (r [tokens [0]] === undefined) {
+ SavePage.authorizeImgur();
+ }
+ else {
+ SavePage.uploadToImgurAuthorized(r [tokens [0]], r [tokens [1]]);
+ }
+ $("#imgur-upload-form").hide();
+ });
+ });
+
$("#saveOptionContent").click(function(a){
if ($(a.target).hasClass("save")) {
if ($(a.target).hasParent(".diigo")) {
diff --git a/manifest.json b/manifest.json
index 0a38057..ac64c66 100644
--- a/manifest.json
+++ b/manifest.json
@@ -32,7 +32,8 @@
"identity.email",
"storage",
"desktopCapture",
- "notifications"
+ "notifications",
+ "https://api.imgur.com/*"
],
"update_url": "https://clients2.google.com/service/update2/crx",
"version": "4.0.0.4",
diff --git a/stylesheets/main.css b/stylesheets/main.css
index 5f5ece2..46ff791 100644
--- a/stylesheets/main.css
+++ b/stylesheets/main.css
@@ -28,7 +28,7 @@ input[type=password] {
#tool-panel {
position:fixed; top:0; left:0; z-index:3000;
width:100%; height:49px;
- background:#464646 url(../images/tool-panel-bg.png) repeat-x fixed 0 0;
+ background:#464646 url(../images/tool-panel-bg.png) repeat-x fixed 0 0;
}
#tool-panel a#logo {
position:absolute; z-index:2;
@@ -36,7 +36,7 @@ input[type=password] {
background:url("../images/logo-half.png") no-repeat top left;
color:#666; font-size:14px; line-height:24px;
-webkit-transition:color ease-in .2s;
-
+
}
#tool-panel a#logo:hover {
background:url(../images/logo-half.png) no-repeat bottom left;
@@ -45,7 +45,7 @@ input[type=password] {
#annotation_bar {
margin:0 auto; padding:12px 240px;
- min-width:500px; height:24px;
+ min-width:500px; height:24px;
text-align:center;
}
@@ -53,7 +53,7 @@ input[type=password] {
#tool-panel>div>span>a {
display:inline-block;
padding:2px 5px;
- width:20px; height:20px;
+ width:20px; height:20px;
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F8F8F8), to(#D2D2D2));
-webkit-box-shadow: #222 2px 2px 2px;
color:#000;
@@ -74,12 +74,12 @@ input[type=password] {
width:20px; height:20px;
background-image:url(../images/icons.png); background-repeat:no-repeat;
}
-#tool-panel #undo {
- margin-right:0;
+#tool-panel #undo {
+ margin-right:0;
padding:2px 7px;
-webkit-border-radius:6px;
}
-#tool-panel #crop {
+#tool-panel #crop {
padding-left:6px;
border-right:1px solid #c1c1c1;
-webkit-border-top-left-radius:6px; -webkit-border-bottom-left-radius:6px;
@@ -87,11 +87,11 @@ input[type=password] {
#tool-panel #rectangle { border-left:1px solid #efefef; }
#tool-panel #text { border-right:1px solid #c1c1c1; }
#tool-panel #color { -webkit-border-top-right-radius:6px; -webkit-border-bottom-right-radius:6px; position:relative; padding-right:6px; border-left:1px solid #efefef; margin-right:10px; }
-#resize {
+#resize {
float:right;
width:60px !important; margin-right:10px; border-radius:6px;
}
-#tool-panel #save, #tool-panel #done, #tool-panel #cancel {
+#tool-panel #save, #tool-panel #done, #tool-panel #cancel {
-webkit-border-radius:6px;
width:auto;
padding:2px 8px 2px 6px;
@@ -100,13 +100,13 @@ input[type=password] {
}
#tool-panel #done, #tool-panel #cancel, #tool-panel #crop-dimension{ display:none; }
#tool-panel #done { margin-right:20px; font-size:13px !important; font-weight:bold; }
-#tool-panel>div>a#save {
+#tool-panel>div>a#save {
margin-left:40px;
border: 1px solid #f5f5f5;
height: 18px;
vertical-align: top;
font-weight:bold; font-size: 13px !important; line-height: 18px;
- cursor: pointer;
+ cursor: pointer;
}
/* feedback buttons */
@@ -117,7 +117,7 @@ input[type=password] {
height:22px;
margin-top:26px; margin-right: 200px;
padding-left:89px;
-
+
}
@-webkit-keyframes bounce {
0%, 20%, 50%, 80%, 100% {-webkit-transform: translateY(0);}
@@ -248,7 +248,7 @@ li#diigo_web_highlighter:hover a {
/* tip */
#tip {
display:none;
- position:absolute;
+ position:absolute;
top:12px; left: 0;
z-index:1000;
margin-left: 50px;
@@ -275,7 +275,7 @@ li#diigo_web_highlighter:hover a {
background-position: 0 12px;
}
-/* exit button */
+/* exit button */
#exit {
position:fixed; top:12px; /*right:10px;*/
padding: 2px 5px;
@@ -304,15 +304,15 @@ li#diigo_web_highlighter:hover a {
content:url(../images/color-arrow.png);
position:absolute; top:-10px; left:61px; z-index:1;
}
-#color ul li {
+#color ul li {
float:left; width:17px; height:17px; border:1px solid #5F92FF; margin:0 1px 1px 0;
}
#color ul li:hover {
border-color:#fff;
}
-/*#resizer span {
- width:30px;
+/*#resizer span {
+ width:30px;
border-right: 1px solid #C1C1C1;
}*/
#resizer ul { }
@@ -327,9 +327,9 @@ li#diigo_web_highlighter:hover a {
/* Edit Area
----------------------------------*/
#edit-area {
- position:relative;
+ position:relative;
overflow:hidden;
- margin:48px auto 0;
+ margin:48px auto 0;
-webkit-box-shadow: 5px 5px 10px #404040;
-webkit-user-select:none;
}
@@ -340,23 +340,23 @@ li#diigo_web_highlighter:hover a {
#save-image, #save-tip, #re-edit, #helper { display:none; }
canvas, #helper, #crop-tip { position:absolute; top:0; left:0; }
-#edit-area div[contenteditable] {
+#edit-area div[contenteditable] {
display:none; position:absolute; outline:none; overflow:hidden;
background:rgba(255,255,255,0);
font:bold 14px/18px Arial,Helvetica,sans-serif; text-align:left;
-}
-#input-helper {
+}
+#input-helper {
visibility:hidden; font:bold 14px/18px Arial,Helvetica,sans-serif; text-align:left;
}
/*#helper { position:absolute; width:100%; height:100%; }*/
#helper>* { position:absolute; }
-#crop-tip {
+#crop-tip {
display:inline-block; z-index:1;
width:140px; padding:0 10px; border-radius:10px; background-color:rgba(0, 0, 0, 0.7);
color:#eee; text-align:center; line-height:20px;
}
-#crop-size {
+#crop-size {
display:none; position:absolute; z-index:5000; top:-25px; left:5px;
min-width:60px; padding:0 10px; border-radius:10px; background-color:rgba(0, 0, 0, 0.7); cursor:default;
color:#eee; text-align:center; line-height:20px;
@@ -415,18 +415,18 @@ input.cd-input{
.selected #tool-panel>div a,
.selected .tip, .selected .annotate
{ display:none; }
-.selected #tool-panel>div a#done,
+.selected #tool-panel>div a#done,
.selected #tool-panel>div a#cancel,
.selected #tool-panel>div #crop-dimension
{ display:inline-block; }
-.changed #top,
+.changed #top,
.changed #right,
.changed #bottom,
.changed #left { background-color:rgba(0, 0, 0, 0.25); cursor:default; }
.changed #center div{ display:block !important;}
-.changing #top,
+.changing #top,
.changing #right,
.changing #bottom,
.changing #left { background-color:rgba(0, 0, 0, 0); cursor:default; }
@@ -437,7 +437,7 @@ input.cd-input{
----------------------------------*/
#show-canvas.draw:hover { cursor:crosshair; }
#draw-canvas:hover { cursor:move; }
-#free-line-canvas:hover {
+#free-line-canvas:hover {
cursor:url(../images/pen.png),auto !important;
}
#highlight-canvas:hover {
@@ -450,7 +450,7 @@ input.cd-input{
margin-bottom:1px; /* fix blur bug fix */
}
-#blur-canvas {
+#blur-canvas {
cursor: url(../images/cursor-blur.png), default;
}
@@ -501,7 +501,7 @@ body.save #edit-area {
border:none; outline:none;
width:90% !important; height:auto !important;
-webkit-box-shadow: none; */
-
+
margin: 10px auto 0px;
/* border:1px solid #000; */
width: 960px !important;
@@ -520,8 +520,8 @@ body.save #edit-area {
overflow-y:auto;
}
/*#save_image_wrapper>div:last-child {
- position:absolute;
- bottom:0;
+ position:absolute;
+ bottom:0;
text-align: left;
height:30px;
}*/
@@ -536,13 +536,13 @@ body.save #edit-area {
overflow: hidden;
}
-#image_loader {
+#image_loader {
display:none;
padding-left:26px; background:url(../images/loader.gif) no-repeat 0 50%;
color:#4E7DDB; line-height:32px;font-size:14px;font-weight:bold;
/*text-shadow: 0px -1px 0px #404040;*/
}
-.save #save-image {
+.save #save-image {
display:block;
/* -webkit-box-shadow:0 5px 10px #404040; */
margin: 0 auto;
@@ -563,7 +563,7 @@ body.save #edit-area {
background-color:#101010;
color:#fff;
text-decoration:none;
-
+
}
#annotation_bar {
@@ -581,7 +581,7 @@ body.save #edit-area {
/* save tip */
.save #save-tip { display:block; width:48%; float:right; }
-/* .save #save-tip>div {
+/* .save #save-tip>div {
text-shadow: 0 1px 0 #404040;
float:left;
width:80%; margin-bottom: 40px; padding-left:15%; background:url(../images/arrow.png) 0 50px no-repeat;
@@ -612,7 +612,7 @@ body.save #edit-area {
border-radius: 10px;
-webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, .4);
font-weight: normal;
-}
+}
#share .tip:hover div {
display:block;
}
@@ -650,7 +650,7 @@ body.save #edit-area {
-webkit-border-radius:6px;
}
-.save #save-tip dd a#save_button {
+.save #save-tip dd a#save_button {
float:none;
}/*v2.0*/
.save #save-tip dd a#save_button span {
@@ -702,7 +702,7 @@ a.visited { color:#bbb !important; }
}
*/
-#share-link span {
+#share-link span {
display:none; margin-left:-80px;
color:#57D4FF; font-size:12px;
line-height: 26px;
@@ -711,7 +711,7 @@ a.visited { color:#bbb !important; }
/* Drag and Resize
----------------------------------*/
.ui-resizable { position: relative !important;}
-.ui-resizable-handle {
+.ui-resizable-handle {
position: absolute !important; z-index: 999 !important; display: block !important;
background:url(../images/spot.png) no-repeat center center !important;
font-size: 0.1px !important;
@@ -745,7 +745,7 @@ a.visited { color:#bbb !important; }
/* border:1px solid #000;
border-radius:10px; */
}
-#saveWrapper::after,
+#saveWrapper::after,
.clear::after {
content: '';
display: block;
@@ -828,7 +828,7 @@ a.visited { color:#bbb !important; }
}
/* .save #save-image {
- max-height:100%;
+ max-height:100%;
width:auto;
} */
@@ -879,8 +879,8 @@ a.visited { color:#bbb !important; }
content:'';
float:left;
margin-right:5px;
- padding:0;
- width:20px;
+ padding:0;
+ width:20px;
height:20px;
}
#selectedHost.diigo::before {
@@ -950,13 +950,13 @@ a.visited { color:#bbb !important; }
float:right;
margin-bottom:10px;
color: #CBCBCB;
-*/
+*/
}
#accountInfo a, #privateLink {
color:#888;
font-weight: normal;
}
-#accountInfo a:hover,
+#accountInfo a:hover,
#privateLink:hover,
#goPremium a:hover {
color:#666;
@@ -1011,8 +1011,8 @@ a.visited { color:#bbb !important; }
content:'';
float:left;
margin-right:5px;
- padding:0;
- width:20px;
+ padding:0;
+ width:20px;
height:20px;
}
#saveOnline .diigo .button.save::before {
@@ -1074,7 +1074,7 @@ label[for=privacy] {
/* overide old */
#upload {
- display:none !important;
+ display:none !important;
}
/* Account Form
@@ -1161,11 +1161,11 @@ label[for=privacy] {
save page list view
----------------------------------*/
-/* overide */
+/* overide */
/* #saveOnline, #legacySave, #saveLocal {
display:none !important;
} */
-#saveOnline,
+#saveOnline,
#legacySave,
#saveOptionList .local {
display:none !important;
@@ -1198,9 +1198,9 @@ label[for=privacy] {
.share a.buzz span { background-position:-80px 50%; }
/* general */
-.loader {
- padding-left:22px;
- background:url('../images/loader.gif') no-repeat 0 4px;
+.loader {
+ padding-left:22px;
+ background:url('../images/loader.gif') no-repeat 0 4px;
}
.back {
@@ -1287,7 +1287,7 @@ label[for=privacy] {
.as::before {
background: url(../images/icon19.png) no-repeat 1px 1px;
background-size: 17px;
-}
+}
.local::before {
background:url(../images/icons.png) no-repeat -160px 0;
}
@@ -1330,13 +1330,13 @@ div#saveOptionBody:not(.showContent) .share {
.diigo .premium {
display:none;
}
-.diigo .premium a {
+.diigo .premium a {
margin-left:10px;
- color:#f5f5f5;
- text-decoration:underline;
+ color:#f5f5f5;
+ text-decoration:underline;
}
.diigo.signin .saveForm {
- display:block;
+ display:block;
}
.diigo .saveForm li {
margin-bottom:10px;
@@ -1350,11 +1350,11 @@ div#saveOptionBody:not(.showContent) .share {
/* animation */
#saveOptionList {
- margin-left:0;
+ margin-left:0;
-webkit-transition: margin-left 0.2s ease-out;
}
.showContent #saveOptionList {
- /*margin-left:-50%;
+ /*margin-left:-50%;
-webkit-transition: margin-left 0.2s ease-out;*/
}
/* #saveOptionContent {
@@ -1393,26 +1393,26 @@ div#saveOptionBody:not(.showContent) .share {
.as .head::before {
background: url(../images/icon19.png) no-repeat 1px 1px;
background-size: 17px;
-}
+}
.local .head::before {
background:url(../images/icons.png) no-repeat -160px 0;
} */
/* #saveOption .body {
- margin-top:-20px;
- margin-left:100%;
+ margin-top:-20px;
+ margin-left:100%;
width:100%;
-webkit-transition: margin-left 0.2s ease-out;
}
#saveOption.showBody>li {
height:0;
- -webkit-transition: height 0.2s ease-out;
+ -webkit-transition: height 0.2s ease-out;
}
-#saveOption.showBody>li.selected {
+#saveOption.showBody>li.selected {
height:auto;
-webkit-transition: height 0.2s ease-out;
-}
-#saveOption.showBody .head {
+}
+#saveOption.showBody .head {
margin-left:-100%;
-webkit-transition: margin-left 0.2s ease-out;
}
@@ -1525,6 +1525,34 @@ body.save #edit-area {
margin-top: 2px;
display: inline-block;
}
+/************imgur upload**************/
+#imgur-image-name{
+ width: 215px;
+ margin-bottom: 10px;
+}
+#imgur-image-link{
+ width: 215px;
+}
+.imgur::before{
+ background: url(../images/imgur.png);
+ background-size: 19px;
+}
+#imgur-share-link {
+ display: none;
+}
+#imgur-error {
+ display: none;
+}
+
+div#imgur-upload-form table {
+ width:100%;
+}
+div#imgur-upload-form table td {
+ width:50%;
+}
+div#imgur-upload-form strong {
+ line-height:16px;
+}
/************adQuire**************/
#adQuire{