Merge pull request #1285 from nikhilgupta1211/modify_navbar
Sign in Ui improved in mobile
This commit is contained in:
commit
05209260a4
3 changed files with 39 additions and 2 deletions
|
|
@ -15,4 +15,5 @@
|
||||||
*= require leaflet
|
*= require leaflet
|
||||||
*= require bootstrap3-switch
|
*= require bootstrap3-switch
|
||||||
*= require osem-payments
|
*= require osem-payments
|
||||||
|
*= require osem-navbar
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
36
app/assets/stylesheets/osem-navbar.css.scss
Normal file
36
app/assets/stylesheets/osem-navbar.css.scss
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
@import "breakpoints.css.scss";
|
||||||
|
.nav-osem {
|
||||||
|
border: none;
|
||||||
|
@include breakpoint(xs) {
|
||||||
|
.navbar-collapse {
|
||||||
|
background-color: white;
|
||||||
|
border-bottom: 2px solid #efefef;
|
||||||
|
}
|
||||||
|
.navbar-nav > li > a {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
.navbar-collapse.in {
|
||||||
|
overflow: hidden;
|
||||||
|
max-height: none;
|
||||||
|
}
|
||||||
|
.navbar-toggle .icon-bar {
|
||||||
|
background-color: white;
|
||||||
|
}
|
||||||
|
.navbar-nav .open .dropdown-toggle:focus {
|
||||||
|
color: black;
|
||||||
|
background-color: #eeeeee;
|
||||||
|
}
|
||||||
|
input[type=text],
|
||||||
|
input[type=password] {
|
||||||
|
text-align: center;
|
||||||
|
padding: 5px;
|
||||||
|
display: block;
|
||||||
|
margin: auto;
|
||||||
|
width: 255px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.dropdown-menu {
|
||||||
|
padding: 17px 17px 0px 17px;
|
||||||
|
min-width: 225px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
.navbar.navbar-default.navbar-fixed-top{:role=>"navigation"}
|
.navbar.navbar-default.navbar-fixed-top.nav-osem{:role=>"navigation"}
|
||||||
.container
|
.container
|
||||||
.navbar-header
|
.navbar-header
|
||||||
%button{"data-target"=>".navbar-collapse", "data-toggle"=>"collapse", :class=>"navbar-toggle", :type=>"button"}
|
%button{"data-target"=>".navbar-collapse", "data-toggle"=>"collapse", :class=>"navbar-toggle", :type=>"button"}
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
%span.fa.fa-user
|
%span.fa.fa-user
|
||||||
Sign In
|
Sign In
|
||||||
%span.caret
|
%span.caret
|
||||||
.dropdown-menu{:style => "padding: 17px; min-width: 225px;"}
|
.dropdown-menu
|
||||||
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
|
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
|
||||||
= form_tag User.ichain_login_url do
|
= form_tag User.ichain_login_url do
|
||||||
= text_field_tag 'username', nil, id: 'user_ichain_email_dd', placeholder: 'Username'
|
= text_field_tag 'username', nil, id: 'user_ichain_email_dd', placeholder: 'Username'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue