diff --git a/app/styles/app/layouts/footer.sass b/app/styles/app/layouts/footer.sass
index 1e244a2a..6c97ba13 100644
--- a/app/styles/app/layouts/footer.sass
+++ b/app/styles/app/layouts/footer.sass
@@ -50,7 +50,7 @@ $blue-grey: #8f9ba2
flex: 0 1 16%
margin-left: 1em
&:first-of-type
- flex: 1 1 45%
+ flex: 1 1 30%
margin-left: 0
.status-circle
diff --git a/app/styles/app/layouts/settings.sass b/app/styles/app/layouts/settings.sass
index 11446efa..8cbceb29 100644
--- a/app/styles/app/layouts/settings.sass
+++ b/app/styles/app/layouts/settings.sass
@@ -88,12 +88,6 @@
@extend %settings-name-section
width: 100%
margin-bottom: 1em
- .icon-key
- @extend %icon
- @extend .icon-key
- width: 1.2em
- height: 1.3em
-
@media #{$medium-up}
width: 32%
margin-bottom: 0
@@ -110,16 +104,11 @@
display: inline-block
vertical-align: middle
overflow: hidden
+ color: #8e8f8e
.ssh-key-value
@extend %settings-value-section
word-break: break-all
- .icon-fingerprint
- @extend %icon
- @extend .icon-fingerprint
- width: 1.3em
- height: 1.3em
- margin-right: .5em
@media #{$medium-up}
width: grid-calc(6, 12)
word-break: normal
@@ -188,7 +177,7 @@
@extend .icon-delete-disabled
display: block
width: 1.1em
- height: 1.3em
+ height: 1.4em
margin: .2em auto 0
diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass
index cedcf80f..4a9d7d15 100644
--- a/app/styles/app/modules/icons.sass
+++ b/app/styles/app/modules/icons.sass
@@ -9,24 +9,6 @@
height: 1em
@extend %icon
-.icon-cog,
-.icon--cog
- background-image: inline-image('svg/settings_gray.svg')
- &:hover
- background-image: inline-image('svg/settings_teal.svg')
-
-.icon-api,
-.icon.api
- background-image: inline-image('svg/api-white.svg')
-.icon--grey.api
- background-image: inline-image('svg/api-light-grey.svg')
-
-.icon--cancel
- background-image: inline-image('svg/off.svg')
-
-.icon-sync
- background-image: inline-image('icons/sync-account-icon.svg')
-
%icon-download-log
background-image: url('data:image/svg+xml;utf8,')
%icon-remove-log
@@ -35,23 +17,22 @@
background-image: url('data:image/svg+xml;utf8,')
.icon--search
- background-image: inline-image('svg/search.svg')
+ background-image: inline-image('ui/search.svg')
.icon--dismiss-yellow
- background-image: inline-image('svg/icon-warning-dismiss.svg')
+ background-image: inline-image('ui/icon-warning-dismiss.svg')
.icon--dismiss-green
- background-image: inline-image('svg/icon-success-dismiss.svg')
+ background-image: inline-image('ui/icon-success-dismiss.svg')
.icon--dismiss-red
- background-image: inline-image('svg/icon-error-dismiss.svg')
+ background-image: inline-image('ui/icon-error-dismiss.svg')
.icon--dismiss-grey
- background-image: inline-image('svg/dismiss.svg')
+ background-image: inline-image('ui/dismiss.svg')
%icon-hook-on
- background-image: inline-image('svg/hooks-on.svg')
+ background-image: inline-image('ui/hooks-on.svg')
%icon-hook-off
- background-image: inline-image('svg/hooks-off.svg')
-
+ background-image: inline-image('ui/hooks-off.svg')
%icon-line-trashcan
background-image: url('data:image/svg+xml;utf8,')
@@ -67,18 +48,32 @@
.icon-delete-disabled
@extend %icon-line-trashcan-disabled
+%icon-line-key
+ background-image: url('data:image/svg+xml;utf8,')
.icon-key
- background-image: inline-image('svg/key.svg')
+ @extend %icon
+ @extend %icon-line-key
+ width: 1.2em
+ height: 1.3em
+ background-position: 0 6px
+ margin-right: .3em
+%icon-line-fingerprint
+ background-image: url('data:image/svg+xml;utf8,')
.icon-fingerprint
- background-image: inline-image('svg/fingerprint.svg')
-
+ @extend %icon
+ @extend %icon-line-fingerprint
+ width: 1.3em
+ height: 1.3em
+ margin-right: .3em
%icon-line-calendar
- background-image: inline-image('line-icons/icon-cal.svg')
-.icon-line-cal
+ background-image: url('data:image/svg+xml;utf8,')
+.icon-line-calendar,
+.icon-cal,
+.icon-calendar
@extend %icon
- @extend %icon-line-calendar
+ @extend %icon-line-fingre
%icon-line-clock
background-image: url('data:image/svg+xml;utf8,')
@@ -139,6 +134,16 @@
%icon-line-cog-teal
background-image: url('data:image/svg+xml;utf8,')
+.icon-settings
+ @extend %icon-line-cog
+ width: 1em
+ height: 1em
+ background:
+ repeat: no-repeat
+ position: 0 0
+ &:hover
+ @extend %icon-line-cog-teal
+
%icon-line-dropdown
background-image: url('data:image/svg+xml;utf8,')
%icon-line-dropdown-teal
diff --git a/app/styles/app/modules/logo.sass b/app/styles/app/modules/logo.sass
index 17f01410..7ebd8cfc 100644
--- a/app/styles/app/modules/logo.sass
+++ b/app/styles/app/modules/logo.sass
@@ -13,9 +13,9 @@
outline: none
text-indent: -9999px
transition: background-color 200ms ease
- background: inline-image('svg/travis-ci-logo.svg') no-repeat 0 50%
+ background: inline-image('ui/travis-ci-logo.svg') no-repeat 0 50%
&:hover
- background: $cream-light inline-image('svg/travis-ci-logo-hover.svg') no-repeat 50%
+ background: $cream-light inline-image('ui/travis-ci-logo-hover.svg') no-repeat 50%
.centered &
margin-left: 0
diff --git a/app/styles/app/modules/search.sass b/app/styles/app/modules/search.sass
index 1c1df77c..5974258f 100644
--- a/app/styles/app/modules/search.sass
+++ b/app/styles/app/modules/search.sass
@@ -1,6 +1,4 @@
.search
- // @include grid-column(3)
- // float : right
ul
text-align : left
margin : 0
@@ -20,7 +18,7 @@
width: 100%
border: none;
background:
- image : url('/images/dashboard/search-icon.svg')
+ image : url('/images/ui/search-icon.svg')
repeat : no-repeat
position: right 5px center
size : 16px 16px
diff --git a/app/templates/account.hbs b/app/templates/account.hbs
index 58e90143..409c46d9 100644
--- a/app/templates/account.hbs
+++ b/app/templates/account.hbs
@@ -61,19 +61,19 @@
-
-
+ 
Flick the repository switch on
-
-
+ 
Add .travis.yml file to your repository
-
-
+ 
Trigger your first build with a git push
diff --git a/app/templates/components/hooks-list-item.hbs b/app/templates/components/hooks-list-item.hbs
index 1e2df72e..a667ba34 100644
--- a/app/templates/components/hooks-list-item.hbs
+++ b/app/templates/components/hooks-list-item.hbs
@@ -3,7 +3,7 @@
{{#if hook.isSaving}}
{{loading-indicator inline=true}}
{{else}}
- {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}}
+ {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Go to Travis CI repo settings"}}{{/link-to}}
{{/if}}
diff --git a/app/templates/footer.hbs b/app/templates/footer.hbs
index f22b10c1..b1dfb2f2 100644
--- a/app/templates/footer.hbs
+++ b/app/templates/footer.hbs
@@ -6,14 +6,14 @@
@@ -21,7 +21,7 @@