Merge pull request #7 from beatriceo/frontend-setup

Frontend setup
This commit is contained in:
Beatrice Olivera 2018-08-28 12:38:41 +01:00 committed by GitHub
commit d12fa2a46b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 71 additions and 121 deletions

View File

@ -2,6 +2,7 @@
@import "config/fonts"; @import "config/fonts";
@import "config/colors"; @import "config/colors";
@import "config/bootstrap_variables"; @import "config/bootstrap_variables";
@import "config/subtitles";
// External libraries // External libraries
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";

View File

@ -1,77 +1,59 @@
/* Main navbar */ .polyglot-navbar {
.navbar-wagon {
box-shadow: 0 1px 5px 0 rgba(0,0,0,0.07),0 1px 0 0 rgba(0,0,0,0.03);
background: white;
transition: all 0.3s ease;
height: 70px;
padding: 0px 30px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} width: 100vw;
height: 3.5em;
background: $navbar-background;
/* Logo */ .logo {
.navbar-wagon-brand img { color: $primary;
height: 50px; margin-left: 1em;
}
/* User Avatar */ font-size: 2em;
.navbar-wagon .avatar { font-weight: bold;
height: 35px; }
width: 35px;
border-radius: 50%;
}
/* Right section */
.navbar-wagon-right {
display: flex;
align-items: center;
justify-content: space-between;
}
/* Basic navbar item */ .right-align {
.navbar-wagon-item { height: 100%;
cursor: pointer; width: 16em;
padding: 0 20px; margin-right: 5em;
} display: flex;
align-items: center;
justify-content: space-between;
.links {
display: flex;
height: inherit;
div {
height: inherit;
display: flex;
align-items: center;
border-bottom: 5px solid transparent;
/* Navbar link */ &:first-child {
.navbar-wagon-link { margin-right: 1em;
color: #616668; }
font-size: 14px;
}
.navbar-wagon-link:hover {
color: #da552f;
text-decoration: none;
}
/* Dropdown menu */ &.active {
.navbar-wagon-dropdown-menu { border-bottom: 5px solid $primary;
margin-top: 15px; color: white;
box-shadow: 1px 1px 4px #E6E6E6;
border-color: #E6E6E6; a {
} color: white;
.navbar-wagon-dropdown-menu li > a { }
transition: color 0.3s ease; }
font-weight: lighter !important; a {
color: #999999 !important; color: #C4C4C4;
font-size: 15px !important; text-decoration: none;
line-height: 22px !important; }
padding: 10px 20px; }
} }
.navbar-wagon-dropdown-menu li > a:hover { }
background: transparent !important;
color: black !important; .profile {
} img {
.navbar-wagon-dropdown-menu:before { width: 3.25em;
content: ' '; }
height: 10px; }
width: 10px;
position: absolute;
right: 10px;
top: -6px;
background-color: white;
transform: rotate(45deg);
border-left: 1px solid #E6E6E6;
border-top: 1px solid #E6E6E6;
} }

View File

@ -11,11 +11,12 @@ $font-size-base: 18px;
// Colors // Colors
$gray-base: $gray; $gray-base: $gray;
$brand-primary: $blue; $brand-primary: $primary;
$brand-success: $green; $brand-success: $green;
$brand-info: $yellow; $brand-info: $yellow;
$brand-danger: $red; $brand-danger: $red;
$brand-warning: $orange; $brand-warning: $orange;
$brand-secondary: $secondary;
// Buttons & inputs' radius // Buttons & inputs' radius
$border-radius-base: 2px; $border-radius-base: 2px;

View File

@ -8,3 +8,9 @@ $orange: #E67E22;
$green: #32B796; $green: #32B796;
$gray: #000000; $gray: #000000;
$light-gray: #F4F4F4; $light-gray: #F4F4F4;
$primary: #F55E4F;
$secondary: #5ED17E;
$background: #33333D;
$card-backround: #464650;
$navbar-background: #1F1F29;

View File

@ -0,0 +1,3 @@
$subtitle-background: #000000;
$subtitle-text: #FFFFFF;
$subtitle-font: "Comic Sans MS"

View File

@ -1,58 +1,15 @@
<div class="navbar-wagon"> <div class="polyglot-navbar">
<!-- Logo --> <div class="logo">
<%= link_to root_path, class: "navbar-wagon-brand" do %> Polyglot
<%= image_tag "logo.png", height: 50 %>
<% end %>
<!-- Right Navigation -->
<div class="navbar-wagon-right hidden-xs hidden-sm">
<% if user_signed_in? %>
<!-- Links when logged in -->
<%= link_to "Host", "#", class: "navbar-wagon-item navbar-wagon-link" %>
<%= link_to "Trips", "#", class: "navbar-wagon-item navbar-wagon-link" %>
<%= link_to "Messages", "#", class: "navbar-wagon-item navbar-wagon-link" %>
<!-- Avatar with dropdown menu -->
<div class="navbar-wagon-item">
<div class="dropdown">
<%= image_tag "http://kitt.lewagon.com/placeholder/users/ssaunier", class: "avatar dropdown-toggle", id: "navbar-wagon-menu", "data-toggle" => "dropdown" %>
<ul class="dropdown-menu dropdown-menu-right navbar-wagon-dropdown-menu">
<li>
<%= link_to "#" do %>
<i class="fa fa-user"></i> <%= t(".profile", default: "Profile") %>
<% end %>
</li>
<li>
<%= link_to "#" do %>
<i class="fa fa-cog"></i> <%= t(".settings", default: "Settings") %>
<% end %>
</li>
<li>
<%= link_to destroy_user_session_path, method: :delete do %>
<i class="fa fa-sign-out"></i> <%= t(".sign_out", default: "Log out") %>
<% end %>
</li>
</ul>
</div>
</div>
<% else %>
<!-- Login link (when logged out) -->
<%= link_to t(".sign_in", default: "Login"), new_user_session_path, class: "navbar-wagon-item navbar-wagon-link" %>
<% end %>
</div> </div>
<!-- Dropdown list appearing on mobile only --> <div class="right-align">
<div class="navbar-wagon-item hidden-md hidden-lg"> <div class="links">
<div class="dropdown"> <div class="active"><%= link_to "Dashboard", "#" %></div>
<i class="fa fa-bars dropdown-toggle" data-toggle="dropdown"></i> <div><%= link_to "Settings", "#" %></div>
<ul class="dropdown-menu dropdown-menu-right navbar-wagon-dropdown-menu"> </div>
<li><a href="#">Some mobile link</a></li> <div class="profile">
<li><a href="#">Other one</a></li> <%= image_tag "https://avatars2.githubusercontent.com/u/38472180?v=4", class: "img-circle"%>
<li><a href="#">Other one</a></li>
</ul>
</div> </div>
</div> </div>
</div> </div>