From a78094425f1169143a1804ad58668d3fa34de43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 26 Jun 2014 15:42:52 +0200 Subject: [PATCH] Font refactor fixes --- app/partials/views/modules/admin-submenu.jade | 4 ++-- app/styles/dependencies/forms.scss | 2 +- app/styles/layout/invitation.scss | 1 + app/styles/layout/login.scss | 1 + app/styles/layout/us-detail.scss | 7 +++++-- app/styles/modules/admin-menu.scss | 1 + app/styles/modules/admin-submenu.scss | 1 + app/styles/modules/nav.scss | 1 + app/styles/modules/project-details.scss | 4 +--- app/styles/modules/taskboard-table.scss | 1 + 10 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/partials/views/modules/admin-submenu.jade b/app/partials/views/modules/admin-submenu.jade index 2f44ad04..75e789a5 100644 --- a/app/partials/views/modules/admin-submenu.jade +++ b/app/partials/views/modules/admin-submenu.jade @@ -20,5 +20,5 @@ section.admin-submenu a(href="") Front span.icon.icon-arrow-right - a.button-gray(href="", title="Add New US") - span.text + New role \ No newline at end of file + a.button.button-gray(href="", title="Add New US") + span.text + New role diff --git a/app/styles/dependencies/forms.scss b/app/styles/dependencies/forms.scss index 6daab6ce..cc333df3 100644 --- a/app/styles/dependencies/forms.scss +++ b/app/styles/dependencies/forms.scss @@ -26,5 +26,5 @@ textarea { } } input[type="password"] { - @extend %text; + @extend %title; } diff --git a/app/styles/layout/invitation.scss b/app/styles/layout/invitation.scss index aebfbe67..4a295bc6 100644 --- a/app/styles/layout/invitation.scss +++ b/app/styles/layout/invitation.scss @@ -35,6 +35,7 @@ color: $white; line-height: 3rem; text-align: center; + text-transform: uppercase; .project-name { @extend %xxlarge; display: block; diff --git a/app/styles/layout/login.scss b/app/styles/layout/login.scss index f6f876c4..c713812e 100644 --- a/app/styles/layout/login.scss +++ b/app/styles/layout/login.scss @@ -21,6 +21,7 @@ @extend %title; color: $white; line-height: 2rem; + text-transform: uppercase; } form { margin-bottom: 2rem; diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 589bbcf8..c3dd61c6 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -11,8 +11,9 @@ .us-story-main-data { margin-bottom: 2rem; .us-title { - @extend %xlarge; + @extend %large; @extend %text; + text-transform: uppercase; background: $whitish; padding: 2rem 1rem; .us-number { @@ -38,6 +39,7 @@ } .blocked { @extend %xlarge; + @extend %bold; margin-bottom: .3em; } p { @@ -193,6 +195,7 @@ .title { @extend %large; @extend %title; + text-transform: uppercase; } .icon { @extend %large; @@ -214,7 +217,7 @@ } .watcher-name { @include table-flex-child(8, 0); - @extend %large; + @extend %medium; color: $grayer; margin-left: 1rem; } diff --git a/app/styles/modules/admin-menu.scss b/app/styles/modules/admin-menu.scss index 664b9ab7..b00fc26e 100644 --- a/app/styles/modules/admin-menu.scss +++ b/app/styles/modules/admin-menu.scss @@ -3,6 +3,7 @@ @extend %xlarge; @extend %title; border-bottom: 1px solid $gray-light; + text-transform: uppercase; &:last-child { border-bottom: 0; } diff --git a/app/styles/modules/admin-submenu.scss b/app/styles/modules/admin-submenu.scss index 47c7fda3..a1a075d9 100644 --- a/app/styles/modules/admin-submenu.scss +++ b/app/styles/modules/admin-submenu.scss @@ -5,6 +5,7 @@ li { @extend %xlarge; @extend %title; + text-transform: uppercase; border-bottom: 1px solid #a6b2a7; &:last-child { border-bottom: 0; diff --git a/app/styles/modules/nav.scss b/app/styles/modules/nav.scss index 7896ae16..2aeb12ef 100644 --- a/app/styles/modules/nav.scss +++ b/app/styles/modules/nav.scss @@ -6,6 +6,7 @@ height: 100%; padding: 2rem .3rem; position: fixed; + text-transform: uppercase; width: 90px; z-index: 99; } diff --git a/app/styles/modules/project-details.scss b/app/styles/modules/project-details.scss index 7842d1d5..c72d0355 100644 --- a/app/styles/modules/project-details.scss +++ b/app/styles/modules/project-details.scss @@ -1,10 +1,8 @@ .project-details { input[type="text"], textarea { - @extend %medium; - @extend %text; + @extend %title; background-color: $very-light-gray; - font-weight: bold; } fieldset { margin-bottom: 1rem; diff --git a/app/styles/modules/taskboard-table.scss b/app/styles/modules/taskboard-table.scss index 2237b644..02b58fb2 100644 --- a/app/styles/modules/taskboard-table.scss +++ b/app/styles/modules/taskboard-table.scss @@ -25,6 +25,7 @@ $column-margin: 0 10px 0 0; margin: $column-margin; padding: .5rem 0; text-align: center; + text-transform: uppercase; &:last-child { margin-right: 0; }