Skip to content
This repository has been archived by the owner. It is now read-only.

Fixed Col 12/9 #3

Merged
merged 2 commits into from
Aug 8, 2014
Merged

Fixed Col 12/9 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5c504a
-Changing font size/color in footer/mega-footer
Aug 8, 2014
bf498af
Fixed Padding for col12/9
Aug 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitignore
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion _notes/dwsync.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion javascripts/_notes/dwsync.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion javascripts/min/_notes/dwsync.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion sass/_notes/dwsync.xml
View file
Open in desktop

This file was deleted.

14 changes: 8 additions & 6 deletions sass/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $uc-ecw-day-color: #454545;

$header_border: #273a60;

$title_parent: #fff;
$title_parent: #7c878e;
$title_parentHover: #fff;

$title_txt: #fff;
Expand Down Expand Up @@ -83,15 +83,15 @@ $link-hover-color: darken($link-color, 15%) !default;

$footers-margin: 0;
$footers-bg: #08193c;
$footers-link-color: rgba(255,255,255,.8);
$footers-link-color: rgba(255,255,255,.7);
$footers-link-hover: rgba(255,255,255,1);

$footers-border-color: #bd2429;
$footers-border-width: 1px 0 0 0;


$megafooter-widget-color: rgba(255,255,255, 0.6);
$megafooter-widget-head-color: #7C7C7C!important;
$megafooter-widget-head-color: #999999!important;



Expand All @@ -100,8 +100,8 @@ $megafooter-widget-head-color: #7C7C7C!important;
.searchform {
$searchText: #fff;
$searchPlacehoderText: rgba($searchText, .5);
$searchBackground: rgba(255, 255, 255, .2);

$searchBackground: rgba(255, 255, 255, .15);
.form-control {
background-color:$searchBackground;
color: $searchText;
Expand All @@ -126,14 +126,16 @@ $megafooter-widget-head-color: #7C7C7C!important;
background-color: $searchBackground;
color:$searchPlacehoderText;
border:none;
padding:5px 12px;
&:hover {
color:#fff;
background-color:darken($searchBackground, 40%);
}
}
}

.ie7 .searchform .formcontrol,
.ie7 .searchform .btn {
background-color:#3e4a67!important;
}
}
}
142 changes: 105 additions & 37 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ th {
src: url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.eot");
src: url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../global/bootstrap-sass-master/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg");
}

.glyphicon {
position: relative;
top: 1px;
Expand Down Expand Up @@ -1156,7 +1155,7 @@ th {

html {
font-size: 10px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
}

body {
Expand Down Expand Up @@ -5146,7 +5145,6 @@ a.thumbnail.active {
background-position: 0 0;
}
}

@keyframes progress-bar-stripes {
from {
background-position: 40px 0;
Expand All @@ -5156,7 +5154,6 @@ a.thumbnail.active {
background-position: 0 0;
}
}

.progress {
overflow: hidden;
height: 20px;
Expand Down Expand Up @@ -6366,7 +6363,7 @@ button.close {
border-radius: 10px;
cursor: pointer;
background-color: #000 \9;
background-color: rgba(0, 0, 0, 0);
background-color: transparent;
}
.carousel-indicators .active {
margin: 0;
Expand Down Expand Up @@ -6476,7 +6473,6 @@ button.close {
@-ms-viewport {
width: device-width;
}

.visible-xs, .visible-sm, .visible-md, .visible-lg {
display: none !important;
}
Expand Down Expand Up @@ -6734,15 +6730,13 @@ button.close {
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Proxima Nova';
src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot");
src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix") format("embedded-opentype"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold") format("svg"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.woff") format("woff"), url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf") format("truetype");
font-weight: 500;
font-style: normal;
}

/* - - - - - - - - - - - - - - - - - - -
== Titlebar
- - - - - - - - - - - - - - - - - - - */
Expand Down Expand Up @@ -6865,6 +6859,63 @@ button.close {
display: none;
}

/*
// Support for mulitple-level dropdown menus.
.dropdown-submenu{
position:relative;
}
.dropdown-submenu > .dropdown-menu {
top:0;
left:100%;
padding:0;
}
.dropdown-submenu:hover > .dropdown-menu{
display:block;
}
.dropdown-submenu:hover > a {
color: $navbar-default-link-hover-color;
background-color: $navbar-default-link-hover-bg;
}
.dropdown-submenu > a:after{
display:block;
content:" ";
float:right;
width:0;
height:0;
border-color:transparent;
border-style:solid;
border-width:5px 0 5px 5px;
border-left-color:$navbar-default-link-color;
margin-top:5px;
margin-right:-10px;
}
.dropdown-submenu:hover > a:after{
border-left-color:$navbar-default-link-hover-color;
}
.dropdown-submenu .pull-left{
float:none;
}
.dropdown-submenu.pull-left > .dropdown-menu{
left:-100%;
margin-left:10px;
}
.dropdown-menu {
.dropdown-menu {
margin:0;
top:-1px;
}
}
/**/
.navbar-collapse {
max-height: none;
}
Expand Down Expand Up @@ -7060,15 +7111,9 @@ code {
margin: 1em;
}
.page .uc-cal.uc-listcal .uc-cal-list a.uc-cal-event {
display: block;
position: relative;
padding-left: 3em;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.page .uc-cal.uc-listcal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
position: absolute;
left: 0;
top: 0;
display: block;
font-weight: normal;
color: #aaa;
Expand Down Expand Up @@ -7499,15 +7544,9 @@ object {
margin: 1em;
}
.widget.uc-ecw .uc-cal.uc-listcal .uc-cal-list a.uc-cal-event {
display: block;
position: relative;
padding-left: 3em;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.widget.uc-ecw .uc-cal.uc-listcal .uc-cal-list a.uc-cal-event .uc-cal-event-date {
position: absolute;
left: 0;
top: 0;
display: block;
font-weight: normal;
color: #aaa;
Expand Down Expand Up @@ -7788,23 +7827,23 @@ body.sticky #footers {
border: none;
}
#mega-footer .widget a {
color: rgba(255, 255, 255, 0.8);
color: rgba(255, 255, 255, 0.7);
}
#mega-footer .widget a:hover {
color: white;
}
#mega-footer .widget .widget-head {
background-color: transparent;
color: #7c7c7c !important;
color: #999999 !important;
border: none;
}

#footer {
padding: 1.5em 0;
color: rgba(255, 255, 255, 0.8);
color: rgba(255, 255, 255, 0.7);
}
#footer a {
color: rgba(255, 255, 255, 0.8);
color: rgba(255, 255, 255, 0.7);
}
#footer a:hover {
color: white;
Expand Down Expand Up @@ -7846,7 +7885,7 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#142548', endColorstr='#071839',GradientType=0 );
}
#masthead #uc-site-parent a {
color: white;
color: #7c878e;
}
#masthead #uc-site-parent a:hover {
color: white;
Expand All @@ -7858,7 +7897,7 @@ body {
color: white;
}
#masthead .searchform .form-control {
background-color: rgba(255, 255, 255, 0.2);
background-color: rgba(255, 255, 255, 0.15);
color: white;
border-radius: 0;
border: none;
Expand All @@ -7877,13 +7916,14 @@ body {
color: rgba(255, 255, 255, 0.5);
}
#masthead .searchform .btn {
background-color: rgba(255, 255, 255, 0.2);
background-color: rgba(255, 255, 255, 0.15);
color: rgba(255, 255, 255, 0.5);
border: none;
padding: 5px 12px;
}
#masthead .searchform .btn:hover {
color: #fff;
background-color: rgba(153, 153, 153, 0.2);
background-color: rgba(153, 153, 153, 0.15);
}
#masthead .ie7 .searchform .formcontrol,
#masthead .ie7 .searchform .btn {
Expand Down Expand Up @@ -7914,7 +7954,7 @@ body {
padding: 0;
}
#masthead #site-navigation .navbar-collapse .nav .searchform .form-control {
background-color: rgba(255, 255, 255, 0.2);
background-color: rgba(255, 255, 255, 0.15);
color: white;
border-radius: 0;
border: none;
Expand All @@ -7933,13 +7973,14 @@ body {
color: rgba(255, 255, 255, 0.5);
}
#masthead #site-navigation .navbar-collapse .nav .searchform .btn {
background-color: rgba(255, 255, 255, 0.2);
background-color: rgba(255, 255, 255, 0.15);
color: rgba(255, 255, 255, 0.5);
border: none;
padding: 5px 12px;
}
#masthead #site-navigation .navbar-collapse .nav .searchform .btn:hover {
color: #fff;
background-color: rgba(153, 153, 153, 0.2);
background-color: rgba(153, 153, 153, 0.15);
}
#masthead #site-navigation .navbar-collapse .nav .ie7 .searchform .formcontrol,
#masthead #site-navigation .navbar-collapse .nav .ie7 .searchform .btn {
Expand Down Expand Up @@ -7982,6 +8023,9 @@ body {
#masthead #site-navigation .navbar-collapse .nav > li.open:after {
display: none;
}
#masthead .searchform .btn {
padding: 6px 12px;
}
}
.widget .widget-head .widget-title {
font-weight: normal;
Expand Down Expand Up @@ -8038,8 +8082,8 @@ body {
color: #4C608A;
}
#content .col-sm-12 .page {
padding-left: 6em;
padding-right: 6em;
padding-left: 3em;
padding-right: 3em;
}
#content .col-sm-9 .page {
padding-left: 3em;
Expand All @@ -8056,6 +8100,20 @@ body {
padding-right: 1em !important;
}
}
.form-control {
border-right: none;
box-shadow: none;
}

.btn {
border-left: none;
color: #777777;
}

#site-title .searchform .form-group .form-control {
font-size: 12px;
}

#page-home {
padding-top: 15px;
}
Expand All @@ -8079,10 +8137,20 @@ body {
border-top: none;
}

.form-control {
border-right: none;
#mega-footer .widget .widget-head h2 {
color: #999999;
}

#mega-footer .widget .widget-head h2 {
color: #7C7C7C;
#mega-footer li {
font-size: 13px;
}

footer li {
font-size: 13px;
}

table .external .glyphicon-new-window {
font-size: 0.8em !important;
margin-left: 0.4em !important;
opacity: 0.7 !important;
}
Loading