Merge branch 'feature-update-buttons' into devel

olgabrani · athinab · commit ffa0e1c3971c · 2018-11-15T16:29:47.000+02:00
diff --git a/README.md b/README.md
@@ -154,6 +154,8 @@ At the moment there are style rules for the IdPs:
 * IGTF
 * LinkedIn
 * ORCID
+* OpenAIRE
+* OpenMinTeD
 
 ### Cookie Policy
 
diff --git a/www/resources/images/openaire.png b/www/resources/images/openaire.png
diff --git a/www/resources/images/openminted.png b/www/resources/images/openminted.png
diff --git a/www/resources/sass/_colors.scss b/www/resources/sass/_colors.scss
@@ -34,4 +34,7 @@ $eduteams-yellow: #f1ccb3;
 $eduteams-yellow-dark: #e59959;
 $egi-gray: #b1b1b1;
 $egi-cyan: #a2c5df;
+$openaire-lightblue: #4686e6;
+$openaire-blue: #39378d;
+$openminted: #02bab4;
 
diff --git a/www/resources/sass/_extra.scss b/www/resources/sass/_extra.scss
@@ -414,7 +414,7 @@ h4 {
     .ssp-line-or-line__or {
         @extend h2;
         position: relative;
-        background: $white;
+        background: $body-bg;
         padding: 0 24px;
         bottom: -10px;
 
diff --git a/www/resources/sass/_idps_buttons.scss b/www/resources/sass/_idps_buttons.scss
@@ -10,6 +10,7 @@
     }
     &.elixir {
         background-color: $elixir;
+        border: 1px solid $elixir;
     }
     &.igtf {
         color: $igtf;
@@ -26,6 +27,7 @@
     }
     &.google {
         background-color: $google;
+        border: 1px solid $google;
     }
     &.orcid {
         color: darken($orcid, 10%);
@@ -34,19 +36,22 @@
     }
     &.linkedin {
         background-color: $linkedin;
+        border: 1px solid $linkedin;
     }
     &.facebook {
         background-color: $facebook;
+        border: 1px solid $facebook;
     }
     &.aria {
         background-color: $aria;
+        border: 1px solid $aria;
         img {
             height: 24px;
             margin: 6px 0;
         }
     }
     &.eduteams {
-        background-color: transparent;
+        background-color: $white;
         border: $eduteams-yellow 1px solid;
         &:hover {
             border-color: $eduteams-yellow-dark;
@@ -57,7 +62,7 @@
         }
     }
     &.egi {
-        background-color: transparent;
+        background-color: $white;
         border: $egi-gray 1px solid;
         color: $black;
         padding: 2px 6px;
@@ -75,4 +80,26 @@
         }
 
     }
+    &.openaire {
+        background-color: $white;
+        border: $openaire-lightblue 1px solid;
+        &:hover {
+            border-color: $openaire-blue;
+        }
+        img {
+            height: 30px;
+            margin: 2px 0 4px;
+        }
+    }
+    &.openminted {
+        background-color: $white;
+        border: $openminted 1px solid;
+        &:hover {
+            border-color: darken($openminted, 20%);
+        }
+        img {
+            height: 16px;
+            margin: 10px 0;
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`&.elixir {`
`12`	`12`	`background-color: $elixir;`
	`13`	`+ border: 1px solid $elixir;`
`13`	`14`	`}`
`14`	`15`	`&.igtf {`
`15`	`16`	`color: $igtf;`
`@@ -26,6 +27,7 @@`
`26`	`27`	`}`
`27`	`28`	`&.google {`
`28`	`29`	`background-color: $google;`
	`30`	`+ border: 1px solid $google;`
`29`	`31`	`}`
`30`	`32`	`&.orcid {`
`31`	`33`	`color: darken($orcid, 10%);`
`@@ -34,19 +36,22 @@`
`34`	`36`	`}`
`35`	`37`	`&.linkedin {`
`36`	`38`	`background-color: $linkedin;`
	`39`	`+ border: 1px solid $linkedin;`
`37`	`40`	`}`
`38`	`41`	`&.facebook {`
`39`	`42`	`background-color: $facebook;`
	`43`	`+ border: 1px solid $facebook;`
`40`	`44`	`}`
`41`	`45`	`&.aria {`
`42`	`46`	`background-color: $aria;`
	`47`	`+ border: 1px solid $aria;`
`43`	`48`	`img {`
`44`	`49`	`height: 24px;`
`45`	`50`	`margin: 6px 0;`
`46`	`51`	`}`
`47`	`52`	`}`
`48`	`53`	`&.eduteams {`
`49`		`- background-color: transparent;`
	`54`	`+ background-color: $white;`
`50`	`55`	`border: $eduteams-yellow 1px solid;`
`51`	`56`	`&:hover {`
`52`	`57`	`border-color: $eduteams-yellow-dark;`
`@@ -57,7 +62,7 @@`
`57`	`62`	`}`
`58`	`63`	`}`
`59`	`64`	`&.egi {`
`60`		`- background-color: transparent;`
	`65`	`+ background-color: $white;`
`61`	`66`	`border: $egi-gray 1px solid;`
`62`	`67`	`color: $black;`
`63`	`68`	`padding: 2px 6px;`
`@@ -75,4 +80,26 @@`
`75`	`80`	`}`
`76`	`81`
`77`	`82`	`}`
	`83`	`+ &.openaire {`
	`84`	`+ background-color: $white;`
	`85`	`+ border: $openaire-lightblue 1px solid;`
	`86`	`+ &:hover {`
	`87`	`+ border-color: $openaire-blue;`
	`88`	`+ }`
	`89`	`+ img {`
	`90`	`+ height: 30px;`
	`91`	`+ margin: 2px 0 4px;`
	`92`	`+ }`
	`93`	`+ }`
	`94`	`+ &.openminted {`
	`95`	`+ background-color: $white;`
	`96`	`+ border: $openminted 1px solid;`
	`97`	`+ &:hover {`
	`98`	`+ border-color: darken($openminted, 20%);`
	`99`	`+ }`
	`100`	`+ img {`
	`101`	`+ height: 16px;`
	`102`	`+ margin: 10px 0;`
	`103`	`+ }`
	`104`	`+ }`
`78`	`105`	`}`