Merge branch 'release-2.3.0'

rciam · Aug 1, 2019 · 9fe8d97 · 9fe8d97
2 parents 625b1c2 + 3b0d671
commit 9fe8d97
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.3.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.2.1...v2.3.0) - 2019-08-01
+
+### Added
+
+- Module discopower: Add style rules and logos for the buttons of the IdPs:
+  - Bitbucket
+  - Github
+
+
 ## [v2.2.1](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.2.0...v2.2.1) - 2019-07-03
 
 ### Fixed
@@ -19,7 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - QQ
   - WeChat
   - Epos
-- Add info about compatiblity in README.
+- Add info about compatibility in README.
 - Enable/disable cookie banner functionality via setting in config file.
 
 ### Changed

diff --git a/version.txt b/version.txt
@@ -1,2 +1,2 @@
 simplesamlphp-module-themevanilla
-version 2.2.1
+version 2.3.0
diff --git a/www/resources/images/bitbucket.svg b/www/resources/images/bitbucket.svg
diff --git a/www/resources/images/github-mark.png b/www/resources/images/github-mark.png
diff --git a/www/resources/images/github.png b/www/resources/images/github.png
diff --git a/www/resources/sass/_colors.scss b/www/resources/sass/_colors.scss
@@ -41,4 +41,5 @@ $openminted: #02bab4;
 $wechat: #2dc101;
 $qq: #4292FF;
 $epos: #10482A;
-
+$bitbucket: #0747a6;
+$github: #24292e;
diff --git a/www/resources/sass/_idps_buttons.scss b/www/resources/sass/_idps_buttons.scss
@@ -142,9 +142,35 @@
     &.epos {
 	border-color: $epos;
 	background-color: $white;
-	img {
-	    padding: 5px;
-	    margin-right: 0;
-	}
+        img {
+            padding: 5px;
+            margin-right: 0;
+        }
+    }
+    &.bitbucket {
+        border-color: $bitbucket;
+        background-color: $white;
+        span {
+            display: none;
+        }
+        img {
+            padding: 5px;
+            margin-right: 0;
+        }
+    }
+    &.github {
+        border-color: $github;
+        background: $white url("../images/github.png") no-repeat center center;
+        background-size: 55%;
+        span {
+            display: none;
+        }
+        img {
+            visibility: hidden;
+        }
+        &:hover {
+            background: $white url("../images/github-mark.png") no-repeat center center;
+            background-size: 26px;
+        }
     }
 }