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

add font and rearrange imports

Browse Source
This commit is contained in:
Lisa Passing 2015-02-06 13:34:52 +01:00
parent 9846b41861
commit 4efd8f9f66
39 changed files with 20 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/index.html
View File

@ -9,6 +9,7 @@
{{content-for 'head'}} {{content-for 'head'}}
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,800' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="assets/vendor.css"> <link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/travis.css"> <link rel="stylesheet" href="assets/travis.css">

19
app/styles/app.scss
View File

@ -1,4 +1,11 @@
@import "app/app"; @import "app/_mixins/colors";
@import "app/_mixins/fonts";
@import "app/_mixins/vars";
@import "app/foundation/scss/foundation/_settings";
@import "app/foundation/scss/foundation/components/_grid";
@import "app/_mixins/mixins";
@import "app/ansi"; @import "app/ansi";
@import "app/auth"; @import "app/auth";
@import "app/button"; @import "app/button";
@ -11,10 +18,7 @@
@import "app/forms"; @import "app/forms";
@import "app/getting_started"; @import "app/getting_started";
@import "app/github"; @import "app/github";
@import "app/layout";
@import "app/layouts/dashboard";
@import "app/layouts/error";
@import "app/layouts/footer";
@import "app/left/list"; @import "app/left/list";
@import "app/left"; @import "app/left";
@import "app/loading"; @import "app/loading";
@ -41,4 +45,9 @@
@import "app/status"; @import "app/status";
@import "app/tabs"; @import "app/tabs";
@import "app/tipsy"; @import "app/tipsy";
@import "app/layout";
@import "app/layouts/dashboard";
@import "app/layouts/error";
@import "app/layouts/footer";
@import "app/top"; @import "app/top";

5
app/styles/app/_mixins/all.sass → app/styles/app/_mixins/mixins.sass
View File

@ -1,8 +1,3 @@
@import "colors"
@import "fonts"
@import "vars"
@import "../foundation/scss/foundation/_settings"
@import "../foundation/scss/foundation/components/_grid"
@mixin popup @mixin popup
display: none display: none

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

@ -1,5 +1,3 @@
@import "./_mixins/all"
// ansi styles, see javascripts/lib/deansi.js // ansi styles, see javascripts/lib/deansi.js
.ansi .ansi
.bold .bold

1
app/styles/app/app.sass
View File

@ -1,4 +1,3 @@
@import "_mixins/all"
html, body html, body
font-family: 'Source Sans Pro', Helvetica, sans-serif font-family: 'Source Sans Pro', Helvetica, sans-serif

1
app/styles/app/auth.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
#auth #auth
#main #main

1
app/styles/app/button.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
.button .button
position: relative position: relative

1
app/styles/app/components/tiles.sass
View File

@ -1,7 +1,6 @@
/* /*
* tile component as seen on dashboard * tile component as seen on dashboard
*/ */
@import "../_mixins/all"
.tiles .tiles
background : #f4f3ea background : #f4f3ea

1
app/styles/app/flash.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
.flash .flash
color: #fff color: #fff

1
app/styles/app/github.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
#github-wrapper #github-wrapper
position: absolute position: absolute

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

@ -1,5 +1,3 @@
@import "./_mixins/all"
.centered .row .centered .row
max-width: 1024px max-width: 1024px

3
app/styles/app/layouts/dashboard.sass
View File

@ -3,9 +3,6 @@
* @todo: split into components: filter, search * @todo: split into components: filter, search
*/ */
@import "../_mixins/all"
.wrapper-dashboard .wrapper-dashboard
background-color: $wrapper-bg-color background-color: $wrapper-bg-color

1
app/styles/app/layouts/error.sass
View File

@ -1,7 +1,6 @@
/* /*
* Error Pages * Error Pages
*/ */
@import "../_mixins/all"
.main--error .main--error
min-height: 100% min-height: 100%

1
app/styles/app/layouts/footer.sass
View File

@ -1,7 +1,6 @@
/* /*
* Footer on the dashboard * Footer on the dashboard
*/ */
@import "../_mixins/all"
footer footer
padding : 20px 0 padding : 20px 0

1
app/styles/app/left.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all.sass"
#left #left
#search_box #search_box

1
app/styles/app/left/list.sass
View File

@ -1,4 +1,3 @@
@import "../_mixins/all"
#accounts, #accounts,
#repos #repos

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

@ -1,4 +1,3 @@
@import "./_mixins/all"
.loading .loading
padding: 15px 25px 0 0 padding: 15px 25px 0 0

1
app/styles/app/main.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
#main #main
h3 h3

1
app/styles/app/main/annotations.sass
View File

@ -1,4 +1,3 @@
@import "../_mixins/all"
#annotations #annotations
@include clearfix @include clearfix

1
app/styles/app/main/list.sass
View File

@ -1,4 +1,3 @@
@import "../_mixins/all"
table.list table.list
width: 100% width: 100%

1
app/styles/app/main/log.sass
View File

@ -1,4 +1,3 @@
@import "../_mixins/all"
pre#log pre#log
position: relative position: relative

1
app/styles/app/main/repository.sass
View File

@ -1,4 +1,3 @@
@import "../_mixins/all"
#repo #repo
position: relative position: relative

2
app/styles/app/main/summary.sass
View File

@ -1,5 +1,3 @@
@import "../_mixins/all"
@import "../foundation/scss/foundation/components/_grid"
.green .build-status .green .build-status
background: #549e54 inline-image('icons/state-passed-white.svg') no-repeat background: #549e54 inline-image('icons/state-passed-white.svg') no-repeat

3
app/styles/app/main/tools.sass
View File

@ -1,4 +1,3 @@
@import "../_mixins/all"
#tools #tools
@ -16,7 +15,7 @@
margin-top: -32px margin-top: -32px
color: #fff color: #fff
font-size: 13px font-size: 13px
padding: 3px 24px 0 25px padding: 3px 24px 2px 25px
background-image: inline-image('icons/settings.svg'), inline-image('icons/dropdown-arrow-white.svg') background-image: inline-image('icons/settings.svg'), inline-image('icons/dropdown-arrow-white.svg')
background-size: 14px 14px, 8px 8px background-size: 14px 14px, 8px 8px
background-position: 6px 7px, right 9px center background-position: 6px 7px, right 9px center

1
app/styles/app/maximize.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
.pro.maximized .pro.maximized
#right #right

1
app/styles/app/misc.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
.display .display
display: block !important display: block !important

1
app/styles/app/popup.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
.help .help
display: inline-block display: inline-block

1
app/styles/app/pro.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
.pro .pro
#log-container #log-container

1
app/styles/app/profile.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
#profile #profile
#main #main

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

@ -1,4 +1,3 @@
@import "../_mixins/all"
#profile #profile
#unadministerable-hooks #unadministerable-hooks

1
app/styles/app/requests.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
#request #request
h3 h3

1
app/styles/app/right.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
#profile #profile
#right #right

1
app/styles/app/right/lists.sass
View File

@ -1,4 +1,3 @@
@import "../_mixins/all"
#right #right
.tabs .tabs

1
app/styles/app/right/sponsors.sass
View File

@ -1,4 +1,3 @@
@import "../_mixins/all"
#right #right
.sponsors .sponsors

1
app/styles/app/stats.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
#repo_count_container, #repo_count_container,
#build_count_container #build_count_container

1
app/styles/app/status.sass
View File

@ -1,4 +1,3 @@
@import "./_mixins/all"
.status .status
display: inline-block display: inline-block

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

@ -1,9 +1,5 @@
@import "./_mixins/all"
@import "./foundation/scss/foundation/_settings"
.tabs .tabs
li li
height: 28px height: 28px
vertical-align: top vertical-align: top

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

@ -1,8 +1,7 @@
@import "./_mixins/all"
#top #top
position: static position: static
font-size: $font-size-normal font-size: $font-size-small
background : $topbar-bg background : $topbar-bg
height: 55px height: 55px
overflow: hidden overflow: hidden
@ -50,7 +49,7 @@
ul ul
line-height: 55px line-height: 55px
position: relative position: relative
top: 2px top: 3px
li li
display: inline-block display: inline-block
border: none border: none

2
config/environment.js
View File

@ -60,7 +60,7 @@ module.exports = function(environment) {
ENV.contentSecurityPolicy = { ENV.contentSecurityPolicy = {
'default-src': "'none'", 'default-src': "'none'",
'script-src': "'self'", 'script-src': "'self'",
'font-src': "'self'", 'font-src': "'self' https://fonts.googleapis.com/css",
'connect-src': "'self' https://api.travis-ci.org ws://ws.pusherapp.com wss://ws.pusherapp.com http://sockjs.pusher.com", 'connect-src': "'self' https://api.travis-ci.org ws://ws.pusherapp.com wss://ws.pusherapp.com http://sockjs.pusher.com",
'img-src': "'self' data: https://www.gravatar.com http://www.gravatar.com", 'img-src': "'self' data: https://www.gravatar.com http://www.gravatar.com",
'style-src': "'self'", 'style-src': "'self'",