Merge branch 'feature/foundation-apps-further-refactoring' into feature/foundation-apps-framework

app/assets/stylesheets/_settings.scss

@@ -59,7 +59,7 @@ $include-css: (
   switch: false,
   tabs: false,
   title-bar: false,
-  typography: false,
+  typography: true,
   utilities: false,
 );
 

app/assets/stylesheets/content/_accounts.sass

@@ -58,7 +58,6 @@
     .login-links
       float: right
       text-align: right
-      font-size: 12px
 
 // use id selectors to be specific enough to override general content and top-menu definitions
 #content .login-auth-providers, #top-menu #nav-login-content .login-auth-providers

app/assets/stylesheets/content/_in_place_editing.sass

@@ -59,7 +59,6 @@
       background: lightpink!important
   .ined-errors
     position: absolute
-    font-size: 13px
     line-height: 1.2em
     width: 251px
     padding: 5px
@@ -73,7 +72,6 @@
     bottom: -35px
     right: 0px
     width: 120px
-    font-size: 13px
     background: white
     border: 1px solid #cacaca
     text-align: center
@@ -111,7 +109,6 @@
         display: none
         &.btn-preview
           float: right
-          font-size: 12px
           height: 32px
           width: auto
           display: inline

app/assets/stylesheets/content/_modal.sass

@@ -99,7 +99,6 @@ $ng-modal-image-width:   $ng-modal-image-height
     padding: 0 5px
     background: #ffffff
     border: 1px solid #cacaca
-    font-size: 13px
     color: #222222
     border-radius: 2px
   button

app/assets/stylesheets/content/_user_avatars.sass

@@ -59,6 +59,5 @@ h1, h2, h3, h4, tr
 
 .user-avatar--role
   display:      block
-  font-size:    11px
   font-style:   italic
   color:        #777777

app/assets/stylesheets/content/_wiki.sass

@@ -29,13 +29,10 @@
 div.wiki
   font-size: $wiki-default-font-size
   line-height: 1.6em
-  h1
+
-    font-size: 18px
-  h2
-    font-size: 16px
   h3
-    font-size: 13px
     border-bottom: 1px dotted #bbbbbb
+
   h1, h2, h3
     margin: 1em 0 1em 0
     font-weight: bold

app/assets/stylesheets/content/_work_packages.sass

@@ -27,13 +27,11 @@
 //++
 
 .work-packages--details-content
-  font-size:  13px
   font-size:  0.8125rem
 
   h2
     margin:       0
     padding:      0 0 4px 0
-    font-size:    20px
     font-size:    1.25rem
     line-height:  26px
     font-weight:  normal
@@ -43,14 +41,12 @@
   h3
     margin:       0 0 10px 0
     padding:      0
-    font-size:    14px
     font-size:    0.875rem
     font-weight:  bold
     border:       none
 
 .report-category-actions
   margin-top: -28px
-  font-size: 17px // like h3
   width: 100%
   text-align: right
 
@@ -66,7 +62,6 @@
     position: relative
     padding-left: 160px
     margin-bottom: 30px
-    font-size: 14px
     line-height: 30px
 
     .watcher_label
@@ -128,12 +123,8 @@
   margin: 0px 0 0 0
   padding: 0 0 10px 0
   display: block
-  font-size: 12px
-  font-size: 0.75rem
 
 .select-type
-  font-size: 20px
-  font-size: 1.25rem
   line-height: 26px
   float: left
   color: $content-link-color
@@ -152,13 +143,11 @@
     border: 1px solid #dddddd
     padding: 8px
     border-radius: 2px
-    font-size: 13px
     font-size: 0.8125rem
     box-sizing: border-box
     width: 100%
   button
     float: right
-    font-size: 13px
     font-size: 0.8125rem
     background: linear-gradient(to bottom, white 0%, #eeeeee 74%, #eeeeee 100%) repeat scroll 0 0 rgba(0, 0, 0, 0)
     border: 1px solid #CCCCCC
@@ -182,7 +171,6 @@ accessible-by-keyboard
     a:hover
       text-decoration: none
     .star
-      font-size: 17px
       padding: 0 2px 0 0px
       vertical-align: -3px
       color: #ccc
@@ -208,7 +196,6 @@ $work-package-details--tab-height: 40px
   line-height: $work-package-details--tab-height - 6px
   height:      $work-package-details--tab-height
   overflow: hidden
-  font-size: 14px
   position: relative
   width: 97.5%
   li

app/assets/stylesheets/content/_work_packages_table.sass

@@ -78,13 +78,12 @@ table.workpackages-table
         background: none
     th
       text-transform: uppercase
-      font-size: 14px
       text-align: left
       line-height: 34px
       padding: 0
 
       &.icon-table
-        font-size: 20px
+        //
       &.active-column
         background: #f8f8f8
       a
@@ -121,7 +120,7 @@ table.workpackages-table
       line-height: 34px
 
       &.icon-table
-        font-size: 20px
+        //
       &.checkbox
         min-width: 0
         width: 20px

app/assets/stylesheets/content/work_package_details/_activities_tab.sass

@@ -93,7 +93,6 @@ span.comment
 
   .date
     display: block
-    font-size: 12px
 
 .work-package-details-activities-activity-contents
   .comments-icons

app/assets/stylesheets/content/work_package_details/_attachments_tab.sass

@@ -43,7 +43,6 @@
   float: left
   padding: 8px 0 0 10px
   i
-    font-size: 12px
     padding: 0 2px 0 0
 
 .upload-file

app/assets/stylesheets/content/work_package_details/_overview_tab.sass

@@ -32,7 +32,6 @@
 .detail-panel-description,
 .detail-panel-attributes
   h3
-    font-size: 16px
     font-weight: normal
     text-transform: uppercase
     margin:  0 0 15px 0
@@ -40,7 +39,6 @@
     border-bottom: 2px solid #eee
 
 .detail-panel-attributes
-  font-size: 14px
   float: left
   margin: 3px 0 0 0
   width: 100%
@@ -85,7 +83,6 @@
   h3
     margin: 0 0 10px 0
     padding: 0
-    font-size: 14px
     font-size: 0.875rem
     font-weight: bold
   ul
@@ -114,7 +111,6 @@
   span
     background: #ffffff
     padding: 0
-    font-size: 12px
     font-size: 0.75rem
   i
     background: #ffffff

app/assets/stylesheets/content/work_package_details/_watchers_tab.sass

@@ -49,7 +49,6 @@
 
   .detail-panel-watchers-delete-watcher-icon
     padding: 0 8px
-    font-size: 10px
 
   fieldset
     border: 0

app/assets/stylesheets/jstoolbar.css.sass

@@ -50,7 +50,6 @@
     padding: 6px 5px 4px 5px
     border: $content-form-input-border
     background: url(image-path('bg_input_file.png')) repeat-x 0 0
-    font-size: 18px
     border-radius: 2px
     &:before
       @include icon-common

app/assets/stylesheets/layout/_base.sass

@@ -60,14 +60,13 @@ body
 h1
   margin: 0
   padding: 0
-  font-size: 24px
+
 h3, .wiki h2
-  font-size: 16px
   padding: 2px 10px 1px 0px
   margin: 0 0 10px 0
   border-bottom: 1px solid #bbbbbb
+
 h4, .wiki h3
-  font-size: 13px
   padding: 0px 10px 1px 0px
   margin-bottom: 5px
   border-bottom: 1px dotted #bbbbbb

app/assets/stylesheets/layout/_main_menu.sass

@@ -223,7 +223,6 @@ $toggler-width: 40px
   padding: 0px 17px 0 17px
   width: auto
   color: $main-menu-sidebar-font-color
-  font-size: 12px
   @include main-menu-font
 
   h3
@@ -243,7 +242,6 @@ $toggler-width: 40px
 
   a, a:link
     color: $main-menu-sidebar-link-color
-    font-size: 12px
     display: inline
     position: static
     text-decoration: underline

app/assets/stylesheets/layout/_toolbar.sass

@@ -148,7 +148,6 @@
     padding: 0 0px
     background: #ffffff
     border: 1px solid #cacaca
-    font-size: 13px
     color: #222222
     border-radius: 2px
   .title-group-header
@@ -159,7 +158,6 @@
     position: absolute
     margin: 8px 0 0 -22px
     color: #999999
-    font-size: 12px
 
   input[type="search"]::-webkit-search-cancel-button
     display: none

app/assets/stylesheets/legacy/_01_tables.sass

@@ -606,7 +606,6 @@ ul.projects
       margin-top: 1em
   div.root a.project
     font-weight: bold
-    font-size: 16px
     margin: 0 0 10px 0
 
 #type_project_ids

app/assets/stylesheets/legacy/_12_base_typography.sass

@@ -1,77 +0,0 @@
-//-- copyright
-// OpenProject is a project management system.
-// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2013 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// See doc/COPYRIGHT.rdoc for more details.
-//++
-
-/* Merged from the new layout #263
-/**
- * ToC
- * 00 - Base Typography
- * 01 - Header
- * 02 - Main Menu
- * 03 - Main Content
- * 04 - Issue Tables
- * 05 - Single Issue Page
- * 06 - Projects Page
- * 07 - Behavior Styles
- * 08 - Reusable classes
- * 09 - New Issue Form
- * 10 - Plugins and misc
- * 11 - Appended from staging
-
-/*-------------------------------------------------------------------------------
- *  =00 - Base Typography
- *
- *  This section includes the typography base for the body and heading elements.
- *------------------------------------------------------------------------------
-
-h1, h2, h3, h4, h5, h6
-  font-weight: bold
-
-h1
-  font-size: 21px
-
-h2, .wiki h1
-  font-size: 18px
-  padding: 2px 10px 1px 0px
-  margin: 0 0 10px 0
-  border-bottom: 1px solid #bbbbbb
-
-h3
-  font-size: 16px
-  margin-bottom: 16px
-
-h4
-  font-size: 14px
-  margin-bottom: 16px
-
-h5
-  font-size: 12px
-  text-transform: uppercase
-  margin-bottom: 18px
-
-a:hover
-  text-decoration: underline

app/assets/stylesheets/legacy/_13_main_content.sass

@@ -45,4 +45,3 @@ h1.title
     margin-right: 10px
     cursor: pointer
     font-family: inherit
-    font-size: 11px

app/assets/stylesheets/legacy/_16_projects_page.sass

@@ -45,10 +45,7 @@
 
 li
   &.root
-    font-size: 18px
     margin-bottom: 24px
-  &.child
-    font-size: 14px
 
 .nosidebar ul.projects
   margin: 24px 0 0
@@ -56,7 +53,6 @@ li
     margin: 0
 
 ul.projects .description
-  font-size: 12px
 
 .nosidebar ul.projects li
   list-style: none outside none

app/assets/stylesheets/legacy/_19_misc.sass

@@ -364,8 +364,3 @@ div.indent
     &.wiki_menu_item_optional_links
       margin-left: 10px
       padding-top: 0px
-
-/* Open Project Design generated by theme-generator
-
-content
-  font-size: 12px

app/assets/stylesheets/legacy/main.sass

@@ -43,7 +43,6 @@
 @import "legacy/09_diff.sass"
 @import "legacy/10_work_package_quick_info.sass"
 @import "legacy/11_my_page_layout.sass"
-@import "legacy/12_base_typography.sass"
 @import "legacy/13_main_content.sass"
 @import "legacy/14_issue_table.sass"
 @import "legacy/15_single_issue_page.sass"

app/assets/stylesheets/open_project_global/_mixins.sass

@@ -111,7 +111,6 @@ $button-gray-font-color: #222222
   h3, h2
     border-bottom: 1px solid #EAEAEA
     color: #444444
-    font-size: 17px
     font-weight: normal
     margin: 0 0 20px
     padding: 5px 0 10px