Skip to content

Commit 5e7593b

Browse files
authored
Merge pull request #44 from occupant/v4
V4
2 parents ad76e2b + 4e1904c commit 5e7593b

25 files changed

+301
-2261
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ Project.espressostorage
22
Megatron - PUBLIC.esproj
33
megatron-public.esproj
44
user.jim.espressostorage
5-
bootstrap/
65
clf/
76
theme-settings 2.php
87
views-view--news-views--block.tpl.php

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UBC CLF 7.0.4 DRUPAL THEME (aka Megatron)
1+
UBC CLF 7.0.5 DRUPAL THEME (aka Megatron)
22
=======================================
33

44
A responsive UBC CLF (Common Look and Feel) theme for Drupal 7. Created by the
@@ -12,7 +12,8 @@ compatible with default bootstrap markup, and no need for
1212
conditional IE stylesheets.
1313

1414
### Drupal / Theme level
15-
- Modernizr
15+
- Minimal CLF (optional) - for heavily-themed sites, you can load the minimal required CSS and leave the rest of the bootstrap framework behind
16+
- Modernizr (optional)
1617
- Unit LESS files (and uncompressed CSS for everyone else)
1718
- Page / content type template suggestions (beyond page and blog)
1819
- Body classes to indicate page section and path for easier theming
@@ -39,12 +40,7 @@ conditional IE stylesheets.
3940
Media Query breakpoints.
4041
- Media - for inserting adaptive images into textarea fields
4142
(allows you to choose image style per image).
42-
- Block Class - allows you to easily use
43-
‘visible-phone / visible-tablet / visible-desktop’ type bootstrap styles on
44-
blocks of content.
45-
4643

4744
## MODULES NOT RECOMMENDED
4845

49-
- Environment Indicator - breaks in jQuery versions 1.8+
50-
46+
- Environment Indicator - breaks in jQuery versions 1.8+

0 commit comments

Comments
 (0)