Преглед изворни кода

Merge pull request #2055 from overleaf/jel-sso-layouts

Layouts for login, register, institutional log in, & linking pages

GitOrigin-RevId: af0ea36e3bd6e39b0a6305bf0882c296eb931d5b
Eric Mc Sween пре 7 година
родитељ
комит
ced31d6131

+ 2 - 0
services/web/app/src/infrastructure/Features.js

@@ -50,6 +50,8 @@ module.exports = Features = {
         return Settings.overleaf != null
         return Settings.overleaf != null
       case 'references':
       case 'references':
         return Settings.apis.references.url != null
         return Settings.apis.references.url != null
+      case 'saml':
+        return Settings.enableSaml != null
       default:
       default:
         throw new Error(`unknown feature: ${feature}`)
         throw new Error(`unknown feature: ${feature}`)
     }
     }

+ 6 - 1
services/web/public/stylesheets/app/login-register.less

@@ -4,6 +4,12 @@
 @brand-orcid-color      : #A6CE39;
 @brand-orcid-color      : #A6CE39;
 @brand-sharelatex-color : #A93529;
 @brand-sharelatex-color : #A93529;
 
 
+.login-register-alternatives {
+	.form-group:last-child {
+		margin-bottom: 0;
+	}
+}
+
 .login-register-container {
 .login-register-container {
 	max-width: 400px;
 	max-width: 400px;
 	margin: 0 auto;
 	margin: 0 auto;
@@ -39,7 +45,6 @@
 		.login-register-text,
 		.login-register-text,
 		.login-register-hr-text-container {
 		.login-register-hr-text-container {
 			margin: 0;
 			margin: 0;
-			font-size: 90%;
 		}
 		}
 
 
 		.login-register-text {
 		.login-register-text {

+ 5 - 1
services/web/public/stylesheets/components/card.less

@@ -58,4 +58,8 @@
 
 
 .card-border {
 .card-border {
   border: @border-width-base solid @border-color-base;
   border: @border-width-base solid @border-color-base;
-}
+}
+
+.card-content {
+  padding: @padding-md;
+}

+ 6 - 0
services/web/public/stylesheets/core/type.less

@@ -83,6 +83,12 @@ p {
 small,
 small,
 .small  { font-size: 90%; color: @text-small-color; }
 .small  { font-size: 90%; color: @text-small-color; }
 
 
+.login-register-text,
+.login-register-hr-text-container,
+.text-small {
+  font-size: 90%;
+}
+
 // Undo browser default styling
 // Undo browser default styling
 cite    { font-style: normal; }
 cite    { font-style: normal; }