Commit 7a1d8c60 authored by Ryan Lee's avatar Ryan Lee

Merge branch 'pre-v6.1.5' into 'master'

v6.1.5

See merge request !1
parents 0467a4cf fdd63ae5
/* Override SASS variables from core here. Check available variables in: /* Override SASS variables from core here. Check available variables in:
* app/assets/stylesheets/global/_variables.sass * app/assets/stylesheets/open_project_global/_variables.sass
*/ */
//$gray: #EAEAEA //$gray: #EAEAEA
...@@ -18,6 +18,12 @@ $primary-color-dark: #111111 !default ...@@ -18,6 +18,12 @@ $primary-color-dark: #111111 !default
$secondary-color: #bfbfbf !default $secondary-color: #bfbfbf !default
$alternative-color: #772200 !default $alternative-color: #772200 !default
// these colors should ensure a satisfying contrast for text on the given BG color
//$font-color-on-primary: white !default
//$font-color-on-primary-dark: white !default
//$font-color-on-secondary: white !default
//$font-color-on-alternative: white !default
//$h1-font-size: 2rem !default //$h1-font-size: 2rem !default
//$h1-font-color: $body-font-color !default //$h1-font-color: $body-font-color !default
//$h2-font-size: 1.5rem !default //$h2-font-size: 1.5rem !default
...@@ -46,6 +52,7 @@ $header-home-link-bg: url(image-path('zepheira/logo-he ...@@ -46,6 +52,7 @@ $header-home-link-bg: url(image-path('zepheira/logo-he
//$header-drop-down-projects-search-font-color: $body-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-bg-color: #E0E0E0 !default
//$header-drop-down-projects-search-input-bg-color: #FFFFFF !default //$header-drop-down-projects-search-input-bg-color: #FFFFFF !default
//$header-drop-down-projects-search-input-border-color: #D9D9D9 !default
//$header-search-field-bg-color: #FFFFFF !default //$header-search-field-bg-color: #FFFFFF !default
//$header-search-field-font-color: #000000 !default //$header-search-field-font-color: #000000 !default
...@@ -74,8 +81,10 @@ $main-menu-width: 250px !default ...@@ -74,8 +81,10 @@ $main-menu-width: 250px !default
//$main-menu-font-size: 15px !default //$main-menu-font-size: 15px !default
//$main-menu-selected-hover-indicator-color: $primary-color-dark !default //$main-menu-selected-hover-indicator-color: $primary-color-dark !default
//$main-menu-selected-hover-indicator-width: 4px !default //$main-menu-selected-hover-indicator-width: 4px !default
//$main-menu-selected-hover-border-color: $main-menu-border-color !default
//$main-menu-navigation-toggler-font-hover-color: #FFFFFF !default //$main-menu-navigation-toggler-font-hover-color: #FFFFFF !default
//$main-menu-toggler-separator-color: #EAEAEA !default
//$main-menu-child-item-height: 38px !default //$main-menu-child-item-height: 38px !default
//$main-menu-child-menu-bg-color: #FFFFFF !default //$main-menu-child-menu-bg-color: #FFFFFF !default
...@@ -91,6 +100,11 @@ $main-menu-child-font-color: #333333 !default ...@@ -91,6 +100,11 @@ $main-menu-child-font-color: #333333 !default
//$main-menu-sidebar-h3-border-top-color: #1F4654 !default //$main-menu-sidebar-h3-border-top-color: #1F4654 !default
//$main-menu-sidebar-h3-font-size: 15px !default //$main-menu-sidebar-h3-font-size: 15px !default
//$toolbar-title-color: #5F5F5F
//$toolbar-item--bg-color: #F8F8F8
//$toolbar-item--bg-color-pressed: $gray-lighter
//$toolbar-item--border-color: #DDD
//$breadcrumb-height: 40px !default //$breadcrumb-height: 40px !default
//$breadcrumb-bg-color: #F8F8F8 !default //$breadcrumb-bg-color: #F8F8F8 !default
//$breadcrumb-border-color: #E7E7E7 !default //$breadcrumb-border-color: #E7E7E7 !default
...@@ -116,14 +130,12 @@ $content-icon-color: $alternative-color ...@@ -116,14 +130,12 @@ $content-icon-color: $alternative-color
//$content-form-input-border: 1px solid #CACACA !default //$content-form-input-border: 1px solid #CACACA !default
//$content-form-input-hover-border: 1px solid #888888 !default //$content-form-input-hover-border: 1px solid #888888 !default
//$content-form-error-color: #9E2A1C !default
//$content-form-separator-color: #DDDDDD !default //$content-form-separator-color: #DDDDDD !default
//$content-flash-msg-font-color: #111111 !default //$content-form-danger-zone-bg-color: #CA3F3F !default
//$content-flash-error-msg-bg-color: #FF8B8B !default //$content-form-danger-zone-font-color: white !default
//$content-flash-notice-msg-bg-color: #C4EA96 !default
//$content-flash-warning-msg-bg-color: #EBD785 !default
//$content-flash-height: 25px !default
//$content-flash-icon-close-handler-font-size: 12px !default
//$content-calendar-border-width: 1px !default //$content-calendar-border-width: 1px !default
//$content-calendar-border-color: #D7D7D7 !default //$content-calendar-border-color: #D7D7D7 !default
...@@ -160,3 +172,25 @@ $content-box-bg-color: #FAF8F6 !default ...@@ -160,3 +172,25 @@ $content-box-bg-color: #FAF8F6 !default
//$user-avatar-mini-width: 20px !default //$user-avatar-mini-width: 20px !default
//$select-element-padding: 3px, 24px, 3px, 3px //$select-element-padding: 3px, 24px, 3px, 3px
//$widget-box-content-bg-color: $body-background
//$widget-box-block-bg-color: $body-background
//$widget-box-block-border-color: $content-default-border-color
//$homescreen-footer-bg-color: $gray-light
//$homescreen-footer-icon-color: #7B827B
//$inplace-edit--border-color: #ddd
//$inplace-edit--dark-background: $gray-light
//$inplace-edit--color--very-dark: #cacaca
//$inplace-edit--color-highlight: $primary-color
//$inplace-edit--selected-date-border-color: $primary-color-dark
//$inplace-edit--color--disabled: #4d4d4d
//$inplace-edit--bg-color--disabled: #eee
//$relations-save-button--disabled-color: $gray-dark !default
//$table-row-border-color: #E7E7E7 !default
//$table-row-highlighting-color: #e4f7fb !default
//$table-header-border-color: #D7D7D7 !default
//$table-header-shadow-color: #DDDDDD !default
...@@ -19,6 +19,8 @@ module OpenProject::Themes::Zepheira ...@@ -19,6 +19,8 @@ module OpenProject::Themes::Zepheira
version OpenProject::Themes::Zepheira::VERSION version OpenProject::Themes::Zepheira::VERSION
url 'http://zepheira.com' url 'http://zepheira.com'
author_url 'http://zepheira.com' author_url 'http://zepheira.com'
requires_openproject ">= 6.0.0"
end end
end end
end end
......
module OpenProject module OpenProject
module Themes module Themes
module Zepheira module Zepheira
VERSION = '1.0.3' VERSION = '6.1.5'
end end
end end
end end
$:.push File.expand_path("../lib", __FILE__) $:.push File.expand_path("../lib", __FILE__)
# Maintain your gem's version: # Maintain your gem's version:
require "./lib/open_project/themes/zepheira/version" require "open_project/themes/zepheira/version"
# Describe your gem and declare its dependencies: # Describe your gem and declare its dependencies:
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "openproject-themes-zepheira" s.name = "openproject-themes-zepheira"
s.version = OpenProject::Themes::Zepheira::VERSION s.version = OpenProject::Themes::Zepheira::VERSION
s.authors = ["Ryan Lee"] s.authors = ["Ryan Lee"]
s.email = "systems@zepheira.com" s.email = ["systems@zepheira.com"]
s.homepage = "http://zepheira.com/" s.homepage = "http://zepheira.com/"
s.summary = "Zepheira OpenProject theme" s.summary = "Zepheira OpenProject theme"
s.description = "Zepheira OpenProject theme for corporate branding" s.description = "Zepheira OpenProject theme for corporate branding"
s.files = Dir["{app,lib}/**/*", "Rakefile", "README.rdoc"] s.files = Dir["{app,lib}/**/*", "Rakefile", "README.rdoc"]
s.add_dependency "rails", "~> 4.2.5" s.add_dependency "rails", "~> 5.0"
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment