Skip to content

Commit

Permalink
Merge pull request #588 from coopdevs/develop
Browse files Browse the repository at this point in the history
v3.3.0
  • Loading branch information
sseerrggii authored Jan 8, 2021
2 parents 4001cf9 + 18bf549 commit fece25d
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 27 deletions.
19 changes: 1 addition & 18 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ html {
letter-spacing: -0.040rem;
margin-top: 1rem;
padding: 2rem;
border: none;
}

.btn:hover {
Expand Down Expand Up @@ -309,11 +310,6 @@ ul.statistics li{
width: 100%;
text-align: center;
}
.more {
display: block;
margin: 10px auto;
width: 100px;
}

/*flash*/
.alert > ul {
Expand Down Expand Up @@ -390,19 +386,6 @@ label[required]::after{
background-size: cover;
}

.login-wrapper {
position: absolute;
top: 51%;
left: 0;
transform: translateY(-50%);
width: 100%;
z-index: 1;

@media(max-width: $screen-sm-min) {
top: 47%;
}
}

.home-wrapper {
position: absolute;
top: 20%;
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/confirmations/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="row">
<div class="col-sm-6 col-sm-offset-3">
<div class="panel panel-primary" id="login-box">
<div class="panel" id="login-box">
<div class="panel-body">
<h2><%= t(".resend_instructions") %></h2>
<p class="description"><%= t(".resend_instructions_description") %></p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/passwords/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="row">
<div class="col-sm-6 col-sm-offset-3">
<div class="panel panel-primary" id="login-box">
<div class="panel" id="login-box">
<div class="panel-body">
<h2><%= t(".change_password") %></h2>
<%= render 'layouts/messages' %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/passwords/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="row">
<div class="col-sm-6 col-sm-offset-3">
<div class="panel panel-primary" id="login-box">
<div class="panel" id="login-box">
<div class="panel-body">
<h2><%= t(".forgot_question") %></h2>
<p class="description"><%= t(".forgot_question_description") %></p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/sessions/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="login-wrapper">
<div class="row">
<div class="col-xs-12 col-sm-8 col-md-6 col-lg-6 col-sm-offset-2 col-md-offset-3 col-lg-offset-3">
<div class="panel" id="login-box">
<div class="panel-body">
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/unlocks/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="row">
<div class="col-sm-6 col-sm-offset-3">
<div class="panel panel-primary" id="login-box">
<div class="panel" id="login-box">
<div class="panel-body">
<h2><%= t(".resend_instructions") %></h2>
<p class="description"><%= t(".resend_instructions_description") %></p>
Expand Down
4 changes: 0 additions & 4 deletions app/views/reports/post_list.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<div class="row">
<table class="table table-condensed table-bordered">
<colgroup>
<col class="col-sm-9"></col>
<col class="col-sm-3"></col>
</colgroup>
<thead>
<tr>
<th></th>
Expand Down

0 comments on commit fece25d

Please sign in to comment.