airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject airavata-php-gateway git commit: AIRAVATA-2430 External IDP option styling
Date Sat, 24 Jun 2017 18:52:15 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop f6cc00abd -> 9cd033bde


AIRAVATA-2430 External IDP option styling


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/9cd033bd
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9cd033bd
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9cd033bd

Branch: refs/heads/develop
Commit: 9cd033bde559d64ddb307223582ad414389791e5
Parents: f6cc00a
Author: Marcus Christie <machrist@iu.edu>
Authored: Sat Jun 24 14:52:05 2017 -0400
Committer: Marcus Christie <machrist@iu.edu>
Committed: Sat Jun 24 14:52:05 2017 -0400

----------------------------------------------------------------------
 app/views/account/create.blade.php          |  2 +-
 app/views/account/login.blade.php           |  2 +-
 app/views/partials/login-external.blade.php |  2 +-
 public/css/bootstrap.min.css                | 32 +++++++++++++++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9cd033bd/app/views/account/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/create.blade.php b/app/views/account/create.blade.php
index 4304980..c490761 100644
--- a/app/views/account/create.blade.php
+++ b/app/views/account/create.blade.php
@@ -74,7 +74,7 @@
     </form>
 
         @if (!empty($auth_code_options))
-            <h4>OR</h4>
+            <h3 id="login-option-separator" class="horizontal-rule">OR</h4>
         @endif
     @endif {{-- @if (!empty($auth_password_option)) --}}
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9cd033bd/app/views/account/login.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/login.blade.php b/app/views/account/login.blade.php
index e04a3fb..1e8a52a 100755
--- a/app/views/account/login.blade.php
+++ b/app/views/account/login.blade.php
@@ -11,7 +11,7 @@
     @if (!empty($auth_password_option))
         @include('partials/login-form', array("auth_name" => $auth_password_option["name"]))
         @if (!empty($auth_code_options))
-            <h4>OR</h4>
+            <h3 id="login-option-separator" class="horizontal-rule">OR</h4>
         @endif
     @endif
     @if (!empty($auth_code_options))

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9cd033bd/app/views/partials/login-external.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/login-external.blade.php b/app/views/partials/login-external.blade.php
index aed312b..393048a 100644
--- a/app/views/partials/login-external.blade.php
+++ b/app/views/partials/login-external.blade.php
@@ -1,6 +1,6 @@
 
 @foreach ($auth_code_options as $auth_code_option)
-    <a href="{{ $auth_code_option["auth_url"] }}" class="btn btn-primary">
+    <a href="{{ $auth_code_option["auth_url"] }}" class="btn btn-primary btn-block">
         @if (isset($auth_code_option["logo"]))
         <img src="{{ $auth_code_option["logo"] }}">
         @endif

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9cd033bd/public/css/bootstrap.min.css
----------------------------------------------------------------------
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
index 5ee9a45..cae0f80 100644
--- a/public/css/bootstrap.min.css
+++ b/public/css/bootstrap.min.css
@@ -162,4 +162,34 @@ body{
 	font-size: 12px;
 	font-style: italic;
 	color: #737373;
-}
\ No newline at end of file
+}
+
+#login-option-separator {
+	color: #999999;
+	margin-top: 30px;
+	margin-bottom: 30px;
+}
+
+.horizontal-rule {
+	overflow: hidden;
+	text-align: center;
+}
+.horizontal-rule:before,
+.horizontal-rule:after {
+	background-color: currentColor;
+	content: "";
+	display: inline-block;
+	height: 1px;
+	position: relative;
+	vertical-align: middle;
+	width: 50%;
+	margin-top: -0.2em; /* fudge factor to make it more centered */
+}
+.horizontal-rule:before {
+	right: 0.5em;
+	margin-left: -50%;
+}
+.horizontal-rule:after {
+	left: 0.5em;
+	margin-right: -50%;
+}


Mime
View raw message