suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ember-cli' into error500

Browse Source
This commit is contained in:
Lisa Passing 2015-02-13 11:32:55 +01:00
commit f7b034102a
8 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/top.coffee
View File

@ -12,4 +12,10 @@ Controller = Ember.Controller.extend
"#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm" "#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm"
).property('user.gravatarId') ).property('user.gravatarId')
actions: {
toggleBurgerMenu: ->
@toggleProperty('is-open')
return false
}
`export default Controller` `export default Controller`

2
app/index.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Travis</title> <title>{{title}}</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">

20
app/styles/app/layout.sass
View File

@ -2,7 +2,8 @@
.centered .row .centered .row
max-width: 1024px max-width: 1024px
.main, .profile-view .main,
.profile-view
position: relative position: relative
width: 100% width: 100%
min-height: 100vh min-height: 100vh
@ -14,13 +15,10 @@
#not-found #main #not-found #main
padding: 100px 50px 0 50px padding: 100px 50px 0 50px
#left, #right, .wrapper-main
#left, #right
position: relative position: relative
min-height: 100%
#left #left
min-height: 100%
padding: 0 0 110px 0 padding: 0 0 110px 0
background-color: #fbfbfa background-color: #fbfbfa
border-right: 1px solid $color-border-normal border-right: 1px solid $color-border-normal
@ -52,17 +50,18 @@
// layout magic http://lea.verou.me/2011/01/styling-children-based-on-their-number-with-css3/ // layout magic http://lea.verou.me/2011/01/styling-children-based-on-their-number-with-css3/
.wrapper-main .wrapper-main
overflow: hidden overflow: hidden
height: 100%
& > div:first-child:nth-last-child(2) & > div:first-child:nth-last-child(2)
width: grid-calc(18, 24) width: grid-calc(20, 24)
float: left float: left
& > div:first-child:nth-last-child(2) ~ div & > div:first-child:nth-last-child(2) ~ div
width: grid-calc(6, 24) width: grid-calc(4, 24)
max-width: 180px
float: right float: right
.maximized .maximized
.wrapper-main .wrapper-main
overflow: hidden
& > div:first-child:nth-last-child(2) & > div:first-child:nth-last-child(2)
width: grid-calc(24, 24) width: grid-calc(24, 24)
float: none float: none
@ -71,10 +70,15 @@
display: none display: none
@media #{$large-up} @media #{$large-up}
#left, #right, .wrapper-main
min-height: 100vh
#left #left
width: grid-calc(5, 24) width: grid-calc(5, 24)
float: left float: left
margin-left: -100% margin-left: -100%
max-width: 325px
.wrapper-main .wrapper-main
width: grid-calc(19, 24) width: grid-calc(19, 24)

2
app/styles/app/loading.sass
View File

@ -1,5 +1,5 @@
div.loading div.loading, p.loading
padding: 15px 25px 0 0 padding: 15px 25px 0 0
span span
padding-right: 25px padding-right: 25px

2
app/styles/app/profile/hooks.sass
View File

@ -51,7 +51,7 @@
.controls .controls
position: absolute position: absolute
top: 10px top: 8px
right: 0 right: 0
white-space: nowrap white-space: nowrap
a a

4
app/styles/app/tabs.sass
View File

@ -72,10 +72,6 @@
#tab_new.display #tab_new.display
display: inline-block display: inline-block
@media #{$medium-up}
.tab
min-height: 100vh
#main #main
.tabs .tabs
border-bottom: 3px solid #f5f5f6 border-bottom: 3px solid #f5f5f6

24
app/styles/app/top.sass
View File

@ -1,9 +1,7 @@
#top #top
font-size: $font-size-small font-size: $font-size-normal
background : $topbar-bg background : $topbar-bg
height: 55px
overflow: hidden
#logo #logo
position: relative position: relative
@ -21,6 +19,12 @@
@include resetul @include resetul
line-height: 30px line-height: 30px
#navigation
height: 0
overflow: hidden
&.is-open
height: auto
a, span a, span
color: $white color: $white
text-decoration: none text-decoration: none
@ -47,6 +51,11 @@
@media #{$medium-up} @media #{$medium-up}
overflow: visible overflow: visible
height: 55px
#navigation
height: auto
overflow: visible
ul ul
line-height: 55px line-height: 55px
position: relative position: relative
@ -55,7 +64,7 @@
display: inline-block display: inline-block
border: none border: none
@media #{$medium} @media #{$medium-only}
li.traviscicom li.traviscicom
display: none display: none
@ -76,13 +85,12 @@
&:hover &:hover
cursor: pointer cursor: pointer
&.is-open
height: auto
.menu .menu
position: relative position: relative
&.signed-out
ul
display: none
.handle .handle
margin: 0 margin: 0

4
app/templates/top.hbs
View File

@ -5,10 +5,10 @@
{{/link-to}} {{/link-to}}
<div class="nav-burger"> <div class="nav-burger">
<button type="button" id="burger">&equiv;</button> <button type="button" id="burger" {{action 'toggleBurgerMenu'}}>&equiv;</button>
</div> </div>
<ul id="navigation"> <ul id="navigation" {{bind-attr class="is-open"}}>
<li class="home"> <li class="home">
{{#link-to "main"}}Home{{/link-to}} {{#link-to "main"}}Home{{/link-to}}
</li> </li>