Merge branch 'master' of github.uconn.edu:jem08002/cornerstone

Conflicts: style.css
jmr06005 · Jan 8, 2015 · fc6065d · fc6065d
2 parents eeb3a97 + f48c27e
commit fc6065d
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 12 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@ _notes/dwsync.xml
 inc/_notes/dwsync.xml
 
 prepros.cfg
+
+.DS_Store
diff --git a/sass/fonts.scss b/sass/fonts.scss
@@ -3,21 +3,22 @@
 - - - - - - - - - - - - - - - - - - - */
  @font-face {
 	font-family: 'Proxima Nova';
-	src: url('../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot');
-	src: url('../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix') format('embedded-opentype'),
-url('../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular') format('svg'),
-url('../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.woff') format('woff'),
-url('../../global/fonts/proximanova_regular/ProximaNova-Reg-webfont.ttf') format('truetype');
+	src: 	url('#{$uc-font-path}/proximanova_regular/ProximaNova-Reg-webfont.eot');
+	src: 	url('#{$uc-font-path}/proximanova_regular/ProximaNova-Reg-webfont.eot?#iefix') format('embedded-opentype'),
+			url('#{$uc-font-path}/proximanova_regular/ProximaNova-Reg-webfont.svg#proxima_nova_rgregular') format('svg'),
+			url('#{$uc-font-path}/proximanova_regular/ProximaNova-Reg-webfont.woff') format('woff'),
+			url('#{$uc-font-path}/proximanova_regular/ProximaNova-Reg-webfont.ttf') format('truetype');
 	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');
+	src: 	url('#{$uc-font-path}/proximanova_semibold/ProximaNova-Sbold-webfont.eot');
+	src: 	url('#{$uc-font-path}/proximanova_semibold/ProximaNova-Sbold-webfont.eot?#iefix') format('embedded-opentype'),
+			url('#{$uc-font-path}/proximanova_semibold/ProximaNova-Sbold-webfont.svg#proxima_nova_ltsemibold') format('svg'),
+			url('#{$uc-font-path}/proximanova_semibold/ProximaNova-Sbold-webfont.woff') format('woff'),
+			url('#{$uc-font-path}/proximanova_semibold/ProximaNova-Sbold-webfont.ttf') format('truetype');
 	font-weight: 500;
 	font-style: normal;
-	}	
+	}	
+
diff --git a/sass/variables.scss b/sass/variables.scss
@@ -6,6 +6,9 @@ $uc-header-bottom-border-color: #fff !default;
 $site-title-color: black !default;
 
 
+$uc-font-path: "../../global/fonts" !default;
+
+
 $contentBg: #fff;
 $contentPadding: 1em;
 

diff --git a/sass/widgets.scss b/sass/widgets.scss
@@ -93,6 +93,9 @@
 
 
 }
+* html .widget.widget_dpe_fp_widget .dpe-flexible-posts li a{ 
+		height:1%
+	}
 
 /* Make sure select elements fit in widgets */
 .widget select {
@@ -111,7 +114,7 @@
 	&.widget_search {}
 	&.widget_text {
 		.textwidget {
-			margin:$widget-content-margin;	
+			margin:$widget-content-margin;
 		}
 	}
 	&.widget_tag_cloud {
@@ -171,6 +174,56 @@
 		border:none;
 
 	}
+	&.widget_dpe_fp_widget{
+		padding:0;
+		background-color:transparent;
+		.dpe-flexible-posts{
+			li{
+				padding: 0.1em 0px 0.1em 0px;
+				display:block;
+				background-color:transparent;
+				a{
+					margin:0;
+					position:relative;
+					display:inline-block;
+					.attachment-thumbnail{
+						height: 60px;
+						width: 60px;
+						margin-right:10px;
+						margin-bottom:10px;
+						float:left;
+					}
+					.attachment-medium{
+						width:48%;
+						margin-right:10px;
+						margin-bottom:10px;
+						float:left;
+					}
+					.attachment-large{
+						max-width:100%;
+						margin-right:10px;
+						margin-bottom:10px;
+						float:left;
+						clear:right;
+					}
+					.title{
+						display:block;
+						position:relative;
+						font-size: 1em;
+						font-weight: normal;	
+					}
+					&:after{
+					   visibility: hidden;
+					   display: block;
+					   font-size: 0;
+					   content: " ";
+					   clear: both;
+					   height: 0;
+					}
+				}
+			}
+		}
+	}
 
 
 	/* 	=== UCONN Widgets

diff --git a/style.css b/style.css
@@ -7366,6 +7366,10 @@ object {
   margin-bottom: .5em;
 }
 
+* html .widget.widget_dpe_fp_widget .dpe-flexible-posts li a {
+  height: 1%;
+}
+
 /* Make sure select elements fit in widgets */
 .widget select {
   max-width: 100%;
@@ -7425,6 +7429,54 @@ object {
   background-color: transparent;
   border: none;
 }
+.widget.widget_dpe_fp_widget {
+  padding: 0;
+  background-color: transparent;
+}
+.widget.widget_dpe_fp_widget .dpe-flexible-posts li {
+  padding: 0.1em 0px 0.1em 0px;
+  display: block;
+  background-color: transparent;
+}
+.widget.widget_dpe_fp_widget .dpe-flexible-posts li a {
+  margin: 0;
+  position: relative;
+  display: inline-block;
+}
+.widget.widget_dpe_fp_widget .dpe-flexible-posts li a .attachment-thumbnail {
+  height: 60px;
+  width: 60px;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  float: left;
+}
+.widget.widget_dpe_fp_widget .dpe-flexible-posts li a .attachment-medium {
+  width: 48%;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  float: left;
+}
+.widget.widget_dpe_fp_widget .dpe-flexible-posts li a .attachment-large {
+  max-width: 100%;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  float: left;
+  clear: right;
+}
+.widget.widget_dpe_fp_widget .dpe-flexible-posts li a .title {
+  display: block;
+  position: relative;
+  font-size: 1em;
+  font-weight: normal;
+}
+.widget.widget_dpe_fp_widget .dpe-flexible-posts li a:after {
+  visibility: hidden;
+  display: block;
+  font-size: 0;
+  content: " ";
+  clear: both;
+  height: 0;
+}
 .widget.uc-contact-widget th {
   white-space: nowrap;
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@ _notes/dwsync.xml
		inc/_notes/dwsync.xml

		prepros.cfg

		.DS_Store