Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/assets/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
*= require_self
*/

@import "bootstrap-sprockets";
@import "bootstrap";

$bg-color: #f5f8fa;
$navs-bg-color: #1e1e1e;
$white: #ffffff;
Expand Down Expand Up @@ -89,6 +92,10 @@ html {

span.input-group-addon {
padding: 2rem 2rem 2rem 3rem;

@media (max-width: $screen-xs-min) {
display: none;
}
}

span.show-password {
Expand Down Expand Up @@ -304,7 +311,6 @@ table.users {
max-width: 100%;
}
}

}

@media print {
Expand Down Expand Up @@ -625,6 +631,10 @@ form .checkbox input[type="checkbox"] {
letter-spacing: 0.031rem;
margin-bottom: 2rem;
margin-top: 3rem;

@media (max-width: $screen-xs-min) {
display: none;
}
}

.material-icons {
Expand Down
3 changes: 0 additions & 3 deletions app/assets/stylesheets/libs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@
*= require jquery-ui
*= require select2
*/

@import "bootstrap-sprockets";
@import "bootstrap";