Skip to content
Snippets Groups Projects
Commit 4ad61f25 authored by Melissa Miller's avatar Melissa Miller
Browse files

daily build

parent 41dec866
No related branches found
No related tags found
No related merge requests found
Showing
with 201 additions and 232 deletions
......@@ -15,13 +15,13 @@
.block--ds-extras-ds-hero,
.l-region--hero-wrapper {
position: relative;
max-height: 420px;
max-height: 500px;
.field--name-field-banner-image {
position: relative;
top: 0;
z-index: 9;
max-height: 420px;
max-height: 500px;
overflow: hidden;
}
......
......@@ -191,5 +191,11 @@
}
}
.section-news {
.l-region--sidebar-2 {
h2.block__title {
padding-top: 1.2em;
}
}
}
......@@ -81,9 +81,9 @@ settings[omega_demo_regions_list][sidebar_first] = sidebar_first
settings[omega_demo_regions_list][sidebar_second] = sidebar_second
settings[omega_demo_regions_list][footer] = footer
; Information added by Drupal.org packaging script on 2014-10-20
version = "7.x-4.3"
; Information added by Drupal.org packaging script on 2015-07-21
version = "7.x-4.4"
core = "7.x"
project = "omega"
datestamp = "1413819533"
datestamp = "1437473042"
GEM
remote: https://rubygems.org/
specs:
addressable (2.3.5)
breakpoint (2.0.5)
compass (>= 0.12.1)
sass (>= 3.2.0)
celluloid (0.15.2)
timers (~> 1.1.0)
chunky_png (1.2.8)
addressable (2.3.6)
breakpoint (2.5.0)
sass (~> 3.3)
sassy-maps (< 1.0.0)
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.3)
coderay (1.1.0)
color-schemer (0.2.5)
compass (~> 0.12)
compass-blend-modes (~> 0.0.2)
compass (0.12.2)
compass (1.0.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
compass-blend-modes (0.0.2)
compass
compass-normalize (1.4.3)
compass-core (~> 1.0.1)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.1)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
compass-normalize (1.5)
compass (>= 0.12.0)
compass-rgbapng (0.2.1)
chunky_png (>= 0.8.0)
compass (>= 0.10.0)
compass-validator (3.0.1)
css_parser (1.3.4)
css_parser (1.3.5)
addressable
em-websocket (0.5.0)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.5.3)
http_parser.rb (~> 0.6.0)
eventmachine (1.0.3)
ffi (1.9.0)
formatador (0.2.4)
fssm (0.2.10)
guard (2.2.4)
ffi (1.9.6)
formatador (0.2.5)
guard (2.6.1)
formatador (>= 0.2.4)
listen (~> 2.1)
listen (~> 2.7)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-compass (1.0.0)
guard-compass (1.1.0)
compass (>= 0.10.5)
guard (~> 2.0)
guard-livereload (2.0.0)
guard-livereload (2.3.1)
em-websocket (~> 0.5)
guard (~> 2.0)
multi_json (~> 1.8)
guard-shell (0.5.2)
guard-shell (0.6.1)
guard (>= 1.1.0)
http_parser.rb (0.5.3)
listen (2.2.0)
hitimes (1.2.2)
http_parser.rb (0.6.0)
listen (2.7.11)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.4)
lumberjack (1.0.9)
method_source (0.8.2)
multi_json (1.8.2)
oily_png (1.1.0)
chunky_png (~> 1.2.7)
pry (0.9.12.3)
coderay (~> 1.0)
method_source (~> 0.8)
multi_json (1.10.1)
oily_png (1.1.2)
chunky_png (~> 1.3.1)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rb-fchange (0.0.6)
ffi
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
sass (3.2.9)
sass-globbing (1.1.0)
sass (3.4.6)
sass-globbing (1.1.1)
sass (>= 3.1)
sassy-strings (0.3.1)
compass (>= 0.12.2)
singularitygs (1.0.8)
breakpoint (>= 2.0.1)
compass (>= 0.12.2)
sass (>= 3.2.1)
slop (3.4.7)
susy (1.0.9)
compass (>= 0.12.2)
sass (>= 3.2.0)
thor (0.18.1)
timers (1.1.0)
toolkit (1.3.3)
breakpoint (>= 2.0.2)
color-schemer (>= 0.2.3)
compass (>= 0.12.2)
sassy-strings (>= 0.1)
singularitygs (>= 1.0.7)
yajl-ruby (1.1.0)
sassy-maps (0.4.0)
sass (~> 3.3)
singularitygs (1.4.0)
breakpoint (~> 2.4)
sass (~> 3.3)
slop (3.6.0)
susy (2.1.3)
sass (>= 3.3.0, < 3.5)
thor (0.19.1)
timers (4.0.1)
hitimes
toolkit (2.6.0)
sass (~> 3.3)
yajl-ruby (1.2.1)
PLATFORMS
ruby
......
......@@ -25,18 +25,18 @@
@media (min-width: 700px) {
/* Header Area */
.l-branding {
width: 61.98347%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
.l-region--header {
width: 37.19008%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
}
......@@ -46,35 +46,35 @@
/* Content Area */
.l-content {
width: 100.0%;
float: right;
width: 15.25424%;
float: left;
margin-right: -100%;
margin-left: 0;
margin-right: 0;
clear: none;
}
/* Sidebars */
.has-one-sidebar .l-region--sidebar-first,
.has-one-sidebar .l-region--sidebar-second {
width: 100.0%;
float: right;
width: 15.25424%;
float: left;
margin-right: -100%;
margin-left: 0;
margin-right: 0;
clear: none;
}
.has-two-sidebars .l-region--sidebar-first {
width: 61.98347%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: both;
}
.has-two-sidebars .l-region--sidebar-second {
width: 37.19008%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
}
}
......@@ -90,18 +90,18 @@
}
.l-branding {
width: 50.33557%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
.l-region--header {
width: 48.99329%;
float: right;
margin-left: 0;
margin-right: 0;
width: 15.25424%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
}
......@@ -111,35 +111,35 @@
/* Content Area */
.l-content {
width: 50.33557%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
/* Sidebars */
.has-one-sidebar .l-region--sidebar-first,
.has-one-sidebar .l-region--sidebar-second {
width: 48.99329%;
float: right;
margin-left: 0;
margin-right: 0;
width: 15.25424%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
}
.has-two-sidebars .l-region--sidebar-first {
width: 30.20134%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 51.00671%;
margin-left: 8.47458%;
clear: none;
}
.has-two-sidebars .l-region--sidebar-second {
width: 18.12081%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 16.94915%;
clear: none;
}
}
......@@ -33,18 +33,18 @@
}
.l-branding {
width: 50.33557%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
.l-region--header {
width: 48.99329%;
float: right;
margin-left: 0;
margin-right: 0;
width: 15.25424%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
}
......@@ -54,34 +54,34 @@
/* Content Area */
.l-content {
width: 50.33557%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
/* Sidebars */
.has-one-sidebar .l-region--sidebar-first,
.has-one-sidebar .l-region--sidebar-second {
width: 48.99329%;
float: right;
margin-left: 0;
margin-right: 0;
width: 15.25424%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
}
.has-two-sidebars .l-region--sidebar-first {
width: 30.20134%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 51.00671%;
margin-left: 8.47458%;
clear: none;
}
.has-two-sidebars .l-region--sidebar-second {
width: 18.12081%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 16.94915%;
clear: none;
}
......@@ -19,51 +19,51 @@
@media (min-width: 700px) {
.golden-region--first {
width: 100.0%;
float: right;
width: 15.25424%;
float: left;
margin-right: -100%;
margin-left: 0;
margin-right: 0;
clear: none;
}
.golden-region--second {
width: 61.98347%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: both;
}
.golden-region--third {
width: 37.19008%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
}
}
@media (min-width: 1250px) {
.golden-region--first {
width: 50.33557%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
.golden-region--second {
width: 30.20134%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 51.00671%;
margin-left: 8.47458%;
clear: none;
}
.golden-region--third {
width: 18.12081%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 16.94915%;
clear: none;
}
}
......@@ -19,28 +19,28 @@
@media (min-width: 1250px) {
.grid-3-region--first,
.grid-3-region--fourth {
width: 27.27273%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: left;
}
.grid-3-region--second,
.grid-3-region--fifth {
width: 27.27273%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 36.36364%;
margin-left: 8.47458%;
clear: none;
}
.grid-3-region--third,
.grid-3-region--sixth {
width: 27.27273%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 16.94915%;
clear: right;
}
}
......@@ -17,80 +17,80 @@
}
.mondrian-region--tertiary-second {
width: 45.45455%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
.mondrian-region--tertiary-third {
width: 45.45455%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
}
@media (min-width: 700px) {
.mondrian-region--secondary,
.mondrian-region--tertiary-second {
width: 45.45455%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
clear: left;
}
.mondrian-region--tertiary-first,
.mondrian-region--tertiary-third {
width: 45.45455%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 8.47458%;
clear: none;
clear: right;
}
}
@media (min-width: 1250px) {
.mondrian-region--main {
width: 72.72727%;
width: 15.25424%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
.mondrian-region--secondary {
width: 22.72727%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 16.94915%;
clear: none;
}
.mondrian-region--tertiary-first {
width: 45.45455%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 27.27273%;
margin-left: 8.47458%;
clear: left;
}
.mondrian-region--tertiary-second {
width: 22.72727%;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 0%;
margin-left: 0;
clear: none;
}
.mondrian-region--tertiary-third {
width: 22.72727%;
float: right;
margin-left: 0;
margin-right: 0;
width: 6.77966%;
float: left;
margin-right: -100%;
margin-left: 16.94915%;
clear: right;
}
}
......@@ -18,6 +18,7 @@
text-indent: -119988px;
overflow: hidden;
text-align: left;
text-transform: capitalize;
}
.l-off-canvas-show {
......@@ -62,9 +63,9 @@
bottom: 0;
left: -70%;
padding-top: 24px;
-webkit-transition: left 0.2s ease-in;
-moz-transition: left 0.2s ease-in;
-o-transition: left 0.2s ease-in;
-webkit-transition: left 0.2s ease-in;
transition: left 0.2s ease-in;
cursor: pointer;
}
......@@ -85,11 +86,7 @@
.l-header,
.l-main,
.l-footer {
*zoom: 1;
max-width: 1080px;
_width: 1080px;
padding-left: 10px;
padding-right: 10px;
max-width: 1100px;
margin-left: auto;
margin-right: auto;
*zoom: 1;
......@@ -98,8 +95,8 @@
.l-header:after,
.l-main:after,
.l-footer:after {
content: "";
display: table;
content: " ";
display: block;
clear: both;
}
.l-header:after,
......@@ -118,23 +115,19 @@
.l-header,
.l-main,
.l-footer {
max-width: 1080px;
_width: 1080px;
max-width: 1100px;
}
.l-branding {
width: 32.20339%;
float: left;
margin-right: 1.69492%;
display: inline;
}
.l-region--header {
width: 66.10169%;
float: right;
margin-right: 0;
*margin-left: -1em;
display: inline;
}
.l-region--navigation {
......@@ -147,7 +140,6 @@
width: 66.10169%;
float: left;
margin-right: 1.69492%;
display: inline;
}
.has-sidebar-first .l-region--sidebar-first,
.has-sidebar-first .l-region--sidebar-second,
......@@ -158,8 +150,6 @@
width: 32.20339%;
float: right;
margin-right: 0;
*margin-left: -1em;
display: inline;
}
.has-sidebar-first .l-region--sidebar-second,
.has-sidebar-second .l-region--sidebar-second,
......@@ -172,43 +162,34 @@
width: 36.70886%;
float: left;
margin-right: 1.26582%;
display: inline;
}
.l-region--header {
width: 62.02532%;
float: right;
margin-right: 0;
*margin-left: -1em;
display: inline;
}
.has-sidebar-first .l-content {
width: 74.68354%;
float: right;
margin-right: 0;
*margin-left: -1em;
display: inline;
}
.has-sidebar-first .l-region--sidebar-first {
width: 24.05063%;
float: left;
margin-right: 1.26582%;
display: inline;
}
.has-sidebar-second .l-content {
width: 74.68354%;
float: left;
margin-right: 1.26582%;
display: inline;
}
.has-sidebar-second .l-region--sidebar-second {
width: 24.05063%;
float: right;
margin-right: 0;
*margin-left: -1em;
display: inline;
clear: none;
}
......@@ -216,7 +197,6 @@
width: 49.36709%;
float: left;
margin-right: 1.26582%;
display: inline;
margin-left: 25.31646%;
}
.has-two-sidebars .l-region--sidebar-first,
......@@ -224,7 +204,6 @@
width: 24.05063%;
float: left;
margin-right: 1.26582%;
display: inline;
}
.has-two-sidebars .l-region--sidebar-first {
margin-left: -75.94937%;
......@@ -232,8 +211,6 @@
.has-two-sidebars .l-region--sidebar-second {
float: right;
margin-right: 0;
*margin-left: -1em;
display: inline;
clear: none;
}
}
......@@ -7,11 +7,7 @@
.l-header,
.l-main,
.l-footer {
*zoom: 1;
max-width: 1190px;
_width: 1190px;
padding-left: 5px;
padding-right: 5px;
max-width: 1200px;
margin-left: auto;
margin-right: auto;
margin-bottom: 20px;
......@@ -19,8 +15,8 @@
.l-header:after,
.l-main:after,
.l-footer:after {
content: "";
display: table;
content: " ";
display: block;
clear: both;
}
......@@ -35,7 +31,7 @@
.l-header,
.l-main,
.l-footer {
max-width: 1190px;
max-width: 1200px;
}
.l-branding {
......@@ -81,7 +77,7 @@
.l-header,
.l-main,
.l-footer {
max-width: 1190px;
max-width: 1200px;
}
.l-branding {
......
......@@ -26,10 +26,8 @@
line-height: 20px;
/* Other Declarations */
background-color: #b4d7f0;
-webkit-border-radius: 0 0 10px 10px;
-moz-border-radius: 0 0 10px 10px;
-ms-border-radius: 0 0 10px 10px;
-o-border-radius: 0 0 10px 10px;
-webkit-border-radius: 0;
border-radius: 0 0 10px 10px;
}
......
......@@ -35,7 +35,7 @@
#palette .down,
#palette .up,
#palette .both {
background: url('../../../images/modules/color/hook-rtl.png?1379458577') no-repeat 0 0;
background: url('../../../images/modules/color/hook-rtl.png?1382488163') no-repeat 0 0;
}
#palette .up {
......
......@@ -56,7 +56,7 @@
#palette .down,
#palette .up,
#palette .both {
background: url('../../../images/modules/color/hook.png?1379458577') no-repeat 100% 0;
background: url('../../../images/modules/color/hook.png?1382488163') no-repeat 100% 0;
/* LTR */
}
......@@ -79,7 +79,7 @@
/* LTR */
width: 20px;
height: 25px;
background: url('../../../images/modules/color/lock.png?1379458577') no-repeat 50% 2px;
background: url('../../../images/modules/color/lock.png?1382488163') no-repeat 50% 2px;
cursor: pointer;
}
......
......@@ -8,9 +8,7 @@
.contextual-links {
left: 0;
right: auto;
-webkit-border-radius: 0 4px 4px 4px;
-moz-border-radius: 0 4px 4px 4px;
-ms-border-radius: 0 4px 4px 4px;
-o-border-radius: 0 4px 4px 4px;
-webkit-border-radius: 0;
border-radius: 0 4px 4px 4px;
}
......@@ -32,12 +32,10 @@
padding: 0 2px !important;
width: 28px;
/* Other Declarations */
background: transparent url('../../../images/modules/contextual/gear-select.png?1379458577') no-repeat 2px 0 !important;
background: transparent url('../../../images/modules/contextual/gear-select.png?1382488163') no-repeat 2px 0 !important;
border: 1px solid transparent !important;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-ms-border-radius: 4px;
-o-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
outline: none;
text-indent: 9999px;
......@@ -80,10 +78,8 @@
/* Other Declarations */
background-color: #fff !important;
border: 1px solid #ccc !important;
-webkit-border-radius: 4px 0 4px 4px;
-moz-border-radius: 4px 0 4px 4px;
-ms-border-radius: 4px 0 4px 4px;
-o-border-radius: 4px 0 4px 4px;
-webkit-border-radius: 4px;
border-radius: 4px 0 4px 4px;
/* LTR */
text-align: left;
......
......@@ -33,7 +33,7 @@
padding: 0 1.5em 0.5em;
}
.filter-help a {
background: transparent url('../../../images/misc/help.png?1379458577') right center no-repeat;
background: transparent url('../../../images/misc/help.png?1382488163') right center no-repeat;
padding: 0 20px;
}
......
......@@ -8,7 +8,7 @@
width: 24px;
height: 24px;
margin-right: 0.4em;
background-image: url('../../../images/modules/forum/forum-icons.png?1379458577');
background-image: url('../../../images/modules/forum/forum-icons.png?1382488163');
background-repeat: no-repeat;
text-indent: -9999px;
}
......
......@@ -8,7 +8,7 @@
.form-item-openid-identifier input {
padding-left: 20px;
/* LTR */
background-image: url('../../../images/modules/openid/login-bg.png?1379458577');
background-image: url('../../../images/modules/openid/login-bg.png?1382488163');
background-position: left 50%;
/* LTR */
background-repeat: no-repeat;
......@@ -23,7 +23,7 @@
.openid-links a {
padding: 0 0 0 1.5em;
/* LTR */
background-image: url('../../../images/modules/openid/login-bg.png?1379458577');
background-image: url('../../../images/modules/openid/login-bg.png?1382488163');
background-position: left top;
/* LTR */
background-repeat: no-repeat;
......
......@@ -62,17 +62,17 @@
}
.module-link-help {
background: url('../../../images/misc/help.png?1379458577') 0 50% no-repeat;
background: url('../../../images/misc/help.png?1382488163') 0 50% no-repeat;
/* LTR */
}
.module-link-permissions {
background: url('../../../images/misc/permissions.png?1379458577') 0 50% no-repeat;
background: url('../../../images/misc/permissions.png?1382488163') 0 50% no-repeat;
/* LTR */
}
.module-link-configure {
background: url('../../../images/misc/configure.png?1379458577') 0 50% no-repeat;
background: url('../../../images/misc/configure.png?1382488163') 0 50% no-repeat;
/* LTR */
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment