Merge branch 'master' of github.com:concerto/concerto

app/assets/javascripts/screens_views.js

@@ -1,7 +1,7 @@
 $(document).ready(function() {
   // inset-selection gridlist: when a user clicks on an item in this
   // type of gridlist, auto-select the input that's inside of the item
-  $("ul.GL.inset-selection li > a").click(function(e) {
+  $("ul.list-grid.inset-selection li > a").click(function(e) {
     e.preventDefault();
     $(this).find(".inp input").prop("checked", true);
   });

app/assets/stylesheets/application/common/mixins.scss.erb

@@ -5,28 +5,6 @@
           border-radius: $radius;
 }
 
-@mixin border-radius-corners($topleft, $topright, $bottomright, $bottomleft) {
-	// top left:
-	border-top-left-radius:$topleft;
-	-webkit-border-top-left-radius:$topleft;
-	-moz-border-radius-topleft:$topleft;
-
-	// top right:
-	border-top-right-radius:$topright;
-	-webkit-border-top-right-radius:$topright;
-	-moz-border-radius-topright:$topright;
-
-	// bottom left:
-	border-bottom-left-radius:$bottomleft;
-	-webkit-border-bottom-left-radius:$bottomleft;
-	-moz-border-radius-bottomleft:$bottomleft;
-
-	// bottom right:
-	border-bottom-right-radius:$bottomright;
-	-webkit-border-bottom-right-radius:$bottomright;
-	-moz-border-radius-bottomright:$bottomright;
-}
-
 // Drop shadows
 @mixin box-shadow($shadow: 0 1px 3px rgba(0,0,0,.25)) {
   -webkit-box-shadow: $shadow;
@@ -36,8 +14,8 @@
 
 @mixin no-box-shadow {
 	box-shadow: 0 0 0;
-    -moz-box-shadow: 0 0 0;
-    -webkit-box-shadow: 0 0 0;
+  -moz-box-shadow: 0 0 0;
+  -webkit-box-shadow: 0 0 0;
 }
 
 

app/assets/stylesheets/application/controls/button-groups.scss.erb

@@ -36,20 +36,20 @@
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group .btn:first-child {
   margin-left: 0;
-  @include border-radius-corners(4px, 0px, 0px, 4px);
+  @include border-radius(4px 0px 0px 4px);
 }
 .btn-group .btn:last-child,
 .btn-group .dropdown-toggle {
-  @include border-radius-corners(0px, 4px, 4px, 0px);
+  @include border-radius(0px 4px 4px 0px);
 }
 // Reset corners for large buttons
 .btn-group .btn.large:first-child {
   margin-left: 0;
-  @include border-radius-corners(6px, 0px, 0px, 6px);
+  @include border-radius(6px 0px 0px 6px);
 }
 .btn-group .btn.large:last-child,
 .btn-group .large.dropdown-toggle {
-  @include border-radius-corners(0px, 6px, 6px, 0px);
+  @include border-radius(0px 6px 6px 0px);
 }
 
 // On hover/focus/active, bring the proper btn to front

app/assets/stylesheets/application/controls/buttons.scss.erb

@@ -3,17 +3,6 @@
 /*##########################################################################*/
 
 
-//////////////////
-
-
-/* Special Rules: */
-
-.C-header_right a.button {
- 	margin-right: 0px;
- 	margin-left: 6px; 
-}
-
-
 
 // BUTTON STYLES
 // -------------
@@ -156,7 +145,7 @@
   // back button:
 	&.back {
 		@include no-box-shadow;
-		@include border-radius-corners(0px, 4px, 4px, 0px);
+		@include border-radius(0px 4px 4px 0px);
 		background: transparent image-url('layout/button_back_states.png') no-repeat scroll top left;
    	font-size: 0.7em;
    	border: 0;

app/assets/stylesheets/application/controls/jquery.qtip.scss.erb

@@ -193,7 +193,7 @@
 .ui-tooltip-dark {
 
   .ui-tooltip-titlebar+.ui-tooltip-content {
-    @include border-radius-corners(0px, 0px, 5px, 5px);
+    @include border-radius(0px 0px 5px 5px);
   }
 
   @include box-shadow(0 0 3px #333);
@@ -246,11 +246,11 @@
 }
 
 .ui-tooltip-rounded .ui-tooltip-titlebar, .ui-tooltip-tipsy .ui-tooltip-titlebar, .ui-tooltip-youtube .ui-tooltip-titlebar {
-  @include border-radius-corners(5px, 5px, 0px, 0px);
+  @include border-radius(5px 5px 0px 0px);
 }
 
 .ui-tooltip-rounded .ui-tooltip-titlebar+.ui-tooltip-content, .ui-tooltip-tipsy .ui-tooltip-titlebar+.ui-tooltip-content {
-  @include border-radius-corners(0px, 0px, 5px, 5px);
+  @include border-radius(0px 0px 5px 5px);
 }
 
 /* Class applied to remove inner box padding for tooltip */

app/assets/stylesheets/application/index-manifest.scss

@@ -14,7 +14,7 @@
 @import "layout/forms";
 @import "layout/tables";
 @import "layout/navs";
-@import "layout/contentcell";
+@import "layout/viewblock";
 @import "layout/lists-grid-stacked";
 @import "layout/topmenu";
 @import "layout/alerts-badges";

app/assets/stylesheets/application/layout/forms.scss.erb

@@ -491,15 +491,3 @@ textarea[readonly] {
     padding-left: 20px;
   }
 }
-
-
-
-// Forms in Boxes
-//------------------
-// Entire <form> elements or <fieldset>'s can be inserted into bordered boxes
-// This is commonly done with groups of related inputs in the sidebar (submissions#show, for instance)
-
-.form-box {
-  @include border-radius(6px);
-  border:solid 1px $grayLight;
-}

app/assets/stylesheets/application/layout/lists-grid-stacked.scss.erb

@@ -7,81 +7,76 @@
 // This UL aligns 1..n items in a visual grid. Each item is floated left and fills up available space 
 // (20% width apiece). This UL is used extensively on browse content grids of content.
 
-@mixin gridlist-item {
-	list-style: none;
-	float: left;
-	min-width: 200px;
-	width: 25%;
-  min-height:88px;
-
-  .cont {
-		padding: 12px;
-		//border-right: solid 1px $grayLight;
-		//border-bottom: solid 1px $grayLight;
-		min-height: 64px;
-		text-decoration:none;
-
-		// these elements come along for the ride by bringing in gridlist-item mixin:
-		b {
-			color: $black;
-		}
-
-		.controls {
-			display: block;
-			margin-top: 4px;
-    }
-
-    h1 {
-			font-size: 1.2em;
- 			color: #333;
- 			background:none;
- 			padding: 0px;
- 			margin: 0px;
- 			font-weight: bold;
- 			text-align: center;
-		}
-
-		p {
-      margin-bottom: 3px;
-		}
-
-
-
-	}
-
-  img {
-		@extend .with-shadow;
-		float: left;
-		margin-bottom:6px;
-		margin-right:10px;
-  }
-
-  i {
-    float: left;
-    margin-bottom: 6px;
-    margin-right: 10px;
-  }
-
-
-}
-
-ul.GL {
+ul.list-grid {
 	//border-top:solid 1px $grayLight;
 	margin: 0px;
 	padding: 0px;
 
   > li {
-		@include gridlist-item;		
+	  list-style: none;
+    float: left;
+    min-width: 200px;
+    width: 25%;
+    min-height:88px;
+
+    .cont {
+      padding: 12px;
+      //border-right: solid 1px $grayLight;
+      //border-bottom: solid 1px $grayLight;
+      min-height: 64px;
+      text-decoration:none;
+
+      // these elements come along for the ride by bringing in gridlist-item mixin:
+      b {
+        color: $black;
+      }
+
+      .controls {
+        display: block;
+        margin-top: 4px;
+      }
+
+      h1 {
+        font-size: 1.2em;
+        color: #333;
+        background:none;
+        padding: 0px;
+        margin: 0px;
+        font-weight: bold;
+        text-align: center;
+      }
+
+      p {
+        margin-bottom: 3px;
+      }
+
+
+
+    }
+
+    img {
+      @extend .with-shadow;
+      float: left;
+      margin-bottom:6px;
+      margin-right:10px;
+    }
+
+    i {
+      float: left;
+      margin-bottom: 6px;
+      margin-right: 10px;
+    }
+
   }
 
   // inset-selection gridlists appear inside forms and while they use 
-  // the base styles of GL, several attributes are different
+  // the base styles of list-grid, several attributes are different
   // these gridlists are used to make a selection of one or more items
   // within them (hence their usage in forms)
   &.inset-selection {
     border-top: none;
 
-    // a common use for inset gridlists is to have each item in the GL
+    // a common use for inset gridlists is to have each item in the list-grid
     // be a clickable link - each item appears with a slight rounded 
     // border and is a fully clickable region
 
@@ -116,7 +111,7 @@ ul.GL {
       background: $grayLightest;
       min-height: 46px;
       padding: 8px 5px;
-      @include border-radius-corners(4px, 0px, 0px, 4px);
+      @include border-radius(4px 0px 0px 4px);
     }
 
     .cont {
@@ -125,7 +120,7 @@ ul.GL {
     }
   }
 
-  // this class can be applied to a GL to compress the size of each
+  // this class can be applied to a list-grid to compress the size of each
   // list item inside the grid
   &.small {
     > li {
@@ -142,7 +137,7 @@ ul.GL {
 
 // variant: for span columns that are small enough, override the 
 // width to make it appear flush:
-.row-fluid .span3 ul.GL > li, .row-fluid .span2 ul.GL > li, .row-fluid .span1 ul.GL > li {
+.row-fluid .span3 ul.list-grid > li, .row-fluid .span2 ul.list-grid > li, .row-fluid .span1 ul.list-grid > li {
   width: 100%;
 }
 
@@ -153,32 +148,21 @@ ul.GL {
 // on top of one another with visual elements. It is often used for 
 // nested lists, such as the feed list on contents#index.
 
-// this mixin defines how each top-level item looks in the UL:
-@mixin stackedlist-item {
-  //@include vertical-gradient($white, #eee);
-  border-top: solid 1px $grayLighter;
-  padding: 12px;
-}
-
-// this mixin defines how each second-level (nested) item looks in the UL:
-@mixin stackedlist-nesteditem {
-  padding-left: 25px;
-  background: #efefef;
-}
-
-ul.SL {
+ul.list-stacked {
   margin-left: 0px;
 
   > li {
-    @include stackedlist-item;
+    border-top: solid 1px $grayLighter;
+    padding: 12px;
 
     // this is the second level of UL, which represents a nested list
     // we only recommend one level deep of visual nesting
     ul {
       margin-left: 0px;
 
       > li {
-        @include stackedlist-nesteditem;
+        padding-left: 25px;
+        background: #efefef;
       }
     }