diff --git a/app/fonts/OpenSans-CondLight-webfont.eot b/app/fonts/OpenSans-CondLight-webfont.eot new file mode 100644 index 00000000..b2c34dc5 Binary files /dev/null and b/app/fonts/OpenSans-CondLight-webfont.eot differ diff --git a/app/fonts/OpenSans-CondLight-webfont.svg b/app/fonts/OpenSans-CondLight-webfont.svg new file mode 100644 index 00000000..a23ca9ec --- /dev/null +++ b/app/fonts/OpenSans-CondLight-webfont.svg @@ -0,0 +1,1830 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/fonts/OpenSans-CondLight-webfont.ttf b/app/fonts/OpenSans-CondLight-webfont.ttf new file mode 100644 index 00000000..044dc1f9 Binary files /dev/null and b/app/fonts/OpenSans-CondLight-webfont.ttf differ diff --git a/app/fonts/OpenSans-CondLight-webfont.woff b/app/fonts/OpenSans-CondLight-webfont.woff new file mode 100644 index 00000000..7564c664 Binary files /dev/null and b/app/fonts/OpenSans-CondLight-webfont.woff differ diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index 865dc356..dffcbd24 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -1,7 +1,7 @@ // Buttons components .trans-button { @extend %large; - font-family: 'ostrichSans'; + @extend %title; &:hover, &.active { @include transition (color .3s linear); @@ -14,18 +14,18 @@ %button, .button { - @extend %large; + @extend %medium; + @extend %title; @include transition (background .3s linear); display: inline-block; - font-family: 'ostrichSans'; padding: 8px 40px; + text-transform: uppercase; + &:hover { @include transition (background .3s linear); } span { color: $white; - position: relative; - top: 2px; } .icon { margin-right: .3rem; diff --git a/app/styles/components/filter.scss b/app/styles/components/filter.scss index 1e65b688..795358af 100644 --- a/app/styles/components/filter.scss +++ b/app/styles/components/filter.scss @@ -1,8 +1,8 @@ .single-filter { @extend %large; @include clearfix; + @extend %title; display: block; - font-family: 'ostrichSans'; height: 32px; margin-bottom: 1rem; opacity: .5; diff --git a/app/styles/components/notification-message.scss b/app/styles/components/notification-message.scss index e6dae507..81084a72 100644 --- a/app/styles/components/notification-message.scss +++ b/app/styles/components/notification-message.scss @@ -13,8 +13,8 @@ } .warning { @extend %xlarge; + @extend %bold; color: $white; - font-family: 'DroidSans-Bold'; line-height: 2.4rem; } .icon-delete { diff --git a/app/styles/components/popover.scss b/app/styles/components/popover.scss index bd150f5e..c8eaec22 100644 --- a/app/styles/components/popover.scss +++ b/app/styles/components/popover.scss @@ -1,9 +1,9 @@ @mixin popover($width, $top: '', $left: '', $bottom: '', $right: '', $arrow-width: 0, $arrow-top: '', $arrow-left: '', $arrow-bottom: '') { + @extend %text; background: $blackish; bottom: #{$bottom}; color: $white; display: none; - font-family: 'DroidSans'; left: #{$left}; list-style-type: none; margin: 0; diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss index 57b9a47a..5d39675f 100644 --- a/app/styles/components/summary.scss +++ b/app/styles/components/summary.scss @@ -29,8 +29,8 @@ } .number { @extend %xlarge; + @extend %bold; float: left; - font-family: 'DroidSans-Bold'; margin-right: .3rem; position: relative; top: 5px; @@ -39,8 +39,8 @@ .description { // line-height: 0; @extend %small; + @extend %text; float: left; - font-family: DroidSans; line-height: .9rem; } } diff --git a/app/styles/dependencies/forms.scss b/app/styles/dependencies/forms.scss index be4e8848..6daab6ce 100644 --- a/app/styles/dependencies/forms.scss +++ b/app/styles/dependencies/forms.scss @@ -13,10 +13,10 @@ input[type="date"], select, textarea { @extend %large; + @extend %title; background: $gray-light; border: 0; color: $grayer; - font-family: 'ostrichSans'; height: 40px; margin: 0; padding: 8px; @@ -26,5 +26,5 @@ textarea { } } input[type="password"] { - font-family: 'DroidSans'; + @extend %text; } diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss index e6bc31a5..96b2efc3 100755 --- a/app/styles/dependencies/typography.scss +++ b/app/styles/dependencies/typography.scss @@ -2,7 +2,7 @@ // Font face -@each $font-face in DroidSans, DroidSans-Bold, ostrichSans, taiga { +@each $font-face in DroidSans, DroidSans-Bold, ostrichSans, OpenSans-CondLight-webfont, taiga { @font-face { font-family: '#{$font-face}'; src: url('../fonts/#{$font-face}.eot?#iefix') format('embedded-opentype'), @@ -25,7 +25,7 @@ h6 { } } -// __Font Sizes__ +// __Font Sizes__ // %xsmall {font-size: .5rem;} %small {font-size: .8rem;} %medium {font-size: 1rem;} @@ -33,13 +33,21 @@ h6 { %xlarge {font-size: 2rem;} %xxlarge {font-size: 3rem;} +// __Font Types__ // +%title {font-family: 'OpenSans-CondLight-webfont';} +%text {font-family: 'DroidSans';} +%bold {font-family: 'DroidSans-Bold';} +%taiga {font-family: 'taiga';} + h1 { @extend %xxlarge; - font-family: 'ostrichSans'; + @extend %title; line-height: 2.7rem; margin-bottom: 1rem; + text-transform: uppercase; span { @include ellipsis(250px); + display: inline; margin-right: .5rem; } .green { @@ -53,7 +61,7 @@ h1 { h2 { @extend %xlarge; - font-family: 'ostrichSans'; + @extend %title; margin-bottom: 1rem; } diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 7086484c..0bc164d8 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -80,7 +80,7 @@ body { } .icon { - font-family: 'taiga'; + @extend %taiga; } .hidden { diff --git a/app/styles/layout/invitation.scss b/app/styles/layout/invitation.scss index ca9ca1ae..aebfbe67 100644 --- a/app/styles/layout/invitation.scss +++ b/app/styles/layout/invitation.scss @@ -31,8 +31,8 @@ } .invitation-text { @extend %xlarge; + @extend %title; color: $white; - font-family: 'ostrichSans'; line-height: 3rem; text-align: center; .project-name { diff --git a/app/styles/layout/login.scss b/app/styles/layout/login.scss index 6c8f8782..f6f876c4 100644 --- a/app/styles/layout/login.scss +++ b/app/styles/layout/login.scss @@ -18,8 +18,8 @@ } .tagline { @extend %xlarge; + @extend %title; color: $white; - font-family: 'ostrichSans'; line-height: 2rem; } form { @@ -80,7 +80,7 @@ } .title { @extend %large; - font-family: 'DroidSans-bold'; + @extend %bold; } .icon-delete { color: $red-light; diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 3d49229f..589bbcf8 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -12,8 +12,8 @@ margin-bottom: 2rem; .us-title { @extend %xlarge; + @extend %text; background: $whitish; - font-family: 'DroidSans'; padding: 2rem 1rem; .us-number { color: $gray-light; @@ -73,8 +73,8 @@ } .us-activity-tabs { + @extend %title; border-bottom: 3px solid $gray-light; - font-family: 'ostrichSans'; padding: .5rem 0; li { @extend %large; @@ -149,8 +149,8 @@ } .points { @extend %xlarge; + @extend %title; display: block; - font-family: 'ostrichSans'; text-align: center; } .role { @@ -192,7 +192,7 @@ position: relative; .title { @extend %large; - font-family: 'ostrichSans'; + @extend %title; } .icon { @extend %large; diff --git a/app/styles/modules/activity.scss b/app/styles/modules/activity.scss index 62674b1f..d1266be7 100644 --- a/app/styles/modules/activity.scss +++ b/app/styles/modules/activity.scss @@ -33,7 +33,7 @@ @include table-flex-child(1, 50px, 0); } .activity-changed { - font-family: 'DroidSans-Bold'; + @extend %bold; } .activity-fromto { @extend %small; diff --git a/app/styles/modules/admin-membership-table.scss b/app/styles/modules/admin-membership-table.scss index 47aabf9d..07a0e556 100644 --- a/app/styles/modules/admin-membership-table.scss +++ b/app/styles/modules/admin-membership-table.scss @@ -1,6 +1,6 @@ .admin-membership-table { .title { - font-family: 'DroidSans-Bold'; + @extend %bold; } .avatar { align-items: center; @@ -17,7 +17,7 @@ width: 100%; } .name { - font-family: DroidSans-Bold; + @extend %bold; } .email { color: $gray-light; diff --git a/app/styles/modules/admin-menu.scss b/app/styles/modules/admin-menu.scss index 3436539a..664b9ab7 100644 --- a/app/styles/modules/admin-menu.scss +++ b/app/styles/modules/admin-menu.scss @@ -1,8 +1,8 @@ .admin-menu { li { @extend %xlarge; + @extend %title; border-bottom: 1px solid $gray-light; - font-family: 'ostrichSans'; &:last-child { border-bottom: 0; } diff --git a/app/styles/modules/admin-roles.scss b/app/styles/modules/admin-roles.scss index 3d3aa2ee..6a6fe5c8 100644 --- a/app/styles/modules/admin-roles.scss +++ b/app/styles/modules/admin-roles.scss @@ -1,12 +1,12 @@ .admin-roles { .total { @extend %large; + @extend %title; background-color: $whitish; - font-family: DroidSans-Bold; padding: .5rem 1rem; span { @extend %medium; - font-family: DroidSans; + @extend %text; padding-left: .5rem; } } diff --git a/app/styles/modules/admin-submenu.scss b/app/styles/modules/admin-submenu.scss index d25fc739..47c7fda3 100644 --- a/app/styles/modules/admin-submenu.scss +++ b/app/styles/modules/admin-submenu.scss @@ -4,8 +4,8 @@ } li { @extend %xlarge; + @extend %title; border-bottom: 1px solid #a6b2a7; - font-family: 'ostrichSans'; &:last-child { border-bottom: 0; } diff --git a/app/styles/modules/backlog-table.scss b/app/styles/modules/backlog-table.scss index ef4597c8..3ad87098 100644 --- a/app/styles/modules/backlog-table.scss +++ b/app/styles/modules/backlog-table.scss @@ -61,13 +61,13 @@ .backlog-table-header { .backlog-table-title { @extend %medium; - font-family: 'DroidSans-Bold'; + @extend %bold; } .backlog-table-subtitle { @extend %small; + @extend %text; background: $whitish; border-bottom: 2px solid $grayer; - font-family: 'DroidSans'; &:hover { background: $whitish; } diff --git a/app/styles/modules/colors-table.scss b/app/styles/modules/colors-table.scss index 6e2552df..02643563 100644 --- a/app/styles/modules/colors-table.scss +++ b/app/styles/modules/colors-table.scss @@ -11,8 +11,8 @@ } .title { @extend %medium; + @extend %bold; border-bottom: 1px solid $gray-light; - font-family: 'DroidSans-Bold'; &:hover { background: transparent; } @@ -67,8 +67,8 @@ margin-bottom: 1rem; } input { + @extend %text; background-color: $very-light-gray; - font-family: DroidSans; width: 243px; @include placeholder { color: $gray; diff --git a/app/styles/modules/comment-activity.scss b/app/styles/modules/comment-activity.scss index ff658130..6042878a 100644 --- a/app/styles/modules/comment-activity.scss +++ b/app/styles/modules/comment-activity.scss @@ -33,7 +33,7 @@ @include table-flex-child(1, 50px, 0); } .activity-changed { - font-family: 'DroidSans-Bold'; + @extend %bold; } .activity-fromto { @extend %small; diff --git a/app/styles/modules/issues-table.scss b/app/styles/modules/issues-table.scss index d3639d9c..b4e448ab 100644 --- a/app/styles/modules/issues-table.scss +++ b/app/styles/modules/issues-table.scss @@ -11,8 +11,8 @@ } .title { @extend %medium; + @extend %bold; border-bottom: 1px solid $gray-light; - font-family: 'DroidSans-Bold'; &:hover { background: transparent; } diff --git a/app/styles/modules/lightbox.scss b/app/styles/modules/lightbox.scss index c634873b..7e2f1053 100644 --- a/app/styles/modules/lightbox.scss +++ b/app/styles/modules/lightbox.scss @@ -227,7 +227,7 @@ } .subtitle { @extend %large; - font-family: 'ostrichSans'; + @extend %title; } .delete-options { @include table-flex(); diff --git a/app/styles/modules/list-filters.scss b/app/styles/modules/list-filters.scss index c0913e1a..cea40bfa 100644 --- a/app/styles/modules/list-filters.scss +++ b/app/styles/modules/list-filters.scss @@ -12,7 +12,7 @@ margin-right: 2rem; a { @extend %large; - font-family: 'ostrichSans'; + @extend %title; opacity: .4; &.active, &:hover { diff --git a/app/styles/modules/nav.scss b/app/styles/modules/nav.scss index 3b71031f..7896ae16 100644 --- a/app/styles/modules/nav.scss +++ b/app/styles/modules/nav.scss @@ -1,8 +1,8 @@ .menu { + @extend %title; background-image: url('../images/menu.png'); background-position: left bottom; flex-wrap: wrap; - font-family: 'ostrichSans'; height: 100%; padding: 2rem .3rem; position: fixed; diff --git a/app/styles/modules/project-details.scss b/app/styles/modules/project-details.scss index 6d660fd2..7842d1d5 100644 --- a/app/styles/modules/project-details.scss +++ b/app/styles/modules/project-details.scss @@ -2,8 +2,8 @@ input[type="text"], textarea { @extend %medium; + @extend %text; background-color: $very-light-gray; - font-family: 'DroidSans'; font-weight: bold; } fieldset { diff --git a/app/styles/modules/project-nav.scss b/app/styles/modules/project-nav.scss index 1d7bf2f1..266713ae 100644 --- a/app/styles/modules/project-nav.scss +++ b/app/styles/modules/project-nav.scss @@ -31,9 +31,9 @@ .projects-list { a { @extend %large; + @extend %title; color: $whitish; display: block; - font-family: 'ostrichSans'; padding: 1rem; text-transform: uppercase; width: 100%; diff --git a/app/styles/modules/search-filter.scss b/app/styles/modules/search-filter.scss index f7c4db00..d4611758 100644 --- a/app/styles/modules/search-filter.scss +++ b/app/styles/modules/search-filter.scss @@ -9,7 +9,7 @@ } a { @extend %large; - font-family: 'ostrichSans'; + @extend %title; opacity: .2; &.active, &:hover { diff --git a/app/styles/modules/search-result-table.scss b/app/styles/modules/search-result-table.scss index b046babf..c17f79ce 100644 --- a/app/styles/modules/search-result-table.scss +++ b/app/styles/modules/search-result-table.scss @@ -32,8 +32,8 @@ } .title { @extend %medium; + @extend %bold; border-bottom: 1px solid $gray-light; - font-family: 'DroidSans-Bold'; &:hover { background: transparent; } diff --git a/app/styles/modules/sprints.scss b/app/styles/modules/sprints.scss index bb66fa71..835773db 100644 --- a/app/styles/modules/sprints.scss +++ b/app/styles/modules/sprints.scss @@ -14,8 +14,8 @@ } .sprint-name { @extend %large; + @extend %title; display: inline-block; - font-family: 'ostrichSans'; margin-right: 3px; max-width: 100px; overflow: hidden; @@ -25,8 +25,8 @@ } .sprint-date { @extend %large; + @extend %title; color: $gray-light; - font-family: 'ostrichSans'; } .sprint { margin-bottom: 2rem; diff --git a/app/styles/modules/taskboard-table.scss b/app/styles/modules/taskboard-table.scss index b5771a3c..2237b644 100644 --- a/app/styles/modules/taskboard-table.scss +++ b/app/styles/modules/taskboard-table.scss @@ -63,7 +63,7 @@ $column-margin: 0 10px 0 0; } .us-title { @extend %large; - font-family: 'DroidSans'; + @extend %title; margin-bottom: 1rem; } .us-ref {