From b4b532a076243105feec760678589eeb06d2dc0f Mon Sep 17 00:00:00 2001 From: briandunnigan Date: Fri, 24 Oct 2014 15:20:00 -0400 Subject: [PATCH 1/3] Bug List Updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixed
color in footer - Fixed site title thickness (I think I have the most up to date version of Sherman…hopefully) --- style.css | 158 +++++++++++++++++++++++++++++------------------------ style.scss | 12 +++- 2 files changed, 96 insertions(+), 74 deletions(-) diff --git a/style.css b/style.css index 0039fd9..5acaf35 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ Description: Aurora's new theme for 2014. Author: UITS Web Development Lab Template: cornerstone - Version: 1.0.1 + Version: 1.0.0 */ /* SHERMAN variables @@ -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 - - - - - - - - - - - - - - - - - - - */ @@ -6819,10 +6813,6 @@ button.close { width: 150px; } -.lte7.form-control { - width: 20px; -} - /* NAV --------------------------------------------------------------*/ #nav-secondary { @@ -6869,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; } @@ -7064,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; @@ -7444,12 +7485,6 @@ object { .widget.uc-contact-widget th { white-space: nowrap; } -.widget.uc-contact-widget td.uc-output-email { - word-break: break-all; -} -.widget.uc-contact-widget td.uc-output-more { - word-break: break-all; -} .widget.uc-ecw { padding-bottom: 1em; } @@ -7509,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; @@ -7661,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; @@ -7680,57 +7720,27 @@ q:before, table q:after { .uup-list .uup-item .uup-text > span { display: block; } -.uup-list .uup-item .uup-text a .uup-name { - display: inline; -} .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 -*/ -.page-template-page-user-profile-php .uup-user { - padding: 1em; -} -.page-template-page-user-profile-php .uup-user > span { - display: block; -} -.page-template-page-user-profile-php .uup-user .uup-image { - margin-bottom: 1em; -} -.page-template-page-user-profile-php .uup-user .uup-name { - font-weight: bold; -} -.page-template-page-user-profile-php .uup-user .uup-name .uup-first:after { - content: ' '; -} -.page-template-page-user-profile-php .uup-user .uup-phones .uup-phone2 { - display: block; -} - /* - - - - - - - - - - - - - - - - - - - == Calendar - - - - - - - - - - - - - - - - - - - */ @@ -7887,6 +7897,8 @@ body { } #masthead #uc-site-title a { color: white; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } #masthead #uc-site-title a:hover { color: white; @@ -8230,10 +8242,14 @@ body { font-size: 13px; } -footer li { +.footer li { font-size: 13px; } +#footers hr { + border-color: rgba(255, 255, 255, 0.15); +} + table .external .glyphicon-new-window { font-size: 0.8em !important; margin-left: 0.4em !important; diff --git a/style.scss b/style.scss index 4ef3beb..3447920 100644 --- a/style.scss +++ b/style.scss @@ -3,7 +3,7 @@ Description: Aurora's new theme for 2014. Author: UITS Web Development Lab Template: cornerstone - Version: 1.0.1 + Version: 1.0.0 */ @@ -46,7 +46,8 @@ body { } #uc-site-title a { color:$title_txt; - + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; &:hover { color:$title_txtHover; } @@ -397,10 +398,15 @@ body { font-size:13px; } -footer li { +.footer li { font-size:13px; } +#footers hr { + border-color: rgba(255, 255, 255, 0.15); +} + + table .external .glyphicon-new-window { font-size: 0.8em !important; margin-left: 0.4em !important; From 55a82616b1c327bc4c9d564cb9492746db594a83 Mon Sep 17 00:00:00 2001 From: briandunnigan Date: Mon, 27 Oct 2014 09:19:31 -0400 Subject: [PATCH 2/3] Padding Fixes - Fixed padding on interior pages - Fixed UUP list layout - Commented out some sections that were causing errors so I can see why they were doing so. Will delete or alter in a future push --- style.css | 68 ++++++++++++++++++++++++++++++++++-------------------- style.scss | 38 +++++++++++++++++++----------- 2 files changed, 68 insertions(+), 38 deletions(-) diff --git a/style.css b/style.css index 5acaf35..09c101e 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ Description: Aurora's new theme for 2014. Author: UITS Web Development Lab Template: cornerstone - Version: 1.0.0 + Version: 1.0.1 */ /* SHERMAN variables @@ -7897,8 +7897,6 @@ body { } #masthead #uc-site-title a { color: white; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; } #masthead #uc-site-title a:hover { color: white; @@ -8097,8 +8095,23 @@ body { #main { border: 1px solid #eee; border-top: none; + padding-left: 3em; + padding-right: 3em; +} +#main .post { + padding: 1em 0em; } +#content { + /* .col-sm-12 .page { + padding-left:3em; + padding-right:3em; + } + .col-sm-9 .page { + padding-left:3em; + padding-right:3em; + } */ +} #content .page { padding-top: 0px; padding-bottom: 4em; @@ -8128,14 +8141,6 @@ body { #content #page-archive .entry-header .page-title { padding-left: 0.57em; } -#content .col-sm-12 .page { - padding-left: 3em; - padding-right: 3em; -} -#content .col-sm-9 .page { - padding-left: 3em; - padding-right: 3em; -} #content #page-blank .page { padding-left: 0; padding-right: 0; @@ -8165,6 +8170,10 @@ body { border-right: 1px solid #cccccc; } +#comments .form-control { + border-right: 1px solid #cccccc; +} + #site-title .searchform .form-group .form-control { font-size: 12px; } @@ -8197,20 +8206,29 @@ body { margin: 0 0 10px; } -.page .col-xs-1, .page .col-sm-1, .page .col-md-1, .page .col-lg-1, .page .col-xs-2, .page .col-sm-2, .page .col-md-2, .page .col-lg-2, .page .col-xs-3, .page .col-sm-3, .page .col-md-3, .page .col-lg-3, .page .col-xs-4, .page .col-sm-4, .page .col-md-4, .page .col-lg-4, .page .col-xs-5, .page .col-sm-5, .page .col-md-5, .page .col-lg-5, .page .col-xs-6, .page .col-sm-6, .page .col-md-6, .page .col-lg-6, .page .col-xs-7, .page .col-sm-7, .page .col-md-7, .page .col-lg-7, .page .col-xs-8, .page .col-sm-8, .page .col-md-8, .page .col-lg-8, .page .col-xs-9, .page .col-sm-9, .page .col-md-9, .page .col-lg-9, .page .col-xs-10, .page .col-sm-10, .page .col-md-10, .page .col-lg-10, .page .col-xs-11, .page .col-sm-11, .page .col-md-11, .page .col-lg-11, .page .col-xs-12, .page .col-sm-12, .page .col-md-12, .page .col-lg-12 { - padding-left: 15px; - padding-right: 15px; -} -.page .entry-header { - padding-left: 15px; - padding-right: 15px; +/* +.page { + + .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { + + padding-left:15px; + padding-right:15px; + } + + .entry-header { + padding-left:15px; + padding-right:15px; + + } + } #content .col-sm-12 .page { - padding-left: 2em; - padding-right: 2em; + padding-left:2em; + padding-right:2em; } +*/ #page-home { padding-top: 15px; } @@ -8242,14 +8260,10 @@ body { font-size: 13px; } -.footer li { +footer li { font-size: 13px; } -#footers hr { - border-color: rgba(255, 255, 255, 0.15); -} - table .external .glyphicon-new-window { font-size: 0.8em !important; margin-left: 0.4em !important; @@ -8289,3 +8303,7 @@ table .external .glyphicon-new-window { .page-template-page-user-profile-php .uup-user .uup-phones .uup-phone2 { display: block; } + +.uup-list a.uup-user { + float: none; +} diff --git a/style.scss b/style.scss index 3447920..83f498e 100644 --- a/style.scss +++ b/style.scss @@ -3,7 +3,7 @@ Description: Aurora's new theme for 2014. Author: UITS Web Development Lab Template: cornerstone - Version: 1.0.0 + Version: 1.0.1 */ @@ -46,8 +46,7 @@ body { } #uc-site-title a { color:$title_txt; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + &:hover { color:$title_txtHover; } @@ -227,6 +226,13 @@ body { #main { border:1px solid #eee; border-top:none; + padding-left:3em; + padding-right:3em; + + .post { + padding:1em 0em; + + } } #content { @@ -267,14 +273,14 @@ body { } } - .col-sm-12 .page { + /* .col-sm-12 .page { padding-left:3em; padding-right:3em; } .col-sm-9 .page { padding-left:3em; padding-right:3em; - } + } */ #page-blank { .page { padding-left:0; @@ -307,6 +313,10 @@ body { .comment-form-comment .form-control { border-right:1px solid #cccccc; } + + #comments .form-control { + border-right:1px solid #cccccc; + } #site-title .searchform .form-group .form-control { font-size:12px; @@ -341,7 +351,7 @@ body { } - +/* .page { .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { @@ -363,6 +373,7 @@ body { padding-right:2em; } +*/ #page-home { padding-top:15px; @@ -398,15 +409,10 @@ body { font-size:13px; } -.footer li { +footer li { font-size:13px; } -#footers hr { - border-color: rgba(255, 255, 255, 0.15); -} - - table .external .glyphicon-new-window { font-size: 0.8em !important; margin-left: 0.4em !important; @@ -438,6 +444,7 @@ table .external .glyphicon-new-window { Profile Page */ .page-template-page-user-profile-php { + .uup-user { padding: 2em; & > span { @@ -475,4 +482,9 @@ table .external .glyphicon-new-window { .uup-mailing-address { } } -} \ No newline at end of file +} + + .uup-list a.uup-user { + float:none; + } + From 34d902d623c99a465673dc7c26f0d38b5fa00bbf Mon Sep 17 00:00:00 2001 From: briandunnigan Date: Mon, 27 Oct 2014 09:43:00 -0400 Subject: [PATCH 3/3] Changing Nav Secondary Border Color - border color changed to match the rest of the borders --- style.css | 85 +++++++++++++++++++++++++++++++++++++++++------------- style.scss | 3 ++ 2 files changed, 68 insertions(+), 20 deletions(-) diff --git a/style.css b/style.css index 09c101e..66f6d12 100644 --- a/style.css +++ b/style.css @@ -6813,6 +6813,10 @@ button.close { width: 150px; } +.lte7.form-control { + width: 20px; +} + /* NAV --------------------------------------------------------------*/ #nav-secondary { @@ -7111,9 +7115,15 @@ 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; @@ -7485,6 +7495,12 @@ object { .widget.uc-contact-widget th { white-space: nowrap; } +.widget.uc-contact-widget td.uc-output-email { + word-break: break-all; +} +.widget.uc-contact-widget td.uc-output-more { + word-break: break-all; +} .widget.uc-ecw { padding-bottom: 1em; } @@ -7544,9 +7560,15 @@ 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; @@ -7690,29 +7712,18 @@ 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; - float: left; - position: relative; - left: -170px; - margin-right: -150px; -} -.uup-list a.uup-user { - float: left; + position: absolute; + left: 0; + top: 0; } .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; @@ -7720,27 +7731,57 @@ q:before, table q:after { .uup-list .uup-item .uup-text > span { display: block; } +.uup-list .uup-item .uup-text a .uup-name { + display: inline; +} .uup-list .uup-item .uup-text .uup-name { font-weight: bold; } -.uup-list .uup-item .uup-text .uup-name .uup-last:before { +.uup-list .uup-item .uup-text .uup-name .uup-first:after { 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: 75px; - float: left; - margin: 0 1em 1em 0 !important; + width: 50px; + height: 50px; + position: absolute; + left: 0; + top: 5px; } .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 +*/ +.page-template-page-user-profile-php .uup-user { + padding: 1em; +} +.page-template-page-user-profile-php .uup-user > span { + display: block; +} +.page-template-page-user-profile-php .uup-user .uup-image { + margin-bottom: 1em; +} +.page-template-page-user-profile-php .uup-user .uup-name { + font-weight: bold; +} +.page-template-page-user-profile-php .uup-user .uup-name .uup-first:after { + content: ' '; +} +.page-template-page-user-profile-php .uup-user .uup-phones .uup-phone2 { + display: block; +} + /* - - - - - - - - - - - - - - - - - - - == Calendar - - - - - - - - - - - - - - - - - - - */ @@ -8244,6 +8285,10 @@ body { margin: 0 0 10px; } +#nav-secondary { + border-color: #eee; +} + #mega-footer, #footer { border-top: 1px solid #233e75; } diff --git a/style.scss b/style.scss index 83f498e..64cfc02 100644 --- a/style.scss +++ b/style.scss @@ -392,6 +392,9 @@ body { } } +#nav-secondary { + border-color:#eee; +} #mega-footer, #footer { border-top:1px solid #233e75;