Compile with Cornerstone

weblab · Oct 6, 2014 · 190aea4 · 190aea4
1 parent a1d456a
commit 190aea4
Showing 1 changed file with 35 additions and 83 deletions.
diff --git a/style.css b/style.css
@@ -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;
@@ -1155,7 +1156,7 @@ th {
 
 html {
   font-size: 10px;
-  -webkit-tap-highlight-color: transparent;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
 body {
@@ -5145,6 +5146,7 @@ a.thumbnail.active {
     background-position: 0 0;
   }
 }
+
 @keyframes progress-bar-stripes {
   from {
     background-position: 40px 0;
@@ -5154,6 +5156,7 @@ a.thumbnail.active {
     background-position: 0 0;
   }
 }
+
 .progress {
   overflow: hidden;
   height: 20px;
@@ -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;
@@ -6473,6 +6476,7 @@ button.close {
 @-ms-viewport {
   width: device-width;
 }
+
 .visible-xs, .visible-sm, .visible-md, .visible-lg {
   display: none !important;
 }
@@ -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 
 - - - - - - - - - - - - - - - - - - - */
@@ -6814,7 +6820,7 @@ button.close {
 }
 
 .lte7.form-control {
-  height: 20px;
+  width: 20px;
 }
 
 /*	NAV
@@ -6863,63 +6869,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;
 }
@@ -7115,9 +7064,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;
@@ -7554,9 +7509,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;
@@ -7700,29 +7661,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;
@@ -7733,26 +7683,29 @@ 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 {
   content: ' ';
 }
 
-<<<<<<< HEAD
-=======
 /*
 	 Profile Page
 */
@@ -7775,7 +7728,6 @@ q:before, table q:after {
   display: block;
 }
 
->>>>>>> FETCH_HEAD
 /* - - - - - - - - - - - - - - - - - - - 
 	== Calendar 
 - - - - - - - - - - - - - - - - - - - */