Эх сурвалжийг харах

Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

Henry Oswald 10 жил өмнө
parent
commit
c7a3de45bb

+ 1 - 0
services/web/app/coffee/Features/Project/ProjectController.coffee

@@ -245,6 +245,7 @@ module.exports = ProjectController =
 						first_name : user.first_name
 						first_name : user.first_name
 						last_name  : user.last_name
 						last_name  : user.last_name
 						referal_id : user.referal_id
 						referal_id : user.referal_id
+						signUpDate : user.signUpDate
 						subscription :
 						subscription :
 							freeTrial: {allowed: allowedFreeTrial}
 							freeTrial: {allowed: allowedFreeTrial}
 						featureSwitches: user.featureSwitches
 						featureSwitches: user.featureSwitches

+ 40 - 1
services/web/public/stylesheets/app/editor.less

@@ -252,7 +252,7 @@
 	margin-bottom:0px;
 	margin-bottom:0px;
 }
 }
 
 
-.sl_references_search_hint {
+.sl_references_search_hint-varDefault {
 	position: absolute;
 	position: absolute;
 	bottom: -22px;
 	bottom: -22px;
 	left: -1px;
 	left: -1px;
@@ -262,10 +262,49 @@
 	background: rgb(202, 214, 250);
 	background: rgb(202, 214, 250);
 	border: 1px solid lightgray;
 	border: 1px solid lightgray;
 	box-shadow: 3px 3px 5px rgba(0,0,0,.2);
 	box-shadow: 3px 3px 5px rgba(0,0,0,.2);
+
 	span {
 	span {
 		color: black;
 		color: black;
 	}
 	}
 }
 }
+
+.sl_references_search_hint-varButton {
+	position: absolute;
+	bottom: -65px;
+	left: -1px;
+	right: 0px;
+	padding: 0 6px 6px;
+	text-align: center;
+	background: #fbfbfb;
+	color: #FFF;
+	box-shadow: 3px 3px 5px rgba(0,0,0,.2);
+	border-left: 1px solid lightgray;
+	font-family: @font-family-sans-serif;
+	font-size: 13px;
+	font-weight: 600;
+
+	hr {
+		margin: 6px -6px;
+	}
+
+	button {
+		width: 100%;
+		font-size: inherit;
+		line-height: 1.4;
+	}
+
+	span {
+		padding-left: 10px;
+	}
+
+	kbd {
+		display: block;
+		font-family: inherit;
+		font-size: 12px;
+		font-weight: normal;
+	}
+}
+
 // -- References Search Modal --
 // -- References Search Modal --
 .references-search-modal-backdrop {
 .references-search-modal-backdrop {
 	// don't grey out the editor when the
 	// don't grey out the editor when the