From 4efd8f9f66dfd2075aff23b9a60f6f6bcb8ed88b Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 6 Feb 2015 13:34:52 +0100 Subject: [PATCH] add font and rearrange imports --- app/index.html | 1 + app/styles/app.scss | 21 +++++++++++++------ .../app/_mixins/{all.sass => mixins.sass} | 5 ----- app/styles/app/ansi.sass | 2 -- app/styles/app/app.sass | 1 - app/styles/app/auth.sass | 1 - app/styles/app/button.sass | 1 - app/styles/app/components/tiles.sass | 1 - app/styles/app/flash.sass | 1 - app/styles/app/github.sass | 1 - app/styles/app/layout.sass | 2 -- app/styles/app/layouts/dashboard.sass | 3 --- app/styles/app/layouts/error.sass | 1 - app/styles/app/layouts/footer.sass | 1 - app/styles/app/left.sass | 1 - app/styles/app/left/list.sass | 1 - app/styles/app/loading.sass | 1 - app/styles/app/main.sass | 1 - app/styles/app/main/annotations.sass | 1 - app/styles/app/main/list.sass | 1 - app/styles/app/main/log.sass | 1 - app/styles/app/main/repository.sass | 1 - app/styles/app/main/summary.sass | 2 -- app/styles/app/main/tools.sass | 3 +-- app/styles/app/maximize.sass | 1 - app/styles/app/misc.sass | 1 - app/styles/app/popup.sass | 1 - app/styles/app/pro.sass | 1 - app/styles/app/profile.sass | 1 - app/styles/app/profile/hooks.sass | 1 - app/styles/app/requests.sass | 1 - app/styles/app/right.sass | 1 - app/styles/app/right/lists.sass | 1 - app/styles/app/right/sponsors.sass | 1 - app/styles/app/stats.sass | 1 - app/styles/app/status.sass | 1 - app/styles/app/tabs.sass | 4 ---- app/styles/app/top.sass | 5 ++--- config/environment.js | 2 +- 39 files changed, 20 insertions(+), 58 deletions(-) rename app/styles/app/_mixins/{all.sass => mixins.sass} (65%) diff --git a/app/index.html b/app/index.html index acba4eaa..993dbc13 100644 --- a/app/index.html +++ b/app/index.html @@ -9,6 +9,7 @@ {{content-for 'head'}} + diff --git a/app/styles/app.scss b/app/styles/app.scss index ee23f640..0fe06a53 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -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/auth"; @import "app/button"; @@ -11,10 +18,7 @@ @import "app/forms"; @import "app/getting_started"; @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"; @import "app/loading"; @@ -41,4 +45,9 @@ @import "app/status"; @import "app/tabs"; @import "app/tipsy"; -@import "app/top"; + +@import "app/layout"; +@import "app/layouts/dashboard"; +@import "app/layouts/error"; +@import "app/layouts/footer"; +@import "app/top"; \ No newline at end of file diff --git a/app/styles/app/_mixins/all.sass b/app/styles/app/_mixins/mixins.sass similarity index 65% rename from app/styles/app/_mixins/all.sass rename to app/styles/app/_mixins/mixins.sass index 99f78de5..4d038aff 100644 --- a/app/styles/app/_mixins/all.sass +++ b/app/styles/app/_mixins/mixins.sass @@ -1,8 +1,3 @@ -@import "colors" -@import "fonts" -@import "vars" -@import "../foundation/scss/foundation/_settings" -@import "../foundation/scss/foundation/components/_grid" @mixin popup display: none diff --git a/app/styles/app/ansi.sass b/app/styles/app/ansi.sass index 92b813dc..6d027648 100644 --- a/app/styles/app/ansi.sass +++ b/app/styles/app/ansi.sass @@ -1,5 +1,3 @@ -@import "./_mixins/all" - // ansi styles, see javascripts/lib/deansi.js .ansi .bold diff --git a/app/styles/app/app.sass b/app/styles/app/app.sass index abb4639e..2764be70 100644 --- a/app/styles/app/app.sass +++ b/app/styles/app/app.sass @@ -1,4 +1,3 @@ -@import "_mixins/all" html, body font-family: 'Source Sans Pro', Helvetica, sans-serif diff --git a/app/styles/app/auth.sass b/app/styles/app/auth.sass index dd8247c6..c12cb26b 100644 --- a/app/styles/app/auth.sass +++ b/app/styles/app/auth.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" #auth #main diff --git a/app/styles/app/button.sass b/app/styles/app/button.sass index 7c104999..20416969 100644 --- a/app/styles/app/button.sass +++ b/app/styles/app/button.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" .button position: relative diff --git a/app/styles/app/components/tiles.sass b/app/styles/app/components/tiles.sass index 865b468b..7d499f1f 100644 --- a/app/styles/app/components/tiles.sass +++ b/app/styles/app/components/tiles.sass @@ -1,7 +1,6 @@ /* * tile component as seen on dashboard */ -@import "../_mixins/all" .tiles background : #f4f3ea diff --git a/app/styles/app/flash.sass b/app/styles/app/flash.sass index 2ec5fedf..5f8bb172 100644 --- a/app/styles/app/flash.sass +++ b/app/styles/app/flash.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" .flash color: #fff diff --git a/app/styles/app/github.sass b/app/styles/app/github.sass index 974ac021..f7a0b394 100644 --- a/app/styles/app/github.sass +++ b/app/styles/app/github.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" #github-wrapper position: absolute diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index e6f32d21..21c4a6a1 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -1,5 +1,3 @@ -@import "./_mixins/all" - .centered .row max-width: 1024px diff --git a/app/styles/app/layouts/dashboard.sass b/app/styles/app/layouts/dashboard.sass index b3595ef5..9e1732ea 100644 --- a/app/styles/app/layouts/dashboard.sass +++ b/app/styles/app/layouts/dashboard.sass @@ -3,9 +3,6 @@ * @todo: split into components: filter, search */ -@import "../_mixins/all" - - .wrapper-dashboard background-color: $wrapper-bg-color diff --git a/app/styles/app/layouts/error.sass b/app/styles/app/layouts/error.sass index 9ed13efd..186650e5 100644 --- a/app/styles/app/layouts/error.sass +++ b/app/styles/app/layouts/error.sass @@ -1,7 +1,6 @@ /* * Error Pages */ -@import "../_mixins/all" .main--error min-height: 100% diff --git a/app/styles/app/layouts/footer.sass b/app/styles/app/layouts/footer.sass index 00549493..b059d606 100644 --- a/app/styles/app/layouts/footer.sass +++ b/app/styles/app/layouts/footer.sass @@ -1,7 +1,6 @@ /* * Footer on the dashboard */ -@import "../_mixins/all" footer padding : 20px 0 diff --git a/app/styles/app/left.sass b/app/styles/app/left.sass index 05778c5d..96a30a12 100644 --- a/app/styles/app/left.sass +++ b/app/styles/app/left.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all.sass" #left #search_box diff --git a/app/styles/app/left/list.sass b/app/styles/app/left/list.sass index 44a5bcff..de9e367f 100644 --- a/app/styles/app/left/list.sass +++ b/app/styles/app/left/list.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" #accounts, #repos diff --git a/app/styles/app/loading.sass b/app/styles/app/loading.sass index dbfc7c0d..5abd0b2c 100644 --- a/app/styles/app/loading.sass +++ b/app/styles/app/loading.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" .loading padding: 15px 25px 0 0 diff --git a/app/styles/app/main.sass b/app/styles/app/main.sass index 295d5353..d8d6149b 100644 --- a/app/styles/app/main.sass +++ b/app/styles/app/main.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" #main h3 diff --git a/app/styles/app/main/annotations.sass b/app/styles/app/main/annotations.sass index 2282313f..35fe3b3c 100644 --- a/app/styles/app/main/annotations.sass +++ b/app/styles/app/main/annotations.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" #annotations @include clearfix diff --git a/app/styles/app/main/list.sass b/app/styles/app/main/list.sass index 87674206..e01b9831 100644 --- a/app/styles/app/main/list.sass +++ b/app/styles/app/main/list.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" table.list width: 100% diff --git a/app/styles/app/main/log.sass b/app/styles/app/main/log.sass index a88927ca..a843d362 100644 --- a/app/styles/app/main/log.sass +++ b/app/styles/app/main/log.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" pre#log position: relative diff --git a/app/styles/app/main/repository.sass b/app/styles/app/main/repository.sass index bd1b11cc..5d09f556 100644 --- a/app/styles/app/main/repository.sass +++ b/app/styles/app/main/repository.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" #repo position: relative diff --git a/app/styles/app/main/summary.sass b/app/styles/app/main/summary.sass index 9b6d8f88..6ffa0e0b 100644 --- a/app/styles/app/main/summary.sass +++ b/app/styles/app/main/summary.sass @@ -1,5 +1,3 @@ -@import "../_mixins/all" -@import "../foundation/scss/foundation/components/_grid" .green .build-status background: #549e54 inline-image('icons/state-passed-white.svg') no-repeat diff --git a/app/styles/app/main/tools.sass b/app/styles/app/main/tools.sass index 822692b7..a8313d7d 100644 --- a/app/styles/app/main/tools.sass +++ b/app/styles/app/main/tools.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" #tools @@ -16,7 +15,7 @@ margin-top: -32px color: #fff 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-size: 14px 14px, 8px 8px background-position: 6px 7px, right 9px center diff --git a/app/styles/app/maximize.sass b/app/styles/app/maximize.sass index 12912866..59532baf 100644 --- a/app/styles/app/maximize.sass +++ b/app/styles/app/maximize.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" .pro.maximized #right diff --git a/app/styles/app/misc.sass b/app/styles/app/misc.sass index b6ca55e2..0a6e4bb0 100644 --- a/app/styles/app/misc.sass +++ b/app/styles/app/misc.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" .display display: block !important diff --git a/app/styles/app/popup.sass b/app/styles/app/popup.sass index 94c4d10f..5ca08e0e 100644 --- a/app/styles/app/popup.sass +++ b/app/styles/app/popup.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" .help display: inline-block diff --git a/app/styles/app/pro.sass b/app/styles/app/pro.sass index 3a7fbc3f..477f3a7e 100644 --- a/app/styles/app/pro.sass +++ b/app/styles/app/pro.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" .pro #log-container diff --git a/app/styles/app/profile.sass b/app/styles/app/profile.sass index ae45f217..645d9146 100644 --- a/app/styles/app/profile.sass +++ b/app/styles/app/profile.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" #profile #main diff --git a/app/styles/app/profile/hooks.sass b/app/styles/app/profile/hooks.sass index ef67e0f8..1dfc70ad 100644 --- a/app/styles/app/profile/hooks.sass +++ b/app/styles/app/profile/hooks.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" #profile #unadministerable-hooks diff --git a/app/styles/app/requests.sass b/app/styles/app/requests.sass index cc07beca..efd61334 100644 --- a/app/styles/app/requests.sass +++ b/app/styles/app/requests.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" #request h3 diff --git a/app/styles/app/right.sass b/app/styles/app/right.sass index 0897c1bd..1f5dae75 100644 --- a/app/styles/app/right.sass +++ b/app/styles/app/right.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" #profile #right diff --git a/app/styles/app/right/lists.sass b/app/styles/app/right/lists.sass index 5c44cb3f..71e61b07 100644 --- a/app/styles/app/right/lists.sass +++ b/app/styles/app/right/lists.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" #right .tabs diff --git a/app/styles/app/right/sponsors.sass b/app/styles/app/right/sponsors.sass index 85d76de9..bdb1813b 100644 --- a/app/styles/app/right/sponsors.sass +++ b/app/styles/app/right/sponsors.sass @@ -1,4 +1,3 @@ -@import "../_mixins/all" #right .sponsors diff --git a/app/styles/app/stats.sass b/app/styles/app/stats.sass index 300c6d39..aecdcf56 100644 --- a/app/styles/app/stats.sass +++ b/app/styles/app/stats.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" #repo_count_container, #build_count_container diff --git a/app/styles/app/status.sass b/app/styles/app/status.sass index 5a988561..2ddd2618 100644 --- a/app/styles/app/status.sass +++ b/app/styles/app/status.sass @@ -1,4 +1,3 @@ -@import "./_mixins/all" .status display: inline-block diff --git a/app/styles/app/tabs.sass b/app/styles/app/tabs.sass index ec8e56e1..48c4e68f 100644 --- a/app/styles/app/tabs.sass +++ b/app/styles/app/tabs.sass @@ -1,9 +1,5 @@ -@import "./_mixins/all" -@import "./foundation/scss/foundation/_settings" .tabs - - li height: 28px vertical-align: top diff --git a/app/styles/app/top.sass b/app/styles/app/top.sass index 021023cb..8e976c16 100644 --- a/app/styles/app/top.sass +++ b/app/styles/app/top.sass @@ -1,8 +1,7 @@ -@import "./_mixins/all" #top position: static - font-size: $font-size-normal + font-size: $font-size-small background : $topbar-bg height: 55px overflow: hidden @@ -50,7 +49,7 @@ ul line-height: 55px position: relative - top: 2px + top: 3px li display: inline-block border: none diff --git a/config/environment.js b/config/environment.js index 516e62e4..5c30ae39 100644 --- a/config/environment.js +++ b/config/environment.js @@ -60,7 +60,7 @@ module.exports = function(environment) { ENV.contentSecurityPolicy = { 'default-src': "'none'", '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", 'img-src': "'self' data: https://www.gravatar.com http://www.gravatar.com", 'style-src': "'self'",