Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

quickfixes #14

Merged
merged 1 commit into from Jul 3, 2014
Merged

quickfixes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/css/partials/header.scss
View file
Open in desktop
Expand Up @@ -10,6 +10,9 @@
}
}

.login {
border: none !important;
}

.login > a {
padding: $headheight/2 40px;
Expand All @@ -19,6 +22,14 @@
color: $color-white;
}

.login > span {
border: 1px solid white;
cursor: pointer;
color: $color-black;
background-color: white;
line-height: $headheight;
padding: 20px 15px;
}

.search {
padding-left: 2em;
Expand Down
2 changes: 1 addition & 1 deletion app/index.html
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
<div class="logo" ng-click="go('/')"><p class="color-blue">Campus<span>TV</span></p></div>
<div class="search"><i class="fa fa-search"></i><input type="search" placeholder="pesquisar" name="search"></div>
<div class="login btn-blue" ng-show="log"><a href ng-click="login()">Login</a></div>
<div class="login btn-green" ng-show="logged"><a href ng-click="logout()">{{user.name}}</a></div>
<div class="login btn-green" ng-show="logged"><span>{{user.name || user.email}}</span><a href ng-click="logout()">Logout</a></div>
</header>
<div class="grid-body">
<aside class="label-black sidebar">
Expand Down
2 changes: 2 additions & 0 deletions app/templates/view.html
View file
Open in desktop
Expand Up @@ -10,13 +10,15 @@ <h1 class="title">{{data.titulo || data.name}}</h1>
<div ng-if="data.conteudo">
<img style="max-width: 100%" src="http://www.fct.unl.pt/sites/default/files/imagens/noticias/noticias.jpg">
<br>
<p>{{data.conteudo}}</p>
<span>Ver notícia completa </span><a ng-href="{{data.link}}">aqui</a>
<hr>
</div>

<div ng-if="!data.conteudo && !data.videoId">
<img style="max-width: 100%" src="{{data.image}}">
<br>
<p>{{data.desc}}</p>
<span>Ver evento completo </span><a ng-href="{{data.link}}">aqui</a>
<hr>
</div>
Expand Down