Skip to content
Snippets Groups Projects
Commit 881bb656 authored by srosse's avatar srosse
Browse files

Merge with 16810927e4cb0033e6031beedd6567c7a9926e8e

parents 310531bf 7c2d7653
No related branches found
No related tags found
No related merge requests found
...@@ -258,6 +258,9 @@ $o-login-header-color : $brand-primary !default; ...@@ -258,6 +258,9 @@ $o-login-header-color : $brand-primary !default;
$o-login-form-width : 400px !default; $o-login-form-width : 400px !default;
$o-login-form-align : right !default; /* left, center or right */ $o-login-form-align : right !default; /* left, center or right */
$o-login-form-bg-img : $o-images-path + "learn-bg.jpg" !default; /* image CC by Thomas Leuthard https://www.flickr.com/photos/thomasleuthard/8587724648/ */ $o-login-form-bg-img : $o-images-path + "learn-bg.jpg" !default; /* image CC by Thomas Leuthard https://www.flickr.com/photos/thomasleuthard/8587724648/ */
$o-login-btn-register-color : $btn-info-color !default;
$o-login-btn-register-bg : $btn-info-bg !default;
$o-login-btn-register-border : darken($o-login-btn-register-bg, 5%) !default;
/* Course and catalog site */ /* Course and catalog site */
$o-coursesite-rowelem-width-md : 180px !default; $o-coursesite-rowelem-width-md : 180px !default;
......
...@@ -61,9 +61,9 @@ body.o_dmz { ...@@ -61,9 +61,9 @@ body.o_dmz {
@else if $o-login-form-align == right { @else if $o-login-form-align == right {
.o_login_intro { .o_login_intro {
padding-left: 10%; padding-left: 10%;
h1 { h1, .lead {
text-align: right text-align: right
} }
} }
.o_login_box_wrapper, .o_login_box_wrapper,
.o_login_footer_wrapper { .o_login_footer_wrapper {
...@@ -71,8 +71,10 @@ body.o_dmz { ...@@ -71,8 +71,10 @@ body.o_dmz {
} }
} }
@else { @else {
.o_login_intro h1 { .o_login_intro {
text-align: center h1, .lead {
text-align: center
}
} }
.o_login_box_wrapper, .o_login_box_wrapper,
.o_login_footer_wrapper { .o_login_footer_wrapper {
...@@ -126,7 +128,7 @@ body.o_dmz { ...@@ -126,7 +128,7 @@ body.o_dmz {
line-height: 2em; line-height: 2em;
font-size: floor($font-size-base * 1.3); font-size: floor($font-size-base * 1.3);
text-align: center; text-align: center;
@include button-variant($btn-info-color, $btn-info-bg, $btn-info-border); @include button-variant($o-login-btn-register-color, $o-login-btn-register-bg, $o-login-btn-register-border);
border-radius: $border-radius-base; border-radius: $border-radius-base;
margin-top: $padding-large-horizontal; margin-top: $padding-large-horizontal;
padding: $padding-large-vertical $padding-base-horizontal; padding: $padding-large-vertical $padding-base-horizontal;
......
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment