From b5c504a1150fb930e86cf5441ffc663580f5b510 Mon Sep 17 00:00:00 2001 From: briandunnigan Date: Fri, 8 Aug 2014 12:37:23 -0400 Subject: [PATCH 1/2] -Changing font size/color in footer/mega-footer -Changing search size/color in nav -Color change of secondary site title -Altering page padding -Fixing external link icons in tables -Changing search box look --- .gitignore | 4 - _notes/dwsync.xml | 1 - javascripts/_notes/dwsync.xml | 1 - javascripts/min/_notes/dwsync.xml | 1 - sass/_notes/dwsync.xml | 1 - sass/variables.scss | 14 +-- style.css | 142 ++++++++++++++++++++++-------- style.scss | 45 +++++++--- stylesheets/_notes/dwsync.xml | 1 - variables.css | 3 + 10 files changed, 151 insertions(+), 62 deletions(-) delete mode 100644 .gitignore delete mode 100644 _notes/dwsync.xml delete mode 100644 javascripts/_notes/dwsync.xml delete mode 100644 javascripts/min/_notes/dwsync.xml delete mode 100644 sass/_notes/dwsync.xml delete mode 100644 stylesheets/_notes/dwsync.xml create mode 100644 variables.css diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 07d961b..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ - -*.xml - -*.xml diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml deleted file mode 100644 index a8c8fea..0000000 --- a/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/javascripts/_notes/dwsync.xml b/javascripts/_notes/dwsync.xml deleted file mode 100644 index 1ebe831..0000000 --- a/javascripts/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/javascripts/min/_notes/dwsync.xml b/javascripts/min/_notes/dwsync.xml deleted file mode 100644 index b8bb07a..0000000 --- a/javascripts/min/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/sass/_notes/dwsync.xml b/sass/_notes/dwsync.xml deleted file mode 100644 index 0adc851..0000000 --- a/sass/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/sass/variables.scss b/sass/variables.scss index 4619421..0a676d8 100644 --- a/sass/variables.scss +++ b/sass/variables.scss @@ -10,7 +10,7 @@ $uc-ecw-day-color: #454545; $header_border: #273a60; -$title_parent: #fff; +$title_parent: #7c878e; $title_parentHover: #fff; $title_txt: #fff; @@ -83,7 +83,7 @@ $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; @@ -91,7 +91,7 @@ $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; @@ -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; @@ -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; } -} \ No newline at end of file +} diff --git a/style.css b/style.css index bcc6527..56a8d11 100644 --- a/style.css +++ b/style.css @@ -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; @@ -1156,7 +1155,7 @@ th { html { font-size: 10px; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + -webkit-tap-highlight-color: transparent; } body { @@ -5146,7 +5145,6 @@ a.thumbnail.active { background-position: 0 0; } } - @keyframes progress-bar-stripes { from { background-position: 40px 0; @@ -5156,7 +5154,6 @@ a.thumbnail.active { background-position: 0 0; } } - .progress { overflow: hidden; height: 20px; @@ -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; @@ -6476,7 +6473,6 @@ button.close { @-ms-viewport { width: device-width; } - .visible-xs, .visible-sm, .visible-md, .visible-lg { display: none !important; } @@ -6734,7 +6730,6 @@ button.close { font-weight: normal; font-style: normal; } - @font-face { font-family: 'Proxima Nova'; src: url("../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.eot"); @@ -6742,7 +6737,6 @@ button.close { font-weight: 500; font-style: normal; } - /* - - - - - - - - - - - - - - - - - - - == Titlebar - - - - - - - - - - - - - - - - - - - */ @@ -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; } @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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 { @@ -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; @@ -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 { @@ -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; @@ -8038,8 +8082,8 @@ body { color: #4C608A; } #content .col-sm-12 .page { - padding-left: 6em; - padding-right: 6em; + padding-left: 2em; + padding-right: 2em; } #content .col-sm-9 .page { padding-left: 3em; @@ -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; } @@ -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; } diff --git a/style.scss b/style.scss index 64adf47..7c54fc2 100644 --- a/style.scss +++ b/style.scss @@ -144,6 +144,11 @@ body { } } } + .searchform { + .btn { + padding:6px 12px; + } + } } } .widget { @@ -211,8 +216,8 @@ body { } .col-sm-12 .page { - padding-left:6em; - padding-right:6em; + padding-left:2em; + padding-right:2em; } .col-sm-9 .page { padding-left:3em; @@ -233,6 +238,19 @@ body { } +.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; @@ -245,14 +263,10 @@ body { .row { margin-left:-5px; margin-right:-5px; - } .widget { margin: 0 0 10px; - } - - } @@ -263,10 +277,21 @@ body { border-top:none; } + +#mega-footer .widget .widget-head h2 { + color:#999999; +} -.form-control { - border-right:none; +#mega-footer li { + font-size:13px; } -#mega-footer .widget .widget-head h2 { - color:#7C7C7C; + +footer li { + font-size:13px; } + +table .external .glyphicon-new-window { + font-size: 0.8em !important; + margin-left: 0.4em !important; + opacity: 0.7 !important; +} \ No newline at end of file diff --git a/stylesheets/_notes/dwsync.xml b/stylesheets/_notes/dwsync.xml deleted file mode 100644 index b3a7f1d..0000000 --- a/stylesheets/_notes/dwsync.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/variables.css b/variables.css new file mode 100644 index 0000000..692f7da --- /dev/null +++ b/variables.css @@ -0,0 +1,3 @@ +/* + SHERMAN variables +*/ From bf498afb02267f0f7311ca52e71efa6064907556 Mon Sep 17 00:00:00 2001 From: briandunnigan Date: Fri, 8 Aug 2014 13:08:31 -0400 Subject: [PATCH 2/2] Fixed Padding for col12/9 -3em 4eva --- style.css | 4 ++-- style.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/style.css b/style.css index 56a8d11..b1a531f 100644 --- a/style.css +++ b/style.css @@ -8082,8 +8082,8 @@ body { color: #4C608A; } #content .col-sm-12 .page { - padding-left: 2em; - padding-right: 2em; + padding-left: 3em; + padding-right: 3em; } #content .col-sm-9 .page { padding-left: 3em; diff --git a/style.scss b/style.scss index 7c54fc2..6e11cb3 100644 --- a/style.scss +++ b/style.scss @@ -216,8 +216,8 @@ body { } .col-sm-12 .page { - padding-left:2em; - padding-right:2em; + padding-left:3em; + padding-right:3em; } .col-sm-9 .page { padding-left:3em;