From 1574f41eb00963789296958f4e4331fcc3415420 Mon Sep 17 00:00:00 2001 From: briandunnigan Date: Fri, 5 Sep 2014 16:24:44 -0400 Subject: [PATCH] Style Updates - Fixed padding on site title - Fixed margin on mobile site title - Search button size fix for IE 7+ - Added a background color for mobile dropdown - Fixed the padding and look of the search bar area in mobile - Fixed missing border on comment forms --- style.css | 165 +++++++++++++++++++++++++++++++++++++---------------- style.scss | 44 +++++++++++++- 2 files changed, 159 insertions(+), 50 deletions(-) diff --git a/style.css b/style.css index c8384bd..5cfb551 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; @@ -7651,18 +7690,29 @@ q:before, table q:after { display: block; position: relative; padding-left: 170px; - min-height: 150px; } .uup-list .has-image .uup-thumbnail { display: block; width: 150px; height: 150px; - position: absolute; - left: 0; - top: 0; + float: left; + position: relative; + left: -170px; + margin-right: -150px; +} +.uup-list a.uup-user { + float: left; } .uup-list .uup-item { margin-bottom: 1em; + *zoom: 1; +} +.uup-list .uup-item:after, .uup-list .uup-item:before { + content: ''; + display: table; +} +.uup-list .uup-item:after { + clear: both; } .uup-list .uup-item .uup-text { display: block; @@ -7673,42 +7723,24 @@ q:before, table q:after { .uup-list .uup-item .uup-text .uup-name { font-weight: bold; } -.uup-list .uup-item .uup-text .uup-name .uup-first:after { +.uup-list .uup-item .uup-text .uup-name .uup-last:before { content: ' '; } -.uup-index-table .uup-table-name.table-has-image { - position: relative; - padding-left: 60px; -} .uup-index-table .uup-table-name.table-has-image .uup-table-thumbnail { display: block; - width: 50px; - height: 50px; - position: absolute; - left: 0; - top: 5px; + width: 75px; + float: left; + margin: 0 1em 1em 0 !important; } .uup-index-table .uup-table-name.table-has-image .uup-name { + float: left; display: block; } .uup-index-table .uup-table-name .uup-last:before { content: ' '; } -/* - Profile Page -*/ -.uup-user > span { - display: block; -} -.uup-user .uup-name { - font-weight: bold; -} -.uup-user .uup-name .uup-first:after { - content: ' '; -} - /* - - - - - - - - - - - - - - - - - - - == Calendar - - - - - - - - - - - - - - - - - - - */ @@ -7835,7 +7867,7 @@ body.sticky #footers { } #uc-site-header { - padding-left: 15px; + padding-left: 8px; } #uc-header { @@ -8001,8 +8033,17 @@ body { } #masthead .searchform .btn { padding: 6px 12px; + margin-top: -2px !important; + } + + #masthead #site-navigation .navbar-collapse .nav .dropdown-menu { + background-color: #091733; } } +#masthead #site-navigation .navbar-header .navbar-brand { + margin-top: 4px; +} + .widget .widget-head .widget-title { font-weight: normal; } @@ -8115,10 +8156,38 @@ body { color: #777777; } +.comment-form-comment .form-control { + border-right: 1px solid #cccccc; +} + #site-title .searchform .form-group .form-control { font-size: 12px; } +/* Fixes for IE search button size */ +.lte9 #site-title .searchform .form-group .form-control { + height: 30px; +} + +/*A little hack-y to target IE10+ */ +@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + #site-title .searchform .form-group .form-control { + height: 30px; + } +} +.menu-label { + top: -1px; +} + +.menu-icon, .menu-label { + margin-bottom: -1px; +} + +.navbar-form { + padding: 10px 15px 2px !important; + margin: 8px -15px 0px !important; +} + .widget { margin: 0 0 10px; } diff --git a/style.scss b/style.scss index bb81690..6d934c5 100644 --- a/style.scss +++ b/style.scss @@ -16,7 +16,7 @@ #uc-site-header { - padding-left:15px; + padding-left:8px; } #uc-header { border-bottom-color:$header_border; @@ -153,10 +153,22 @@ body { .searchform { .btn { padding:6px 12px; + margin-top:-2px !important; } } } +#masthead #site-navigation .navbar-collapse .nav .dropdown-menu { + background-color: #091733; + } + } + +#masthead #site-navigation .navbar-header .navbar-brand { + margin-top:4px; + } + + + .widget { .widget-head { .widget-title { @@ -284,10 +296,37 @@ body { color:#777777; } +.comment-form-comment .form-control { + border-right:1px solid #cccccc; +} + #site-title .searchform .form-group .form-control { font-size:12px; } + +/* Fixes for IE search button size */ + .lte9 #site-title .searchform .form-group .form-control { + height:30px; + } + /*A little hack-y to target IE10+ */ + @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + #site-title .searchform .form-group .form-control { + height:30px; + } + } +.menu-label { + top:-1px; +} + + .menu-icon, .menu-label { + margin-bottom:-1px; + } + +.navbar-form { + padding: 10px 15px 2px !important; + margin: 8px -15px 0px !important; +} .widget { margin:0 0 10px; @@ -364,4 +403,5 @@ table .external .glyphicon-new-window { th:first-child { width:auto; } -} \ No newline at end of file +} +