diff --git a/assets/images/ui/logo.png b/assets/images/ui/logo.png index b5eb3346..1e8a48e7 100644 Binary files a/assets/images/ui/logo.png and b/assets/images/ui/logo.png differ diff --git a/assets/styles/_mixins/colors.sass b/assets/styles/_mixins/colors.sass index 9ea07313..8e827dd4 100644 --- a/assets/styles/_mixins/colors.sass +++ b/assets/styles/_mixins/colors.sass @@ -48,15 +48,15 @@ $color-link: $gray-dark-3 $color-link-highlight: $red-medium-1 $color-link-sponsor: #575c7c $color-link-top: $gray-medium-3 -$color-link-top-highlight: $white +$color-link-top-highlight: #ADC7D0 $color-link-disabled: $gray-medium-1 $color-bg-dark: $slate-blue-2 $color-bg-light: $gray-light-1 $color-bg-input: $white $color-bg-link-top: $black -$color-bg-dropdown: $gray-dark-2 -$color-bg-dropdown-highlight: $gray-dark-3 +$color-bg-dropdown: #40454f +$color-bg-dropdown-highlight: #30343b $color-bg-pre: $gray-light-2 $color-bg-tab: $gray-light-3 $color-bg-tab-hover: $white diff --git a/assets/styles/_mixins/fonts.sass b/assets/styles/_mixins/fonts.sass index 731a1927..1a0d8e90 100644 --- a/assets/styles/_mixins/fonts.sass +++ b/assets/styles/_mixins/fonts.sass @@ -1,13 +1,13 @@ -$font-size-huge: 24px +$font-size-huge: 30px $font-size-big: 15px -$font-size-normal: 13px -$font-size-small: 12px -$font-size-log: 12px -$font-size-smaller: 12px +$font-size-normal: 14px +$font-size-small: 13px +$font-size-log: 13px +$font-size-smaller: 15px $font-size-tiny: 11px $font-size-tiniest: 10px -$line-height: 19px -$line-height-log: 18px +$line-height: 22px +$line-height-log: 19px diff --git a/assets/styles/app.sass b/assets/styles/app.sass index efb64d62..b586643c 100644 --- a/assets/styles/app.sass +++ b/assets/styles/app.sass @@ -1,7 +1,7 @@ @import "_mixins/all" html, body - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif + font-family: 'Source Sans Pro', sans-serif font-size: $font-size-small line-height: $line-height margin: 0 diff --git a/assets/styles/getting_started.sass b/assets/styles/getting_started.sass index 3b81c21b..d1d5dbb6 100644 --- a/assets/styles/getting_started.sass +++ b/assets/styles/getting_started.sass @@ -1,7 +1,7 @@ #getting-started width: 650px margin: 0px auto - font-family: Arial + font-family: 'Source Sans Pro' p font-size: 15px diff --git a/assets/styles/layout.sass b/assets/styles/layout.sass index 95f1a383..7a4b88a8 100644 --- a/assets/styles/layout.sass +++ b/assets/styles/layout.sass @@ -27,7 +27,7 @@ html, body top: -40px left: 0 width: 100% - height: 40px + height: 55px z-index: 1000 #left, #right diff --git a/assets/styles/main.sass b/assets/styles/main.sass index 7e1ed33e..431d7a64 100644 --- a/assets/styles/main.sass +++ b/assets/styles/main.sass @@ -5,6 +5,7 @@ margin: 15px 60px 0 0 font-size: $font-size-huge a + color: #9e2525 text-decoration: underline #stats diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass index ecdfb74a..f1ca354a 100644 --- a/assets/styles/main/repository.sass +++ b/assets/styles/main/repository.sass @@ -27,7 +27,8 @@ .description, .language font-weight: normal - color: $color-text-light + color: #666a72 + font-size: 15px .language display: none diff --git a/assets/styles/right/lists.sass b/assets/styles/right/lists.sass index b74cd3a8..affc3104 100644 --- a/assets/styles/right/lists.sass +++ b/assets/styles/right/lists.sass @@ -15,7 +15,7 @@ border-bottom-color: $color-border-light white-space: nowrap cursor: pointer - @include border-top-radius(4px) + @include border-top-radius(2px) font-size: 10px &:hover diff --git a/assets/styles/top.sass b/assets/styles/top.sass index 990f60b3..343f3faf 100644 --- a/assets/styles/top.sass +++ b/assets/styles/top.sass @@ -1,23 +1,24 @@ @import "_mixins/all" #top - line-height: 40px - @include background(linear-gradient(#444, #111)) + line-height: 55px + background: #40454f font-size: $font-size-normal h1 float: left - width: 73px + width: 72px height: 30px - margin: 4px 40px 0 22px + margin: 12px 40px 0 22px text-indent: -9999px background: inline-image('ui/logo.png') no-repeat + background-size: cover ul list-style-type: none a, span - color: $color-link-top + color: #ffffff text-decoration: none li @@ -26,7 +27,7 @@ display: block padding: 0 15px &:hover - color: $color-link-top-highlight + color: #ADC7D0 li.traviscicom a @@ -48,13 +49,10 @@ top: 40px width: 100% background-color: $color-bg-dropdown - @include border-bottom-radius(6px) - @include single-box-shadow(rgba(black, 0.3), 2px, 2px, 10px) li display: block &:last-child a:hover - @include border-bottom-radius(4px) a display: block @@ -106,7 +104,9 @@ #home #navigation .home, #stats #navigation .stats, #profile #navigation .profile - background-color: $color-bg-link-top + background-color: transparent a + color: #ffffff + a:hover color: $color-link-top-highlight diff --git a/public/images/icons/off.png b/public/images/icons/off.png index 1282e2f3..8e11bea2 100644 Binary files a/public/images/icons/off.png and b/public/images/icons/off.png differ diff --git a/public/images/icons/repeat.png b/public/images/icons/repeat.png index f89bf28b..6e5b206f 100644 Binary files a/public/images/icons/repeat.png and b/public/images/icons/repeat.png differ diff --git a/public/index.html b/public/index.html index fb4970ef..824aee17 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,7 @@ +