diff --git a/css/sherman-black.css b/css/sherman-black.css index b83c7b9..f2f5fa0 100644 --- a/css/sherman-black.css +++ b/css/sherman-black.css @@ -7821,99 +7821,6 @@ q:before, table q:after { display: none; } -#events-table { - /* - ul.btn-multi{ - margin-bottom:.5em; - - li{ - - ul{ - - padding: 0px 0px 0px 12px; - - li{ - - &.month-arrow{ - - a.icon{ - - span.glyphicons{ - padding: 0px 0px 0px 5px; - - &:before{ - color:#fff; - font-size: 14px; - display:block; - position: relative; - } - } - } - } - } - } - a.btn-toggle{ - margin-left:10px; - font-size:14px; - color:#777; - text-align: center; - } - } - } - } - */ - /* - #events-grid.table { - tbody{ - tr{ - - th{ - width:14%; - text-align:right; - - span{ - font-weight:normal; - color:#777; - font-size:12px !important; - } - } - td{ - border-left: 1px solid #eee; - border-right: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #fff; - text-align:left; - height: 90px; - padding:1px; - ol.event-list{ - li{ - span.event-time{ - font-size:11px !important; - padding: 0px 0px 0px 2px !important; - } - ol{ - padding: 0px 2px 0px 2px !important; - li{ - background: rgba(15,25,56, 0.1); - border:1px solid rgba(15,25,56, 0.2) !important; - padding: 0px 3px 0px 3px !important; - margin-bottom: 2px !important; - a.event-link{ - strong{ - font-weight:normal; - font-size:12px !important; - } - } - } - } - } - } - } - } - } - } - */ -} #events-table #events-toolbar { margin-bottom: 1em; } @@ -7935,6 +7842,10 @@ q:before, table q:after { font-weight: normal; opacity: .7; } +#events-table table tbody th.today { + background: #f5f5f5; + color: #9A0405; +} #events-table table tbody td { border-top-width: 0; padding-top: 0; @@ -8537,9 +8448,9 @@ table .external .glyphicon-new-window { ==================================== */ .btn { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; font-weight: 400; } .btn.btn-default { @@ -8552,7 +8463,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #0e2e5d 0%, #0b2347 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #061224; opacity: 0.9; } .btn.btn-default:hover { @@ -8572,7 +8483,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #747474 0%, #676767 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #535353; opacity: 0.9; } .btn.btn-primary:hover { @@ -8592,7 +8503,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #58ca4b 0%, #48c239 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #3ca230; opacity: 0.9; } .btn.btn-success:hover { @@ -8612,10 +8523,9 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #c3c3c3; opacity: 0.9; color: #676767; - border-color: #b1b1b1; } .btn.btn-info:hover { opacity: 0.75; @@ -8634,10 +8544,9 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #e7cc49 0%, #e4c632 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #d2b31c; opacity: 0.9; color: #676767; - border-color: #b29817; } .btn.btn-warning:hover { opacity: 0.75; @@ -8656,7 +8565,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #b71716 0%, #a01413 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #7c0f0f; opacity: 0.9; } .btn.btn-danger:hover { @@ -8676,7 +8585,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #0e2e5d 0%, #0b2347 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #061224; opacity: 0.9; } .btn.btn-link:hover { diff --git a/css/sherman-blue.css b/css/sherman-blue.css index bfdf0da..91c42dc 100644 --- a/css/sherman-blue.css +++ b/css/sherman-blue.css @@ -7821,99 +7821,6 @@ q:before, table q:after { display: none; } -#events-table { - /* - ul.btn-multi{ - margin-bottom:.5em; - - li{ - - ul{ - - padding: 0px 0px 0px 12px; - - li{ - - &.month-arrow{ - - a.icon{ - - span.glyphicons{ - padding: 0px 0px 0px 5px; - - &:before{ - color:#fff; - font-size: 14px; - display:block; - position: relative; - } - } - } - } - } - } - a.btn-toggle{ - margin-left:10px; - font-size:14px; - color:#777; - text-align: center; - } - } - } - } - */ - /* - #events-grid.table { - tbody{ - tr{ - - th{ - width:14%; - text-align:right; - - span{ - font-weight:normal; - color:#777; - font-size:12px !important; - } - } - td{ - border-left: 1px solid #eee; - border-right: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #fff; - text-align:left; - height: 90px; - padding:1px; - ol.event-list{ - li{ - span.event-time{ - font-size:11px !important; - padding: 0px 0px 0px 2px !important; - } - ol{ - padding: 0px 2px 0px 2px !important; - li{ - background: rgba(15,25,56, 0.1); - border:1px solid rgba(15,25,56, 0.2) !important; - padding: 0px 3px 0px 3px !important; - margin-bottom: 2px !important; - a.event-link{ - strong{ - font-weight:normal; - font-size:12px !important; - } - } - } - } - } - } - } - } - } - } - */ -} #events-table #events-toolbar { margin-bottom: 1em; } @@ -7935,6 +7842,10 @@ q:before, table q:after { font-weight: normal; opacity: .7; } +#events-table table tbody th.today { + background: #f5f5f5; + color: #388ac3; +} #events-table table tbody td { border-top-width: 0; padding-top: 0; @@ -8537,9 +8448,9 @@ table .external .glyphicon-new-window { ==================================== */ .btn { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; font-weight: 400; } .btn.btn-default { @@ -8552,7 +8463,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #0e2e5d 0%, #0b2347 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #061224; opacity: 0.9; } .btn.btn-default:hover { @@ -8572,7 +8483,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #747474 0%, #676767 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #535353; opacity: 0.9; } .btn.btn-primary:hover { @@ -8592,7 +8503,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #58ca4b 0%, #48c239 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #3ca230; opacity: 0.9; } .btn.btn-success:hover { @@ -8612,10 +8523,9 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #c3c3c3; opacity: 0.9; color: #676767; - border-color: #b1b1b1; } .btn.btn-info:hover { opacity: 0.75; @@ -8634,10 +8544,9 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #e7cc49 0%, #e4c632 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #d2b31c; opacity: 0.9; color: #676767; - border-color: #b29817; } .btn.btn-warning:hover { opacity: 0.75; @@ -8656,7 +8565,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #b71716 0%, #a01413 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #7c0f0f; opacity: 0.9; } .btn.btn-danger:hover { @@ -8676,7 +8585,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #0e2e5d 0%, #0b2347 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #061224; opacity: 0.9; } .btn.btn-link:hover { diff --git a/css/sherman-grey.css b/css/sherman-grey.css index a0500da..afe122a 100644 --- a/css/sherman-grey.css +++ b/css/sherman-grey.css @@ -7821,99 +7821,6 @@ q:before, table q:after { display: none; } -#events-table { - /* - ul.btn-multi{ - margin-bottom:.5em; - - li{ - - ul{ - - padding: 0px 0px 0px 12px; - - li{ - - &.month-arrow{ - - a.icon{ - - span.glyphicons{ - padding: 0px 0px 0px 5px; - - &:before{ - color:#fff; - font-size: 14px; - display:block; - position: relative; - } - } - } - } - } - } - a.btn-toggle{ - margin-left:10px; - font-size:14px; - color:#777; - text-align: center; - } - } - } - } - */ - /* - #events-grid.table { - tbody{ - tr{ - - th{ - width:14%; - text-align:right; - - span{ - font-weight:normal; - color:#777; - font-size:12px !important; - } - } - td{ - border-left: 1px solid #eee; - border-right: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #fff; - text-align:left; - height: 90px; - padding:1px; - ol.event-list{ - li{ - span.event-time{ - font-size:11px !important; - padding: 0px 0px 0px 2px !important; - } - ol{ - padding: 0px 2px 0px 2px !important; - li{ - background: rgba(15,25,56, 0.1); - border:1px solid rgba(15,25,56, 0.2) !important; - padding: 0px 3px 0px 3px !important; - margin-bottom: 2px !important; - a.event-link{ - strong{ - font-weight:normal; - font-size:12px !important; - } - } - } - } - } - } - } - } - } - } - */ -} #events-table #events-toolbar { margin-bottom: 1em; } @@ -7935,6 +7842,10 @@ q:before, table q:after { font-weight: normal; opacity: .7; } +#events-table table tbody th.today { + background: #f5f5f5; + color: #2e77b0; +} #events-table table tbody td { border-top-width: 0; padding-top: 0; @@ -8537,9 +8448,9 @@ table .external .glyphicon-new-window { ==================================== */ .btn { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; font-weight: 400; } .btn.btn-default { @@ -8552,7 +8463,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #0e2e5d 0%, #0b2347 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #061224; opacity: 0.9; } .btn.btn-default:hover { @@ -8572,7 +8483,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #747474 0%, #676767 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #535353; opacity: 0.9; } .btn.btn-primary:hover { @@ -8592,7 +8503,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #58ca4b 0%, #48c239 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #3ca230; opacity: 0.9; } .btn.btn-success:hover { @@ -8612,10 +8523,9 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #c3c3c3; opacity: 0.9; color: #676767; - border-color: #b1b1b1; } .btn.btn-info:hover { opacity: 0.75; @@ -8634,10 +8544,9 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #e7cc49 0%, #e4c632 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #d2b31c; opacity: 0.9; color: #676767; - border-color: #b29817; } .btn.btn-warning:hover { opacity: 0.75; @@ -8656,7 +8565,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #b71716 0%, #a01413 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #7c0f0f; opacity: 0.9; } .btn.btn-danger:hover { @@ -8676,7 +8585,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #0e2e5d 0%, #0b2347 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #061224; opacity: 0.9; } .btn.btn-link:hover { diff --git a/css/sherman-red.css b/css/sherman-red.css index ee6ebd6..c0e76f5 100644 --- a/css/sherman-red.css +++ b/css/sherman-red.css @@ -7821,99 +7821,6 @@ q:before, table q:after { display: none; } -#events-table { - /* - ul.btn-multi{ - margin-bottom:.5em; - - li{ - - ul{ - - padding: 0px 0px 0px 12px; - - li{ - - &.month-arrow{ - - a.icon{ - - span.glyphicons{ - padding: 0px 0px 0px 5px; - - &:before{ - color:#fff; - font-size: 14px; - display:block; - position: relative; - } - } - } - } - } - } - a.btn-toggle{ - margin-left:10px; - font-size:14px; - color:#777; - text-align: center; - } - } - } - } - */ - /* - #events-grid.table { - tbody{ - tr{ - - th{ - width:14%; - text-align:right; - - span{ - font-weight:normal; - color:#777; - font-size:12px !important; - } - } - td{ - border-left: 1px solid #eee; - border-right: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #fff; - text-align:left; - height: 90px; - padding:1px; - ol.event-list{ - li{ - span.event-time{ - font-size:11px !important; - padding: 0px 0px 0px 2px !important; - } - ol{ - padding: 0px 2px 0px 2px !important; - li{ - background: rgba(15,25,56, 0.1); - border:1px solid rgba(15,25,56, 0.2) !important; - padding: 0px 3px 0px 3px !important; - margin-bottom: 2px !important; - a.event-link{ - strong{ - font-weight:normal; - font-size:12px !important; - } - } - } - } - } - } - } - } - } - } - */ -} #events-table #events-toolbar { margin-bottom: 1em; } @@ -7935,6 +7842,10 @@ q:before, table q:after { font-weight: normal; opacity: .7; } +#events-table table tbody th.today { + background: #f5f5f5; + color: #b02e36; +} #events-table table tbody td { border-top-width: 0; padding-top: 0; @@ -8537,9 +8448,9 @@ table .external .glyphicon-new-window { ==================================== */ .btn { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; font-weight: 400; } .btn.btn-default { @@ -8552,7 +8463,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #0e2e5d 0%, #0b2347 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #061224; opacity: 0.9; } .btn.btn-default:hover { @@ -8572,7 +8483,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #747474 0%, #676767 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #535353; opacity: 0.9; } .btn.btn-primary:hover { @@ -8592,7 +8503,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #58ca4b 0%, #48c239 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #3ca230; opacity: 0.9; } .btn.btn-success:hover { @@ -8612,10 +8523,9 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #c3c3c3; opacity: 0.9; color: #676767; - border-color: #b1b1b1; } .btn.btn-info:hover { opacity: 0.75; @@ -8634,10 +8544,9 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #e7cc49 0%, #e4c632 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #d2b31c; opacity: 0.9; color: #676767; - border-color: #b29817; } .btn.btn-warning:hover { opacity: 0.75; @@ -8656,7 +8565,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #b71716 0%, #a01413 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #7c0f0f; opacity: 0.9; } .btn.btn-danger:hover { @@ -8676,7 +8585,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, #0e2e5d 0%, #0b2347 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color: #fff; - border-color: #fafafa; + border-color: #061224; opacity: 0.9; } .btn.btn-link:hover { diff --git a/sass/sherman-common.scss b/sass/sherman-common.scss index b763b8d..e3a2618 100644 --- a/sass/sherman-common.scss +++ b/sass/sherman-common.scss @@ -500,7 +500,7 @@ table .external .glyphicon-new-window { background: linear-gradient(to bottom, lighten($color, 5%) 0%,$color 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='lighten($color, 5%)', endColorstr='$color',GradientType=0 ); color:$sh-secondary-text-color; - border-color: darken($sh-secondary-text-color, 2%); + border-color: darken($color, 8%); opacity:0.9; &:hover{ opacity:0.75; @@ -516,9 +516,9 @@ table .external .glyphicon-new-window { */ //Button Styles .btn{ - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; font-weight: 400; &.btn-default{ @include button($brand-default); @@ -532,12 +532,10 @@ table .external .glyphicon-new-window { &.btn-info{ @include button($brand-info); color:$brand-primary; - border-color: darken($brand-info, 15%); } &.btn-warning{ @include button($brand-warning); color:$brand-primary; - border-color: darken($brand-warning, 15%); } &.btn-danger{ @include button($brand-danger);