From 9750945bb784b08d9aedf2d4d1464d965e1ba42c Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Tue, 6 Jan 2015 15:26:51 +0100 Subject: [PATCH] Replace own variables with Foundation's: global Signed-off-by: Alex Coles --- app/assets/stylesheets/content/_accounts.sass | 4 +-- .../_components_add_comments_default.sass | 2 +- .../_form_elements_input_textarea.sass | 4 +-- app/assets/stylesheets/content/_forms.sass | 10 +++--- .../stylesheets/content/_grid_table.sass | 8 ++--- app/assets/stylesheets/content/_journal.sass | 2 +- app/assets/stylesheets/content/_modal.sass | 6 ++-- .../stylesheets/content/_pagination.sass | 2 +- .../content/_work_packages_table.sass | 6 ++-- app/assets/stylesheets/layout/_main_menu.sass | 4 +-- .../open_project_global/_mixins.sass | 2 +- .../open_project_global/_variables.md | 2 +- .../open_project_global/_variables.sass | 33 +++++++++---------- 13 files changed, 42 insertions(+), 43 deletions(-) diff --git a/app/assets/stylesheets/content/_accounts.sass b/app/assets/stylesheets/content/_accounts.sass index 76e5f843d9..a9986cf808 100644 --- a/app/assets/stylesheets/content/_accounts.sass +++ b/app/assets/stylesheets/content/_accounts.sass @@ -68,7 +68,7 @@ border: none margin-top: 20px font-weight: normal - font-size: $global-font-size + font-size: 1rem text-decoration: none text-align: center @@ -113,7 +113,7 @@ background-size: 40px 40px background-repeat: no-repeat font-weight: normal - color: $global-font-color + color: $body-font-color &:hover text-decoration: none diff --git a/app/assets/stylesheets/content/_components_add_comments_default.sass b/app/assets/stylesheets/content/_components_add_comments_default.sass index 48a0da401b..d516db3482 100644 --- a/app/assets/stylesheets/content/_components_add_comments_default.sass +++ b/app/assets/stylesheets/content/_components_add_comments_default.sass @@ -32,7 +32,7 @@ background: #ffffff border-radius: 2px padding: 8px - font-size: $global-font-size + font-size: 1rem width: 100% box-sizing: border-box &:required diff --git a/app/assets/stylesheets/content/_form_elements_input_textarea.sass b/app/assets/stylesheets/content/_form_elements_input_textarea.sass index 119406da52..bb9b18ac71 100644 --- a/app/assets/stylesheets/content/_form_elements_input_textarea.sass +++ b/app/assets/stylesheets/content/_form_elements_input_textarea.sass @@ -31,7 +31,7 @@ #work-packages-index input background: #ffffff - font-size: $global-font-size + font-size: 1rem box-sizing: border-box &:focus box-shadow: 1px 1px 1px #dddddd inset @@ -56,7 +56,7 @@ background: #ffffff border-radius: 2px padding: 8px - font-size: $global-font-size + font-size: 1rem width: 100% box-sizing: border-box &:hover diff --git a/app/assets/stylesheets/content/_forms.sass b/app/assets/stylesheets/content/_forms.sass index 9d876eac30..1f9ed632bd 100644 --- a/app/assets/stylesheets/content/_forms.sass +++ b/app/assets/stylesheets/content/_forms.sass @@ -32,7 +32,7 @@ padding: 0 0 0 10px border-radius: 2px font-weight: bold - font-size: $global-font-size + font-size: 1rem line-height: 30px margin: 0 &:hover, &:focus @@ -68,7 +68,7 @@ position: relative padding: 0 margin-bottom: 10px - font-size: $global-font-size + 1 + font-size: 1.1rem line-height: 30px label @include label-style @@ -90,7 +90,7 @@ width: 50% textarea font-weight: bold - font-size: $global-font-size + font-size: 1rem border: $content-form-input-border &:hover, &:focus border: $content-form-input-hover-border @@ -153,8 +153,8 @@ fieldset background-color: white .ui-widget - font-family: $font-family-normal - font-size: $global-font-size - 1px + font-family: $body-font-family + font-size: 0.9rem #content .tabular diff --git a/app/assets/stylesheets/content/_grid_table.sass b/app/assets/stylesheets/content/_grid_table.sass index deac7e281e..dd79923210 100644 --- a/app/assets/stylesheets/content/_grid_table.sass +++ b/app/assets/stylesheets/content/_grid_table.sass @@ -30,12 +30,12 @@ width: 100% / 12 * $columns .grid-items-lines - $grid-items-background: $base-body-color - $grid-item-background: $base-body-color - $grid-item-border: 1px solid transparentize($global-font-color, 0.8) + $grid-items-background: $body-background + $grid-item-background: $body-background + $grid-item-border: 1px solid transparentize($body-font-color, 0.8) $grid-item-columns: 4 $grid-item-big-columns: 8 - $grid-item-color: $global-font-color + $grid-item-color: $body-font-color $grid-item-height: 14em +clearfix position: relative diff --git a/app/assets/stylesheets/content/_journal.sass b/app/assets/stylesheets/content/_journal.sass index 4b3d35a7bb..628d618a92 100644 --- a/app/assets/stylesheets/content/_journal.sass +++ b/app/assets/stylesheets/content/_journal.sass @@ -61,7 +61,7 @@ right: 4px h4 padding-right: 5px - font-size: $global-font-size + font-size: 1rem font-weight: normal position: relative z-index: 5 diff --git a/app/assets/stylesheets/content/_modal.sass b/app/assets/stylesheets/content/_modal.sass index b9aca2ef37..b267eaf6a9 100644 --- a/app/assets/stylesheets/content/_modal.sass +++ b/app/assets/stylesheets/content/_modal.sass @@ -27,7 +27,7 @@ //++ $ng-modal-padding: 3em -$ng-modal-background: $base-body-color +$ng-modal-background: $body-background $ng-modal-close-color: $light-gray $ng-modal-image-height: 135px $ng-modal-image-width: $ng-modal-image-height @@ -130,11 +130,11 @@ ul.export-options a cursor: pointer text-decoration: none - color: $global-font-color + color: $body-font-color font-weight: normal &:hover, &:active text-decoration: none - color: $global-font-color + color: $body-font-color span.export-label display: block padding: 10px 0 0 0 diff --git a/app/assets/stylesheets/content/_pagination.sass b/app/assets/stylesheets/content/_pagination.sass index e482b6dfdb..15dd6e34ec 100644 --- a/app/assets/stylesheets/content/_pagination.sass +++ b/app/assets/stylesheets/content/_pagination.sass @@ -79,7 +79,7 @@ background: #f8f8f8 border-radius: 2px border: 1px solid #cccccc - color: $global-font-color + color: $body-font-color font-weight: normal cursor: pointer text-decoration: none diff --git a/app/assets/stylesheets/content/_work_packages_table.sass b/app/assets/stylesheets/content/_work_packages_table.sass index b3604a8d4d..c2126bb005 100644 --- a/app/assets/stylesheets/content/_work_packages_table.sass +++ b/app/assets/stylesheets/content/_work_packages_table.sass @@ -88,10 +88,10 @@ table.workpackages-table background: #f8f8f8 a text-decoration: none - color: $global-font-color + color: $body-font-color &:hover, &:active text-decoration: none - color: $global-font-color + color: $body-font-color tfoot tr @@ -132,7 +132,7 @@ table.workpackages-table width: 20px a text-decoration: none - color: $global-font-color + color: $body-font-color p padding: 0 8px diff --git a/app/assets/stylesheets/layout/_main_menu.sass b/app/assets/stylesheets/layout/_main_menu.sass index 6f59c2f29e..27ee5433d7 100644 --- a/app/assets/stylesheets/layout/_main_menu.sass +++ b/app/assets/stylesheets/layout/_main_menu.sass @@ -159,7 +159,7 @@ $toggler-width: 40px position: relative height: $main-menu-item-height color: $main-menu-font-color - font-family: $font-family-normal + font-family: $body-font-family font-weight: normal font-size: $main-menu-font-size font-style: normal @@ -222,7 +222,7 @@ $toggler-width: 40px padding: 0 17px 0 17px width: auto color: $main-menu-sidebar-font-color - font-family: $font-family-normal + font-family: $body-font-family font-style: normal h3 diff --git a/app/assets/stylesheets/open_project_global/_mixins.sass b/app/assets/stylesheets/open_project_global/_mixins.sass index c28cecb0f5..3b5d193b95 100644 --- a/app/assets/stylesheets/open_project_global/_mixins.sass +++ b/app/assets/stylesheets/open_project_global/_mixins.sass @@ -31,7 +31,7 @@ @mixin default-font($color, $font-size: 13px, $font-weight: normal) color: $color - font-family: $font-family-normal + font-family: $body-font-family font-size: $font-size font-weight: $font-weight diff --git a/app/assets/stylesheets/open_project_global/_variables.md b/app/assets/stylesheets/open_project_global/_variables.md index 046d4d9c8f..c05680ffeb 100644 --- a/app/assets/stylesheets/open_project_global/_variables.md +++ b/app/assets/stylesheets/open_project_global/_variables.md @@ -5,7 +5,7 @@ Color Variables ``` @colors -- $global-font-color - - +- $body-font-color - - - $header-bg-color - $header-logo-bg-color - ``` diff --git a/app/assets/stylesheets/open_project_global/_variables.sass b/app/assets/stylesheets/open_project_global/_variables.sass index 67e9c788ce..d6af57ff08 100644 --- a/app/assets/stylesheets/open_project_global/_variables.sass +++ b/app/assets/stylesheets/open_project_global/_variables.sass @@ -26,22 +26,21 @@ // See doc/COPYRIGHT.rdoc for more details. //++ -$base-body-color: white $light-gray: #ccc -$font-family-normal: 'Lato', 'Lucida Grande', Helvetica, Arial, sans-serif !default -$global-font-color: #555 !default -$global-font-size: 13px !default -$global-line-height: 1.5 !default +$body-background: white !default +$body-font-family: 'Lato', 'Lucida Grande', Helvetica, Arial, sans-serif !default +$body-font-color: #555 !default +$base-line-height: 1.5 !default -$headline-h1-font-size: 28px !default -$headline-h1-font-color: $global-font-color !default -$headline-h2-font-size: 22px !default -$headline-h2-font-color: #06799F !default -$headline-h3-font-size: 19px !default -$headline-h3-font-color: $global-font-color !default -$headline-h4-font-size: 17px !default -$headline-h4-font-color: $global-font-color !default +$headline-h1-font-size: 28px !default +$headline-h1-font-color: $body-font-color !default +$headline-h2-font-size: 22px !default +$headline-h2-font-color: #06799F !default +$headline-h3-font-size: 19px !default +$headline-h3-font-color: $body-font-color !default +$headline-h4-font-size: 17px !default +$headline-h4-font-color: $body-font-color !default $header-height: 55px !default $header-bg-color: #3493B3 !default @@ -53,13 +52,13 @@ $header-item-font-hover-color: #FFFFFF !default $header-item-bg-hover-color: #06799F !default $header-drop-down-bg-color: #FFFFFF !default $header-drop-down-border-color: #E0E0E0 !default -$header-drop-down-item-font-color: $global-font-color !default +$header-drop-down-item-font-color: $body-font-color !default $header-drop-down-item-font-hover-color: #FFFFFF !default $header-logo-bg-color: #06799F !default $header-home-link-bg: url(image-path('logo_openproject_white_big.png')) no-repeat 20px 0 !default -$header-drop-down-projects-search-font-color: $global-font-color !default +$header-drop-down-projects-search-font-color: $body-font-color !default $header-drop-down-projects-search-bg-color: #E0E0E0 !default $header-drop-down-projects-search-input-bg-color: #FFFFFF !default @@ -112,7 +111,7 @@ $breadcrumb-bg-color: #F8F8F8 !default $breadcrumb-border-color: #E7E7E7 !default $breadcrumb-font-size: 12px !default $breadcrumb-highlighted-font-size: 14px !default -$breadcrumb-font-color: $global-font-color !default +$breadcrumb-font-color: $body-font-color !default $content-default-border-color: #EAEAEA !default $content-default-border-width: 1px !default @@ -175,7 +174,7 @@ $drop-down-selected-bg-color: #24B3E7 !default $action-menu-bg-color: #FFFFFF -$wiki-default-font-size: $global-font-size +$wiki-default-font-size: 1rem $wiki-toc-header-font-size: 10px !default $wiki-toc-ul-font-size: 0.8em !default