Skip to content

Commit

Permalink
Nav fix for Firefox
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Aug 7, 2014
1 parent a6a142c commit e6614d4
Show file tree
Hide file tree
Showing 6 changed files with 182 additions and 25 deletions.
2 changes: 1 addition & 1 deletion _notes/dwsync.xml

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions css/header-image.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
/* - - - - - - - - - - - - - - - - - - -
== Header Image
- - - - - - - - - - - - - - - - - - - */
#masthead {
-ms-word-break: break-all;
word-break: break-all;
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
}

#masthead.header-image .container {
position: relative;
}
Expand Down
179 changes: 179 additions & 0 deletions css/variables.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
/* - - - - - - - - - - - - - - - - - - -
== Variables
- - - - - - - - - - - - - - - - - - - */
/*
$contentBg: #fff;
$contentPadding: 1em;
*/
/* == Nav */
/*
$nav-secondary-border-color: #ccc !default;
$nav-secondary-border-radius: $border-radius-base !default;
$nav-secondary-padding: 5px !default;
$nav-secondary-bg-color: #fff !default;
$nav-secondary-font-size: .9em !default;
$nav-secondary-link-padding: $nav-link-padding !default;
$nav-secondary-link-border-radius: $border-radius-base !default;
$nav-secondary-link-bg: transparent !default;
$nav-secondary-link-hover-bg: $nav-link-hover-bg !default;
$nav-secondary-link-color: #428bca !default;
$nav-secondary-open-link-hover-color: $nav-open-link-hover-color !default;
$nav-secondary-active-link-hover-bg: $component-active-bg !default;
$nav-secondary-active-link-hover-color: $component-active-color !default;
/* == Widgets */
/*
$widget-border-color: #ccc !default;
$widget-border-radius: $border-radius-base !default;
$widget-border-width: 1px !default;
$widget-margin: 0 0 1.5em 0 !default;
$widget-padding: 0 !default;
$widget-bg: #fff !default;
$widget-content-margin: 1em;
$widget-color: #000 !default;
$widget-size: 1em !default;
$widget-link-color: $link-color !default;
$widget-link-hover: $link-hover-color !default;
$widget-head-bg: $widget-bg !default;
$widget-head-color: $widget-color !default;
$widget-head-border-width: 0 0 1px 0 !default;
$widget-head-border-color: $widget-border-color !default;
$widget-head-padding: .5em .5em .5em 1em !default;
$widget-head-size: $widget-size !default;
/* Sepcific Widgets */
/*
$footers-margin: 1.5em 0 0 0 !default;
$footers-bg: #eee !default;
$footers-color: #333 !default;
$footers-link-color: $link-color !default;
$footers-link-hover: $link-hover-color !default;
$footers-border-color: #ccc !default;
$footers-border-width: 2px 0 0 0 !default;
$megafooter-bg: transparent !default;
$megafooter-widget-bg: transparent !default;
$megafooter-widget-color: $footers-color !default;
$megafooter-widget-link-color: $footers-link-color !default;
$megafooter-widget-link-hover: $footers-link-hover !default;
$megafooter-widget-head-bg: transparent !default;
$megafooter-widget-head-color: $footers-color !default;
$uc-footer-link-color: $footers-link-color !default;
$uc-footer-link-hover: $footers-link-hover !default;
$uc-footer-link-spacing: 1em !default;;
@mixin uc-cal() {
.uc-cal {
padding:0;
&.uc-iconcal {
.uc-cal-list {
margin:$widget-content-margin;
a.uc-cal-event {
font-family:$font-family-base;
padding-left:65px;
min-height:65px;
.uc-cal-event-date {
border:none;
width:50px;
left:0;
box-shadow:none;
background-color:#eee;
.uc-cal-event-month {
height:auto;
padding:.4em .2em .3em .2em;
font-size:.8em;
background-color:$uc-ecw-month-bg;
color:$uc-ecw-month-color;
font-weight:normal;
letter-spacing:0;
text-transform:capitalize;
}
.uc-cal-event-day {
padding:.5em .1em .6em;
height:auto;
background-color:$uc-ecw-day-bg;
color:$uc-ecw-day-color;
font-size:1.2em;
}
}
.uc-cal-event-title {
color:$uc-ecw-title-color ;
font-size:1em;
line-height:$line-height-base;
margin-bottom:.3em;
margin-top:.2em;
}
.uc-cal-event-time {
color: $uc-ecw-time-color;
font-size:1em;
}
&:hover {
.uc-cal-event-title {
color: $uc-ecw-title-hover;
}
.uc-cal-event-time {
color: $uc-ecw-time-hover;
}
}
}
}
}
&.uc-listcal {
.uc-cal-list {
margin:$widget-content-margin;
a.uc-cal-event {
font-family:$font-family-base;
.uc-cal-event-date {
display:block;
font-weight:normal;
color:#aaa;
line-height:$line-height-base;
}
.uc-cal-event-title {
display:block;
color: $uc-ecw-title-color;
line-height:$line-height-base;
}
.uc-cal-event-time {
color: $uc-ecw-time-color;
}
&:hover {
.uc-cal-event-title {
color: $uc-ecw-title-hover;
}
.uc-cal-event-time {
color: $uc-ecw-time-hover;
}
}
}
}
}
}
}
/**/
6 changes: 0 additions & 6 deletions sass/header-image.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
== Header Image
- - - - - - - - - - - - - - - - - - - */
#masthead {
-ms-word-break: break-all;
word-break: break-all;
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
}
#masthead.header-image .container {
position:relative;
Expand Down
9 changes: 0 additions & 9 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -6898,15 +6898,6 @@ button.close {
/* - - - - - - - - - - - - - - - - - - -
== Header Image
- - - - - - - - - - - - - - - - - - - */
#masthead {
-ms-word-break: break-all;
word-break: break-all;
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
}

#masthead.header-image .container {
position: relative;
}
Expand Down
2 changes: 2 additions & 0 deletions style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ $icon-font-path: "../../global/bootstrap-sass-master/assets/fonts/bootstrap/" !d

@import "../../global/bootstrap-sass-master/assets/stylesheets/bootstrap.scss";


@import "sass/variables.scss";
@import "sass/utilities.scss";
@import "sass/fonts.scss";
@import "sass/titlebar.scss";
@import "sass/nav.scss";
@import "sass/header-image.scss";


@import "sass/content.scss";
@import "sass/captions.scss";
@import "sass/alignments.scss";
Expand Down

0 comments on commit e6614d4

Please sign in to comment.