Merge branch 'fix_first_sync'

This commit is contained in:
Lisa Passing 2015-05-11 13:53:55 +02:00
commit f697278527
20 changed files with 61 additions and 1023 deletions

View File

@ -8,32 +8,18 @@
@import "app/ansi"; @import "app/ansi";
@import "app/auth"; @import "app/auth";
// @import "app/caches";
@import "app/charm"; @import "app/charm";
// @import "app/flash";
@import "app/forms"; @import "app/forms";
// @import "app/getting_started";
@import "app/github"; @import "app/github";
// @import "app/left/list";
// @import "app/left";
@import "app/loading"; @import "app/loading";
@import "app/main/annotations"; @import "app/main/annotations";
@import "app/main/list"; @import "app/main/list";
@import "app/main/log"; @import "app/main/log";
@import "app/main/sponsors"; @import "app/main/sponsors";
// @import "app/main";
// @import "app/maximize";
@import "app/misc"; @import "app/misc";
@import "app/popup"; @import "app/popup";
@import "app/pro"; @import "app/pro";
// @import "app/profile/hooks";
// @import "app/profile";
// @import "app/requests";
// @import "app/right/lists";
// @import "app/right/sponsors";
// @import "app/right";
@import "app/settings"; @import "app/settings";
@import "app/tabs"; @import "app/tabs";
@ -66,9 +52,9 @@
@import "app/layouts/profile"; @import "app/layouts/profile";
@import "app/layouts/top"; @import "app/layouts/top";
@import "app/layouts/owner"; @import "app/layouts/owner";
// @import "app/top";
@import "app/landing"; @import "app/landing";
@import "app/layouts/requests"; @import "app/layouts/requests";
@import "app/layouts/caches"; @import "app/layouts/caches";
@import "app/layouts/getting-started"; @import "app/layouts/getting-started";
@import "app/layouts/first-sync";

View File

@ -1,43 +0,0 @@
.delete-repo-caches.deleting
background-color: #bbb
background-image: inline-image('ui/round-spinner.svg')
background-repeat: no-repeat
background-position: center
background-size: 20px
text-indent: -9999px
.delete-repo-caches
display: inline-block
margin: 6px 0 15px 0
color: #ffffff
background-color: #932828
border-radius: 4px
padding: 4px 15px 4px 15px
font-size: 13px
cursor: pointer
#caches
.delete
color: #EA0000
.delete.deleting:after
content: ""
background-image: inline-image('ui/spinner.svg')
background-repeat: no-repeat
background-position: center
background-size: 13px
width: 13px
height: 10px
display: inline-block
.caches-group
padding-bottom: 5px
.branch
font-size: 14px
font-weight: bold
.caches-group .label
font-weight: bold
.caches-list
padding-top: 5px
padding-left: 14px

View File

@ -1,39 +0,0 @@
.flash
color: #fff
font-weight: bold
li
position: relative
margin: -10px -40px 20px -30px
padding: 15px 60px 15px 30px
a
color: #ffffff
text-decoration: underline
.success
background-color: $color-bg-flash-success
.notice
background-color: $color-bg-flash-notice
.error
background-color: $color-bg-flash-error
.broadcast
background-color: $color-bg-flash-broadcast
p
margin: 0
.close
display: block
position: absolute
top: 17px
right: 30px
width: 16px
height: 16px
background: inline-image('ui/close-white.svg') no-repeat 0 0
cursor: pointer

View File

@ -1,120 +0,0 @@
#first_sync
width: 850px
margin: 0 auto
padding-top: 30px
font-size: 17px
line-height: 26px
text-align: center
.first-sync-head
font-size: 35px
color: #337389
font-weight: 800
text-align: center
margin: 0
.few-more
color: #919191
font-size: 20px
font-weight: 400
text-align: center
padding: 0
margin: 0
.great-news
font-size: 35px
color: #337389
text-align: center
color: #c44845
font-weight: 800
margin: 0
p
text-align: left
padding-bottom: 10px
.spinner
border: 0px
padding-bottom: 30px
align: center
.sync-row
display: inline-block
clear: all
padding-top: 30px
.sync-column
padding-right: 28px
max-width: 380px
display: block
float: left
clear: all
#getting-started
width: 850px
margin: 0 auto
padding-top: 30px
font-family: 'Source Sans Pro'
text-align: left
h2
color: #919191
font-weight: 400
line-height: 30px
text-align: center
h3
font-size: 30px
color: #337389
text-align: center
.getting-started-row
display: inline-block
clear: all
padding-top: 30px
a
color: #337389
text-decoration: underline
&:hover
color: #607a84
text-decoration: underline
img
padding: 0
float: none
margin: 15px 0 0 0
width: 450px
p
font-size: 17px
line-height: 26px
.after-steps
padding-top: 50px
border-top : 1px solid #AAAAAA
.column
padding-right: 20px
max-width: 450px
display: block
float: left
clear: all
.column-right
width: 40%
display: block
float: left
clear: all
.steps
display: block
margin-top: 10px
font-size: 22px
line-height: 30px
font-weight: 400
color: #bc3c3c
.end-of-steps
padding-bottom: 50px

View File

@ -110,56 +110,3 @@
a a
margin-left: 5px margin-left: 5px
// @media screen and (max-width: 1400px)
// #left .duration_label
// display: inline-block
// width: 11px
// height: 11px
// margin-right: 1px
// text-indent: 10px
// overflow: hidden
// background: inline-image('ui/clock.svg') no-repeat 0px 0px
// background-size: contain
// @media screen and (max-width: 1400px)
// #left .finished_at_label
// display: none
// @media screen and (max-width: 1400px)
// table#builds .committer
// display: none
// @media handheld, only screen and (max-device-width: 980px)
// #left
// display: none
// #main
// min-width: 99%
// max-width: 99%
// padding: 0px
// .tabs
// margin-top: 5px
// p.description
// margin: 5px 0px
// #repo
// padding: 15px 10px
// width: 95%
// #top
// width: 100%
// min-width: 960px
// #tools
// display: none
// a
// text-decoration : none
// .application,
// .dashboard
// height: 100%
// .no-padding
// padding : 0

View File

@ -0,0 +1,23 @@
.mascot
display: block
margin: 0 0 50px 0
height: 150px
background: inline-image('travis-mascot-150.png') 50% 0 no-repeat
background-size: 150px 150px
.first-sync
margin-top: 5rem
text-align: center
.great-news
margin: 1.5em 0 1em
font-size: 36px
font-weight: 400
color: $grey3
p
font-size: $font-size-ml
line-height: 1.5

View File

@ -2,7 +2,7 @@
* Footer on the dashboard * Footer on the dashboard
*/ */
$footer-height: 204px $footer-height: 210px
a a
color : $color-link color : $color-link
@ -28,7 +28,7 @@ footer
height: auto height: auto
@media (min-width: 640px) @media (min-width: 640px)
.wrapper .wrapper
padding-bottom: $footer-height + 50 padding-bottom: $footer-height
footer footer
margin-top: - $footer-height margin-top: - $footer-height

View File

@ -1,20 +0,0 @@
#left
#search_box
height: 87px
padding: 35px 20px 90px 20px
background-color: $left-bg
input[type=text]
height: 28px
width: 100%
padding: 0 0 0 10px
color: $color-text
font-size: $font-size-small
border: 0
background: $color-bg-input inline-image('ui/search.svg') no-repeat 95%
background-size: 3%
@media #{$large-up}
background-size: 5%

View File

@ -1,131 +0,0 @@
#accounts,
#repos
@include resetul
&.open li .info
display: block
a:hover,
a:active
text-decoration: underline
a:focus
outline: 1px dotted
li
position: relative
font-size: $font-size-big
padding: 15px 20px 15px 15px
border-bottom: 1px solid $color-border-light
background-repeat: no-repeat
cursor: pointer
&:nth-child(odd),
&:nth-child(odd) .indicator span
background-color: $color-bg-list-odd
&:nth-child(even),
&:nth-child(even) .indicator span
background-color: $color-bg-list-even
.slug-and-status
white-space: nowrap
overflow: hidden
text-overflow: ellipsis
padding-right: 35px
a
display: inline-block
width: 91%
text-overflow: ellipsis
overflow: hidden
vertical-align: top
.last_build
position: absolute
top: 15px
right: 20px
text-align: right
// font-size: $font-size-normal
// border: 1px solid #ddd
// @include border-radius(10px)
.summary
margin: 5px 0 0 0
white-space: nowrap
overflow: hidden
text-overflow: ellipsis
color: $color-text-light
font-size: $font-size-small
.duration-icon
display: inline-block
width: 10px
height: 10px
margin-right: 5px
background-image: inline-image('ui/clock.svg')
background-size: cover
.finished-icon
display: inline-block
width: 10px
height: 10px
margin-right: 5px
background-image: inline-image('ui/cal.svg')
background-size: cover
.info
overflow: hidden
margin: 12px -20px -15px -45px
font-size: $font-size-small
background-color: $color-bg-list-info
color: $color-text-list-info
display: none
p
margin: 0 -10px 0 -10px
padding: 12px 35px 12px 73px
box-shadow: $color-shadow-list-info 0 1px 8px 0 inset
.indicator
display: none
position: absolute
top: 0
right: -20px
width: 20px
height: 100%
overflow: hidden
span
position: relative
display: block
top: calc(50% - 10px)
left: -15px
width: 20px
height: 20px
border: 1px solid $color-border-normal
transform: rotate(45deg)
&.selected .indicator
display: block
#left .loading
padding: 15px 25px 15px 30px
background-color: $color-bg-list-odd
background-image: none
#accounts
li
margin-left: -4px
padding-left: 52px
&.user
background-image: inline-image('ui/user.svg')
background-position: 29px 18px
background-size: 0.9em
&.organization
background-image: inline-image('ui/org.svg')
background-position: 24px 18px
background-size: 0.9em
.summary
margin-left: 0
.indicator
span
top: 32px

View File

@ -1,21 +0,0 @@
#main
h3
margin: 13px 5px 0 0
font-size: $font-size-huge
line-height: 1
a
color: $main-repo-link-color
text-decoration: none
a:hover
color: $main-repo-hover-color
text-decoration: underline
#stats
#main
width: 600px
padding: 20px 0 0 0
margin-left: auto
margin-right: auto

View File

@ -1,27 +0,0 @@
#global_slider
display: none
.pro.maximized
#right
display: none
#profile, #home
&.pro.maximized .application
#global_slider
position: absolute
background-color: $color-bg-slider
cursor: pointer
background: transparent inline-image('ui/slider-open.svg') no-repeat 6px 5px
border-top-left-radius: 4px
top: 85px
right: 0
width: 20px
height: 20px
border-bottom-left-radius: 4px
// display: block
&:hover
background-color: $color-border-slider-hover
// #top .profile
// margin-right: 15px

View File

@ -1,53 +0,0 @@
#profile
#main
padding-top: 40px
h3
height: 19px
padding-bottom: 50px
line-height: 19px
color: $color-text
img
float: left
width: 100px
height: 100px
margin: 3px 20px 0 0
border-radius: 100px
background-color: $color-bg-light
dl.profile
display: table
font-size: 18px
line-height: 30px
margin: 0 0 20px 0
div
display: table-row
dt
color: #939386
font-weight: 600
display: table-cell
padding-right: 20px
dd
margin-left: 0
color: #337389
a
color: #337389
form
clear: left
.tip
margin-top: -5px
color: $color-text-light
.message
margin-top: 20px
padding: 10px 10px
color: $color-text-light
border: 1px solid #DDD
.sync_now
float: right
margin-top: -6px

View File

@ -1,76 +0,0 @@
#profile
#unadministerable-hooks
margin-top: 15px
h3
font-size: $font-size-big
.tip
margin-top: 5px
#hooks, #unadministerable-hooks
@include resetul
.travis-switch
font-size: 10px
margin-top: 10px
li
box-sizing: content-box
position: relative
height: 19px
padding: 10px
white-space: nowrap
overflow: hidden
border-bottom: 1px solid $color-border-light
&:nth-child(odd)
background-color: $color-bg-hooks-odd
.controls
background: $color-bg-hooks-odd
&:nth-child(even)
background-color: $color-bg-hooks-even
.controls
background: $color-bg-hooks-even
> a
float: left
font-size: $font-size-big
text-decoration: none
.description
display: none
margin-left: 10px
line-height: 22px
font-size: $font-size-smaller
white-space: nowrap
overflow: hidden
text-overflow: ellipsis
color: $color-text-light
.controls
position: absolute
top: 8px
right: 0
white-space: nowrap
a
float: left
display: block
.repo-settings-icon
// Overriding an earlier definition above, which is probably
// obsolete. TODO: Remove if so.
position: relative
height: 20px
width: 20px
padding-right: 0
background: inline-image('ui/repo-settings.png') no-repeat 3px 4px
&:hover
> a
color: $color-link-highlight
.description
display: inline

View File

@ -1,23 +0,0 @@
#request
h3
font-size: 120%
padding-left: 15px
background-position: 0px 6px
background-repeat: no-repeat
&.accepted
h3
background-image: inline-image('icons/state-passed.svg')
color: $color-text-status-passed
&.rejected
h3
background-image: inline-image('icons/state-failed.svg')
color: $color-text-status-failed
.pr-number
border-bottom: dotted black 1px
#requests
td.commit-message
max-width: 250px
overflow: hidden
text-overflow: ellipsis

View File

@ -1,31 +0,0 @@
#profile
#right
padding-top: 13px
padding-right: 20px
padding-left: 20px
background-color: #E9E9E7
border-left: 1px solid $color-border-normal
h4
margin: 24px 0 0 0
ul
margin-top: 10px
.box
margin-top: 15px
margin-left: -3px
padding: 15px
border: 1px solid #e0e0e0
background-color: $white
h4
margin: 0
a
text-decoration: underline
li
list-style-type: square
margin-left: 15px

View File

@ -1,103 +0,0 @@
#right
.tabs
margin-top: 28px
height: 25px
border-bottom-color: $color-border-light
li
display: inline-block
height: 24px
margin-right: 5px
background-color: $color-bg-right
border: 1px solid $color-bg-right
border-bottom-color: $color-border-light
white-space: nowrap
cursor: pointer
border-top-radius: 2px
font-size: 10px
&:hover
background-color: $color-bg-tab-hover
border-color: $color-border-light
border-bottom-color: $color-bg-tab-active
.active
background-color: $color-bg-tab-active
border-color: $color-border-light
border-bottom-color: $color-bg-tab-active
h5
margin: 0
font-size: $font-size-small
font-weight: normal
line-height: 26px
a
display: block
padding: 0 10px
.pane
position: relative
#toggle-workers
position: absolute
top: -30px
right: 5px
display: inline-block
width: 10px
height: 10px
cursor: pointer
background: inline-image('ui/workers-open.svg') no-repeat left 5px
&.open
background-image: inline-image('ui/workers-close.svg')
#workers li ul
display: none
#queues
margin-top: 0
#workers li,
#queues ul li
overflow: hidden
white-space: nowrap
margin: 0
list-style-type: none
h5
font-size: $font-size-small
font-weight: normal
margin: 0px
cursor: pointer
ul
margin-top: 8px
margin-bottom: 5px
padding-left: 1px
.name,
.slug
display: inline-block
display: -moz-inline-stack
overflow: hidden
white-space: nowrap
text-overflow: ellipsis
vertical-align: top
.name
max-width: 140px
.slug
max-width: 150px
&.open ul
display: block
.status
display: inline-block
width: 8px
height: 8px
margin-right: 3px
border-radius: 4px

View File

@ -1,58 +0,0 @@
#right
.sponsors
&.top
height: 140px
margin-left: -3px
li
overflow: hidden
width: 205px
margin: 0 0 8px 0
border: 1px solid $color-border-light
border-radius: 8px
list-style-type: none
a
overflow: hidden
img
z-index: 200
overflow: hidden
width: 205px
border-radius: 8px
.platinum
height: 130px
img
height: 130px
.gold
height: 60px
img
height: 60px
.silver
h5
margin: 0
p
margin: 0
.box .sponsors
li
list-style-type: none
margin-left: 0
padding-bottom: 12px
a
color: $color-link-sponsor
font-weight: bold
text-decoration: none
.hint
margin: 0 0 0 2px
font-size: $font-size-tiny
text-align: left
a
color: $gray-medium-1

View File

@ -1,177 +0,0 @@
$top-height: 55px
.top
position: relative
z-index: 999
font-size: $font-size-normal
background: $topbar-bg
.navigation
@include resetul
height: 0
overflow: hidden
line-height: $top-height
&.is-open
height: auto
ul
@include resetul
line-height: 30px
a, span
color: $white
text-decoration: none
li
border-top: 1px solid $topbar-bg-darker
a, span
display: block
padding: 2px 12px 0
&:hover
color: $color-link-top-highlight
img
margin: 10px 10px 7px 10px
width : 30px
height : 30px
border-radius: 100px
@media #{$medium-up}
float : right
margin : 12px 0 0 10px
a.werehiring
background-color: $topbar-bg-darker
border-radius: 4px
padding: 8px 16px
line-height: 20px
margin-right: 80px
display: inline
li.traviscicom
a
padding-left: 0px
@media #{$medium-up}
overflow: visible
height: $top-height
.navigation
height: auto
overflow: visible
ul
line-height: $top-height
position: relative
li
display: inline-block
border: none
@media #{$medium-only}
li.traviscicom
display: none
.menu
position: relative
&.signed-out
ul
display: none
.handle
margin: 0
&:hover > ul
display: block
ul li a
padding-left: 3em
@media #{$medium-up}
ul
display: none
position: absolute
z-index: 300
right: 0px
top: 52px
width: 100%
background-color: $color-bg-dropdown
li
display: block
li a
display: block
line-height: 24px
white-space: nowrap
padding: 5px 20px
&:hover
background-color: $color-bg-dropdown-highlight
.menu.community
min-width: 120px
.menu.profile
padding: 0.2em 0px 0.5em
.centered & .handle a
padding-right: 0
@media #{$medium-up}
padding: 0
&.signed-in
top: 2px
img
width: 30px
height: 30px
border-radius: 100px
ul
min-width: 145px
a
padding: 5px 25px 5px 45px
@media #{$medium-up}
float: right
.handle > *
display: none
padding: 0 15px 0 45px
.signed-out, .signing-in
min-width: 110px
&.signed-out .signed-out
display: block
&.signing-in .signing-in
display: inline-block
&.signed-in .signed-in
display: block
&:not(.signed-in):hover ul
display: none
.logo
position: relative
float : left
width : 123px
height : $top-height
margin-right : 14px
z-index: 999
text-indent : -9999px
background : $logo-red inline-image('ui/travis-logo.svg') no-repeat 20px 18px
a
display: block
.burger
overflow: auto
height: $top-height
@media #{$medium-up}
display: none
.burger-btn
float: right
font-size: 50px
background: none
border: none
line-height: 1
color: $white
outline: none !important
@include clearfix
&:hover
cursor: pointer

View File

@ -1,30 +1,25 @@
<div id="first_sync"> <div id="first_sync" class="row first-sync">
<div class="column medium-6 medium-centered">
{{#if isSyncing}} {{#if isSyncing}}
<img src="/images/getting-started/mustache-spinner.gif" class="spinner" width="300"> <img src="/images/getting-started/mustache-spinner.gif" class="spinner" width="300">
<p class="first-sync-head">One more thing</p> <h1 class="first-sync-head great-news">One more thing</h1>
<p class="few-more">Just a few more seconds as we talk to GitHub to find out which repositories belong to you.</p> <p class="few-more">Just a few more seconds as we talk to GitHub to find out which repositories belong to you.</p>
<div class="sync-row">
<div class="sync-column">
<p class="align-right"> <p class="align-right">
If you're part of an organization that already has repositories set up on Travis CI, we'll take you to the list once we're done. If you're part of an organization that already has repositories set up on Travis CI, we'll take you to the list once we're done.
</p> </p>
</div>
<div class="sync-column">
<p> <p>
If you're not part of any existing organizations yet, we'll take you to a handy getting started guide to get you off the ground quickly. If you're not part of any existing organizations yet, we'll take you to a handy getting started guide to get you off the ground quickly.
</p> </p>
</div>
</div>
{{/if}} {{/if}}
{{#unless isSyncing}} {{#unless isSyncing}}
<div class="sync-row"> <figure>
<img src="/images/getting-started/mustache-no-spin.png" class="spinner" width="100"> <span class="mascot"></span>
<p class="great-news">Great news!</p> </figure>
<h1 class="great-news">Great news!</h1>
<p> <p>
We've successfully synchronized your details from GitHub. We will redirect you to your profile in a few seconds. We've successfully synchronized your details from GitHub.<br>We will redirect you to your profile in a few seconds.
</p> </p>
</div>
{{/unless}} {{/unless}}
</div>
</div> </div>

View File

@ -1,9 +1,18 @@
<div id="top" class="top"> <div class="wrapper">
<header id="top" class="topbar">
<div class="centered">
{{render "top"}} {{render "top"}}
</div> </div>
</header>
{{render "flash"}} <div class="centered">
{{render "flash"}}
<div id="main"> <div id="main" class="main" role="main">
{{yield}} {{yield}}
</div>
</div>
</div> </div>
<footer>
{{render "footer"}}
</footer>