Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Commit

Permalink
Merge pull request #921 from ymcatwincities/8.x-1.x-openy-lily
Browse files Browse the repository at this point in the history
New theme OpenY Lily
  • Loading branch information
ddrozdik authored Feb 23, 2018
2 parents 1b00556 + 28bc932 commit 60b7074
Show file tree
Hide file tree
Showing 373 changed files with 56,991 additions and 5 deletions.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@
"2874811 - Add option to show/hide empty views": "https://www.drupal.org/files/issues/Option-added-to-hide-empty-views-2874811.patch"
},
"drupal/core": {
"2346893 - Fix duplicate AJAX wrapper around a file field issue": "https://www.drupal.org/files/issues/2346893-233.patch"
"2346893 - Fix duplicate AJAX wrapper around a file field issue": "https://www.drupal.org/files/issues/2346893-233.patch",
"1236098 - Notice: Undefined index in _color_rewrite_stylesheet()": "https://www.drupal.org/files/issues/undefined-index-in-_color_rewrite_stylesheet-1236098-37.patch"
}
}
},
Expand Down
2 changes: 2 additions & 0 deletions drupal-org-core.make
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ api = 2
core = 8.x
projects[drupal][type] = core
projects[drupal][version] = 8.3.7
projects[drupal][patch][] = https://www.drupal.org/files/issues/2346893-233.patch
projects[drupal][patch][] = https://www.drupal.org/files/issues/undefined-index-in-_color_rewrite_stylesheet-1236098-37.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
class="block featured-highlights-block blog-photo">
<a title="{{ title }}" href="{{ url }}" rel="bookmark">
<div class="inner-wrapper">
{% if elements.field_featured_hl_block_image['#field_type'] %}
<div class="blog-up">
<div class="blog-up">
{% if elements.field_featured_hl_block_image['#field_type'] %}
{{ elements.field_featured_hl_block_image }}
</div>
{% endif %}
{% endif %}
</div>
<div class="blog-heading">
<h3><span>{{ title }}</span></h3>
<p>{{ description|striptags }}</p>
Expand Down
14 changes: 14 additions & 0 deletions themes/openy_themes/openy_lily/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Pull gems from RubyGems
source 'https://rubygems.org'

# ~> Refers to all versions of the given gem on the current full version number, so it will be able to use any version of Compass Aurora until Compass Aurora 4.x.x. For a specific version of a gem, remove the ~>
gem 'compass-aurora', '~>3.0.0'
gem 'toolkit', '~>1.0.0'
gem 'singularitygs', '~> 1.4.0'
gem 'sass', '~> 3.4.9'
gem 'breakpoint', '~> 2.5.0'
gem 'sassy-buttons', '~>0.1.4'
gem 'compass-normalize', '~>1.4.3'
gem 'css_parser', '~>1.3.4'

# Now that you're using Bundler, you need to run `bundle exec compass watch` instead of simply `compass watch`.
70 changes: 70 additions & 0 deletions themes/openy_themes/openy_lily/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
breakpoint (2.5.0)
sass (~> 3.3)
sassy-maps (< 1.0.0)
chunky_png (1.3.6)
color-schemer (0.2.8)
compass-blend-modes (~> 0.0.2)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-aurora (3.0.6)
bundler (>= 1.3.5)
compass (>= 0.12.2)
compass-normalize (>= 1.4.3)
css_parser (>= 1.3.4)
sassy-buttons (>= 0.1.4)
toolkit (>= 0.3.0)
compass-blend-modes (0.0.2)
compass
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
compass-normalize (1.4.3)
compass (>= 0.12.0)
css_parser (1.3.7)
addressable
ffi (1.9.10)
multi_json (1.12.1)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
sass (3.4.22)
sassy-buttons (0.1.4)
compass (>= 0.12.2)
sass (>= 3.2.0)
sassy-maps (0.4.0)
sass (~> 3.3)
sassy-strings (1.0.0)
compass (>= 0.12.2)
singularitygs (1.4.0)
breakpoint (~> 2.4)
sass (~> 3.3)
toolkit (1.0.0)
breakpoint (>= 2.0.2)
color-schemer (>= 0.2.3)
compass (>= 0.12.2)
sassy-strings (>= 0.1)
singularitygs (>= 1.0.7)

PLATFORMS
ruby

DEPENDENCIES
breakpoint (~> 2.5.0)
compass-aurora (~> 3.0.0)
compass-normalize (~> 1.4.3)
css_parser (~> 1.3.4)
sass (~> 3.4.9)
sassy-buttons (~> 0.1.4)
singularitygs (~> 1.4.0)
toolkit (~> 1.0.0)
47 changes: 47 additions & 0 deletions themes/openy_themes/openy_lily/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Maintaining the theme.

In order to compile css here are the necessary steps:

1. Install Ruby 2.2.5:

`gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3`

`\curl -sSL https://get.rvm.io | bash -s stable`

To start using RVM you need to run
`source ~/.rvm/scripts/rvm`

If still not working restart sh client.

`rvm install ruby-2.2.5`

Set as default ruby:

`rvm --default use 2.2.5`

2. Install ruby-compass:

`sudo apt-get install ruby-compass`

3. Install bundler

`sudo gem install bundler`

4. Install autoprefixer

`sudo gem install autoprefixer-rails -v '6.4.1.1'`

5. Go to the theme folder

`bundle install`

If you see error like this `tmpdir': could not find a temporary directory (ArgumentError)`
Run command `sudo chmod o+t /tmp` and try again.

5. To compile css one time use

`bundler exec compass compile`

6. Compass watching changes

`bundler exec compass watch --poll`
98 changes: 98 additions & 0 deletions themes/openy_themes/openy_lily/color/color.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?php

/**
* @file
* Lists available colors and color schemes for the OpenY Lily theme.
*/

$info = [
// Available colors and color labels used in theme.
'fields' => [
'headerbg' => t('Header background'),
'headermenulink' => t('Header menu link'),
'headermenuhover' => t('Header menu hover'),
'headermenulinkhover' => t('Header menu link hover'),
'headermainmenubg' => t('Header main menu background'),
'headermainmenulink' => t('Header main menu link'),
'bg' => t('Main background'),
'footer' => t('Footer background'),
'footertext' => t('Footer text'),
'text' => t('Global text color'),
'link' => t('Global link color'),
'button' => t('Global button color'),
'buttonlink' => t('Global Button link color'),
'primaryhighlight' => t('Primary highlight color'),
'secondaryhighlight' => t('Secondary highlight color'),
'branchsubheaderbg' => t('Branch subheader background'),
'branchbutton' => t('Branch button color'),
'branchbuttonlink' => t('Branch button link color'),
'campsubheaderbg' => t('Camp subheader background'),
'campmenubg' => t('Camp menu background'),
'campmenulink' => t('Camp menu link color'),
'campmenuhighlight' => t('Camp menu highlight color'),
'camplink' => t('Camp link color'),
'campbutton' => t('Camp button color'),
'campbuttonlink' => t('Camp button link color'),
'campprimaryhighlight' => t('Camp primary highlight color'),
'campsecondaryhighlight' => t('Camp secondary highlight color'),
],
// Pre-defined color schemes.
'schemes' => [
'default' => [
'title' => t('Default'),
'colors' => [
'headerbg' => '#f8f8f8',
'headermenulink' => '#777777',
'headermenuhover' => '#ffffff',
'headermenulinkhover' => '#000000',
'headermainmenubg' => '#0060af',
'headermainmenulink' => '#fffffe',
'bg' => '#fffffb',
'footer' => '#fffff9',
'footertext' => '#a8a8a8',
'text' => '#636466',
'link' => '#377bb5',
'button' => '#b92f9e',
'buttonlink' => '#fffffc',
'primaryhighlight' => '#5c2e91',
'secondaryhighlight' => '#c6168d',
'branchsubheaderbg' => '#5a2b8d',
'branchbutton' => '#b92f9f',
'branchbuttonlink' => '#fffff8',
'campsubheaderbg' => '#f47520',
'campmenubg' => '#383838',
'campmenulink' => '#fffffd',
'campmenuhighlight' => '#505050',
'camplink' => '#019c85',
'campbutton' => '#019c86',
'campbuttonlink' => '#fffff7',
'campprimaryhighlight' => '#019c87',
'campsecondaryhighlight' => '#c6168e',
],
],
],

// CSS files (excluding @import) to rewrite with new color scheme.
'css' => [
'css/colors.css',
],

// Copy the logo file from the theme. Color module forces this behavior.
'copy' => [
'logo.png',
],

// Preview files.
'preview_library' => 'openy_lily/color.preview',
'preview_html' => 'color/preview.html',

// Attachments.
'#attached' => [
'drupalSettings' => [
'color' => [
// Put the logo path into JavaScript for the live preview.
'logo' => theme_get_setting('logo.url', 'openy_lily'),
],
],
],
];
Loading

0 comments on commit 60b7074

Please sign in to comment.