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

Commit

Permalink
Minor formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmbacon committed Aug 20, 2014
1 parent 1881361 commit 74d2fd3
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 83 deletions.
123 changes: 42 additions & 81 deletions style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ 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 @@ -1155,7 +1156,7 @@ th {

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

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

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

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

.visible-xs, .visible-sm, .visible-md, .visible-lg {
display: none !important;
}
Expand Down Expand Up @@ -6730,13 +6734,15 @@ 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 @@ -6859,63 +6865,6 @@ 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 @@ -7111,9 +7060,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;
Expand Down Expand Up @@ -7544,9 +7499,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;
Expand Down Expand Up @@ -7690,29 +7651,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;
Expand All @@ -7723,18 +7673,23 @@ 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-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 {
Expand Down Expand Up @@ -7866,6 +7821,10 @@ body.sticky #footers {
display: none;
}

#uc-site-header {
padding-left: 15px;
}

#uc-header {
border-bottom-color: #273a60;
}
Expand Down Expand Up @@ -8035,7 +7994,8 @@ body {
font-weight: normal;
}

#masthead #site-navigation .navbar-collapse .nav > li.active:after, #masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
#masthead #site-navigation .navbar-collapse .nav > li.active:after,
#masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
-moz-border-bottom-colors: none;
-moz-border-left-colors: none;
-moz-border-right-colors: none;
Expand All @@ -8055,7 +8015,8 @@ body {
}

@media (max-width: 767px) {
#masthead #site-navigation .navbar-collapse .nav > li.active:after, #masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
#masthead #site-navigation .navbar-collapse .nav > li.active:after,
#masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
display: none;
}
}
Expand Down
9 changes: 7 additions & 2 deletions style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
@import "../cornerstone/style.scss";


#uc-site-header {
padding-left:15px;
}

#uc-header {
border-bottom-color:$header_border;
Expand Down Expand Up @@ -163,7 +166,8 @@ body {
}
}

#masthead #site-navigation .navbar-collapse .nav > li.active:after, #masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
#masthead #site-navigation .navbar-collapse .nav > li.active:after,
#masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
-moz-border-bottom-colors: none;
-moz-border-left-colors: none;
-moz-border-right-colors: none;
Expand All @@ -183,7 +187,8 @@ body {
}

@media (max-width: 767px) {
#masthead #site-navigation .navbar-collapse .nav > li.active:after, #masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
#masthead #site-navigation .navbar-collapse .nav > li.active:after,
#masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
display: none;
}
}
Expand Down

0 comments on commit 74d2fd3

Please sign in to comment.