Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_admin/web/css/learningLibraryGroup.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_admin/web/css/learningLibraryGroup.scss	(.../learningLibraryGroup.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_admin/web/css/learningLibraryGroup.scss	(.../learningLibraryGroup.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -77,19 +77,4 @@
 
 .groupContainer .removeGroupButton {
 	padding-top: 3px;
-}
-
-.draggableLearningLibrary {
-	padding: 3px 0px 3px 0px;
-	cursor: default;
-}
-
-.droppableHighlight {
-	padding : 1px !important;
-	border: 5px solid $brand-primary-mid !important;
-}
-
-.draggableLearningLibrarySelected {
-	background-color: $brand-primary-mid !important;
-	color: white !important;
 }
\ No newline at end of file
Index: lams_admin/web/includes/javascript/learningLibraryGroup.js
===================================================================
diff -u -rff01a6c237cefc4a5186889bf46041152cfc37ae -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_admin/web/includes/javascript/learningLibraryGroup.js	(.../learningLibraryGroup.js)	(revision ff01a6c237cefc4a5186889bf46041152cfc37ae)
+++ lams_admin/web/includes/javascript/learningLibraryGroup.js	(.../learningLibraryGroup.js)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -181,8 +181,8 @@
 function colorDraggableLearningLibraries(container) {
 	// every second line is different
 	$(container).find('div.draggableLearningLibrary').each(function(index, learningLibraryDiv){
-		// exact colour should be defined in CSS, but it's easier this way...
-		$(this).css('background-color', index % 2 ? '#dfeffc' : 'inherit');
+		$(this).removeClass( index % 2 ? 'draggableEven' : 'draggableOdd');
+		$(this).addClass( index % 2 ? 'draggableOdd' : 'draggableEven');
 	});
 }
 
Index: lams_build/common.properties
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_build/common.properties	(.../common.properties)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_build/common.properties	(.../common.properties)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -32,7 +32,7 @@
 conf.dir=${basedir}/conf
 
 # SASS properties sometimes get altered in project's own properties file
-scss.common.variables=../lams_build/conf/scss/
+scss.common.variables=../lams_central/conf/scss/
 scss.css.dir=${basedir}/web/css
 
 #======== TOOL PROPERTIES =========
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_build/conf/scss/_bootstrap-variables.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_build/conf/scss/_lams_variables.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/conf/scss/_bootstrap-variables.scss
===================================================================
diff -u
--- lams_central/conf/scss/_bootstrap-variables.scss	(revision 0)
+++ lams_central/conf/scss/_bootstrap-variables.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,840 @@
+// Default Bootstrap values (from bootstrap-sass v3.3.7)
+// Generated using compass install of Bootstrap sass. Remove comment marks
+// for the variables that will be used in LAMS.
+
+//
+// Variables
+// --------------------------------------------------
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+$gray-base:              #000;
+$gray-darker:            lighten($gray-base, 13.5%); // #222
+$gray-dark:              lighten($gray-base, 20%);   // #333
+$gray:                   lighten($gray-base, 33.5%); // #555
+$gray-light:             lighten($gray-base, 46.7%); // #777
+$gray-lighter:           lighten($gray-base, 93.5%); // #eee
+
+$brand-primary:         darken(#428bca, 6.5%); // #337ab7
+$brand-success:         #5cb85c;
+$brand-info:            #5bc0de;
+$brand-warning:         #f0ad4e;
+$brand-danger:          #d9534f;
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
+$body-bg:               #fff;
+//** Global text color on `<body>`.
+$text-color:            $gray-dark;
+
+//** Global textual link color.
+$link-color:            $brand-primary;
+//** Link hover color set via `darken()` function.
+$link-hover-color:      darken($link-color, 15%);
+//** Link hover decoration.
+$link-hover-decoration: underline;
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+$font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-serif:       Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+// $font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace
+$font-family-base:        $font-family-sans-serif;
+
+$font-size-base:          14px;
+// $font-size-large:         ceil(($font-size-base * 1.25)); // ~18px
+$font-size-small:         ceil(($font-size-base * 0.85)); // ~12px
+
+// $font-size-h1:            floor(($font-size-base * 2.6)) // ~36px
+// $font-size-h2:            floor(($font-size-base * 2.15)) // ~30px
+// $font-size-h3:            ceil(($font-size-base * 1.7)) // ~24px
+// $font-size-h4:            ceil(($font-size-base * 1.25)) // ~18px
+// $font-size-h5:            $font-size-base
+// $font-size-h6:            ceil(($font-size-base * 0.85)) // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+// $line-height-base:        1.428571429 // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+// $line-height-computed:    floor(($font-size-base * $line-height-base)) // ~20px
+
+//** By default, this inherits from the `<body>`.
+// $headings-font-family:    inherit
+// $headings-font-weight:    500
+// $headings-line-height:    1.1
+// $headings-color:          inherit
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+
+// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
+// $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/")
+
+//** File name for all font files.
+// $icon-font-name:          "glyphicons-halflings-regular"
+//** Element ID within SVG icon file.
+// $icon-font-svg-id:        "glyphicons_halflingsregular"
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+// $padding-base-vertical:     6px
+// $padding-base-horizontal:   12px
+
+// $padding-large-vertical:    10px
+// $padding-large-horizontal:  16px
+
+// $padding-small-vertical:    5px
+// $padding-small-horizontal:  10px
+
+// $padding-xs-vertical:       1px
+// $padding-xs-horizontal:     5px
+
+// $line-height-large:         1.3333333 // extra decimals for Win 8.1 Chrome
+// $line-height-small:         1.5
+
+// $border-radius-base:        4px
+// $border-radius-large:       6px
+// $border-radius-small:       3px
+
+//** Global color for active items (e.g., navs or dropdowns).
+// $component-active-color:    #fff
+//** Global background color for active items (e.g., navs or dropdowns).
+// $component-active-bg:       $brand-primary
+
+//** Width of the `border` for generating carets that indicate dropdowns.
+// $caret-width-base:          4px
+//** Carets increase slightly in size for larger components.
+// $caret-width-large:         5px
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `<th>`s and `<td>`s.
+// $table-cell-padding:            8px
+//** Padding for cells in `.table-condensed`.
+// $table-condensed-cell-padding:  5px
+
+//** Default background color used for all tables.
+// $table-bg:                      transparent
+//** Background color used for `.table-striped`.
+// $table-bg-accent:               #f9f9f9
+//** Background color used for `.table-hover`.
+// $table-bg-hover:                #f5f5f5
+// $table-bg-active:               $table-bg-hover
+
+//** Border color for table and cell borders.
+// $table-border-color:            #ddd
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+// $btn-font-weight:                normal
+
+// $btn-default-color:              #333
+// $btn-default-bg:                 #fff
+// $btn-default-border:             #ccc
+
+// $btn-primary-color:              #fff
+// $btn-primary-bg:                 $brand-primary
+// $btn-primary-border:             darken($btn-primary-bg, 5%)
+
+// $btn-success-color:              #fff
+// $btn-success-bg:                 $brand-success
+// $btn-success-border:             darken($btn-success-bg, 5%)
+
+// $btn-info-color:                 #fff
+// $btn-info-bg:                    $brand-info
+// $btn-info-border:                darken($btn-info-bg, 5%)
+
+// $btn-warning-color:              #fff
+// $btn-warning-bg:                 $brand-warning
+// $btn-warning-border:             darken($btn-warning-bg, 5%)
+
+// $btn-danger-color:               #fff
+// $btn-danger-bg:                  $brand-danger
+// $btn-danger-border:              darken($btn-danger-bg, 5%)
+
+// $btn-link-disabled-color:        $gray-light
+
+// Allows for customizing button radius independently from global border radius
+// $btn-border-radius-base:         $border-radius-base
+// $btn-border-radius-large:        $border-radius-large
+// $btn-border-radius-small:        $border-radius-small
+
+//== Forms
+//
+//##
+
+//** `<input>` background color
+// $input-bg:                       #fff
+//** `<input disabled>` background color
+// $input-bg-disabled:              $gray-lighter
+
+//** Text color for `<input>`s
+// $input-color:                    $gray
+//** `<input>` border color
+// $input-border:                   #ccc
+
+// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
+// $input-border-radius:            $border-radius-base
+//** Large `.form-control` border radius
+// $input-border-radius-large:      $border-radius-large
+//** Small `.form-control` border radius
+// $input-border-radius-small:      $border-radius-small
+
+//** Border color for inputs on focus
+$input-border-focus:             #66afe9;
+
+//** Placeholder text color
+// $input-color-placeholder:        #999
+
+//** Default `.form-control` height
+// $input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2)
+//** Large `.form-control` height
+// $input-height-large:             (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2)
+//** Small `.form-control` height
+// $input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2)
+
+//** `.form-group` margin
+// $form-group-margin-bottom:       15px
+
+// $legend-color:                   $gray-dark
+$legend-border-color:            #e5e5e5;
+
+//** Background color for textual input addons
+// $input-group-addon-bg:           $gray-lighter
+//** Border color for textual input addons
+// $input-group-addon-border-color: $input-border
+
+//** Disabled cursor for form controls and buttons.
+// $cursor-disabled:                not-allowed
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+// $dropdown-bg:                    #fff
+//** Dropdown menu `border-color`.
+// $dropdown-border:                rgba(0,0,0,.15)
+//** Dropdown menu `border-color` **for IE8**.
+// $dropdown-fallback-border:       #ccc
+//** Divider color for between dropdown items.
+// $dropdown-divider-bg:            #e5e5e5
+
+//** Dropdown link text color.
+// $dropdown-link-color:            $gray-dark
+//** Hover color for dropdown links.
+// $dropdown-link-hover-color:      darken($gray-dark, 5%)
+//** Hover background for dropdown links.
+// $dropdown-link-hover-bg:         #f5f5f5
+
+//** Active dropdown menu item text color.
+// $dropdown-link-active-color:     $component-active-color
+//** Active dropdown menu item background color.
+// $dropdown-link-active-bg:        $component-active-bg
+
+//** Disabled dropdown menu item background color.
+// $dropdown-link-disabled-color:   $gray-light
+
+//** Text color for headers within dropdown menus.
+// $dropdown-header-color:          $gray-light
+
+//** Deprecated `$dropdown-caret-color` as of v3.1.0
+// $dropdown-caret-color:           #000
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+// $zindex-navbar:            1000
+// $zindex-dropdown:          1000
+// $zindex-popover:           1060
+// $zindex-tooltip:           1070
+// $zindex-navbar-fixed:      1030
+// $zindex-modal-background:  1040
+// $zindex-modal:             1050
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `$screen-xs` as of v3.0.1
+// $screen-xs:                  480px
+//** Deprecated `$screen-xs-min` as of v3.2.0
+// $screen-xs-min:              $screen-xs
+//** Deprecated `$screen-phone` as of v3.0.1
+// $screen-phone:               $screen-xs-min
+
+// Small screen / tablet
+//** Deprecated `$screen-sm` as of v3.0.1
+// $screen-sm:                  768px
+// $screen-sm-min:              $screen-sm
+//** Deprecated `$screen-tablet` as of v3.0.1
+// $screen-tablet:              $screen-sm-min
+
+// Medium screen / desktop
+//** Deprecated `$screen-md` as of v3.0.1
+// $screen-md:                  992px
+// $screen-md-min:              $screen-md
+//** Deprecated `$screen-desktop` as of v3.0.1
+// $screen-desktop:             $screen-md-min
+
+// Large screen / wide desktop
+//** Deprecated `$screen-lg` as of v3.0.1
+// $screen-lg:                  1200px
+// $screen-lg-min:              $screen-lg
+//** Deprecated `$screen-lg-desktop` as of v3.0.1
+// $screen-lg-desktop:          $screen-lg-min
+
+// So media queries don't overlap when required, provide a maximum
+// $screen-xs-max:              ($screen-sm-min - 1)
+// $screen-sm-max:              ($screen-md-min - 1)
+// $screen-md-max:              ($screen-lg-min - 1)
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+// $grid-columns:              12
+//** Padding between columns. Gets divided in half for the left and right.
+// $grid-gutter-width:         30px
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+// $grid-float-breakpoint:     $screen-sm-min
+//** Point at which the navbar begins collapsing.
+// $grid-float-breakpoint-max: ($grid-float-breakpoint - 1)
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+// $container-tablet:             (720px + $grid-gutter-width)
+//** For `$screen-sm-min` and up.
+// $container-sm:                 $container-tablet
+
+// Medium screen / desktop
+// $container-desktop:            (940px + $grid-gutter-width)
+//** For `$screen-md-min` and up.
+// $container-md:                 $container-desktop
+
+// Large screen / wide desktop
+// $container-large-desktop:      (1140px + $grid-gutter-width)
+//** For `$screen-lg-min` and up.
+// $container-lg:                 $container-large-desktop
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+// $navbar-height:                    50px
+// $navbar-margin-bottom:             $line-height-computed
+// $navbar-border-radius:             $border-radius-base
+// $navbar-padding-horizontal:        floor(($grid-gutter-width / 2))
+// $navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2)
+// $navbar-collapse-max-height:       340px
+
+// $navbar-default-color:             #777
+// $navbar-default-bg:                #f8f8f8
+// $navbar-default-border:            darken($navbar-default-bg, 6.5%)
+
+// Navbar links
+// $navbar-default-link-color:                #777
+// $navbar-default-link-hover-color:          #333
+// $navbar-default-link-hover-bg:             transparent
+// $navbar-default-link-active-color:         #555
+// $navbar-default-link-active-bg:            darken($navbar-default-bg, 6.5%)
+// $navbar-default-link-disabled-color:       #ccc
+// $navbar-default-link-disabled-bg:          transparent
+
+// Navbar brand label
+// $navbar-default-brand-color:               $navbar-default-link-color
+// $navbar-default-brand-hover-color:         darken($navbar-default-brand-color, 10%)
+// $navbar-default-brand-hover-bg:            transparent
+
+// Navbar toggle
+// $navbar-default-toggle-hover-bg:           #ddd
+// $navbar-default-toggle-icon-bar-bg:        #888
+// $navbar-default-toggle-border-color:       #ddd
+
+//=== Inverted navbar
+// Reset inverted navbar basics
+// $navbar-inverse-color:                      lighten($gray-light, 15%)
+// $navbar-inverse-bg:                         #222
+// $navbar-inverse-border:                     darken($navbar-inverse-bg, 10%)
+
+// Inverted navbar links
+// $navbar-inverse-link-color:                 lighten($gray-light, 15%)
+// $navbar-inverse-link-hover-color:           #fff
+// $navbar-inverse-link-hover-bg:              transparent
+// $navbar-inverse-link-active-color:          $navbar-inverse-link-hover-color
+// $navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 10%)
+// $navbar-inverse-link-disabled-color:        #444
+// $navbar-inverse-link-disabled-bg:           transparent
+
+// Inverted navbar brand label
+// $navbar-inverse-brand-color:                $navbar-inverse-link-color
+// $navbar-inverse-brand-hover-color:          #fff
+// $navbar-inverse-brand-hover-bg:             transparent
+
+// Inverted navbar toggle
+// $navbar-inverse-toggle-hover-bg:            #333
+// $navbar-inverse-toggle-icon-bar-bg:         #fff
+// $navbar-inverse-toggle-border-color:        #333
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+// $nav-link-padding:                          10px 15px
+// $nav-link-hover-bg:                         $gray-lighter
+
+// $nav-disabled-link-color:                   $gray-light
+// $nav-disabled-link-hover-color:             $gray-light
+
+//== Tabs
+// $nav-tabs-border-color:                     #ddd
+
+// $nav-tabs-link-hover-border-color:          $gray-lighter
+
+// $nav-tabs-active-link-hover-bg:             $body-bg
+// $nav-tabs-active-link-hover-color:          $gray
+// $nav-tabs-active-link-hover-border-color:   #ddd
+
+// $nav-tabs-justified-link-border-color:            #ddd
+// $nav-tabs-justified-active-link-border-color:     $body-bg
+
+//== Pills
+// $nav-pills-border-radius:                   $border-radius-base
+// $nav-pills-active-link-hover-bg:            $component-active-bg
+// $nav-pills-active-link-hover-color:         $component-active-color
+
+//== Pagination
+//
+//##
+
+// $pagination-color:                     $link-color
+// $pagination-bg:                        #fff
+// $pagination-border:                    #ddd
+
+// $pagination-hover-color:               $link-hover-color
+// $pagination-hover-bg:                  $gray-lighter
+// $pagination-hover-border:              #ddd
+
+// $pagination-active-color:              #fff
+// $pagination-active-bg:                 $brand-primary
+// $pagination-active-border:             $brand-primary
+
+// $pagination-disabled-color:            $gray-light
+// $pagination-disabled-bg:               #fff
+// $pagination-disabled-border:           #ddd
+
+//== Pager
+//
+//##
+
+// $pager-bg:                             $pagination-bg
+// $pager-border:                         $pagination-border
+// $pager-border-radius:                  15px
+
+// $pager-hover-bg:                       $pagination-hover-bg
+
+// $pager-active-bg:                      $pagination-active-bg
+// $pager-active-color:                   $pagination-active-color
+
+// $pager-disabled-color:                 $pagination-disabled-color
+
+//== Jumbotron
+//
+//##
+
+// $jumbotron-padding:              30px
+// $jumbotron-color:                inherit
+// $jumbotron-bg:                   $gray-lighter
+// $jumbotron-heading-color:        inherit
+// $jumbotron-font-size:            ceil(($font-size-base * 1.5))
+// $jumbotron-heading-font-size:    ceil(($font-size-base * 4.5))
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+// $state-success-text:             #3c763d
+// $state-success-bg:               #dff0d8
+// $state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%)
+
+$state-info-text:                #31708f;
+$state-info-bg:                  #d9edf7;
+$state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%);
+
+$state-warning-text:             #8a6d3b;
+$state-warning-bg:               #fcf8e3;
+$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%);
+
+// $state-danger-text:              #a94442
+// $state-danger-bg:                #f2dede
+// $state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%)
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+// $tooltip-max-width:           200px
+//** Tooltip text color
+// $tooltip-color:               #fff
+//** Tooltip background color
+// $tooltip-bg:                  #000
+// $tooltip-opacity:             .9
+
+//** Tooltip arrow width
+// $tooltip-arrow-width:         5px
+//** Tooltip arrow color
+// $tooltip-arrow-color:         $tooltip-bg
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+// $popover-bg:                          #fff
+//** Popover maximum width
+// $popover-max-width:                   276px
+//** Popover border color
+// $popover-border-color:                rgba(0,0,0,.2)
+//** Popover fallback border color
+// $popover-fallback-border-color:       #ccc
+
+//** Popover title background color
+// $popover-title-bg:                    darken($popover-bg, 3%)
+
+//** Popover arrow width
+// $popover-arrow-width:                 10px
+//** Popover arrow color
+// $popover-arrow-color:                 $popover-bg
+
+//** Popover outer arrow width
+// $popover-arrow-outer-width:           ($popover-arrow-width + 1)
+//** Popover outer arrow color
+// $popover-arrow-outer-color:           fade_in($popover-border-color, 0.05)
+//** Popover outer arrow fallback color
+// $popover-arrow-outer-fallback-color:  darken($popover-fallback-border-color, 20%)
+
+//== Labels
+//
+//##
+
+//** Default label background color
+// $label-default-bg:            $gray-light
+//** Primary label background color
+// $label-primary-bg:            $brand-primary
+//** Success label background color
+// $label-success-bg:            $brand-success
+//** Info label background color
+// $label-info-bg:               $brand-info
+//** Warning label background color
+// $label-warning-bg:            $brand-warning
+//** Danger label background color
+// $label-danger-bg:             $brand-danger
+
+//** Default label text color
+// $label-color:                 #fff
+//** Default text color of a linked label
+// $label-link-hover-color:      #fff
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+// $modal-inner-padding:         15px
+
+//** Padding applied to the modal title
+// $modal-title-padding:         15px
+//** Modal title line-height
+// $modal-title-line-height:     $line-height-base
+
+//** Background color of modal content area
+// $modal-content-bg:                             #fff
+//** Modal content border color
+// $modal-content-border-color:                   rgba(0,0,0,.2)
+//** Modal content border color **for IE8**
+// $modal-content-fallback-border-color:          #999
+
+//** Modal backdrop background color
+// $modal-backdrop-bg:           #000
+//** Modal backdrop opacity
+// $modal-backdrop-opacity:      .5
+//** Modal header border color
+// $modal-header-border-color:   #e5e5e5
+//** Modal footer border color
+// $modal-footer-border-color:   $modal-header-border-color
+
+// $modal-lg:                    900px
+// $modal-md:                    600px
+// $modal-sm:                    300px
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+// $alert-padding:               15px
+// $alert-border-radius:         $border-radius-base
+// $alert-link-font-weight:      bold
+
+// $alert-success-bg:            $state-success-bg
+// $alert-success-text:          $state-success-text
+// $alert-success-border:        $state-success-border
+
+$alert-info-bg:               $state-info-bg;
+$alert-info-text:             $state-info-text;
+$alert-info-border:           $state-info-border;
+
+// $alert-warning-bg:            $state-warning-bg
+// $alert-warning-text:          $state-warning-text
+// $alert-warning-border:        $state-warning-border
+
+// $alert-danger-bg:             $state-danger-bg
+// $alert-danger-text:           $state-danger-text
+// $alert-danger-border:         $state-danger-border
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+// $progress-bg:                 #f5f5f5
+//** Progress bar text color
+// $progress-bar-color:          #fff
+//** Variable for setting rounded corners on progress bar.
+// $progress-border-radius:      $border-radius-base
+
+//** Default progress bar color
+// $progress-bar-bg:             $brand-primary
+//** Success progress bar color
+// $progress-bar-success-bg:     $brand-success
+//** Warning progress bar color
+// $progress-bar-warning-bg:     $brand-warning
+//** Danger progress bar color
+// $progress-bar-danger-bg:      $brand-danger
+//** Info progress bar color
+// $progress-bar-info-bg:        $brand-info
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+// $list-group-bg:                 #fff
+//** `.list-group-item` border color
+// $list-group-border:             #ddd
+//** List group border radius
+// $list-group-border-radius:      $border-radius-base
+
+//** Background color of single list items on hover
+// $list-group-hover-bg:           #f5f5f5
+//** Text color of active list items
+// $list-group-active-color:       $component-active-color
+//** Background color of active list items
+// $list-group-active-bg:          $component-active-bg
+//** Border color of active list elements
+// $list-group-active-border:      $list-group-active-bg
+//** Text color for content within active list items
+// $list-group-active-text-color:  lighten($list-group-active-bg, 40%)
+
+//** Text color of disabled list items
+// $list-group-disabled-color:      $gray-light
+//** Background color of disabled list items
+// $list-group-disabled-bg:         $gray-lighter
+//** Text color for content within disabled list items
+// $list-group-disabled-text-color: $list-group-disabled-color
+
+// $list-group-link-color:         #555
+// $list-group-link-hover-color:   $list-group-link-color
+// $list-group-link-heading-color: #333
+
+//== Panels
+//
+//##
+
+// $panel-bg:                    #fff
+// $panel-body-padding:          15px
+// $panel-heading-padding:       10px 15px
+// $panel-footer-padding:        $panel-heading-padding
+// $panel-border-radius:         $border-radius-base
+
+//** Border color for elements within panels
+// $panel-inner-border:          #ddd
+// $panel-footer-bg:             #f5f5f5
+
+// $panel-default-text:          $gray-dark
+// $panel-default-border:        #ddd
+// $panel-default-heading-bg:    #f5f5f5
+
+// $panel-primary-text:          #fff
+// $panel-primary-border:        $brand-primary
+// $panel-primary-heading-bg:    $brand-primary
+
+// $panel-success-text:          $state-success-text
+// $panel-success-border:        $state-success-border
+// $panel-success-heading-bg:    $state-success-bg
+
+// $panel-info-text:             $state-info-text
+// $panel-info-border:           $state-info-border
+// $panel-info-heading-bg:       $state-info-bg
+
+// $panel-warning-text:          $state-warning-text
+// $panel-warning-border:        $state-warning-border
+// $panel-warning-heading-bg:    $state-warning-bg
+
+// $panel-danger-text:           $state-danger-text
+// $panel-danger-border:         $state-danger-border
+// $panel-danger-heading-bg:     $state-danger-bg
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+// $thumbnail-padding:           4px
+//** Thumbnail background color
+// $thumbnail-bg:                $body-bg
+//** Thumbnail border color
+// $thumbnail-border:            #ddd
+//** Thumbnail border radius
+// $thumbnail-border-radius:     $border-radius-base
+
+//** Custom text color for thumbnail captions
+// $thumbnail-caption-color:     $text-color
+//** Padding around the thumbnail caption
+// $thumbnail-caption-padding:   9px
+
+//== Wells
+//
+//##
+
+// $well-bg:                     #f5f5f5
+// $well-border:                 darken($well-bg, 7%)
+
+//== Badges
+//
+//##
+
+// $badge-color:                 #fff
+//** Linked badge text color on hover
+// $badge-link-hover-color:      #fff
+// $badge-bg:                    $gray-light
+
+//** Badge text color in active nav link
+// $badge-active-color:          $link-color
+//** Badge background color in active nav link
+// $badge-active-bg:             #fff
+
+// $badge-font-weight:           bold
+// $badge-line-height:           1
+// $badge-border-radius:         10px
+
+//== Breadcrumbs
+//
+//##
+
+// $breadcrumb-padding-vertical:   8px
+// $breadcrumb-padding-horizontal: 15px
+//** Breadcrumb background color
+// $breadcrumb-bg:                 #f5f5f5
+//** Breadcrumb text color
+// $breadcrumb-color:              #ccc
+//** Text color of current page in the breadcrumb
+// $breadcrumb-active-color:       $gray-light
+//** Textual separator for between breadcrumb elements
+// $breadcrumb-separator:          "/"
+
+//== Carousel
+//
+//##
+
+// $carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6)
+
+// $carousel-control-color:                      #fff
+// $carousel-control-width:                      15%
+// $carousel-control-opacity:                    .5
+// $carousel-control-font-size:                  20px
+
+// $carousel-indicator-active-bg:                #fff
+// $carousel-indicator-border-color:             #fff
+
+// $carousel-caption-color:                      #fff
+
+//== Close
+//
+//##
+
+// $close-font-weight:           bold
+// $close-color:                 #000
+// $close-text-shadow:           0 1px 0 #fff
+
+//== Code
+//
+//##
+
+// $code-color:                  #c7254e
+// $code-bg:                     #f9f2f4
+
+// $kbd-color:                   #fff
+// $kbd-bg:                      #333
+
+// $pre-bg:                      #f5f5f5
+// $pre-color:                   $gray-dark
+// $pre-border-color:            #ccc
+// $pre-scrollable-max-height:   340px
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+// $component-offset-horizontal: 180px
+//** Text muted color
+$text-muted:                  $gray-light;
+//** Abbreviations and acronyms border color
+// $abbr-border-color:           $gray-light
+//** Headings small color
+// $headings-small-color:        $gray-light
+//** Blockquote small color
+// $blockquote-small-color:      $gray-light
+//** Blockquote font size
+// $blockquote-font-size:        ($font-size-base * 1.25)
+//** Blockquote border color
+// $blockquote-border-color:     $gray-lighter
+//** Page header border color
+// $page-header-border-color:    $gray-lighter
+//** Width of horizontal description list titles
+// $dl-horizontal-offset:        $component-offset-horizontal
+//** Point at which .dl-horizontal becomes horizontal
+// $dl-horizontal-breakpoint:    $grid-float-breakpoint
+//** Horizontal line color.
+// $hr-border:                   $gray-lighter
Index: lams_central/conf/scss/_lams_variables.scss
===================================================================
diff -u
--- lams_central/conf/scss/_lams_variables.scss	(revision 0)
+++ lams_central/conf/scss/_lams_variables.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,79 @@
+// Import this file into all LAMS scss files to get the consistent definitions
+@import "_bootstrap-variables.scss";
+@import "_mixins.scss";
+
+// LAMS SASS Global Variables
+$gray-light-mid:  lighten($gray-base, 86.5%); // #dddddd
+$gray-lightest:  lighten($gray-base, 96%); // #f5f5f5 or whitesmoke
+
+// Primary colour shades
+$brand-primary-darkest: #072B57; // used for main page offcanvas course list
+$brand-primary-darker: #164276;  // used for main page offcanvas course list
+$brand-primary-mid: lighten($brand-primary, 12%); // #5798d0
+$brand-primary-light: lighten($brand-primary, 45%); // #dbe9f5
+$brand-primary-bright: #0E9AEF;   // used when we need a primary standout, such as the right hand bar indicating the current org in the offcanvas course list.
+
+// a links
+$a-link-default: $brand-primary;
+$a-link-default-hover: $brand-primary-bright;
+$a-link-default-focus: $brand-primary-bright;
+
+// Success Green shades
+$brand-success-light: lighten($brand-success, 25%); // #b5dfb5
+
+// Warning Yellow shades:
+$contrast-fade-start: #FCF0AD; // Used in Forum, Comment for highlighting replies
+$contrast-light: #F6EEBF; 
+
+// Borders in various colours
+// Grey or black
+$border-thin-black: thin solid black;
+$border-thin-dotted: thin dotted #AAAAAA; // admin, central, monitoring
+$border-thin-dashed: thin dashed #AAAAAA; // only used in admin
+$border-thin-solid: thin solid #AAAAAA; // adming and monitoring
+$border-thin-body-bg: thin solid $body-bg; // white line
+$border-thin-default: thin solid #AAAAAA;
+$border-thin-default-light: thin solid $legend-border-color;
+$medium-default: 3px solid $gray-light-mid;
+// Blue
+$border-thin-primary: thin solid $brand-primary;
+// Red
+$border-thin-danger: thin solid $brand-danger;
+$border-medium-danger: 3px solid $brand-danger;
+
+// learner page box shadow
+$panel-box-shadow: 0 1px 1px rgba(8, 8, 8, 0.88);
+
+// progress bar
+$optional-activity-background: lighten($brand-primary-mid, 35%);
+$optional-activity-background-heading: lighten($brand-primary-mid, 5%); 
+$optional-activity-background-hover: $contrast-light;
+$completed-activity-fill: #000099;
+$current-activity-fill: #BB0000;
+$gate-activity-fill: #FF0000;
+$complex-activity-fill: #999999;
+$not-started-activity-fill: #009900;
+
+// Used just for main.css - the main page
+$main_default_link: #5A738E;
+$main_blue_light_highlight: #A6E5FD;
+$main_fav_org_link: #A7B1C2;
+$main_offcanvas_link: #2B5B95;
+$main_dropdown_border: #D9DEE4;
+$main_navbar_link: #515356;
+$main_singlelesson_hover_border: #9be0f9;
+$main_singlelesson_hover_background: #F0F8FF;
+
+// navbar login bar
+// $navbar-brand-login-color: #ffffff;
+// $navbar-login-background: $brand-primary;
+
+// panel header color
+// $panel-default-heading-background: lighten($brand-primary-bright, 20%);
+
+// Text & typography
+// $headings-default-color: $brand-primary-darker;
+
+$url_css_directory: "/lams/images/css/";
+$login_logo: "/lams/images/svg/lams_logo_black.svg";
+$login_logo_size: auto 20px;
Index: lams_central/conf/scss/_mixins.scss
===================================================================
diff -u
--- lams_central/conf/scss/_mixins.scss	(revision 0)
+++ lams_central/conf/scss/_mixins.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,109 @@
+// Button variants
+//
+// Easily pump out default styles, as well as :hover, :focus, :active,
+// and disabled options for all buttons
+
+@mixin button-variant($color, $background, $border) {
+  color: $color;
+  background-color: $background;
+  border-color: $border;
+
+  &:focus,
+  &.focus {
+    color: $color;
+    background-color: darken($background, 10%);
+        border-color: darken($border, 25%);
+        outline:0;
+  }
+  &:hover {
+    color: $color;
+    background-color: darken($background, 10%);
+        border-color: darken($border, 12%);
+  }
+  &:active,
+  &.active,
+  .open > &.dropdown-toggle {
+    color: $color;
+    background-color: darken($background, 10%);
+        border-color: darken($border, 12%);
+
+    &:hover,
+    &:focus,
+    &.focus {
+      color: $color;
+      background-color: darken($background, 17%);
+          border-color: darken($border, 25%);
+          outline:0;
+    }
+  }
+  &:active,
+  &.active,
+  .open > &.dropdown-toggle {
+    background-image: none;
+  }
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    &:hover,
+    &:focus,
+    &.focus {
+      background-color: $background;
+          border-color: $border;
+    }
+  }
+
+  .badge {
+    color: $background;
+    background-color: $color;
+  }
+}
+
+// Button sizes
+@mixin button-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
+  padding: $padding-vertical $padding-horizontal;
+  font-size: $font-size;
+  line-height: $line-height;
+  border-radius: $border-radius;
+}
+
+// Drop shadows
+@mixin box-shadow($shadow) {
+  -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1
+          box-shadow: $shadow;
+}
+@mixin form-control-focus($color) {
+  $color-rgba: rgba(red($color), green($color), blue($color), .6);
+  &:focus {
+    border-color: $color;
+    outline: 0;
+    $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $color-rgba;
+	@include box-shadow($shadow);
+  }
+}
+
+// Alerts
+@mixin alert-variant($background, $border, $text-color) {
+  background-color: $background;
+  border-color: $border;
+  color: $text-color;
+
+  hr {
+    border-top-color: darken($border, 5%);
+  }
+  .alert-link {
+    color: darken($text-color, 10%);
+  }
+}
+
+// Contextual backgrounds
+
+// [converter] $parent hack
+@mixin bg-variant($parent, $color) {
+  #{$parent} {
+    background-color: $color;
+  }
+  a#{$parent}:hover,
+  a#{$parent}:focus {
+    background-color: darken($color, 10%);
+  }
+}
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	(.../CssTag.java)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	(.../CssTag.java)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -56,6 +56,9 @@
 
     private static final String RTL_DIR = "rtl"; // right-to-left direction
 
+    private String suffix = null;
+    private String webapp = null;
+    
     public CssTag() {
 	super();
     }
@@ -99,25 +102,49 @@
     }
 
     private String appendStyle(String stylesheetName, boolean rtl) {
-	String ssName = stylesheetName;
-	if (ssName != null) {
-	    ssName = rtl ? ssName + "_" + CssTag.RTL_DIR + "_" + "learner" : ssName + "_" + "learner";
+	if (stylesheetName != null) {
+	    StringBuilder bldr = new StringBuilder(stylesheetName);
+	    if ( rtl ) {
+		bldr.append("_").append(CssTag.RTL_DIR);
+	    }
+	    bldr.append("_");
+	    bldr.append(suffix != null ? suffix : "learner");
+	    return bldr.toString();
 	}
-	return ssName;
+	return null;
     }
 
     private String generateLink(String stylesheetName, String serverURL) {
-	if (serverURL.endsWith("/")) {
-	    return "<link href=\"" + serverURL + "css/" + stylesheetName
-		    + ".css\" rel=\"stylesheet\" type=\"text/css\">";
-	} else {
-	    return "<link href=\"" + serverURL + "/css/" + stylesheetName
-		    + ".css\" rel=\"stylesheet\" type=\"text/css\">";
+	StringBuilder bldr = new StringBuilder("<link href=\"").append(serverURL);
+	if (!serverURL.endsWith("/")) {
+	    bldr.append("/");
 	}
+	if ( webapp!= null ) {
+	    bldr.append(webapp).append("/");
+	}
+	bldr.append("css/").append(stylesheetName).append(".css\" rel=\"stylesheet\" type=\"text/css\">");
+	return bldr.toString();
     }
 
     @Override
     public int doEndTag() {
 	return Tag.EVAL_PAGE;
     }
+
+    public String getSuffix() {
+	return suffix;
+    }
+
+    /** Set the end of the stylesheet name to call a secondary stylesheet. Do not define to get the normal blah_learner.html stylesheet */
+    public void setSuffix(String suffix) {
+	this.suffix = suffix;
+    }
+
+    public String getWebapp() {
+	return webapp;
+    }
+
+    public void setWebapp(String webapp) {
+	this.webapp = webapp;
+    }
 }
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r757f4919e3cf9567eaad331bc4323fda7ea50eb2 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 757f4919e3cf9567eaad331bc4323fda7ea50eb2)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -90,7 +90,7 @@
 						    	<div id="canvasDiv">
 						    		<div id="ldScreenshotAuthor" class="ldChoiceDependentCanvasElement"></div>
 					    			<i id="ldScreenshotLoading" class="ldChoiceDependentCanvasElement fa fa-refresh fa-spin fa-2x fa-fw"></i>
-					    			<div id="ldNotChosenError" class="ldChoiceDependentCanvasElement errorMessage" ><fmt:message key="error.tab.lesson.sequence" /></div>
+					    			<div id="ldNotChosenError" class="ldChoiceDependentCanvasElement errorMessage text-danger" ><fmt:message key="error.tab.lesson.sequence" /></div>
 					    			<div id="ldCannotLoadSVG" class="ldChoiceDependentCanvasElement" ><fmt:message key="error.cannot.load.thumbnail" /></div>
 						    	</div>
 							</td>
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r757f4919e3cf9567eaad331bc4323fda7ea50eb2 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 757f4919e3cf9567eaad331bc4323fda7ea50eb2)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -13,7 +13,7 @@
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/yui/folders.css" type="text/css" media="screen" />
 	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/authoring.css" type="text/css" media="screen" />
+	<lams:css suffix="authoring"/>
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
Index: lams_central/web/comments/comments.jsp
===================================================================
diff -u -r5fb9d3a732e1f9c643f4c6023e29b25cd2287988 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/comments/comments.jsp	(.../comments.jsp)	(revision 5fb9d3a732e1f9c643f4c6023e29b25cd2287988)
+++ lams_central/web/comments/comments.jsp	(.../comments.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -19,8 +19,7 @@
 		
 		<!-- ********************  CSS ********************** -->
 		<lams:css />
-		<link type="text/css" href="<lams:LAMSURL />css/jquery.treetable.css" rel="stylesheet"/>
-		<link type="text/css" href="<lams:LAMSURL />css/jquery.treetable.lams.css" rel="stylesheet"/>
+		<lams:css suffix="treetable"/>
 		
 		<!-- ********************  javascript ********************** -->
 		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery-ui.js"></script>
Index: lams_central/web/comments/topicview.jsp
===================================================================
diff -u -r5fb9d3a732e1f9c643f4c6023e29b25cd2287988 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision 5fb9d3a732e1f9c643f4c6023e29b25cd2287988)
+++ lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -9,7 +9,7 @@
 <c:set var="hide"><fmt:message key="label.hide" /></c:set>
 <c:set var="prompt"><fmt:message key="label.showhide.prompt" /></c:set>
 <c:set var="tableCommand">expandable:true,initialState:'expanded',
-	expanderTemplate:'<a class=\"btn btn-xs\" href=\"#\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${prompt}</a>',
+	expanderTemplate:'<a href=\"#\"><span style="margin-left:20px">${prompt}</span></a>',
 	stringCollapse:'${hide}',stringExpand:'${show}',
 	clickableNodeNames:true,indent:${indent},
 	onNodeInitialized:function() {
@@ -19,7 +19,7 @@
 	}
  </c:set>
 <c:set var="tableCommandSticky">expandable:true,initialState:'collapsed',
-	expanderTemplate:'<a class=\"btn btn-xs\" href=\"#\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${prompt}</a>',
+	expanderTemplate:'<a href=\"#\"><span style="margin-left:20px">${prompt}</span></a>',
 	stringCollapse:'${hide}',stringExpand:'${show}',
 	clickableNodeNames:true,indent:${indent},
 	onNodeInitialized:function() {
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u
--- lams_central/web/css/_authoring_base.scss	(revision 0)
+++ lams_central/web/css/_authoring_base.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,480 @@
+/**** Global styles ****/
+
+a.ygtvspacer {
+	border-bottom: none;
+}
+
+
+/**** Dialog styles ****/
+#loadingOverlay {
+	width: 99%;
+	height: 99%;
+	z-index: 2000;
+	position: absolute;
+	background-color: $body-bg;
+	text-align: center;
+}
+
+#loadingOverlay * {
+	margin-top: 20%;
+}
+
+.dialogContainer {
+	-webkit-overflow-scrolling: touch !important;
+}
+
+.dialogContainer .modal-content {
+	box-shadow: none;
+}
+
+.dialogContainer .modal-body {
+	height : 100%;
+	max-height: calc(100% - 38px);
+	padding: 0;
+}
+
+.dialogContainer button {
+	cursor: pointer;
+}
+
+.dialogContainer button:focus {
+	outline: none;
+}
+
+.dialogContainer .modal-header button .fa {
+  font-size: 16px;
+  margin-left: 10px;
+}
+
+.dialogContainer .ui-draggable .modal-header {
+	cursor: move;
+}
+
+div.dialogContents, #ldScreenshotAuthor, #ldScreenshotLoading {
+	display: none;
+}
+
+.dialogContainer iframe {
+	width: 100%;
+	height: 99%;
+	border: none;
+}
+
+.dialogContainer .ui-spinner {
+	border: none;
+}
+
+.dialogMin {
+	top: auto !important;
+	bottom: 5px !important;
+	overflow: hidden !important;
+	padding: 0 !important;
+	position: fixed !important;
+	width: 250px !important;
+	height: 35px !important;
+}
+
+.dialogMin .modal-title {
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.dialogMin .modal-dialog {
+	left: 0 !important;
+	top: 0 !important;
+}
+
+.dialogMin .modal-dialog, .dialogMin .modal-content {
+	width: 250px !important;
+	height: 35px !important;
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+.dialogMin .modal-header {
+	height: 100%;
+	margin: 0 !important;
+	padding: 3px 5px !important;
+	cursor: default !important;
+}
+
+div.smallHeader .modal-header {
+	padding: 5px;
+}
+
+div.smallHeader .modal-title {
+	font-size: 16px;
+}
+
+div.propertiesDialogContainer .dialogContents table {
+	width: 100%;
+}
+
+div.propertiesDialogContainer .dialogContents td {
+	padding: 5px;
+}
+
+input[name="propertiesContentFieldGroupDivide"] {
+	margin-right: 10px;
+}
+
+input.propertiesContentFieldLearnerCount, input.propertiesContentFieldGroupCount {
+	width: 40px;
+}
+
+tr.propertiesContentRowGateSchedule input.spinner {
+	width: 30px;
+}
+
+input.propertiesContentFieldTitle, textarea.propertiesContentFieldDescription,
+select.propertiesContentFieldGradebook {
+	width: 99%;	
+}
+
+.dialogContents .labelPlusSize {
+	cursor: pointer;
+}
+
+.dialogContents .labelMinusSize {
+	margin-left: 15px;
+	cursor: pointer;
+}
+
+div#groupNamingDialog .btn-group,
+div#gtbDialog  .btn-group,
+div#ctbDialog .btn-group,
+div#outputConditionsDialog .btn-group {
+	margin: 10px 0 10px 10px;
+}
+
+input.groupName {
+	margin: 5px 0 5px 10px;
+	width: 95%;
+}
+
+
+div#infoDialog .modal-body {
+	font-weight: bold;
+	padding: 5px;
+}
+
+
+div.exportDialog {
+	text-align: center;
+}
+
+div.exportDialog a {
+	text-decoration: none;
+}
+
+div.exportDialog iframe {
+	display: none;
+}
+
+div#exportLDDialog {
+	cursor: pointer;
+}
+
+div#ldStoreDialog {
+	z-index: 1051;
+}
+
+div#ldStoreDialogContents {
+	width: 100%;
+	height: 100%;
+}
+
+div#ldStoreDialogContents > table {
+	height: 100%;
+	width: 100%;
+	border-collapse: separate;
+}
+
+div#ldStoreDialogContents #ldStoreDialogButtonCell {
+	height: 40px;
+	border-top: $border-thin-dotted;
+	padding-top: 5px;
+}
+
+div#ldStoreDialogContents #ldStoreDialogButtonCell > div > div {
+	display: inline-block;
+}
+
+div#ldStoreDialogContents td#ldStoreDialogTreeCell {
+	padding: 2px 2px 0px 5px;
+	vertical-align: top;
+	border-right: $border-thin-dotted;
+	width: 200px;
+}
+
+div#ldStoreDialogContents div#ldStoreDialogTree {
+	width: 200px;
+	overflow: auto;
+}
+
+div#ldStoreDialogContents #ldStoreDialogAccessCell {
+	border-top: $border-thin-dotted;
+	border-right: $border-thin-dotted;
+}
+
+div#ldStoreDialogContents #ldStoreDialogAccessDiv {
+	width: 200px;
+	overflow: auto;
+	height: 150px;
+	vertical-align: top;
+	padding: 5px 0px 5px 0px;
+}
+
+div#ldStoreDialogContents #ldStoreDialogAccessDiv > div#ldStoreDialogAccessTitle {
+	font-size: 13px;
+	font-weight: bold;
+	text-align: center;
+}
+
+div#ldStoreDialogContents #ldStoreDialogAccessDiv > div.access {
+	padding: 3px 0 3px 3px;
+	cursor: pointer;
+	margin-left: 10px;
+	margin-right: 10px;
+	font-size: small;
+}
+
+div#ldStoreDialogContents #ldStoreDialogAccessDiv > div.selected {
+	background-color: $brand-primary-light;
+}
+
+
+div#ldStoreDialogContents td#ldStoreDialogCanvasCell {
+	text-align: center;
+	padding: 10px 0px 0px 10px;
+	vertical-align: middle;
+}
+
+div#ldStoreDialogContents div#ldStoreDialogCanvasDiv {
+	overflow: auto;
+}
+
+div#ldStoreDialogContents img#ldScreenshotLoading  {
+	padding-top: 200px;
+}
+
+div#ldStoreDialogContents #ldStoreDialogImportPartFrame {
+	border: none;
+	width: 99%;
+}
+
+div#ldStoreDialogContents div#ldStoreDialogNameContainer {
+	margin-left: 20px;
+}
+
+div#ldStoreDialogContents div#ldStoreDialogNameContainer span {
+	font-weight: bold;
+}
+
+div#ldStoreDialogContents #ldStoreDialogNameContainer input {
+	width: 300px;
+	margin-left: 10px;
+	color: $gray-base;
+}
+
+div.branchMappingDialog {
+	margin-left: 10px;
+	margin-right: 10px;
+}
+
+div.branchMappingDialog .container-fluid {
+	padding-right: 0;
+}
+
+div.branchMappingDialog > table {
+	width: 100%;
+	height: 98%;
+	table-layout: fixed;
+	border-collapse: collapse;
+}
+
+div.branchMappingDialog td {
+	text-align: center;
+	vertical-align: top;
+}
+
+div.branchMappingDialog td.branchMappingLabelCell {
+	height: 15px;
+	font-weight: bold;
+}
+
+div.branchMappingDialog td.branchMappingListCell {
+	border: $border-thin-black;
+	padding: 3px;
+}
+
+div.branchMappingDialog td.branchMappingListCell .selected {
+	background-color: $brand-primary-mid;
+	color: white;
+}
+
+div.branchMappingDialog .branchMappingButton {
+	width: 40%;
+	display: block;
+	margin: auto;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+div.branchMappingDialog td.branchMappingListCell div {
+	text-align: left;
+	cursor: pointer;
+}
+
+div#outputConditionsDialogContents div#complexConditions > div {
+	font-weight: bold;
+	margin: 10px 0 0 2px;
+}
+
+div#outputConditionsDialogContents select {
+	margin-bottom: 10px;
+	width: 95%;
+}
+
+div#outputConditionsDialogContents .spinner {
+	width: 40px;
+}
+
+div#outputConditionsDialogContents div#multiRangeDiv {
+	display: inline-block;	
+}
+
+div#outputConditionsDialogContents #rangeAddButton {
+	margin-left: 10px;
+}
+
+div#outputConditionsDialogContents table#rangeConditions {
+	width: 100%;
+	margin-top: 15px;
+	border-collapse: collapse;
+	text-align: center;
+}
+
+div#outputConditionsDialogContents table#rangeConditions tr td,
+div#outputConditionsDialogContents table#rangeConditions tr th {
+	padding: 3px;
+	border: $border-thin-black;
+	cursor: pointer;
+}
+
+div#outputConditionsDialogContents table#rangeConditions input {
+	width: 95%;
+}
+
+div#outputConditionsDialogContents tr.selected {
+	background-color: $brand-primary-light;
+}
+
+/**** Main authoring styles ****/
+
+div#toolbar {
+	padding: 3px;
+}
+
+#cancelLiveEditButton {
+	display: none;
+}
+
+table#authoringTable {
+	table-layout: fixed;
+	width: 100%;
+}
+
+td#templateContainerCell {
+	width: 175px;
+	vertical-align: top;
+}
+
+td#templateContainerCell select {
+	width: 100%;
+	margin-bottom: 3px;
+}
+
+div.templateContainer {
+	display: none;
+	overflow: auto;
+	border: $border-thin-default;
+	border-radius: 3px;
+}
+
+div.template {
+	min-height: 45px;
+	border-bottom: $border-thin-default;
+	cursor: pointer;
+}
+
+.tooltemplate :hover {
+	background-color:$gray-lighter;
+}
+
+.tooltemplate .media {
+	margin-top: 0px;
+	padding: 8px 0px 5px 5px;
+}
+
+.media #toolDisplayName {
+}
+
+td#canvasContainerCell {
+	vertical-align: top;
+}
+
+#ldDescriptionDiv {
+	z-index: 1099;
+	border-bottom: $border-thin-default;
+}
+
+#ldDescriptionDiv #ldDescriptionTitleContainer {
+	padding: 2px 0 0 0;
+	text-align: center;
+	font-size: 14px;
+	font-weight: bold;
+	cursor: pointer;
+}
+
+#ldDescriptionDiv #ldDescriptionHideTip {
+	float: right;
+	margin-right: 10px;
+}
+
+#ldDescriptionDiv #ldDescriptionDetails {
+	padding: 0 0 5px 10px;
+	display: none;
+}
+
+#ldDescriptionDiv .ldDescriptionLabel {
+	font-size: 12px;
+}
+
+#ldDescriptionDiv #ldDescriptionEditorContainer {
+	margin: 0px 15px 15px 0;
+}
+
+#ldDescriptionDiv #ldDescriptionLicenseTextContainer,
+#ldDescriptionDiv #ldDescriptionLicenseImage,
+#ldDescriptionDiv #ldDescriptionLicenseButton {
+	display: none;
+}
+
+#ldDescriptionDiv #ldDescriptionLicenseImage {
+	vertical-align: text-bottom;
+	padding: 0 10px;
+}
+
+#ldDescriptionDiv #ldDescriptionLicenseTextContainer {
+	padding-top: 10px;
+}
+
+#ldDescriptionDiv #ldDescriptionLicenseText {
+	width: 99%;
+} 
+
+#canvas {
+	overflow: auto;
+	vertical-align: top;
+}
Index: lams_central/web/css/_chart_base.scss
===================================================================
diff -u
--- lams_central/web/css/_chart_base.scss	(revision 0)
+++ lams_central/web/css/_chart_base.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,45 @@
+.axis {
+	font: 10px $font-family-sans-serif;
+}
+
+.axis path, .axis line {
+	fill: none;
+	stroke: black;
+	shape-rendering: crispEdges;
+}
+
+// distinguish it from jquery-ui tooltips
+div.chartTooltip {
+    position: absolute;			
+    padding: 2px;
+    font: 12px $font-family-sans-serif;		
+    background: white;
+    border: 0px;
+    border-radius: 8px;			
+    pointer-events: none;
+	opacity: 0;
+}
+
+/* Histogram Chart */
+.bar rect {
+	fill: $brand-primary;
+}
+
+.bar text {
+	fill: white;
+	font: 14px $font-family-sans-serif;
+}
+.zoom {
+	cursor: move;
+	fill: none;
+	pointer-events: all;
+}
+
+/* Tool Mark Charts (Monitoring) - space for the histogram chart */
+.markChartDiv {
+	margin-top: 10px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	width: 95%;
+	height: 500px;
+}
Index: lams_central/web/css/_inlineeditor.scss
===================================================================
diff -u
--- lams_central/web/css/_inlineeditor.scss	(revision 0)
+++ lams_central/web/css/_inlineeditor.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,29 @@
+/** CKEditor Inline */
+.cke_textarea_inline {
+  /* From bootstrap form-control */
+  display: block;
+  width: 100%;
+  padding: 6px 12px;
+  font-size: 14px;
+  line-height: 1.42857143;
+  color: #555;
+  background-color: #fff;
+  background-image: none;
+  border: $border-thin-default;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+       -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+          transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;	border: 1px solid #c1c1c1;
+  overflow: hidden; /* keeps floating objects within ckeditor area */
+  /* LAMS -  min height is set in ckconfig_custom.js but keep the default here too so that most fields 
+   * are the right size and only the ones where the height is overridden does the size change.  */
+  min-height: 60px;
+ -webkit-appearance: textfield;
+  @include form-control-focus($input-border-focus);
+}
+
+.cke_reset_all {
+	width: 70% !important;
+}
Index: lams_central/web/css/_jquery.jRating_base.scss
===================================================================
diff -u
--- lams_central/web/css/_jquery.jRating_base.scss	(revision 0)
+++ lams_central/web/css/_jquery.jRating_base.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,91 @@
+/*********************/
+/** jRating CSS **/
+/*********************/
+
+/**Div containing the color of the stars */
+.jRatingAverage {
+	background-color:#f62929;
+	position:relative;
+	top:0;
+	left:0;
+	z-index:2;
+	height:100%;
+}
+.jRatingColor {
+	background-color:#f4c239; /* bgcolor of the stars*/
+	position:relative;
+	top:0;
+	left:0;
+	z-index:2;
+	height:100%;
+}
+
+/** Div containing the stars **/
+.jStar {
+	position:relative;
+	left:0;
+	z-index:3;
+}
+
+/** P containing the rate informations **/
+p.jRatingInfos {
+	position:		absolute;
+	z-index:9999;
+	background:	transparent url('../images/css/jquery.jRating-background.png') no-repeat; /** customized url by LAMS **/
+	color:			#FFF;
+	display:		none;
+	width:			91px;
+	height:			29px;	
+	font-size:16px;
+	text-align:center;
+	padding-top:5px;
+}
+
+p.jRatingInfos span.maxRate {
+	color:#c9c9c9;
+	font-size:14px;
+}
+
+/** Please, note this is a LAMS customization. In case of library upgrade copy these lines manually.  **/
+.extra-controls-inner:after {
+	content: " ";
+	display: block; 
+	height: 0; 
+	clear: both;
+}
+.rating-stars-holder {text-align: center;}
+.rating-stars-caption {padding-top: 6px; font-size: 12px}
+.rating-stars, .rating-stars-disabled {margin: 0px auto; min-height: 20px;}
+.add-comment {
+	background-image: url('../images/tick.png');
+	width:16px !important;
+	height:16px;
+	cursor: pointer;
+	float: right !important;
+	margin-top: 20px;
+}
+.rating-comment{
+	background: url("../images/css/greyfade_bg.jpg") repeat-x scroll 0px 0px transparent;
+	padding: 15px;
+	margin: 10px 0;
+}
+.rating-info{
+	margin-top: 0;
+	margin-bottom: 12px;
+}
+textarea[id^=comment-textarea-] {
+	color: #d3d3d3;
+}
+.tablesorter tr.odd:hover .jStar {
+	background-image: url(/lams/images/css/jquery.jRating-stars-hover.png)!important;
+}
+.tablesorter tr.even:hover .jStar {
+	background-image: url(/lams/images/css/jquery.jRating-stars-hover.png)!important;
+}
+.tablesorter tr.odd .jStar {
+	background-image: url(/lams/images/css/jquery.jRating-stars-odd.png)!important;
+}
+
+/** Remove the following once we move all tools to use Rating.tag.  **/
+.rating-stars-div {float:right; padding-right: 10px; margin-top: -8px; min-height: 45px;}
+.rating-stars-caption {text-align: center}
\ No newline at end of file
Index: lams_central/web/css/_learner_base.scss
===================================================================
diff -u
--- lams_central/web/css/_learner_base.scss	(revision 0)
+++ lams_central/web/css/_learner_base.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,957 @@
+// The content defaultHTML_learner.scss and all the equivalent skin files. Change this an then all the skin files change. 
+@media (max-width: 500px) {
+  .h1,
+  .h2,
+  .h3,
+  .h4 {
+    font-size: $font-size-base;
+  }
+  * {
+    font-size: $font-size-small;
+  }
+  .panel-title {
+    font-size: $font-size-base;
+  }
+  .no-gutter > [class*='col-'] {
+    padding-right: 5px;
+    padding-left: 5px;
+  }
+  .rating-criteria-tag {
+	width: 100%;
+  }
+  .rating-criteria-tag input[type="text"] {
+	width: 100%;
+  }
+  .rating-criteria-tag .ui-widget input{
+	font-family: $font-family-base;
+	font-size:11px;
+  }
+  #criterias-table {
+	margin-left: 0px;
+	border-bottom: inherit;
+  }
+  #criterias-table td {
+	vertical-align:middle;
+  }
+ .navbar-login {
+    margin-bottom: 5px;
+  }
+ .navbar-brand-login {
+    font-size: large;
+  }
+}
+
+@media (min-width: 501px) {
+  .no-gutter > [class*='col-'] {
+    padding-right: 8px;
+    padding-left: 8px;
+ }
+ .navbar-login {
+    margin-bottom: 10px;
+  }
+ .navbar-brand-login {
+    font-size: x-large;
+  } 
+}
+
+/* customizations */
+.fa-bars {
+	color: $brand-primary;
+}
+
+.alert-info {
+	@include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text);
+}
+
+.form-control {
+	@include form-control-focus($input-border-focus);
+}
+
+a {
+    color: $a-link-default;
+}
+
+
+a:hover {
+    color: $a-link-default-hover;
+}
+
+a:focus {
+    color: $a-link-default-focus;
+}
+
+@if variable-exists(panel-default-heading-background) {
+    .panel-default>.panel-heading {
+	    background-color: $panel-default-heading-background;
+    }
+}
+
+@if variable-exists(navbar-login-background) {
+    .navbar-login {
+        background-color: $navbar-login-background;
+    }
+}
+
+.navbar-brand {
+    @if variable-exists(navbar-brand-login-color) {
+	    color: $navbar-brand-login-color !important;
+    } @else {
+        color: $brand-primary !important;
+    }
+}
+
+@if variable-exists(headings-default-color) {
+    h1,h2,h3,h4 {
+	    color: $headings-default-color;
+    }
+}
+
+.text-primary {
+    color: $brand-primary-darker;
+}
+
+// Useful coloured backgrounds 
+@include bg-variant('.bg-primary', $brand-primary);
+@include bg-variant('.bg-primary-mid', $brand-primary-mid);
+
+.bg-primary-hover:hover,
+.ygtv-highlight1, .ygtv-highlight1 .ygtvlabel {
+	background-color: $brand-primary-light;
+}
+
+
+/* Spacer classes */
+
+.offset2 {
+	margin: 2px;
+}
+.offset3 {
+	margin: 3px;
+}
+.offset5 {
+	margin: 5px;
+}
+.offset10 {
+	margin: 10px;
+}
+.offset15 {
+	margin: 15px;
+}
+.offset20 {
+	margin: 20px;
+}
+
+.voffset2 {
+  margin-top: 2px;
+}
+.voffset5 {
+  margin-top: 5px;
+}
+.voffset10 {
+  margin-top: 10px;
+}
+.voffset20 {
+  margin-top: 20px;
+}
+.roffset2 {
+  margin-right: 2px;
+}
+.roffset5 {
+  margin-right: 5px;
+}
+.roffset10 {
+  margin-right: 10px;
+}
+.loffset2 {
+  margin-left: 2px;
+}
+.loffset5 {
+  margin-left: 5px;
+}
+.loffset10 {
+  margin-left: 10px;
+}
+.loffset20 {
+  margin-left: 20px;
+}
+.clear-both {
+	clear: both;
+}
+/* Eliminate the scrollbar on learner popup windows, monitoring windows */
+.no-margin{
+	margin-left: 0px;
+	margin-right: 0px;
+}
+/* Comments/Forum classes */
+.msg .panel-heading {
+  padding: 3px;
+}
+.msg {
+  margin-bottom: 5px;
+}
+.msg .panel-title {
+  font-weight: normal;
+  font-size: $font-size-base;
+}
+.msg-footer {
+  display: block;
+  font-size: $font-size-small;
+  float: right;
+}
+.msg-hr {
+  margin-top: 5px;
+  margin-bottom: 3px;
+}
+.msg .panel-footer {
+  font-size: $font-size-small;
+}
+.panel-heading-sm {
+  padding: 3px 5px;
+  font-size: smaller;
+  font-weight: bold;
+}
+.panel-body-sm {
+  padding: 3px 5px;
+}
+.panel-learner-page {
+  border-radius: 6px;
+  box-shadow: $panel-box-shadow;
+}
+.panel-monitor-page {
+  border-radius: 6px;
+  box-shadow: $panel-box-shadow;
+}
+// .panel-learner-page-title,
+// .panel-admin-page-title {
+//   -moz-border-bottom-colors: none;
+//   -moz-border-left-colors: none;
+//   -moz-border-right-colors: none;
+//   -moz-border-top-colors: none;
+//   border-color: #e7eaec;
+//   border-radius: 0px;
+//   border-image: none;
+//   border-style: solid solid none;
+//   border-width: 3px 0 0;
+//   color: inherit;
+//   min-height: 48px;
+// }
+.panel-admin-page {
+  border-radius: 6px;
+  box-shadow: $panel-box-shadow;
+  margin-top: 20px;
+}
+.panel-learner-title {
+	color:$brand-primary !important;
+}
+.panel-admin-title {
+	color:$brand-primary !important;
+}
+.panel-title {
+	font-size: inherit;
+	font-weight: 500;
+}
+.panel-heading {
+  padding: 7px 10px;
+}
+
+th {
+	font-weight: normal;
+	font-style: italic;
+	
+}
+
+body.stripes {
+  background: url('/lams/images/css/light-fabric.jpg');
+}
+.sbox {
+  border-bottom: 2px solid $gray-lighter;
+  border-radius: 0px;
+}
+.sbox-body {
+  padding: 5px;
+}
+.sbox-heading {
+  padding: 3px 5px;
+  border-bottom: 1px solid $gray-lighter;
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+.user {
+  display: inline-block;
+}
+.user:before {
+  content: "\f007";
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  text-decoration: inherit;
+  margin-right: 3px;
+  color: inherit;
+  float: left;
+}
+.help-tabs{
+  display: inline-block;
+  margin-right: 10px;
+}
+.help-no-tabs{
+  display: inline-block;
+  margin-right: 10px;
+}
+.help {
+  display: inline-block;
+}
+.help:before {
+  content: "\f059";
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  text-decoration: inherit;
+  margin-right: 2px;
+  color: inherit;
+  float: right;
+}
+.na {
+  display: inline-block;
+}
+.na:after {
+  content: "\f0a9";
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  text-decoration: inherit;
+  margin-left: 5px;
+  color: inherit;
+  /*float: right;*/
+}
+
+/* Restrict the width of the up and down arrows so they do not grow wider when the screen is enlarged. td needs to be 5px wider than div. */
+div.arrows{
+	display:inline-block;
+	width:30px;
+	text-align: center;
+}
+td.arrows{
+	width:35px;
+	text-align: center;
+}
+/* Tabs are a cross between pills (colouring) and tab outlines. */
+.nav-tabs > li > a{
+  border: $border-thin-default-light
+}
+/* Icons to show panel is collapsed */
+.collapsable-icon-right a:after {
+    font-family: FontAwesome;
+    content:"\f078";
+    float: right;
+    color: $gray-light;
+	margin-right: 5px;
+}
+.collapsable-icon-right a.collapsed:after {
+    content:"\f054";
+}
+.collapsable-icon-left a:after {
+    font-family: FontAwesome;
+    content:"\f078";
+    float: left;
+    color: $gray-light;
+	margin-right: 5px;
+}
+.collapsable-icon-left a.collapsed:after {
+    content:"\f054";
+}
+
+div.navbar-heading {
+	padding:0;
+}
+
+nav.navbar-heading {
+	border: 0; 
+	margin: 0;
+	color: inherit;
+}
+
+.navbar-heading .divider {
+	height: 50px;
+	margin-left: 5px;
+	margin-right: 5px;
+	border-left: $border-thin-default-light;
+}
+
+.navbar-heading .in .divider {
+	height: 1px;
+	margin-left: 5px;
+	margin-right: 5px;
+	margin-bottom: 5px;
+	border-top: $border-thin-default-light;
+}
+
+.navbar-heading .in .navbar-text {
+	padding-left: 15px;
+}
+
+.navbar-text {
+	cursor: pointer;
+}
+
+/** Special settings for the nav bar used in monitoring, authoring, etc */
+.panel-monitor-page .navbar {
+    min-height: 40px;
+}   
+
+.panel-monitor-page .navbar-heading .divider {
+	height: 40px;
+}
+
+/* small display - drop down menu view */
+@media (max-width: 767px) {
+	.panel-monitor-page .navbar-brand {
+		color:$brand-primary !important;
+	 	height: 35px;
+	    margin-top: 5px;
+	    margin-bottom: 3px;
+	   	padding: 5px 10px 5px 25px;
+	}
+	
+	.panel-monitor-page>.navbar-toggle {
+	    margin-top: 3px;
+	    margin-bottom: 3px;
+	}
+	.panel-monitor-page .navbar-nav>li>a {
+	 	padding: 5px;
+	}
+	
+	.panel-monitor-page .navbar-text {
+		cursor: pointer;
+	 	margin-top: 5px;
+		margin-bottom: 5px;
+	}
+	
+	.panel-monitor-page .navbar-header .navbar-toggle {
+	    margin-top: 3px;
+	    margin-bottom: 3px;
+	}
+	
+	.panel-monitor-page .divider {
+		display:none
+	}
+	
+	.panel-monitor-page .navbar-heading .in .navbar-text {
+		padding-left: 4px;
+	}
+
+}
+
+/* normal display */ 
+@media (min-width: 768px) {
+	
+	.panel-monitor-page .navbar-brand {
+		color:$brand-primary !important;
+ 		height: 40px;
+   		padding: 10px; 
+	}
+
+	.panel-monitor-page .navbar-nav>li>a {
+	 	padding: 10px;
+	}
+	
+	.panel-monitor-page .navbar-text {
+		cursor: pointer;
+	 	margin-top: 10px;
+		margin-bottom: 10px;
+	}
+	
+	.panel-monitor-page .navbar-heading .in .navbar-text {
+		padding-left: 15px;
+	}
+	
+}
+
+
+@media (min-width: 0px) and (max-width: 767px) {
+  .btn-primary, .btn-default, .btn-success, .btn-info, .btn-danger {
+    padding:4px 9px 2px;
+  }
+}
+
+@media (max-width: 500px) {  
+  .file-input-name {
+  	height: 22px; /* match height of btn */
+    padding:4px 9px;
+    font-size:90%;
+    line-height: 1.2;		
+  }
+}
+
+@media (min-width: 501px ) and (max-width: 992px) {  
+  .file-input-name {
+  	height: 25px; /* match height of btn */
+    padding:4px 9px;
+    font-size:90%;
+    line-height: 1.2;		
+  }
+}
+
+
+ul.dropdown-menu {
+	left: auto;
+	right: 0;
+}
+
+/** Authoring */
+/*layout of adding a topic button */
+a.button-add-item:before {
+  content: "\f067";
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  text-decoration: inherit;
+  margin-left: 5px;
+  color: inherit;
+}
+
+.modal-header {
+    padding: 8px 15px 8px 15px;
+}
+
+.modal .ui-resizable-handle.ui-resizable-s {
+	border-radius: 6px;
+    border-bottom: 1px solid white;
+}
+
+.table-no-border>thead>tr>th, 
+.table-no-border>tbody>tr>th, 
+.table-no-border>tfoot>tr>th, 
+.table-no-border>thead>tr>td, 
+.table-no-border>tbody>tr>td, 
+.table-no-border>tfoot>tr>td {
+  border-top: none; 
+}
+
+.table-nonfluid {
+   width: auto !important;
+}
+
+.table-centered th, .table-centered td {
+	text-align: center;
+}
+
+.table > tbody > tr > td {
+	vertical-align: middle;
+}
+
+.table .fa {
+	cursor: pointer;
+}
+
+.form-control-inline {
+   width: auto !important;
+   display: inline-block;
+}
+
+.rating-criteria-tag {
+	width: 100%;
+}
+.rating-criteria-tag input[type="text"] {
+	width: 100%;
+}
+.rating-criteria-tag .ui-widget input{
+	font-family: $font-family-base;
+	font-size: $font-size-small;
+	line-height:1.42857143;
+	padding: 2px;
+}
+
+#criterias-table {
+	margin-left: 0px;
+	border-bottom: inherit;
+}
+#criterias-table td {
+	vertical-align:middle;
+}
+
+/* .....NavBar: Icon only with coloring/layout.....*/
+
+/*small/medium side display*/
+@media (min-width: 768px) {
+
+	/*Allow content to be next to Nav*/
+	.navcontent{
+		position: absolute;
+		width: calc(100% - 40px); /*keeps 100% minus nav size*/
+		margin-left: 20px;
+		float: right;
+		min-height:100%;
+	}
+	
+	/* darker outline than usual */
+	nav.sidebar{
+		  border-radius: 6px;
+		  box-shadow: $panel-box-shadow;
+		  min-height:300px;
+	}
+ 
+	/*Center Brand*/
+	nav.sidebar.navbar.sidebar>.container .navbar-brand, .navbar>.container-fluid .navbar-brand {
+		margin-left: 0px;
+	}
+	/*Center Brand*/
+	nav.sidebar .navbar-brand, nav.sidebar .navbar-header{
+		text-align: center;
+		width: 100%;
+		margin-left: 0px;
+	}
+
+	/*Format Icons*/
+	nav.sidebar a{
+		padding:10px 10px 10px 12px;
+	}
+
+	nav.sidebar.slidesidemenu{
+		padding:10px 10px 10px 12px;
+	}
+	/*Hide text when compressed*/
+	nav.sidebar p{
+		padding-right: 35px;
+		text-align: center;
+	}
+ 
+	/* colour in top box to match panel heading */
+	nav.sidebar .navbar-nav > li:first-child{
+		background-color: $gray-lightest !important;
+	}
+
+	/*adds border to bottom nav boxes except for the last box */
+	nav.sidebar .navbar-nav > li{
+		border-bottom: $border-thin-default-light;
+		background-color: $body-bg;
+	}
+
+	nav.sidebar .navbar-nav > li:last-child{
+		border-bottom: 0px;
+	}
+
+	/*allows nav box to use 100% width, style to be like panel */
+	nav.sidebar .navbar-collapse, nav.sidebar .container-fluid{
+		padding: 0 0px 0 0px;
+		border:2px solid transparent;
+		box-shadow: $panel-box-shadow;
+	}
+
+	/*gives sidebar width/height*/
+	nav.sidebar{
+		width: 180px;
+		height: 100%;
+		margin-left: -135px;
+		float: left;
+		z-index: 8000;
+		margin-top: 0px;
+		margin-bottom: 0px;
+	}
+
+	/*give sidebar 100% width;*/
+	nav.sidebar li {
+		width: 100%;
+		margin-top: 3px;
+		margin-bottom: 3px;
+	}
+
+ 	/* Move nav to full on mouse over*/
+ 	nav.sidebar.expandmenu {
+		margin-left: 0;
+	}
+	 
+/* 	nav.sidebar:hover{
+		margin-left: 0px;
+	}
+ */
+ 	/*for hiden things when navbar hidden*/
+	.forAnimate{
+		opacity: 0;
+	}
+	
+	nav.sidebar .fa{
+		font-size: 18px;
+	}
+	
+}
+
+/* .....NavBar: Fully showing nav bar..... */
+
+@media (min-width: 1330px) {
+
+	/*Allow content to be next to Nav*/
+	.navcontent{
+		position: absolute;
+		width: calc(100% - 180px); /*keeps 100% minus nav size*/
+		margin-left: 170px;
+		float: right;
+	}
+
+	/*Show all nav*/
+	nav.sidebar{
+		margin-left: 0px;
+		float: left;
+	}
+	/*Show hidden items on nav*/
+	nav.sidebar .forAnimate{
+		opacity: 1;
+	}
+}
+
+nav.sidebar .navbar-nav .open .dropdown-menu>li>a:hover, nav.sidebar .navbar-nav .open .dropdown-menu>li>a:focus {
+	background-color: transparent;
+}
+
+nav:hover .forAnimate{
+	opacity: 1;
+}
+section{
+	padding-left: 15px;
+}
+
+// Login page
+// CSS to make the footer stick to the bottom see http://cssreset.com/how-to-keep-footer-at-bottom-of-page-with-css/ 
+// Height of footer set to match the navbar at the top for visual reasons - it may be changed. 
+.login-logo {
+  background: url($login_logo) no-repeat center right;
+  background-size: $login_logo_size;
+  width:100px;
+  height:50px;
+}
+
+.login-body {
+	margin:0;
+	padding:0;
+	height:100%;
+}
+.login-content{
+	min-height:100%;
+	position:relative;
+	padding-bottom:50px;
+}
+.login-footer {
+	width: 100%;
+	background-color: $gray-lightest;
+	font-size: 85%;
+	padding-top: 15px;
+	border-top: $border-thin-default-light;
+	height:50px;
+	position:absolute;
+	bottom:0;
+	left:0;
+}
+
+/* fontawesome icon x-small */
+.fa-xs {
+	font-size: smaller;
+}
+
+/* Growl functionality, jquery.blockUI (version: 2.38) */
+.growlUI {
+	width: auto;
+	padding: 0px;
+}
+
+div.growlUI h1,div.growlUI h2 {
+	color: white;
+	padding: 0px;
+	margin: 5px;
+	text-align: center;
+	font-size: medium;
+}
+
+// Tooltips used for learner progress and gradebook (large version)
+.tooltip {
+	position: absolute;
+	border: $border-thin-default;
+	background-color: $gray-light-mid;
+	padding: 3px;
+	z-index: 5;
+	width: 150px;
+	font-size: 0.9em;
+	word-wrap: break-word;
+}
+
+.tooltip-lg{
+	display: none;
+    position:absolute;
+	border: $border-thin-default;
+    background-color:$gray-light-mid;
+    padding:5px;
+    width:250px;
+    font-size: 1.1em;
+	word-wrap: break-word;
+}
+
+// Image Gallery
+.caption-heading {
+	color: $brand-primary; 
+	font-style: italic;
+	font-size: $font-size-base;
+}
+
+.caption-description {
+	color: $text-color; 
+	font-style: italic;
+	font-size: $font-size-small;
+}
+
+// Ratings
+.rating-comment{
+	background-image: none;
+	background-color: $gray-lighter;
+	border: $border-thin-default-light;
+}
+
+.rating-comment-posted-by{
+	color: $brand-primary;
+	text-align: left;
+	font-size: x-small;
+}
+
+// Drag and Drop
+.droppableHighlight {
+	padding : 1px !important;
+	border: 5px solid $brand-primary-mid !important;
+}
+
+.draggableSelected {
+	background-color: $brand-primary-mid !important;
+	color: white !important;
+}
+
+.draggableItem {
+	padding: 3px 0px 3px 0px;
+	cursor: default;
+}
+
+.draggableOdd {
+	background-color: $brand-primary-light;
+}
+	
+.draggableEven {
+	background-color: inherit;
+}
+
+.errorMessage {
+	font-weight: bold;
+	color: $brand-danger;
+}
+
+.errorBorder {
+	border: $border-medium-danger;
+}
+
+// Assessment and Scratchie Countdown - growl settings need to be moved too
+#timelimit-start-dialog {
+	display:none; cursor: default; padding: 10px;
+}
+#timelimit-start-dialog h1{
+	padding-bottom: 10px;
+}
+#countdown {
+	width: 150px; position: absolute; font-size: 110%; font-style: italic; color: $brand-success;
+}
+#countdown-label {
+	font-size: 170%; padding-top:5px; padding-bottom:5px; font-style: italic; color: $brand-success;
+}
+#timelimit-expired {
+	font-size: 145%; padding: 15px;
+}
+
+// nprogress bar used in learning for the Load Tool Activity page
+// Make clicks pass-through/
+#nprogress {
+  pointer-events: none;
+}
+
+#nprogress .bar {
+  background: $brand-primary;
+
+  position: fixed;
+  z-index: 1031;
+  top: 0;
+  left: 0;
+
+  width: 100%;
+  height: 2px;
+}
+
+// Fancy blur effect
+#nprogress .peg {
+  display: block;
+  position: absolute;
+  right: 0px;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px $brand-primary, 0 0 5px $brand-primary;
+  opacity: 1.0;
+
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+      -ms-transform: rotate(3deg) translate(0px, -4px);
+          transform: rotate(3deg) translate(0px, -4px);
+}
+
+// Add these back to use the spinner */
+// #nprogress .spinner {
+//   display: block;
+//   position: fixed;
+//   z-index: 1031;
+//   top: 15px;
+//   right: 15px;
+// }
+// 
+// #nprogress .spinner-icon {
+//   width: 18px;
+//   height: 18px;
+//   box-sizing: border-box;
+// 
+//   border: solid 2px transparent;
+//   border-top-color: $main-color;
+//   border-left-color: $main-color;
+//   border-radius: 50%;
+// 
+//   -webkit-animation: nprogress-spinner 400ms linear infinite;
+//           animation: nprogress-spinner 400ms linear infinite;
+// }
+
+.nprogress-custom-parent {
+  overflow: hidden;
+  position: relative;
+}
+
+// .nprogress-custom-parent #nprogress .spinner,
+.nprogress-custom-parent #nprogress .bar {
+  position: absolute;
+}
+
+// @-webkit-keyframes nprogress-spinner {
+//   0%   { -webkit-transform: rotate(0deg); }
+//   100% { -webkit-transform: rotate(360deg); }
+// }
+// @keyframes nprogress-spinner {
+//   0%   { transform: rotate(0deg); }
+//   100% { transform: rotate(360deg); }
+// }
+
+// end nprogress bar
+
+// fotorama used for image gallery
+.fotorama__thumb {
+    background-color: $gray-base;
+}
+.fotorama__wrap {
+	margin: auto;
+}
+.fotorama__caption {
+	text-align: left;
+}
+.fotorama__thumb-border {
+	border-color: $a-link-default !important;
+}
+
+.fotorama-container {
+	text-align: center;
+	padding-top: 10px;
+}
+// end fotorama
Index: lams_central/web/css/_main_base.scss
===================================================================
diff -u
--- lams_central/web/css/_main_base.scss	(revision 0)
+++ lams_central/web/css/_main_base.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,557 @@
+// The content for defaultHTML_main.scss and all the equivalent skin files. Change this an then all the skin files change. 
+body {
+	width: 100%;
+	overflow-x: hidden;
+	font-size: 13px;
+	background: url(/lams/images/css/light-fabric.jpg);
+}
+html {
+	height: 100%;
+}
+#offcanvas {
+	position: fixed;
+	width: 220px;
+	z-index: 10;
+	height: 100%;
+	background: $brand-primary-darker;
+	color: $gray-lighter;
+}
+.courses-title {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    font-weight: 300;
+    font-size: 23px;
+    width: 100%;
+    margin-left: 0 !important;
+    line-height: 49px;
+    margin: 0;
+    padding-left: 25px;
+}
+#page-wrapper {
+	margin: 0 0 0 220px;
+	padding: 10px 20px 0px;
+}
+.offcanvas-hidden #offcanvas {
+	display: none;
+}
+.offcanvas-hidden #page-wrapper {
+	margin: 0 0 0 0;
+}
+@media (min-width: 769px) {
+	.icon-remove {
+		display: none !important;
+	}
+}
+@media (max-width: 768px) {
+	#offcanvas {
+		width: 100%;
+	}
+	.navbar-nav .open .dropdown-menu {
+    	top:52px; /*hack to prevent disappearing*/
+	}
+}
+@media (max-width: 870px) {
+	body.offcanvas-hidden .xs-hidden {
+		display: none !important;
+	}
+}
+@media (max-width: 1170px) {
+	body:not(.offcanvas-hidden) .xs-hidden {
+		display: none !important;
+	}
+}
+
+.content {
+	padding: 7px 10px;
+	background: $body-bg;
+	box-shadow: $panel-box-shadow;
+}
+#org-container {
+	padding: 17px 10px 17px 25px;
+}
+
+/*FOOTER*/
+footer {
+	width: 100%;
+	font-size: 75%;
+	background-color: $body-bg;
+	border-radius: 0 0 6px 6px;
+	box-shadow: 0 1.4px 1px rgba(8, 8, 8, 0.5);
+	margin-bottom: 10px;
+}
+a {
+	color: $main_default_link; 
+	text-decoration: none;
+}
+a:hover, a:focus {
+	color: $brand-primary-darker;
+}
+
+/*OFFCANVAS BAR*/
+#favorite-organisations {
+    border-top: 1px solid rgba(255, 255, 255, 0.16);
+	border-bottom: 1px solid rgba(255, 255, 255, 0.16);
+}
+#favorite-organisations > li > a, .tablesorter a {
+	color: $main_fav_org_link;
+    font-weight: 400;
+    padding: 14px 20px 14px 25px;
+}
+#favorite-organisations > li > a:hover,
+#favorite-organisations > li > a:focus,
+.pagesize:hover,
+.tablesorter a:hover,
+.tablesorter a:focus {
+  background-color: $brand-primary-darkest;
+  color: white;
+}
+.tablesorter a {
+    display:block;
+    text-decoration:none;
+    font-size: 13px;
+}
+#offcanvas .active > a,
+#offcanvas .active > a:hover,
+#offcanvas .active > a:focus {
+	background: $main_offcanvas_link;
+}
+#offcanvas .active > a {
+    color: $body-bg;
+}
+#offcanvas td.active {
+    border-right: 10px solid $brand-primary-bright;
+    background: $main_offcanvas_link;
+}
+.offcanvas-logo {
+	padding: 20px 0px 15px 25px;
+    background-color: $brand-primary-darkest;
+}
+.offcanvas-logo img{
+	width: 100px;
+}
+.offcanvas-header {
+	padding: 15px 0px 0px 0px;
+}
+.offcanvas-search {
+	padding: 15px 19px 15px;
+	margin-bottom: 0;
+}
+.offcanvas-search .form-control {
+	box-shadow: inset 0 1px 0px rgba(208, 206, 206, 0.25);
+	border-radius: 25px;
+	padding: 2px 5px;
+	line-height: 1;
+	border: 1px solid rgba(221, 226, 232, 0.49);
+	background: $brand-primary-darkest; 
+	color: $main_fav_org_link;
+}
+.offcanvas-search .form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */
+    color: $gray-light-mid;
+}
+.offcanvas-search .form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+   color: $gray-light-mid;
+}
+.offcanvas-search .form-control::-moz-placeholder { /* Mozilla Firefox 19+ */
+   color: $gray-light-mid;
+}
+.offcanvas-search .form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */
+   color: $gray-light-mid;
+}
+.ts-pager {
+	text-align: center;
+    padding: 0 10px 10px;
+    color: darken($main_fav_org_link, 30%);
+}
+.ts-pager .btn{
+	color: darken($main_fav_org_link, 10%);
+    background-color: $brand-primary-darkest;
+    padding: 2px 5px;
+    line-height: 1;
+}
+.tablesorter tfoot i {
+	font-size: 11px;
+}
+.tablesorter tfoot th {
+	background-color: $brand-primary-darkest !important;
+	padding: 10px 0;
+}
+
+.pagesize {
+    border: 1px solid rgba(221, 226, 232, 0.49);
+    background: $brand-primary-darker;
+    cursor: pointer;
+}
+
+.icon-remove {
+	cursor: pointer;
+	position: absolute;
+	width: 40px;
+	top: 30px;
+	right: 5px;
+}
+.icon-remove:hover {
+	color: $body-bg;
+}
+.fa-chevron-circle-right.fa-lg {
+	line-height: 1em;
+}
+/*TOP HEADER*/
+.top-nav {
+    background: $gray-lighter;
+    border-bottom: 1px solid $main_dropdown_border;
+    border-radius: 6px 6px 0 0;
+    height: 53px;
+	box-shadow: 0 1px 1px rgba(8, 8, 8, 0.5);
+}
+.offcanvas-toggle-header {
+    float: left;
+    margin: 0;
+    padding: 15px 0 10px 7px;
+    width: 70px;
+    cursor: pointer;
+    border-radius: 3px;
+}
+@media (min-width: 768px) {
+	.offcanvas-toggle-header {
+	    padding-top: 20px;
+	    padding-bottom: 15px;
+	}
+	.top-nav {
+		height: 63px;
+	}
+}
+.offcanvas-toggle-header i {
+    padding: 0 15px 0;
+    color: $brand-primary-darker;
+}
+
+.offcanvas-toggle i {
+    font-size: 26px;
+}
+.top-nav .navbar-right {
+    margin: 0;
+    width: 70%;
+    float: right;
+}
+.top-nav .navbar-right li {
+    display: inline-block;
+    float: right;
+    position: static;
+    border-radius: 3px;
+}
+@media (min-width: 480px) {
+  .top-nav .navbar-right li {
+    position: relative; 
+  } 
+}
+.top-nav .dropdown-menu li {
+    width: 100%;
+}
+.top-nav li a i {
+	font-size: 15px;
+}
+ul.dropdown-usermenu li {
+    background: $gray-lighter;
+    display: -ms-flexbox;
+    display: flex;
+    margin: 2px 2px 0;
+    width: 98% !important;
+}
+
+/*TOP HEADER LINKS*/
+.offcanvas-toggle-header:hover, ul.dropdown-usermenu li a:focus, ul.dropdown-usermenu li a:hover, .top-nav .nav > li > a:hover, .top-nav .nav .open > a, .top-nav .nav .open > a:focus, .top-nav .nav .open > a:hover {
+    background: $main_dropdown_border;
+}
+.nav > li > a:hover, .nav > li > a:focus {
+    background-color: transparent;
+}
+.navbar-nav > li > a {
+    font-weight: 500;
+    color: $main_navbar_link !important;
+    margin-left: 0 !important;
+    line-height: 32px;
+    border-radius: 3px;
+}
+.top-nav .dropdown-menu li a {
+    width: 100%;
+    padding: 10px 20px;
+    border-radius: 3px;
+}
+.top-nav .dropdown-menu li a i {
+    padding-right: 15px;
+}
+.dropdown-menu a {
+    cursor: pointer;
+    border-radius: 6px;
+}
+#more-links-menu {
+	padding: 10px 5px;
+}
+.navbar-nav .open .dropdown-menu {
+    position: absolute;
+    background: $body-bg;
+    margin-top: 0;
+    padding: 0 0 3px;
+    border: 1px solid $main_dropdown_border;
+    border-radius: 6px;
+    -webkit-box-shadow: none;
+    right: 0;
+    left: auto;
+    width: 210px;
+}
+.user-profile img {
+    width: 29px;
+    height: 29px;
+    border-radius: 50%;
+    margin-right: 10px;
+}
+#notificationsPendingCount{
+	font-size: 10px;
+	font-weight: normal;
+	line-height: 13px;
+	padding: 2px 5px;
+	position: absolute;
+	left: 25px;
+	top: 10px;
+	border-style: solid;
+	border-width: 1px;
+	display: inline-block;
+	min-width: 10px;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: middle;
+	border-radius: 10px;
+}
+#notificationsPendingCount.btn-default {
+    background-color: $gray-light-mid;
+}
+
+/*DIALOGS*/
+.dialogContainer {
+	-webkit-overflow-scrolling: touch !important;
+}
+
+.dialogContainer .modal-body {
+	height : 100%;
+	max-height: calc(100% - 38px);
+	padding: 0;
+}
+
+.dialogContainer iframe {
+	width: 100%;
+	height: 100%;
+	border: none;
+}
+
+.dialogContainer button {
+	cursor: pointer;
+}
+.dialogContainer button:focus {
+	outline: none;
+}
+
+.dialogContainer button .fa {
+  font-size: 16px;
+  margin-left: 10px;
+}
+
+.dialogContainer .ui-draggable .modal-header {
+	cursor: move;
+}
+
+.dialogMin {
+	top: auto !important;
+	bottom: 5px !important;
+	overflow: hidden !important;
+	padding: 0 !important;
+	position: fixed !important;
+	width: 250px !important;
+	height: 35px !important;
+}
+
+.dialogMin .modal-title {
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.dialogMin .modal-dialog {
+	left: 0 !important;
+	top: 0 !important;
+}
+
+.dialogMin .modal-dialog, .dialogMin .modal-content {
+	width: 250px !important;
+	height: 35px !important;
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+.dialogMin .modal-header {
+	height: 100%;
+	margin: 0 !important;
+	padding: 3px 5px !important;
+	cursor: default !important;
+}
+
+.ui-dialog .ui-dialog-content {
+	padding: 3px;
+}
+
+#tablePrivateNotifications tr:first-child td {
+	font-weight: bold;
+	text-align: center;
+}
+
+#tablePrivateNotifications td.notificationsReadCell {
+	font-size: 16px;
+	width: 30px;
+	text-align: center;
+}
+
+#tablePrivateNotifications td.notificationsPendingCell {
+	font-weight: bold;
+}
+
+#tablePrivateNotifications td.notificationsClickableCell:hover {
+	cursor: pointer;
+	/* CSS3 glow effect: */
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	-moz-box-shadow: 0 0 5px $main_blue_light_highlight;
+	-webkit-box-shadow: 0 0 5px $main_blue_light_highlight;
+	box-shadow: 0 0 5px $main_blue_light_highlight;
+}
+
+/* GROUP CONTAINER */
+.j-single-lesson {
+	list-style: none;
+	margin: 6px;
+	padding: 3px 3px 3px 10px;
+	position: relative;
+}
+
+.j-single-lesson:hover {
+	border-color: $main_singlelesson_hover_border;
+	background-color: $main_singlelesson_hover_background;
+	display: block;
+	/* CSS3 glow effect: */
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	-moz-box-shadow: 0 0 5px $main_blue_light_highlight;
+	-webkit-box-shadow: 0 0 5px $main_blue_light_highlight;
+	box-shadow: 0 0 5px $main_blue_light_highlight;
+}
+
+.j-single-lesson:hover .lesson-actions {
+	opacity: 1;
+	// filter: alpha(opacity = 100); /* msie */
+	display: block;
+}
+
+.j-single-lesson:hover .mycourses-monitor-img {
+}
+
+.j-single-lesson:hover .mycourses-mark-img {
+}
+
+.j-single-lesson:hover .mycourses-notifications-img {
+}
+
+.j-single-lesson:hover .mycourses-conditions-img {
+}
+
+.j-single-lesson:hover .mycourses-removelesson-img {
+}
+
+.j-single-lesson:hover .mycourses-move-img {
+	background: url('../images/css/arrow_move.png') no-repeat 0 0px;
+}
+
+.lesson-actions {
+	float: right;
+	font-size: 1.2em;
+	opacity: 0.3;
+	/* filter: alpha(opacity = 10); msie */
+}
+
+.lesson-actions a {
+	border-bottom: none;	
+}
+
+.child-org-name {
+	float: left;
+	padding-top: 5px;
+}
+
+.split-ui-button+ul {
+	z-index: 1;
+}
+
+.split-ui-button+ul li {
+	list-style-type: none;
+}
+
+.split-ui-button+ul li a {
+	border: none;
+}
+
+.split-ui-button div:first-child {
+	margin-right: -0.4em;
+}
+
+.split-ui-button + ul span {
+	color: #999;
+}
+
+.ui-button, .split-ui-button div {
+	font-size: 12px !important;
+	font-weight: normal !important;
+}
+
+a.sorting {
+	border-bottom: none;
+	cursor: pointer;
+}
+
+.lesson-table {
+	margin: 0 auto;
+	width: 100%;
+}
+
+.subgroup-lesson-table {
+	padding-top: 30px;
+}
+
+.course-right-buttons {
+	padding-right: 20px;
+}
+
+.group-name {
+	margin-top: 20px;
+	margin-left: 30px;
+}
+
+.group-name p {
+	padding-top: 0px;
+	margin-bottom: 0px;
+	padding-left: 0px;
+	margin-left: 0px;
+}
+
+.group-name strong {
+	color: $gray-light;
+}
+.course-header {
+	padding-bottom: 5px; 
+	margin-bottom: 12px;
+	border-bottom: $border-thin-default;
+}
+.course-header i{
+	font-size: 16px;
+}
+
+.j-course-contents {
+	border-bottom: $border-thin-default;
+}
Index: lams_central/web/css/_progressBar_base.scss
===================================================================
diff -u
--- lams_central/web/css/_progressBar_base.scss	(revision 0)
+++ lams_central/web/css/_progressBar_base.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,76 @@
+.progressBarContainer {
+	overflow: auto;
+}
+
+div.optionalActivity {
+	display: none;
+	position: absolute;
+	z-index: 6;
+}
+
+div.optionalActivity table {
+	border: $border-thin-black;
+	background-color: $optional-activity-background;
+	width: 145px;
+}
+
+div.optionalActivity table tr:first-child td {
+	border-top: none;
+	background-color: $optional-activity-background-heading;
+}
+
+div.optionalActivity td {
+	border-top: $border-thin-black;
+	cursor: pointer;
+	padding: 0px;
+}
+
+div.optionalActivity td:hover {
+	background-color: $optional-activity-background-hover;
+}
+
+div#progressBarDialog {
+	display: none;
+}
+
+div#progressBarDialog iframe {
+	width: 100%;
+	height: 100%;
+	border: none;
+}
+
+.activityCurrent {
+	fill: $current-activity-fill;
+	stroke: $gray-base;
+}
+
+.activityNotStarted {
+	fill: $not-started-activity-fill;
+	stroke: $gray-base;
+}
+
+.activityCompleted {
+	fill: $completed-activity-fill;
+	stroke: $gray-base;
+}
+
+.activityComplex {
+	fill:  $complex-activity-fill;
+	stroke: $gray-base;
+}
+
+.gate {
+	fill: $gate-activity-fill;
+}
+
+.gateCurrent {
+	stroke: $current-activity-fill;
+}
+
+.gateText {
+	stroke: $body-bg;
+}
+
+.transitionLine {
+	stroke: $gray-base;
+}
\ No newline at end of file
Index: lams_central/web/css/_treetable_base.scss
===================================================================
diff -u
--- lams_central/web/css/_treetable_base.scss	(revision 0)
+++ lams_central/web/css/_treetable_base.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,61 @@
+@import url("/lams/css/jquery.treetable.css");
+	
+table.treetable span.indenter {
+	text-align: left;
+}
+
+table.treetable tr.collapsed span.indenter a {
+	position:relative;
+}
+
+table.treetable tr.collapsed span.indenter a:before {
+    content: "\f054 \f054"; 
+    font-family: FontAwesome;
+    position:absolute;
+    top:0;
+}
+
+table.treetable tr.expanded span.indenter a {
+	position:relative;
+}
+
+table.treetable tr.expanded span.indenter a:before {
+    content: "\f078";
+    font-family: FontAwesome;
+    position:absolute;
+    top:0;	
+}
+
+table.treetable tr span.indenter a {
+  outline: none; /* Expander shows outline after upgrading to 3.0 (#141) */
+  border-bottom: none; /* Hide the dotted line underneath */
+  font-size: x-small;
+}
+
+table.treetable tr.collapsed.selected span.indenter a {
+  background-image: url(data:image/png;base64,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);
+}
+
+table.treetable tr.expanded.selected span.indenter a {
+  background-image: url(data:image/png;base64,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);
+}
+
+table.treetable tr.accept {
+  background-color: $brand-primary-light;
+  color: $body-bg;
+}
+
+table.treetable tr.collapsed.accept td span.indenter a {
+  background-image: url(data:image/x-png;base64,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);
+}
+
+table.treetable tr.expanded.accept td span.indenter a {
+  background-image: url(data:image/x-png;base64,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);
+}
+
+div.highlight {
+	background-color: $contrast-fade-start;
+}
+table.highlight {
+	background : none;
+}
Index: lams_central/web/css/addLesson.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/css/addLesson.scss	(.../addLesson.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_central/web/css/addLesson.scss	(.../addLesson.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -1,7 +1,5 @@
 @import "_lams_variables.scss";
 
-@import url('/lams/css/inlineeditor.css');
-
 #loadingOverlay {
 	width: 100%;
 	height: 99%;
@@ -52,16 +50,6 @@
 	text-align: center;
 }
 
-.errorMessage {
-	font-weight: bold;
-	color: $brand-danger;
-}
-
-.errorField {
-	border: $border-medium-danger;
-}
-
-
 td#learningDesignTreeCell {
 	border-right: $border-thin-dotted;
 }
@@ -74,10 +62,6 @@
 	vertical-align: top;
 }
 
-.ygtv-highlight1, .ygtv-highlight1 .ygtvlabel {
-	background-color: $brand-primary-light;
-}
-
 td#canvasControlCell {
 	padding: 2px 0px 0px 10px;
 	height: 15px;
@@ -166,16 +150,6 @@
 	cursor: pointer;
 }
 
-.droppableHighlight {
-	padding : 1px;
-	border: 5px solid $brand-primary-mid;
-}
-
-.draggableUserSelected {
-	background-color: $brand-primary-mid !important;
-	color: white !important;
-}
-	
 div#tabAdvanced, div#tabConditions {
 	padding-left: 30px;
 }
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_central/web/css/authoring.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_central/web/css/chart.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/css/defaultHTML_authoring.css
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_authoring.css	(revision 0)
+++ lams_central/web/css/defaultHTML_authoring.css	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,378 @@
+/**** Global styles ****/
+a.ygtvspacer {
+  border-bottom: none; }
+
+/**** Dialog styles ****/
+#loadingOverlay {
+  width: 99%;
+  height: 99%;
+  z-index: 2000;
+  position: absolute;
+  background-color: #fff;
+  text-align: center; }
+
+#loadingOverlay * {
+  margin-top: 20%; }
+
+.dialogContainer {
+  -webkit-overflow-scrolling: touch !important; }
+
+.dialogContainer .modal-content {
+  box-shadow: none; }
+
+.dialogContainer .modal-body {
+  height: 100%;
+  max-height: calc(100% - 38px);
+  padding: 0; }
+
+.dialogContainer button {
+  cursor: pointer; }
+
+.dialogContainer button:focus {
+  outline: none; }
+
+.dialogContainer .modal-header button .fa {
+  font-size: 16px;
+  margin-left: 10px; }
+
+.dialogContainer .ui-draggable .modal-header {
+  cursor: move; }
+
+div.dialogContents, #ldScreenshotAuthor, #ldScreenshotLoading {
+  display: none; }
+
+.dialogContainer iframe {
+  width: 100%;
+  height: 99%;
+  border: none; }
+
+.dialogContainer .ui-spinner {
+  border: none; }
+
+.dialogMin {
+  top: auto !important;
+  bottom: 5px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: fixed !important;
+  width: 250px !important;
+  height: 35px !important; }
+
+.dialogMin .modal-title {
+  white-space: nowrap;
+  overflow: hidden; }
+
+.dialogMin .modal-dialog {
+  left: 0 !important;
+  top: 0 !important; }
+
+.dialogMin .modal-dialog, .dialogMin .modal-content {
+  width: 250px !important;
+  height: 35px !important;
+  margin: 0 !important;
+  padding: 0 !important; }
+
+.dialogMin .modal-header {
+  height: 100%;
+  margin: 0 !important;
+  padding: 3px 5px !important;
+  cursor: default !important; }
+
+div.smallHeader .modal-header {
+  padding: 5px; }
+
+div.smallHeader .modal-title {
+  font-size: 16px; }
+
+div.propertiesDialogContainer .dialogContents table {
+  width: 100%; }
+
+div.propertiesDialogContainer .dialogContents td {
+  padding: 5px; }
+
+input[name="propertiesContentFieldGroupDivide"] {
+  margin-right: 10px; }
+
+input.propertiesContentFieldLearnerCount, input.propertiesContentFieldGroupCount {
+  width: 40px; }
+
+tr.propertiesContentRowGateSchedule input.spinner {
+  width: 30px; }
+
+input.propertiesContentFieldTitle, textarea.propertiesContentFieldDescription,
+select.propertiesContentFieldGradebook {
+  width: 99%; }
+
+.dialogContents .labelPlusSize {
+  cursor: pointer; }
+
+.dialogContents .labelMinusSize {
+  margin-left: 15px;
+  cursor: pointer; }
+
+div#groupNamingDialog .btn-group,
+div#gtbDialog .btn-group,
+div#ctbDialog .btn-group,
+div#outputConditionsDialog .btn-group {
+  margin: 10px 0 10px 10px; }
+
+input.groupName {
+  margin: 5px 0 5px 10px;
+  width: 95%; }
+
+div#infoDialog .modal-body {
+  font-weight: bold;
+  padding: 5px; }
+
+div.exportDialog {
+  text-align: center; }
+
+div.exportDialog a {
+  text-decoration: none; }
+
+div.exportDialog iframe {
+  display: none; }
+
+div#exportLDDialog {
+  cursor: pointer; }
+
+div#ldStoreDialog {
+  z-index: 1051; }
+
+div#ldStoreDialogContents {
+  width: 100%;
+  height: 100%; }
+
+div#ldStoreDialogContents > table {
+  height: 100%;
+  width: 100%;
+  border-collapse: separate; }
+
+div#ldStoreDialogContents #ldStoreDialogButtonCell {
+  height: 40px;
+  border-top: thin dotted #AAAAAA;
+  padding-top: 5px; }
+
+div#ldStoreDialogContents #ldStoreDialogButtonCell > div > div {
+  display: inline-block; }
+
+div#ldStoreDialogContents td#ldStoreDialogTreeCell {
+  padding: 2px 2px 0px 5px;
+  vertical-align: top;
+  border-right: thin dotted #AAAAAA;
+  width: 200px; }
+
+div#ldStoreDialogContents div#ldStoreDialogTree {
+  width: 200px;
+  overflow: auto; }
+
+div#ldStoreDialogContents #ldStoreDialogAccessCell {
+  border-top: thin dotted #AAAAAA;
+  border-right: thin dotted #AAAAAA; }
+
+div#ldStoreDialogContents #ldStoreDialogAccessDiv {
+  width: 200px;
+  overflow: auto;
+  height: 150px;
+  vertical-align: top;
+  padding: 5px 0px 5px 0px; }
+
+div#ldStoreDialogContents #ldStoreDialogAccessDiv > div#ldStoreDialogAccessTitle {
+  font-size: 13px;
+  font-weight: bold;
+  text-align: center; }
+
+div#ldStoreDialogContents #ldStoreDialogAccessDiv > div.access {
+  padding: 3px 0 3px 3px;
+  cursor: pointer;
+  margin-left: 10px;
+  margin-right: 10px;
+  font-size: small; }
+
+div#ldStoreDialogContents #ldStoreDialogAccessDiv > div.selected {
+  background-color: #dbe9f5; }
+
+div#ldStoreDialogContents td#ldStoreDialogCanvasCell {
+  text-align: center;
+  padding: 10px 0px 0px 10px;
+  vertical-align: middle; }
+
+div#ldStoreDialogContents div#ldStoreDialogCanvasDiv {
+  overflow: auto; }
+
+div#ldStoreDialogContents img#ldScreenshotLoading {
+  padding-top: 200px; }
+
+div#ldStoreDialogContents #ldStoreDialogImportPartFrame {
+  border: none;
+  width: 99%; }
+
+div#ldStoreDialogContents div#ldStoreDialogNameContainer {
+  margin-left: 20px; }
+
+div#ldStoreDialogContents div#ldStoreDialogNameContainer span {
+  font-weight: bold; }
+
+div#ldStoreDialogContents #ldStoreDialogNameContainer input {
+  width: 300px;
+  margin-left: 10px;
+  color: #000; }
+
+div.branchMappingDialog {
+  margin-left: 10px;
+  margin-right: 10px; }
+
+div.branchMappingDialog .container-fluid {
+  padding-right: 0; }
+
+div.branchMappingDialog > table {
+  width: 100%;
+  height: 98%;
+  table-layout: fixed;
+  border-collapse: collapse; }
+
+div.branchMappingDialog td {
+  text-align: center;
+  vertical-align: top; }
+
+div.branchMappingDialog td.branchMappingLabelCell {
+  height: 15px;
+  font-weight: bold; }
+
+div.branchMappingDialog td.branchMappingListCell {
+  border: thin solid black;
+  padding: 3px; }
+
+div.branchMappingDialog td.branchMappingListCell .selected {
+  background-color: #5898d0;
+  color: white; }
+
+div.branchMappingDialog .branchMappingButton {
+  width: 40%;
+  display: block;
+  margin: auto;
+  margin-top: 10px;
+  margin-bottom: 10px; }
+
+div.branchMappingDialog td.branchMappingListCell div {
+  text-align: left;
+  cursor: pointer; }
+
+div#outputConditionsDialogContents div#complexConditions > div {
+  font-weight: bold;
+  margin: 10px 0 0 2px; }
+
+div#outputConditionsDialogContents select {
+  margin-bottom: 10px;
+  width: 95%; }
+
+div#outputConditionsDialogContents .spinner {
+  width: 40px; }
+
+div#outputConditionsDialogContents div#multiRangeDiv {
+  display: inline-block; }
+
+div#outputConditionsDialogContents #rangeAddButton {
+  margin-left: 10px; }
+
+div#outputConditionsDialogContents table#rangeConditions {
+  width: 100%;
+  margin-top: 15px;
+  border-collapse: collapse;
+  text-align: center; }
+
+div#outputConditionsDialogContents table#rangeConditions tr td,
+div#outputConditionsDialogContents table#rangeConditions tr th {
+  padding: 3px;
+  border: thin solid black;
+  cursor: pointer; }
+
+div#outputConditionsDialogContents table#rangeConditions input {
+  width: 95%; }
+
+div#outputConditionsDialogContents tr.selected {
+  background-color: #dbe9f5; }
+
+/**** Main authoring styles ****/
+div#toolbar {
+  padding: 3px; }
+
+#cancelLiveEditButton {
+  display: none; }
+
+table#authoringTable {
+  table-layout: fixed;
+  width: 100%; }
+
+td#templateContainerCell {
+  width: 175px;
+  vertical-align: top; }
+
+td#templateContainerCell select {
+  width: 100%;
+  margin-bottom: 3px; }
+
+div.templateContainer {
+  display: none;
+  overflow: auto;
+  border: thin solid #AAAAAA;
+  border-radius: 3px; }
+
+div.template {
+  min-height: 45px;
+  border-bottom: thin solid #AAAAAA;
+  cursor: pointer; }
+
+.tooltemplate :hover {
+  background-color: #eeeeee; }
+
+.tooltemplate .media {
+  margin-top: 0px;
+  padding: 8px 0px 5px 5px; }
+
+td#canvasContainerCell {
+  vertical-align: top; }
+
+#ldDescriptionDiv {
+  z-index: 1099;
+  border-bottom: thin solid #AAAAAA; }
+
+#ldDescriptionDiv #ldDescriptionTitleContainer {
+  padding: 2px 0 0 0;
+  text-align: center;
+  font-size: 14px;
+  font-weight: bold;
+  cursor: pointer; }
+
+#ldDescriptionDiv #ldDescriptionHideTip {
+  float: right;
+  margin-right: 10px; }
+
+#ldDescriptionDiv #ldDescriptionDetails {
+  padding: 0 0 5px 10px;
+  display: none; }
+
+#ldDescriptionDiv .ldDescriptionLabel {
+  font-size: 12px; }
+
+#ldDescriptionDiv #ldDescriptionEditorContainer {
+  margin: 0px 15px 15px 0; }
+
+#ldDescriptionDiv #ldDescriptionLicenseTextContainer,
+#ldDescriptionDiv #ldDescriptionLicenseImage,
+#ldDescriptionDiv #ldDescriptionLicenseButton {
+  display: none; }
+
+#ldDescriptionDiv #ldDescriptionLicenseImage {
+  vertical-align: text-bottom;
+  padding: 0 10px; }
+
+#ldDescriptionDiv #ldDescriptionLicenseTextContainer {
+  padding-top: 10px; }
+
+#ldDescriptionDiv #ldDescriptionLicenseText {
+  width: 99%; }
+
+#canvas {
+  overflow: auto;
+  vertical-align: top; }
Index: lams_central/web/css/defaultHTML_authoring.scss
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_authoring.scss	(revision 0)
+++ lams_central/web/css/defaultHTML_authoring.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,2 @@
+@import "_lams_variables.scss";
+@import "_authoring_base.scss";
Index: lams_central/web/css/defaultHTML_chart.css
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_chart.css	(revision 0)
+++ lams_central/web/css/defaultHTML_chart.css	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,38 @@
+.axis {
+  font: 10px "Helvetica Neue", Helvetica, Arial, sans-serif; }
+
+.axis path, .axis line {
+  fill: none;
+  stroke: black;
+  shape-rendering: crispEdges; }
+
+div.chartTooltip {
+  position: absolute;
+  padding: 2px;
+  font: 12px "Helvetica Neue", Helvetica, Arial, sans-serif;
+  background: white;
+  border: 0px;
+  border-radius: 8px;
+  pointer-events: none;
+  opacity: 0; }
+
+/* Histogram Chart */
+.bar rect {
+  fill: #337ab7; }
+
+.bar text {
+  fill: white;
+  font: 14px "Helvetica Neue", Helvetica, Arial, sans-serif; }
+
+.zoom {
+  cursor: move;
+  fill: none;
+  pointer-events: all; }
+
+/* Tool Mark Charts (Monitoring) - space for the histogram chart */
+.markChartDiv {
+  margin-top: 10px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  width: 95%;
+  height: 500px; }
Index: lams_central/web/css/defaultHTML_chart.scss
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_chart.scss	(revision 0)
+++ lams_central/web/css/defaultHTML_chart.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,2 @@
+@import "_lams_variables.scss";
+@import "_chart_base.scss";
Index: lams_central/web/css/defaultHTML_jquery.jRating.css
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_jquery.jRating.css	(revision 0)
+++ lams_central/web/css/defaultHTML_jquery.jRating.css	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,101 @@
+/*********************/
+/** jRating CSS **/
+/*********************/
+/**Div containing the color of the stars */
+.jRatingAverage {
+  background-color: #f62929;
+  position: relative;
+  top: 0;
+  left: 0;
+  z-index: 2;
+  height: 100%; }
+
+.jRatingColor {
+  background-color: #f4c239;
+  /* bgcolor of the stars*/
+  position: relative;
+  top: 0;
+  left: 0;
+  z-index: 2;
+  height: 100%; }
+
+/** Div containing the stars **/
+.jStar {
+  position: relative;
+  left: 0;
+  z-index: 3; }
+
+/** P containing the rate informations **/
+p.jRatingInfos {
+  position: absolute;
+  z-index: 9999;
+  background: transparent url("../images/css/jquery.jRating-background.png") no-repeat;
+  /** customized url by LAMS **/
+  color: #FFF;
+  display: none;
+  width: 91px;
+  height: 29px;
+  font-size: 16px;
+  text-align: center;
+  padding-top: 5px; }
+
+p.jRatingInfos span.maxRate {
+  color: #c9c9c9;
+  font-size: 14px; }
+
+/** Please, note this is a LAMS customization. In case of library upgrade copy these lines manually.  **/
+.extra-controls-inner:after {
+  content: " ";
+  display: block;
+  height: 0;
+  clear: both; }
+
+.rating-stars-holder {
+  text-align: center; }
+
+.rating-stars-caption {
+  padding-top: 6px;
+  font-size: 12px; }
+
+.rating-stars, .rating-stars-disabled {
+  margin: 0px auto;
+  min-height: 20px; }
+
+.add-comment {
+  background-image: url("../images/tick.png");
+  width: 16px !important;
+  height: 16px;
+  cursor: pointer;
+  float: right !important;
+  margin-top: 20px; }
+
+.rating-comment {
+  background: url("../images/css/greyfade_bg.jpg") repeat-x scroll 0px 0px transparent;
+  padding: 15px;
+  margin: 10px 0; }
+
+.rating-info {
+  margin-top: 0;
+  margin-bottom: 12px; }
+
+textarea[id^=comment-textarea-] {
+  color: #d3d3d3; }
+
+.tablesorter tr.odd:hover .jStar {
+  background-image: url(/lams/images/css/jquery.jRating-stars-hover.png) !important; }
+
+.tablesorter tr.even:hover .jStar {
+  background-image: url(/lams/images/css/jquery.jRating-stars-hover.png) !important; }
+
+.tablesorter tr.odd .jStar {
+  background-image: url(/lams/images/css/jquery.jRating-stars-odd.png) !important; }
+
+/** Remove the following once we move all tools to use Rating.tag.  **/
+.rating-stars-div {
+  float: right;
+  padding-right: 10px;
+  margin-top: -8px;
+  min-height: 45px; }
+
+.rating-stars-caption {
+  text-align: center; }
Index: lams_central/web/css/defaultHTML_jquery.jRating.scss
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_jquery.jRating.scss	(revision 0)
+++ lams_central/web/css/defaultHTML_jquery.jRating.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,2 @@
+@import "_lams_variables.scss";
+@import "_jquery.jRating_base.scss";
Index: lams_central/web/css/defaultHTML_learner.scss
===================================================================
diff -u -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/css/defaultHTML_learner.scss	(.../defaultHTML_learner.scss)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
+++ lams_central/web/css/defaultHTML_learner.scss	(.../defaultHTML_learner.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -1,759 +1,8 @@
-/* 
-********************************************
-LAMS Overall Style
-********************************************
-*/ 
-// SASS Imports 
+// Standard LAMS Skin. If you need to add anything add it to _main_base.scss and it will go in all skins.
 @import "_lams_variables.scss";
-
-/* Stylesheet Imports */
+// Stylesheet Imports
 @import url("/lams/includes/font-awesome/css/font-awesome.min.css");
 @import url("/lams/css/bootstrap.min.css");
-@import url("/lams/css/inlineeditor.css");
- 
-@media (max-width: 500px) {
-  .h1,
-  .h2,
-  .h3,
-  .h4 {
-    font-size: $font-size-base;
-  }
-  * {
-    font-size: $font-size-small;
-  }
-  .panel-title {
-    font-size: $font-size-base;
-  }
-  .no-gutter > [class*='col-'] {
-    padding-right: 5px;
-    padding-left: 5px;
-  }
-  .rating-criteria-tag {
-	width: 100%;
-  }
-  .rating-criteria-tag input[type="text"] {
-	width: 100%;
-  }
-  .rating-criteria-tag .ui-widget input{
-	font-family: $font-family-base;
-	font-size:11px;
-  }
-  #criterias-table {
-	margin-left: 0px;
-	border-bottom: inherit;
-  }
-  #criterias-table td {
-	vertical-align:middle;
-  }
- .navbar-login {
-    margin-bottom: 5px;
-  }
- .navbar-brand-login {
-    font-size: large;
-  }
-}
-
-@media (min-width: 501px) {
-  .no-gutter > [class*='col-'] {
-    padding-right: 8px;
-    padding-left: 8px;
- }
- .navbar-login {
-    margin-bottom: 10px;
-  }
- .navbar-brand-login {
-    font-size: x-large;
-  }
-}
-
-/* Spacer classes */
-
-.offset2 {
-	margin: 2px;
-}
-.offset3 {
-	margin: 3px;
-}
-.offset5 {
-	margin: 5px;
-}
-.offset10 {
-	margin: 10px;
-}
-.offset15 {
-	margin: 15px;
-}
-.offset20 {
-	margin: 20px;
-}
-
-.voffset2 {
-  margin-top: 2px;
-}
-.voffset5 {
-  margin-top: 5px;
-}
-.voffset10 {
-  margin-top: 10px;
-}
-.voffset20 {
-  margin-top: 20px;
-}
-.roffset2 {
-  margin-right: 2px;
-}
-.roffset5 {
-  margin-right: 5px;
-}
-.roffset10 {
-  margin-right: 10px;
-}
-.loffset2 {
-  margin-left: 2px;
-}
-.loffset5 {
-  margin-left: 5px;
-}
-.loffset10 {
-  margin-left: 10px;
-}
-.loffset20 {
-  margin-left: 20px;
-}
-.clear-both {
-	clear: both;
-}
-/* Eliminate the scrollbar on learner popup windows, monitoring windows */
-.no-margin{
-	margin-left: 0px;
-	margin-right: 0px;
-}
-/* Comments/Forum classes */
-.msg .panel-heading {
-  padding: 3px;
-}
-.msg {
-  margin-bottom: 5px;
-}
-.msg .panel-title {
-  font-weight: normal;
-  font-size: $font-size-base;
-}
-.msg-footer {
-  display: block;
-  font-size: $font-size-small;
-  float: right;
-}
-.msg-hr {
-  margin-top: 5px;
-  margin-bottom: 3px;
-}
-.msg .panel-footer {
-  font-size: $font-size-small;
-}
-.panel-heading-sm {
-  padding: 3px 5px;
-  font-size: smaller;
-  font-weight: bold;
-}
-.panel-body-sm {
-  padding: 3px 5px;
-}
-.panel-learner-page {
-  border-radius: 6px;
-  box-shadow: $panel-box-shadow;
-}
-.panel-monitor-page {
-  border-radius: 6px;
-  box-shadow: $panel-box-shadow;
-}
-// .panel-learner-page-title,
-// .panel-admin-page-title {
-//   -moz-border-bottom-colors: none;
-//   -moz-border-left-colors: none;
-//   -moz-border-right-colors: none;
-//   -moz-border-top-colors: none;
-//   border-color: #e7eaec;
-//   border-radius: 0px;
-//   border-image: none;
-//   border-style: solid solid none;
-//   border-width: 3px 0 0;
-//   color: inherit;
-//   min-height: 48px;
-// }
-.panel-admin-page {
-  border-radius: 6px;
-  box-shadow: $panel-box-shadow;
-  margin-top: 20px;
-}
-.panel-learner-title {
-	color:$brand-primary !important;
-}
-.panel-admin-title {
-	color:$brand-primary !important;
-}
-.panel-title {
-	font-size: inherit;
-	font-weight: 500;
-}
-.panel-heading {
-  padding: 7px 10px;
-}
-
-th {
-	font-weight: normal;
-	font-style: italic;
-	
-}
-
-body.stripes {
-  background: url('/lams/images/css/light-fabric.jpg');
-}
-.sbox {
-  border-bottom: 2px solid $gray-lighter;
-  border-radius: 0px;
-}
-.sbox-body {
-  padding: 5px;
-}
-.sbox-heading {
-  padding: 3px 5px;
-  border-bottom: 1px solid $gray-lighter;
-  border-top-right-radius: 3px;
-  border-top-left-radius: 3px;
-}
-.user {
-  display: inline-block;
-}
-.user:before {
-  content: "\f007";
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  margin-right: 3px;
-  color: inherit;
-  float: left;
-}
-.help-tabs{
-  display: inline-block;
-  margin-right: 10px;
-}
-.help-no-tabs{
-  display: inline-block;
-  margin-right: 10px;
-}
-.help {
-  display: inline-block;
-}
-.help:before {
-  content: "\f059";
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  margin-right: 2px;
-  color: inherit;
-  float: right;
-}
-.na {
-  display: inline-block;
-}
-.na:after {
-  content: "\f0a9";
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  margin-left: 5px;
-  color: inherit;
-  /*float: right;*/
-}
-
-/* Restrict the width of the up and down arrows so they do not grow wider when the screen is enlarged. td needs to be 5px wider than div. */
-div.arrows{
-	display:inline-block;
-	width:30px;
-	text-align: center;
-}
-td.arrows{
-	width:35px;
-	text-align: center;
-}
-/* Tabs are a cross between pills (colouring) and tab outlines. */
-.nav-tabs > li > a{
-  border: $border-thin-default-light
-}
-/* Icons to show panel is collapsed */
-.collapsable-icon-right a:after {
-    font-family: FontAwesome;
-    content:"\f078";
-    float: right;
-    color: $gray-light;
-	margin-right: 5px;
-}
-.collapsable-icon-right a.collapsed:after {
-    content:"\f054";
-}
-.collapsable-icon-left a:after {
-    font-family: FontAwesome;
-    content:"\f078";
-    float: left;
-    color: $gray-light;
-	margin-right: 5px;
-}
-.collapsable-icon-left a.collapsed:after {
-    content:"\f054";
-}
-
-div.navbar-heading {
-	padding:0;
-}
-
-nav.navbar-heading {
-	border: 0; 
-	margin: 0;
-	color: inherit;
-}
-
-.navbar-heading .divider {
-	height: 50px;
-	margin-left: 5px;
-	margin-right: 5px;
-	border-left: $border-thin-default-light;
-}
-
-.navbar-heading .in .divider {
-	height: 1px;
-	margin-left: 5px;
-	margin-right: 5px;
-	margin-bottom: 5px;
-	border-top: $border-thin-default-light;
-}
-
-.navbar-heading .in .navbar-text {
-	padding-left: 15px;
-}
-
-.navbar-brand {
-	color:$brand-primary !important;
-}
-
-.navbar-text {
-	cursor: pointer;
-}
-
-/** Special settings for the nav bar used in monitoring, authoring, etc */
-.panel-monitor-page .navbar {
-    min-height: 40px;
-}   
-
-.panel-monitor-page .navbar-heading .divider {
-	height: 40px;
-}
-
-/* small display - drop down menu view */
-@media (max-width: 767px) {
-	.panel-monitor-page .navbar-brand {
-		color:$brand-primary !important;
-	 	height: 35px;
-	    margin-top: 5px;
-	    margin-bottom: 3px;
-	   	padding: 5px 10px 5px 25px;
-	}
-	
-	.panel-monitor-page>.navbar-toggle {
-	    margin-top: 3px;
-	    margin-bottom: 3px;
-	}
-	.panel-monitor-page .navbar-nav>li>a {
-	 	padding: 5px;
-	}
-	
-	.panel-monitor-page .navbar-text {
-		cursor: pointer;
-	 	margin-top: 5px;
-		margin-bottom: 5px;
-	}
-	
-	.panel-monitor-page .navbar-header .navbar-toggle {
-	    margin-top: 3px;
-	    margin-bottom: 3px;
-	}
-	
-	.panel-monitor-page .divider {
-		display:none
-	}
-	
-	.panel-monitor-page .navbar-heading .in .navbar-text {
-		padding-left: 4px;
-	}
-
-}
-
-/* normal display */ 
-@media (min-width: 768px) {
-	
-	.panel-monitor-page .navbar-brand {
-		color:$brand-primary !important;
- 		height: 40px;
-   		padding: 10px; 
-	}
-
-	.panel-monitor-page .navbar-nav>li>a {
-	 	padding: 10px;
-	}
-	
-	.panel-monitor-page .navbar-text {
-		cursor: pointer;
-	 	margin-top: 10px;
-		margin-bottom: 10px;
-	}
-	
-	.panel-monitor-page .navbar-heading .in .navbar-text {
-		padding-left: 15px;
-	}
-	
-}
-
-
-@media (min-width: 0px) and (max-width: 767px) {
-  .btn-primary, .btn-default, .btn-success, .btn-info, .btn-danger {
-    padding:4px 9px 2px;
-  }
-}
-
-@media (max-width: 500px) {  
-  .file-input-name {
-  	height: 22px; /* match height of btn */
-    padding:4px 9px;
-    font-size:90%;
-    line-height: 1.2;		
-  }
-}
-
-@media (min-width: 501px ) and (max-width: 992px) {  
-  .file-input-name {
-  	height: 25px; /* match height of btn */
-    padding:4px 9px;
-    font-size:90%;
-    line-height: 1.2;		
-  }
-}
-
-
-ul.dropdown-menu {
-	left: auto;
-	right: 0;
-}
-
-/** Authoring */
-/*layout of adding a topic button */
-a.button-add-item:before {
-  content: "\f067";
-  font-family: FontAwesome;
-  font-style: normal;
-  font-weight: normal;
-  text-decoration: inherit;
-  margin-left: 5px;
-  color: inherit;
-}
-
-.modal-header {
-    padding: 8px 15px 8px 15px;
-}
-
-.modal .ui-resizable-handle.ui-resizable-s {
-	border-radius: 6px;
-    border-bottom: 1px solid white;
-}
-
-.table-no-border>thead>tr>th, 
-.table-no-border>tbody>tr>th, 
-.table-no-border>tfoot>tr>th, 
-.table-no-border>thead>tr>td, 
-.table-no-border>tbody>tr>td, 
-.table-no-border>tfoot>tr>td {
-  border-top: none; 
-}
-
-.table-nonfluid {
-   width: auto !important;
-}
-
-.table-centered th, .table-centered td {
-	text-align: center;
-}
-
-.table > tbody > tr > td {
-	vertical-align: middle;
-}
-
-.table .fa {
-	cursor: pointer;
-}
-
-.form-control-inline {
-   width: auto !important;
-   display: inline-block;
-}
-
-.rating-criteria-tag {
-	width: 100%;
-}
-.rating-criteria-tag input[type="text"] {
-	width: 100%;
-}
-.rating-criteria-tag .ui-widget input{
-	font-family: $font-family-base;
-	font-size: $font-size-small;
-	line-height:1.42857143;
-	padding: 2px;
-}
-
-#criterias-table {
-	margin-left: 0px;
-	border-bottom: inherit;
-}
-#criterias-table td {
-	vertical-align:middle;
-}
-
-/* .....NavBar: Icon only with coloring/layout.....*/
-
-/*small/medium side display*/
-@media (min-width: 768px) {
-
-	/*Allow content to be next to Nav*/
-	.navcontent{
-		position: absolute;
-		width: calc(100% - 40px); /*keeps 100% minus nav size*/
-		margin-left: 20px;
-		float: right;
-		min-height:100%;
-	}
-	
-	/* darker outline than usual */
-	nav.sidebar{
-		  border-radius: 6px;
-		  box-shadow: $panel-box-shadow;
-		  min-height:300px;
-	}
- 
-	/*Center Brand*/
-	nav.sidebar.navbar.sidebar>.container .navbar-brand, .navbar>.container-fluid .navbar-brand {
-		margin-left: 0px;
-	}
-	/*Center Brand*/
-	nav.sidebar .navbar-brand, nav.sidebar .navbar-header{
-		text-align: center;
-		width: 100%;
-		margin-left: 0px;
-	}
-
-	/*Format Icons*/
-	nav.sidebar a{
-		padding:10px 10px 10px 12px;
-	}
-
-	nav.sidebar.slidesidemenu{
-		padding:10px 10px 10px 12px;
-	}
-	/*Hide text when compressed*/
-	nav.sidebar p{
-		padding-right: 35px;
-		text-align: center;
-	}
- 
-	/* colour in top box to match panel heading */
-	nav.sidebar .navbar-nav > li:first-child{
-		background-color: $gray-lightest !important;
-	}
-
-	/*adds border to bottom nav boxes except for the last box */
-	nav.sidebar .navbar-nav > li{
-		border-bottom: $border-thin-default-light;
-		background-color: $body-bg;
-	}
-
-	nav.sidebar .navbar-nav > li:last-child{
-		border-bottom: 0px;
-	}
-
-	/*allows nav box to use 100% width, style to be like panel */
-	nav.sidebar .navbar-collapse, nav.sidebar .container-fluid{
-		padding: 0 0px 0 0px;
-		border:2px solid transparent;
-		box-shadow: $panel-box-shadow;
-	}
-
-	/*gives sidebar width/height*/
-	nav.sidebar{
-		width: 180px;
-		height: 100%;
-		margin-left: -135px;
-		float: left;
-		z-index: 8000;
-		margin-top: 0px;
-		margin-bottom: 0px;
-	}
-
-	/*give sidebar 100% width;*/
-	nav.sidebar li {
-		width: 100%;
-		margin-top: 3px;
-		margin-bottom: 3px;
-	}
-
- 	/* Move nav to full on mouse over*/
- 	nav.sidebar.expandmenu {
-		margin-left: 0;
-	}
-	 
-/* 	nav.sidebar:hover{
-		margin-left: 0px;
-	}
- */
- 	/*for hiden things when navbar hidden*/
-	.forAnimate{
-		opacity: 0;
-	}
-	
-	nav.sidebar .fa{
-		font-size: 18px;
-	}
-	
-}
-
-/* .....NavBar: Fully showing nav bar..... */
-
-@media (min-width: 1330px) {
-
-	/*Allow content to be next to Nav*/
-	.navcontent{
-		position: absolute;
-		width: calc(100% - 180px); /*keeps 100% minus nav size*/
-		margin-left: 170px;
-		float: right;
-	}
-
-	/*Show all nav*/
-	nav.sidebar{
-		margin-left: 0px;
-		float: left;
-	}
-	/*Show hidden items on nav*/
-	nav.sidebar .forAnimate{
-		opacity: 1;
-	}
-}
-
-nav.sidebar .navbar-nav .open .dropdown-menu>li>a:hover, nav.sidebar .navbar-nav .open .dropdown-menu>li>a:focus {
-	background-color: transparent;
-}
-
-nav:hover .forAnimate{
-	opacity: 1;
-}
-section{
-	padding-left: 15px;
-}
-
-/* Login page
- * CSS to make the footer stick to the bottom see http://cssreset.com/how-to-keep-footer-at-bottom-of-page-with-css/ 
- * Height of footer set to match the navbar at the top for visual reasons - it may be changed. 
- */
-.login-body {
-	margin:0;
-	padding:0;
-	height:100%;
-}
-.login-content{
-	min-height:100%;
-	position:relative;
-	padding-bottom:50px;
-}
-.login-footer {
-	width: 100%;
-	background-color: $gray-lightest;
-	font-size: 85%;
-	padding-top: 15px;
-	border-top: $border-thin-default-light;
-	height:50px;
-	position:absolute;
-	bottom:0;
-	left:0;
-}
-
-/* fontawesome icon x-small */
-.fa-xs {
-	font-size: smaller;
-}
-
-/* Growl functionality, jquery.blockUI (version: 2.38) */
-.growlUI {
-	width: auto;
-	padding: 0px;
-}
-
-div.growlUI h1,div.growlUI h2 {
-	color: white;
-	padding: 0px;
-	margin: 5px;
-	text-align: center;
-	font-size: medium;
-}
-
-// Tooltips used for learner progress and gradebook (large version)
-.tooltip {
-	position: absolute;
-	border: $border-thin-default;
-	background-color: $gray-light-mid;
-	padding: 3px;
-	z-index: 5;
-	width: 150px;
-	font-size: 0.9em;
-	word-wrap: break-word;
-}
-
-.tooltip-lg{
-	display: none;
-    position:absolute;
-	border: $border-thin-default;
-    background-color:$gray-light-mid;
-    padding:5px;
-    width:250px;
-    font-size: 1.1em;
-	word-wrap: break-word;
-}
-
-// Image Gallery
-.caption-heading {
-	color: $brand-primary; 
-	font-style: italic;
-	font-size: $font-size-base;
-}
-
-.caption-description {
-	color: $text-color; 
-	font-style: italic;
-	font-size: $font-size-small;
-}
-
-// Assessment and Scratchie Countdown - growl settings need to be moved too
-#timelimit-start-dialog {
-	display:none; cursor: default; padding: 10px;
-}
-#timelimit-start-dialog h1{
-	padding-bottom: 10px;
-}
-#countdown {
-	width: 150px; position: absolute; font-size: 110%; font-style: italic; color: $brand-success;
-}
-#countdown-label {
-	font-size: 170%; padding-top:5px; padding-bottom:5px; font-style: italic; color: $brand-success;
-}
-#timelimit-expired {
-	font-size: 145%; padding: 15px;
-}
-
+// LAMS Classes and overrides
+@import "_inlineeditor.scss";
+@import "_learner_base.scss";
\ No newline at end of file
Index: lams_central/web/css/defaultHTML_main.css
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_main.css	(revision 0)
+++ lams_central/web/css/defaultHTML_main.css	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,488 @@
+body {
+  width: 100%;
+  overflow-x: hidden;
+  font-size: 13px;
+  background: url(/lams/images/css/light-fabric.jpg); }
+
+html {
+  height: 100%; }
+
+#offcanvas {
+  position: fixed;
+  width: 220px;
+  z-index: 10;
+  height: 100%;
+  background: #164276;
+  color: #eeeeee; }
+
+.courses-title {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  font-weight: 300;
+  font-size: 23px;
+  width: 100%;
+  margin-left: 0 !important;
+  line-height: 49px;
+  margin: 0;
+  padding-left: 25px; }
+
+#page-wrapper {
+  margin: 0 0 0 220px;
+  padding: 10px 20px 0px; }
+
+.offcanvas-hidden #offcanvas {
+  display: none; }
+
+.offcanvas-hidden #page-wrapper {
+  margin: 0 0 0 0; }
+
+@media (min-width: 769px) {
+  .icon-remove {
+    display: none !important; } }
+@media (max-width: 768px) {
+  #offcanvas {
+    width: 100%; }
+
+  .navbar-nav .open .dropdown-menu {
+    top: 52px;
+    /*hack to prevent disappearing*/ } }
+@media (max-width: 870px) {
+  body.offcanvas-hidden .xs-hidden {
+    display: none !important; } }
+@media (max-width: 1170px) {
+  body:not(.offcanvas-hidden) .xs-hidden {
+    display: none !important; } }
+.content {
+  padding: 7px 10px;
+  background: #fff;
+  box-shadow: 0 1px 1px rgba(8, 8, 8, 0.88); }
+
+#org-container {
+  padding: 17px 10px 17px 25px; }
+
+/*FOOTER*/
+footer {
+  width: 100%;
+  font-size: 75%;
+  background-color: #fff;
+  border-radius: 0 0 6px 6px;
+  box-shadow: 0 1.4px 1px rgba(8, 8, 8, 0.5);
+  margin-bottom: 10px; }
+
+a {
+  color: #5A738E;
+  text-decoration: none; }
+
+a:hover, a:focus {
+  color: #164276; }
+
+/*OFFCANVAS BAR*/
+#favorite-organisations {
+  border-top: 1px solid rgba(255, 255, 255, 0.16);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.16); }
+
+#favorite-organisations > li > a, .tablesorter a {
+  color: #A7B1C2;
+  font-weight: 400;
+  padding: 14px 20px 14px 25px; }
+
+#favorite-organisations > li > a:hover,
+#favorite-organisations > li > a:focus,
+.pagesize:hover,
+.tablesorter a:hover,
+.tablesorter a:focus {
+  background-color: #072B57;
+  color: white; }
+
+.tablesorter a {
+  display: block;
+  text-decoration: none;
+  font-size: 13px; }
+
+#offcanvas .active > a,
+#offcanvas .active > a:hover,
+#offcanvas .active > a:focus {
+  background: #2B5B95; }
+
+#offcanvas .active > a {
+  color: #fff; }
+
+#offcanvas td.active {
+  border-right: 10px solid #0E9AEF;
+  background: #2B5B95; }
+
+.offcanvas-logo {
+  padding: 20px 0px 15px 25px;
+  background-color: #072B57; }
+
+.offcanvas-logo img {
+  width: 100px; }
+
+.offcanvas-header {
+  padding: 15px 0px 0px 0px; }
+
+.offcanvas-search {
+  padding: 15px 19px 15px;
+  margin-bottom: 0; }
+
+.offcanvas-search .form-control {
+  box-shadow: inset 0 1px 0px rgba(208, 206, 206, 0.25);
+  border-radius: 25px;
+  padding: 2px 5px;
+  line-height: 1;
+  border: 1px solid rgba(221, 226, 232, 0.49);
+  background: #072B57;
+  color: #A7B1C2; }
+
+.offcanvas-search .form-control::-webkit-input-placeholder {
+  /* WebKit, Blink, Edge */
+  color: #dddddd; }
+
+.offcanvas-search .form-control:-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  color: #dddddd; }
+
+.offcanvas-search .form-control::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  color: #dddddd; }
+
+.offcanvas-search .form-control:-ms-input-placeholder {
+  /* Internet Explorer 10-11 */
+  color: #dddddd; }
+
+.ts-pager {
+  text-align: center;
+  padding: 0 10px 10px;
+  color: #55637b; }
+
+.ts-pager .btn {
+  color: #8996ad;
+  background-color: #072B57;
+  padding: 2px 5px;
+  line-height: 1; }
+
+.tablesorter tfoot i {
+  font-size: 11px; }
+
+.tablesorter tfoot th {
+  background-color: #072B57 !important;
+  padding: 10px 0; }
+
+.pagesize {
+  border: 1px solid rgba(221, 226, 232, 0.49);
+  background: #164276;
+  cursor: pointer; }
+
+.icon-remove {
+  cursor: pointer;
+  position: absolute;
+  width: 40px;
+  top: 30px;
+  right: 5px; }
+
+.icon-remove:hover {
+  color: #fff; }
+
+.fa-chevron-circle-right.fa-lg {
+  line-height: 1em; }
+
+/*TOP HEADER*/
+.top-nav {
+  background: #eeeeee;
+  border-bottom: 1px solid #D9DEE4;
+  border-radius: 6px 6px 0 0;
+  height: 53px;
+  box-shadow: 0 1px 1px rgba(8, 8, 8, 0.5); }
+
+.offcanvas-toggle-header {
+  float: left;
+  margin: 0;
+  padding: 15px 0 10px 7px;
+  width: 70px;
+  cursor: pointer;
+  border-radius: 3px; }
+
+@media (min-width: 768px) {
+  .offcanvas-toggle-header {
+    padding-top: 20px;
+    padding-bottom: 15px; }
+
+  .top-nav {
+    height: 63px; } }
+.offcanvas-toggle-header i {
+  padding: 0 15px 0;
+  color: #164276; }
+
+.offcanvas-toggle i {
+  font-size: 26px; }
+
+.top-nav .navbar-right {
+  margin: 0;
+  width: 70%;
+  float: right; }
+
+.top-nav .navbar-right li {
+  display: inline-block;
+  float: right;
+  position: static;
+  border-radius: 3px; }
+
+@media (min-width: 480px) {
+  .top-nav .navbar-right li {
+    position: relative; } }
+.top-nav .dropdown-menu li {
+  width: 100%; }
+
+.top-nav li a i {
+  font-size: 15px; }
+
+ul.dropdown-usermenu li {
+  background: #eeeeee;
+  display: -ms-flexbox;
+  display: flex;
+  margin: 2px 2px 0;
+  width: 98% !important; }
+
+/*TOP HEADER LINKS*/
+.offcanvas-toggle-header:hover, ul.dropdown-usermenu li a:focus, ul.dropdown-usermenu li a:hover, .top-nav .nav > li > a:hover, .top-nav .nav .open > a, .top-nav .nav .open > a:focus, .top-nav .nav .open > a:hover {
+  background: #D9DEE4; }
+
+.nav > li > a:hover, .nav > li > a:focus {
+  background-color: transparent; }
+
+.navbar-nav > li > a {
+  font-weight: 500;
+  color: #515356 !important;
+  margin-left: 0 !important;
+  line-height: 32px;
+  border-radius: 3px; }
+
+.top-nav .dropdown-menu li a {
+  width: 100%;
+  padding: 10px 20px;
+  border-radius: 3px; }
+
+.top-nav .dropdown-menu li a i {
+  padding-right: 15px; }
+
+.dropdown-menu a {
+  cursor: pointer;
+  border-radius: 6px; }
+
+#more-links-menu {
+  padding: 10px 5px; }
+
+.navbar-nav .open .dropdown-menu {
+  position: absolute;
+  background: #fff;
+  margin-top: 0;
+  padding: 0 0 3px;
+  border: 1px solid #D9DEE4;
+  border-radius: 6px;
+  -webkit-box-shadow: none;
+  right: 0;
+  left: auto;
+  width: 210px; }
+
+.user-profile img {
+  width: 29px;
+  height: 29px;
+  border-radius: 50%;
+  margin-right: 10px; }
+
+#notificationsPendingCount {
+  font-size: 10px;
+  font-weight: normal;
+  line-height: 13px;
+  padding: 2px 5px;
+  position: absolute;
+  left: 25px;
+  top: 10px;
+  border-style: solid;
+  border-width: 1px;
+  display: inline-block;
+  min-width: 10px;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  border-radius: 10px; }
+
+#notificationsPendingCount.btn-default {
+  background-color: #dddddd; }
+
+/*DIALOGS*/
+.dialogContainer {
+  -webkit-overflow-scrolling: touch !important; }
+
+.dialogContainer .modal-body {
+  height: 100%;
+  max-height: calc(100% - 38px);
+  padding: 0; }
+
+.dialogContainer iframe {
+  width: 100%;
+  height: 100%;
+  border: none; }
+
+.dialogContainer button {
+  cursor: pointer; }
+
+.dialogContainer button:focus {
+  outline: none; }
+
+.dialogContainer button .fa {
+  font-size: 16px;
+  margin-left: 10px; }
+
+.dialogContainer .ui-draggable .modal-header {
+  cursor: move; }
+
+.dialogMin {
+  top: auto !important;
+  bottom: 5px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: fixed !important;
+  width: 250px !important;
+  height: 35px !important; }
+
+.dialogMin .modal-title {
+  white-space: nowrap;
+  overflow: hidden; }
+
+.dialogMin .modal-dialog {
+  left: 0 !important;
+  top: 0 !important; }
+
+.dialogMin .modal-dialog, .dialogMin .modal-content {
+  width: 250px !important;
+  height: 35px !important;
+  margin: 0 !important;
+  padding: 0 !important; }
+
+.dialogMin .modal-header {
+  height: 100%;
+  margin: 0 !important;
+  padding: 3px 5px !important;
+  cursor: default !important; }
+
+.ui-dialog .ui-dialog-content {
+  padding: 3px; }
+
+#tablePrivateNotifications tr:first-child td {
+  font-weight: bold;
+  text-align: center; }
+
+#tablePrivateNotifications td.notificationsReadCell {
+  font-size: 16px;
+  width: 30px;
+  text-align: center; }
+
+#tablePrivateNotifications td.notificationsPendingCell {
+  font-weight: bold; }
+
+#tablePrivateNotifications td.notificationsClickableCell:hover {
+  cursor: pointer;
+  /* CSS3 glow effect: */
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  -moz-box-shadow: 0 0 5px #A6E5FD;
+  -webkit-box-shadow: 0 0 5px #A6E5FD;
+  box-shadow: 0 0 5px #A6E5FD; }
+
+/* GROUP CONTAINER */
+.j-single-lesson {
+  list-style: none;
+  margin: 6px;
+  padding: 3px 3px 3px 10px;
+  position: relative; }
+
+.j-single-lesson:hover {
+  border-color: #9be0f9;
+  background-color: #F0F8FF;
+  display: block;
+  /* CSS3 glow effect: */
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 0 5px #A6E5FD;
+  -webkit-box-shadow: 0 0 5px #A6E5FD;
+  box-shadow: 0 0 5px #A6E5FD; }
+
+.j-single-lesson:hover .lesson-actions {
+  opacity: 1;
+  display: block; }
+
+.j-single-lesson:hover .mycourses-move-img {
+  background: url("../images/css/arrow_move.png") no-repeat 0 0px; }
+
+.lesson-actions {
+  float: right;
+  font-size: 1.2em;
+  opacity: 0.3;
+  /* filter: alpha(opacity = 10); msie */ }
+
+.lesson-actions a {
+  border-bottom: none; }
+
+.child-org-name {
+  float: left;
+  padding-top: 5px; }
+
+.split-ui-button + ul {
+  z-index: 1; }
+
+.split-ui-button + ul li {
+  list-style-type: none; }
+
+.split-ui-button + ul li a {
+  border: none; }
+
+.split-ui-button div:first-child {
+  margin-right: -0.4em; }
+
+.split-ui-button + ul span {
+  color: #999; }
+
+.ui-button, .split-ui-button div {
+  font-size: 12px !important;
+  font-weight: normal !important; }
+
+a.sorting {
+  border-bottom: none;
+  cursor: pointer; }
+
+.lesson-table {
+  margin: 0 auto;
+  width: 100%; }
+
+.subgroup-lesson-table {
+  padding-top: 30px; }
+
+.course-right-buttons {
+  padding-right: 20px; }
+
+.group-name {
+  margin-top: 20px;
+  margin-left: 30px; }
+
+.group-name p {
+  padding-top: 0px;
+  margin-bottom: 0px;
+  padding-left: 0px;
+  margin-left: 0px; }
+
+.group-name strong {
+  color: #777777; }
+
+.course-header {
+  padding-bottom: 5px;
+  margin-bottom: 12px;
+  border-bottom: thin solid #AAAAAA; }
+
+.course-header i {
+  font-size: 16px; }
+
+.j-course-contents {
+  border-bottom: thin solid #AAAAAA; }
Index: lams_central/web/css/defaultHTML_main.scss
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_main.scss	(revision 0)
+++ lams_central/web/css/defaultHTML_main.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,2 @@
+@import "_lams_variables.scss";
+@import "_main_base.scss";
Index: lams_central/web/css/defaultHTML_orgGroup.css
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_orgGroup.css	(revision 0)
+++ lams_central/web/css/defaultHTML_orgGroup.css	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,107 @@
+html, body {
+  height: 100%; }
+
+.errorMessage {
+  display: none;
+  margin-left: 5px; }
+
+div#titleDiv {
+  padding: 5px 0 0 5px; }
+
+div#titleDiv input {
+  margin-left: 10px;
+  width: 290px; }
+
+div#titleDiv button {
+  margin-right: 10px; }
+
+#titleInstructions {
+  text-align: center;
+  margin-top: 7px;
+  border-bottom: thin dotted #AAAAAA; }
+
+table#groupsTable {
+  height: calc(100% - 110px); }
+
+table#groupsTable td {
+  vertical-align: top;
+  padding: 5px; }
+
+td#unassignedUserCell {
+  width: 200px;
+  border-right: thin dotted #AAAAAA; }
+
+#groupTemplate {
+  display: none; }
+
+#newGroupPlaceholder {
+  border: thin dotted #AAAAAA;
+  cursor: pointer; }
+
+#newGroupPlaceholder > div {
+  text-align: center;
+  margin: 60px 5px 0 5px; }
+
+.groupContainer {
+  float: left;
+  width: 180px;
+  height: 150px;
+  margin: 0 10px 10px 0;
+  padding: 5px;
+  border: thin dotted #AAAAAA; }
+
+.userContainerTitle {
+  font-weight: bold;
+  text-align: center; }
+
+.sortUsersButton {
+  float: right;
+  cursor: pointer; }
+
+.removeGroupButton {
+  float: left;
+  cursor: pointer; }
+
+.userContainer {
+  overflow: auto;
+  height: 109px;
+  margin-top: 5px; }
+
+td#unassignedUserCell .userContainer {
+  height: 100%;
+  overflow-x: auto; }
+
+.groupContainer input {
+  width: 135px;
+  margin-right: 5px; }
+
+.groupContainer .sortUsersButton {
+  padding-top: 3px; }
+
+.draggableUser {
+  padding: 3px 0px 3px 0px;
+  cursor: default; }
+
+.userContainer .ui-state-disabled {
+  opacity: 1 !important; }
+
+.locked {
+  padding: 4px;
+  border: 3px solid #d9534f; }
+
+#course-grouping-advanced-settings {
+  display: inline-block;
+  width: 100%;
+  padding: 10px; }
+
+#save-course-grouping-button {
+  margin-top: 10px; }
+
+#accordionAdvanced {
+  margin-bottom: 0px;
+  margin-top: 20px; }
+
+.dialogContainer {
+  display: none;
+  -webkit-overflow-scrolling: touch !important;
+  overflow: auto; }
Index: lams_central/web/css/defaultHTML_progressBar.css
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_progressBar.css	(revision 0)
+++ lams_central/web/css/defaultHTML_progressBar.css	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,60 @@
+.progressBarContainer {
+  overflow: auto; }
+
+div.optionalActivity {
+  display: none;
+  position: absolute;
+  z-index: 6; }
+
+div.optionalActivity table {
+  border: thin solid black;
+  background-color: #e3eef7;
+  width: 145px; }
+
+div.optionalActivity table tr:first-child td {
+  border-top: none;
+  background-color: #6ca5d6; }
+
+div.optionalActivity td {
+  border-top: thin solid black;
+  cursor: pointer;
+  padding: 0px; }
+
+div.optionalActivity td:hover {
+  background-color: #F6EEBF; }
+
+div#progressBarDialog {
+  display: none; }
+
+div#progressBarDialog iframe {
+  width: 100%;
+  height: 100%;
+  border: none; }
+
+.activityCurrent {
+  fill: #BB0000;
+  stroke: #000; }
+
+.activityNotStarted {
+  fill: #009900;
+  stroke: #000; }
+
+.activityCompleted {
+  fill: #000099;
+  stroke: #000; }
+
+.activityComplex {
+  fill: #999999;
+  stroke: #000; }
+
+.gate {
+  fill: #FF0000; }
+
+.gateCurrent {
+  stroke: #BB0000; }
+
+.gateText {
+  stroke: #fff; }
+
+.transitionLine {
+  stroke: #000; }
Index: lams_central/web/css/defaultHTML_progressBar.scss
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_progressBar.scss	(revision 0)
+++ lams_central/web/css/defaultHTML_progressBar.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,2 @@
+@import "_lams_variables.scss";
+@import "_progressBar_base.scss";
Index: lams_central/web/css/defaultHTML_treetable.css
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_treetable.css	(revision 0)
+++ lams_central/web/css/defaultHTML_treetable.css	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,50 @@
+@import url("/lams/css/jquery.treetable.css");
+table.treetable span.indenter {
+  text-align: left; }
+
+table.treetable tr.collapsed span.indenter a {
+  position: relative; }
+
+table.treetable tr.collapsed span.indenter a:before {
+  content: "\f054 \f054";
+  font-family: FontAwesome;
+  position: absolute;
+  top: 0; }
+
+table.treetable tr.expanded span.indenter a {
+  position: relative; }
+
+table.treetable tr.expanded span.indenter a:before {
+  content: "\f078";
+  font-family: FontAwesome;
+  position: absolute;
+  top: 0; }
+
+table.treetable tr span.indenter a {
+  outline: none;
+  /* Expander shows outline after upgrading to 3.0 (#141) */
+  border-bottom: none;
+  /* Hide the dotted line underneath */
+  font-size: x-small; }
+
+table.treetable tr.collapsed.selected span.indenter a {
+  background-image: url(data:image/png;base64,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); }
+
+table.treetable tr.expanded.selected span.indenter a {
+  background-image: url(data:image/png;base64,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); }
+
+table.treetable tr.accept {
+  background-color: #dbe9f5;
+  color: #fff; }
+
+table.treetable tr.collapsed.accept td span.indenter a {
+  background-image: url(data:image/x-png;base64,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); }
+
+table.treetable tr.expanded.accept td span.indenter a {
+  background-image: url(data:image/x-png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAFtJREFUeNpi/P//PwMlgImBQsA44C6giQENDAwM//HgBmLCAF/AMBLjBUeixf///48L7/+PCvZjU4fPAAc0AxywqcMXCwegGJ1NckL6jx5wpKYDxqGXEkkCgAEAmrqBIejdgngAAAAASUVORK5CYII=); }
+
+div.highlight {
+  background-color: #FCF0AD; }
+
+table.highlight {
+  background: none; }
Index: lams_central/web/css/defaultHTML_treetable.scss
===================================================================
diff -u
--- lams_central/web/css/defaultHTML_treetable.scss	(revision 0)
+++ lams_central/web/css/defaultHTML_treetable.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,2 @@
+@import "_lams_variables.scss";
+@import "_treetable_base.scss";
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_central/web/css/inlineeditor.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_central/web/css/jquery.jRating.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_central/web/css/jquery.treetable.lams.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_central/web/css/main.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/css/orgGroup.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/css/orgGroup.scss	(.../orgGroup.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_central/web/css/orgGroup.scss	(.../orgGroup.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -6,8 +6,6 @@
 
 .errorMessage {
 	display: none;
-	font-weight: bold;
-	color: red;
 	margin-left: 5px;
 }
 
@@ -100,30 +98,15 @@
 	padding-top: 3px;
 }
 
-.draggableUser {
-	padding: 3px 0px 3px 0px;
-	cursor: default;
-}
-
 .userContainer .ui-state-disabled {
 	opacity: 1 !important;
 }
 
-.droppableHighlight {
-	padding : 1px !important;
-	border: 5px solid $brand-primary-mid !important;
-}
-
 .locked {
 	padding : 4px;
 	border: $border-medium-danger;
 }
 
-.draggableUserSelected {
-	background-color: $brand-primary-mid !important;
-	color: white !important;
-}
-
 #course-grouping-advanced-settings {
     display: inline-block;
     width: 100%;
Index: lams_central/web/css/orgGrouping.scss
===================================================================
diff -u -rd2b195b0508f24b2b70237ae4f5ca25ed73298f9 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/css/orgGrouping.scss	(.../orgGrouping.scss)	(revision d2b195b0508f24b2b70237ae4f5ca25ed73298f9)
+++ lams_central/web/css/orgGrouping.scss	(.../orgGrouping.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -28,13 +28,12 @@
 .groupingName {
 	font-size: 12px;
 	border-bottom: $border-thin-dotted;
-	color: $brand-primary;
 	text-decoration: none;
 }
 
 .groupingName:hover {
-	border-bottom: $border-thin-primary;
-	color: $brand-primary;
+	border-bottom: none;
+	text-decoration: underline;
 }
 
 .groupCount {
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_central/web/css/progressBar.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -r97deffe165055d02a9942930ec547b5ee040dc42 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 97deffe165055d02a9942930ec547b5ee040dc42)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -118,7 +118,7 @@
 	fillUserContainer(users.unselectedMonitors, 'unselected-monitors');
 	
 	// allow dragging of user divs
-	$('.draggableUser').each(function(){
+	$('.draggableItem').each(function(){
 		$(this).draggable({ 'scope'       : getDraggableScope($(this).parents('.userContainer').attr('id')),
 							'appendTo'    : 'body',
 							'containment' : '#classTable',
@@ -128,24 +128,24 @@
 						    'cursor'      : 'move',
 							'helper'      : function(event){
 								// include the user from which dragging started
-								$(this).addClass('draggableUserSelected');
+								$(this).addClass('draggableSelected');
 								
 								// copy selected users
 								var helperContainer = $('<div />');
-								$(this).siblings('.draggableUserSelected').andSelf().each(function(){
+								$(this).siblings('.draggableSelected').andSelf().each(function(){
 									$(this).clone().appendTo(helperContainer);
 								});
 								return helperContainer;
 							}	
 		}).click(function(event){
-			var wasSelected = $(this).hasClass('draggableUserSelected');
+			var wasSelected = $(this).hasClass('draggableSelected');
 			var parentId = $(this).parent().attr('id');
 			// this is needed for shift+click
 			var lastSelectedUser = lastSelectedUsers[parentId];
 			
 			if (event.shiftKey && lastSelectedUser && lastSelectedUser != this) {
 				// clear current selection
-				$(this).siblings().andSelf().removeClass('draggableUserSelected');
+				$(this).siblings().andSelf().removeClass('draggableSelected');
 				
 				// find range of users to select
 				var lastSelectedIndex = $(lastSelectedUser).index();
@@ -155,18 +155,18 @@
 				var endingElem = lastSelectedIndex > index ? lastSelectedUser : this;
 				
 				$(startingElem).nextUntil(endingElem).andSelf().add(endingElem)
-					.addClass('draggableUserSelected');
+					.addClass('draggableSelected');
 			} else {
 				if (!event.ctrlKey) {
 					// clear current sleection
-					$(this).siblings().andSelf().removeClass('draggableUserSelected');
+					$(this).siblings().andSelf().removeClass('draggableSelected');
 				}
 				
 				if (wasSelected && !event.shiftKey){
-					$(this).removeClass('draggableUserSelected');
+					$(this).removeClass('draggableSelected');
 					lastSelectedUsers[parentId] = null;
 				} else {
-					$(this).addClass('draggableUserSelected');
+					$(this).addClass('draggableSelected');
 					lastSelectedUsers[parentId] = this;
 				}
 			}
@@ -286,7 +286,7 @@
 	// some validation at first
 	var lessonName = $('#lessonNameInput').val();
 	if (lessonName){
-		$('#lessonNameInput').removeClass('errorField');
+		$('#lessonNameInput').removeClass('errorBorder');
 	}
 	
 	var ldNode = tree.getHighlightedNode();
@@ -300,13 +300,13 @@
 	if (lessonName){
 		var nameValidator = /^[^<>^*@%$]*$/igm;	
 		if (!nameValidator.test(lessonName)) {
-			$('#lessonNameInput').addClass('errorField');
+			$('#lessonNameInput').addClass('errorBorder');
 			doSelectTab(1);
 			alert(LABEL_NAME_INVALID_CHARACTERS);
 			return;
 		}
 	} else {
-		$('#lessonNameInput').addClass('errorField');
+		$('#lessonNameInput').addClass('errorBorder');
 		doSelectTab(1);
 		return;
 	}
@@ -334,7 +334,7 @@
 	$('#monitorsField').val(monitors);
 	
 	if ($('#splitLearnersField').is(':checked')) {
-		var maxLearnerCount = $('#selected-learners div.draggableUser').length,
+		var maxLearnerCount = $('#selected-learners div.draggableItem').length,
 			learnerCount = $('#splitLearnersCountField').val(),
 			instances = Math.ceil(maxLearnerCount/learnerCount);
 		$('#splitNumberLessonsField').val(instances);
@@ -554,7 +554,7 @@
 					$('<div />').attr({
 									'userId'  : userJSON.userID
 									})
-			                    .addClass('draggableUser')
+			                    .addClass('draggableItem')
     						    .text(userJSON.firstName + ' ' + userJSON.lastName 
     						    		  + ' (' + userJSON.login + ')'
     						    	 )
@@ -575,24 +575,24 @@
 
 function colorDraggableUsers(container) {
 	// every second line is different
-	$(container).find('div.draggableUser').each(function(index, userDiv){
-		// exact colour should be defined in CSS, but it's easier this way...
-		$(this).css('background-color', index % 2 ? '#dfeffc' : 'inherit');
+	$(container).find('div.draggableItem').each(function(index, userDiv){
+		$(this).removeClass( index % 2 ? 'draggableEven' : 'draggableOdd');
+		$(this).addClass( index % 2 ? 'draggableOdd' : 'draggableEven');
 	});
 }
 
 
 function getSelectedUserList(containerId) {
 	var list = '';
-	$('#' + containerId).children('div.draggableUser').each(function(){
+	$('#' + containerId).children('div.draggableItem').each(function(){
 		list += $(this).attr('userId') + ',';
 	});
 	return list;
 }
 
 function sortUsers(buttonId) {
 	var container = $('#' + buttonId.substring(buttonId.indexOf('-') + 1));
-	var users = container.children('div.draggableUser');
+	var users = container.children('div.draggableItem');
 	if (users.length > 1) {
 		var sortOrderAsc = sortOrderAscending[buttonId];
 		
@@ -630,7 +630,7 @@
 	var toContainer = $('#' + toContainerId);
 	var fromContainerId = getDraggableScope(toContainerId);
 	var fromContainer = $('#' + fromContainerId);
-	var selectedUsers =  fromContainer.children('.draggableUserSelected');
+	var selectedUsers =  fromContainer.children('.draggableSelected');
 	if (selectedUsers.length > 0){
 	   // remove error message, if exists
 	   toContainer.children('.errorMessage').remove();
@@ -648,7 +648,7 @@
 	            
 	   
 	   // recolour both containers
-	   toContainer.children().removeClass('draggableUserSelected');
+	   toContainer.children().removeClass('draggableSelected');
 	   colorDraggableUsers(toContainer);
 	   colorDraggableUsers(fromContainer);
 	   
@@ -664,7 +664,7 @@
 function updateSplitLearnersFields(){
 	if ($('#splitLearnersField').is(':checked')) {
 		// put users into groups
-		var maxLearnerCount = $('#selected-learners div.draggableUser').length,
+		var maxLearnerCount = $('#selected-learners div.draggableItem').length,
 			learnerCount = $('#splitLearnersCountField').val(),
 			instances = Math.ceil(maxLearnerCount/learnerCount);
 		learnerCount = Math.ceil(maxLearnerCount/instances);
Index: lams_central/web/includes/javascript/nprogress.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/nprogress.js	(revision 0)
+++ lams_central/web/includes/javascript/nprogress.js	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1 @@
+!function(n,e){"function"==typeof define&&define.amd?define(e):"object"==typeof exports?module.exports=e():n.NProgress=e()}(this,function(){function n(n,e,t){return e>n?e:n>t?t:n}function e(n){return 100*(-1+n)}function t(n,t,r){var i;return i="translate3d"===c.positionUsing?{transform:"translate3d("+e(n)+"%,0,0)"}:"translate"===c.positionUsing?{transform:"translate("+e(n)+"%,0)"}:{"margin-left":e(n)+"%"},i.transition="all "+t+"ms "+r,i}function r(n,e){var t="string"==typeof n?n:o(n);return t.indexOf(" "+e+" ")>=0}function i(n,e){var t=o(n),i=t+e;r(t,e)||(n.className=i.substring(1))}function s(n,e){var t,i=o(n);r(n,e)&&(t=i.replace(" "+e+" "," "),n.className=t.substring(1,t.length-1))}function o(n){return(" "+(n.className||"")+" ").replace(/\s+/gi," ")}function a(n){n&&n.parentNode&&n.parentNode.removeChild(n)}var u={};u.version="0.2.0";var c=u.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'};u.configure=function(n){var e,t;for(e in n)t=n[e],void 0!==t&&n.hasOwnProperty(e)&&(c[e]=t);return this},u.status=null,u.set=function(e){var r=u.isStarted();e=n(e,c.minimum,1),u.status=1===e?null:e;var i=u.render(!r),s=i.querySelector(c.barSelector),o=c.speed,a=c.easing;return i.offsetWidth,l(function(n){""===c.positionUsing&&(c.positionUsing=u.getPositioningCSS()),f(s,t(e,o,a)),1===e?(f(i,{transition:"none",opacity:1}),i.offsetWidth,setTimeout(function(){f(i,{transition:"all "+o+"ms linear",opacity:0}),setTimeout(function(){u.remove(),n()},o)},o)):setTimeout(n,o)}),this},u.isStarted=function(){return"number"==typeof u.status},u.start=function(){u.status||u.set(0);var n=function(){setTimeout(function(){u.status&&(u.trickle(),n())},c.trickleSpeed)};return c.trickle&&n(),this},u.done=function(n){return n||u.status?u.inc(.3+.5*Math.random()).set(1):this},u.inc=function(e){var t=u.status;return t?("number"!=typeof e&&(e=(1-t)*n(Math.random()*t,.1,.95)),t=n(t+e,0,.994),u.set(t)):u.start()},u.trickle=function(){return u.inc(Math.random()*c.trickleRate)},function(){var n=0,e=0;u.promise=function(t){return t&&"resolved"!==t.state()?(0===e&&u.start(),n++,e++,t.always(function(){e--,0===e?(n=0,u.done()):u.set((n-e)/n)}),this):this}}(),u.render=function(n){if(u.isRendered())return document.getElementById("nprogress");i(document.documentElement,"nprogress-busy");var t=document.createElement("div");t.id="nprogress",t.innerHTML=c.template;var r,s=t.querySelector(c.barSelector),o=n?"-100":e(u.status||0),l=document.querySelector(c.parent);return f(s,{transition:"all 0 linear",transform:"translate3d("+o+"%,0,0)"}),c.showSpinner||(r=t.querySelector(c.spinnerSelector),r&&a(r)),l!=document.body&&i(l,"nprogress-custom-parent"),l.appendChild(t),t},u.remove=function(){s(document.documentElement,"nprogress-busy"),s(document.querySelector(c.parent),"nprogress-custom-parent");var n=document.getElementById("nprogress");n&&a(n)},u.isRendered=function(){return!!document.getElementById("nprogress")},u.getPositioningCSS=function(){var n=document.body.style,e="WebkitTransform"in n?"Webkit":"MozTransform"in n?"Moz":"msTransform"in n?"ms":"OTransform"in n?"O":"";return e+"Perspective"in n?"translate3d":e+"Transform"in n?"translate":"margin"};var l=function(){function n(){var t=e.shift();t&&t(n)}var e=[];return function(t){e.push(t),1==e.length&&n()}}(),f=function(){function n(n){return n.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,function(n,e){return e.toUpperCase()})}function e(n){var e=document.body.style;if(n in e)return n;for(var t,r=i.length,s=n.charAt(0).toUpperCase()+n.slice(1);r--;)if(t=i[r]+s,t in e)return t;return n}function t(t){return t=n(t),s[t]||(s[t]=e(t))}function r(n,e,r){e=t(e),n.style[e]=r}var i=["Webkit","O","Moz","ms"],s={};return function(n,e){var t,i,s=arguments;if(2==s.length)for(t in e)i=e[t],void 0!==i&&e.hasOwnProperty(t)&&r(n,t,i);else r(n,s[1],s[2])}}();return u});
\ No newline at end of file
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
diff -u -radca50220a7d8b2e43c166ff51dd7e2d22e720e8 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision adca50220a7d8b2e43c166ff51dd7e2d22e720e8)
+++ lams_central/web/includes/javascript/orgGroup.js	(.../orgGroup.js)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -107,7 +107,7 @@
 		// create user DIVs
 		$.each(users, function(index, userJSON) {
 			var userDiv = $('<div />').attr('userId', userJSON.id)
-				.addClass('draggableUser')
+				.addClass('draggableItem')
 	    		.text(userJSON.firstName + ' ' + userJSON.lastName 
 	    				  + ' (' + userJSON.login + ')'
 	    			   );
@@ -126,26 +126,26 @@
 						    'cursor'      : 'move',
 							'helper'      : function(event){
 								// include the user from which dragging started
-								$(this).addClass('draggableUserSelected');
+								$(this).addClass('draggableSelected');
 								
 								// copy selected users
 								var helperContainer = $('<div />');
-								$(this).siblings('.draggableUserSelected').andSelf().each(function(){
+								$(this).siblings('.draggableSelected').andSelf().each(function(){
 									$(this).clone().appendTo(helperContainer);
 								});
 								return helperContainer;
 							}
 					})
 				
 					.click(function(event){
-						var wasSelected = $(this).hasClass('draggableUserSelected');
+						var wasSelected = $(this).hasClass('draggableSelected');
 						var parentId = $(this).parent().parent().attr('id');
 						// this is needed for shift+click
 						var lastSelectedUser = lastSelectedUsers[parentId];
 						
 						if (event.shiftKey && lastSelectedUser && lastSelectedUser != this) {
 							// clear current selection
-							$(this).siblings().andSelf().removeClass('draggableUserSelected');
+							$(this).siblings().andSelf().removeClass('draggableSelected');
 							
 							// find range of users to select
 							var lastSelectedIndex = $(lastSelectedUser).index();
@@ -155,18 +155,18 @@
 							var endingElem = lastSelectedIndex > index ? lastSelectedUser : this;
 							
 							$(startingElem).nextUntil(endingElem).andSelf().add(endingElem)
-								.addClass('draggableUserSelected');
+								.addClass('draggableSelected');
 						} else {
 							if (!event.ctrlKey) {
 								// clear current sleection
-								$(this).siblings().andSelf().removeClass('draggableUserSelected');
+								$(this).siblings().andSelf().removeClass('draggableSelected');
 							}
 							
 							if (wasSelected && !event.shiftKey){
-								$(this).removeClass('draggableUserSelected');
+								$(this).removeClass('draggableSelected');
 								lastSelectedUsers[parentId] = null;
 							} else {
-								$(this).addClass('draggableUserSelected');
+								$(this).addClass('draggableSelected');
 								lastSelectedUsers[parentId] = this;
 							}
 						}
@@ -215,7 +215,7 @@
 					   executeDrop = !transferToLocked || confirm(LABELS.TRANSFER_LOCKED_LABEL);
 					   if (executeDrop) {
 						   var userIds = [];
-						   $('div.draggableUserSelected', draggableUserContainer).each(function(){
+						   $('div.draggableSelected', draggableUserContainer).each(function(){
 							   userIds.push($(this).attr('userId'));
 						   });
 						   // execute transfer on server side
@@ -247,14 +247,14 @@
  * Move user DIVs from one group to another
  */
 function transferUsers(fromContainer, toContainer) {
-	var selectedUsers =  $('.draggableUserSelected', fromContainer);
+	var selectedUsers =  $('.draggableSelected', fromContainer);
 	var locked = toContainer.parent().hasClass('locked');
 	if (selectedUsers.length > 0){   
 	   // move the selected users
 	   selectedUsers.each(function(){	  
 		  $(this).css({'top'  : '0px',
               		   'left' : '0px',
-          }).removeClass('draggableUserSelected')
+          }).removeClass('draggableSelected')
             .appendTo(toContainer);
 		  
 		  if (locked) {
@@ -271,9 +271,9 @@
 
 function colorDraggableUsers(container) {
 	// every second line is different
-	$(container).find('div.draggableUser').each(function(index, userDiv){
-		// exact colour should be defined in CSS, but it's easier this way...
-		$(this).css('background-color', index % 2 ? '#dfeffc' : 'inherit');
+	$(container).find('div.draggableItem').each(function(index, userDiv){
+		$(this).removeClass( index % 2 ? 'draggableEven' : 'draggableOdd');
+		$(this).addClass( index % 2 ? 'draggableOdd' : 'draggableEven');
 	});
 }
 
@@ -282,7 +282,7 @@
  */
 function sortUsers(container) {
 	var containerId = container.attr('id');
-	var users = $('div.draggableUser', container);
+	var users = $('div.draggableItem', container);
 	if (users.length > 1) {
 		var sortOrderAsc = sortOrderAscending[containerId];
 		
@@ -342,7 +342,7 @@
 		}
 		
 		if (executeDelete) {
-			$('#unassignedUserCell .userContainer').append($('.userContainer div.draggableUser', container));
+			$('#unassignedUserCell .userContainer').append($('.userContainer div.draggableItem', container));
 			container.remove();
 		}
 	}
@@ -414,7 +414,7 @@
 	var acceptEmptyGroups = true;
 	var groupContainers = $('#groupsTable .groupContainer').not('#newGroupPlaceholder');
 	$.each(groupContainers.not('[groupId]'), function(){
-		if ($('div.draggableUser', this).length == 0) {
+		if ($('div.draggableItem', this).length == 0) {
 			 acceptEmptyGroups = false;
 			 return false;
 		}
@@ -433,7 +433,7 @@
 	};
 	groupContainers.each(function(){
 		var groupId = $(this).attr('groupId'),
-			users = $('div.draggableUser', this);
+			users = $('div.draggableItem', this);
 		if (!groupId && users.length == 0) {
 			return true;
 		}
@@ -513,7 +513,7 @@
 	container.addClass('locked');
 	$('.removeGroupButton', container).remove();
 	// $('input', container).attr('readonly', 'readonly');
-	$('div.draggableUser', container).off('click').draggable('disable');
+	$('div.draggableItem', container).off('click').draggable('disable');
 }
 
 /**
Index: lams_central/web/login.jsp
===================================================================
diff -u -r20dd59c54655384af617c2081f717b992d00b0c2 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 20dd59c54655384af617c2081f717b992d00b0c2)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -71,7 +71,7 @@
 	          <a class="navbar-brand navbar-brand-login" href="#"><%=Configuration.get(ConfigurationKeys.SITE_NAME)%></a>
 	        </div>
 			<div class="navbar-collapse collapse navbar-right">
-				<img height="20" class="navbar-brand pull-right" src="/lams/images/svg/lams_logo_black.svg" title="Version: <%=Configuration.get(ConfigurationKeys.VERSION)%>" alt="LAMS - Learning Activity Management System"/>
+				<div class="pull-right login-logo" title="LAMS - Learning Activity Management System"></div>
 			</div>
 		</div>	
     </nav>
Index: lams_central/web/loginTwoFactorAuth.jsp
===================================================================
diff -u -r07d778706ab2139d8120f2555f86aeb5844e29e4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/loginTwoFactorAuth.jsp	(.../loginTwoFactorAuth.jsp)	(revision 07d778706ab2139d8120f2555f86aeb5844e29e4)
+++ lams_central/web/loginTwoFactorAuth.jsp	(.../loginTwoFactorAuth.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -59,8 +59,7 @@
 				<a class="navbar-brand navbar-brand-login" href="#"><%=Configuration.get(ConfigurationKeys.SITE_NAME)%></a>
 			</div>
 			<div class="navbar-collapse collapse navbar-right">
-				<img height="20" class="navbar-brand pull-right" src="/lams/images/svg/lams_logo_black.svg" 
-						title="Version: <%=Configuration.get(ConfigurationKeys.VERSION)%>" alt="LAMS - Learning Activity Management System"/>
+				<div class="pull-right login-logo" title="LAMS - Learning Activity Management System"></div>
 			</div>
 		</div>
 	</nav>
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u -r2633cd8430f8de8585122e04bbd187efb1d5537b -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 2633cd8430f8de8585122e04bbd187efb1d5537b)
+++ lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -17,14 +17,11 @@
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen">
 	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/yui/treeview.css">
 	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/yui/folders.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/authoring.css" type="text/css" media="screen">
+	<lams:css suffix="authoring"/>
 	<style>
 		a, a:hover {
 			border-bottom: none;
 		}
-		/*.ygtvfocus .ygtvlabel, .ygtvfocus .ygtvlabel:link, .ygtvfocus ygtvlabel:visited, .ygtvfocus .ygtvlabel:hover {
-			background-color: white;
-		}*/
 		#title-table {
 			padding-top: 10px;
 			padding-bottom: 20px;
Index: lams_central/web/main.jsp
===================================================================
diff -u -re35a58cce2b822a904a44968734f108da2e4d7d2 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/main.jsp	(.../main.jsp)	(revision e35a58cce2b822a904a44968734f108da2e4d7d2)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -15,10 +15,9 @@
 	<link rel="shortcut icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 	
 	<lams:css/>
-	<link rel="stylesheet" href="/lams/includes/font-awesome/css/font-awesome.css" type="text/css">
+	<lams:css suffix="main"/>
 	<link rel="stylesheet" href="/lams/css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" href="/lams/css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
-	<link rel="stylesheet" href="/lams/css/main.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="/lams/css/bootstrap-tour.min.css" type="text/css" media="screen">
 
 	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
Index: lams_central/web/notificationsprivate.jsp
===================================================================
diff -u -r757f4919e3cf9567eaad331bc4323fda7ea50eb2 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/notificationsprivate.jsp	(.../notificationsprivate.jsp)	(revision 757f4919e3cf9567eaad331bc4323fda7ea50eb2)
+++ lams_central/web/notificationsprivate.jsp	(.../notificationsprivate.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -7,7 +7,7 @@
 <c:set var="lams" ><lams:LAMSURL/></c:set>
 
 <lams:css/>
-<link rel="stylesheet" href="${lams}css/main.css" type="text/css" />
+<lams:css suffix="main"/>
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}/includes/javascript/bootstrap.min.js"></script>
Index: lams_central/web/twoFactorAuthSecret.jsp
===================================================================
diff -u -r150ee5723eaf0cca2ff5add0974b52ed0f95045b -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_central/web/twoFactorAuthSecret.jsp	(.../twoFactorAuthSecret.jsp)	(revision 150ee5723eaf0cca2ff5add0974b52ed0f95045b)
+++ lams_central/web/twoFactorAuthSecret.jsp	(.../twoFactorAuthSecret.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -27,8 +27,7 @@
 				</a>
 			</div>
 			<div class="navbar-collapse collapse navbar-right">
-				<img height="20" class="navbar-brand pull-right" src="/lams/images/svg/lams_logo_black.svg" 
-						title="Version: <%=Configuration.get(ConfigurationKeys.VERSION)%>" alt="LAMS - Learning Activity Management System"/>
+				<div class="pull-right login-logo" title="LAMS - Learning Activity Management System"></div>
 			</div>
 		</div>
 	</nav>
Index: lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	(.../CSSThemeUtil.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	(.../CSSThemeUtil.java)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -39,19 +39,14 @@
 
     /**
      * Will return a list of stylesheets for the current user. If the user does not have a specific stylesheet, then the
-     * default stylesheet will be included in this list. The default stylesheet will always be included in this list.
+     * default stylesheet will be included in this list. The different skins replace the default stylesheet, they do 
+     * not build on top of the stylesheet. This is a change from earlier version of LAMS.
      *
      * @return
      */
     public static List<String> getAllUserThemes() {
 	List<String> themeList = new ArrayList<String>();
 
-	// Always have default as that defines everything. Other themes
-	// define changes.
-
-	themeList.add(CSSThemeUtil.DEFAULT_HTML_THEME);
-
-	boolean userThemeFound = false;
 	HttpSession ss = SessionManager.getSession();
 	if (ss != null) {
 	    UserDTO user = null;
@@ -64,9 +59,8 @@
 		ThemeDTO theme = user.getTheme();
 
 		if (theme != null) {
-		    userThemeFound = true;
 		    String themeName = theme.getName();
-		    if ((themeName != null) && !CSSThemeUtil.isLAMSDefaultTheme(themeName)) {
+		    if (themeName != null) {
 			themeList.add(theme.getName());
 		    }
 		}
@@ -75,13 +69,18 @@
 
 	// if we haven't got a user theme, we are probably on the login page
 	// so we'd better include the default server theme (if it isn't the LAMS default theme
-	if (!userThemeFound) {
+	if (themeList.size() == 0) {
 	    String serverDefaultTheme = Configuration.get(ConfigurationKeys.DEFAULT_THEME);
-	    if ((serverDefaultTheme != null) && !serverDefaultTheme.equals(CSSThemeUtil.DEFAULT_HTML_THEME)) {
+	    if (serverDefaultTheme != null) {
 		themeList.add(serverDefaultTheme);
 	    }
 	}
 
+	// Still no theme? Default to default. 
+	if (themeList.size() == 0) {
+	    themeList.add(CSSThemeUtil.DEFAULT_HTML_THEME);
+	}
+	
 	return themeList;
     }
 
Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -12,7 +12,7 @@
 	
 	<lams:css/>
 	<link type="text/css" href="<lams:LAMSURL />gradebook/includes/css/gradebook.css" rel="stylesheet" />
-	<link type="text/css" href="<lams:LAMSURL/>css/chart.css" rel="stylesheet" />
+	<lams:css suffix="chart"/>
 	
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
 	
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_learning/web/css/nprogress.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/css/presence.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_learning/web/css/presence.scss	(.../presence.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_learning/web/css/presence.scss	(.../presence.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -61,10 +61,6 @@
 	cursor: pointer;
 }
 
-.presenceListing:hover {
-	background-color: $brand-primary-light;
-}
-
 .presenceListingNewMessage {
 	background-color: $brand-success-light;
 }
Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -re27d5ecdab649eab65bec7460d22928bb972a722 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision e27d5ecdab649eab65bec7460d22928bb972a722)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -103,7 +103,7 @@
 			function codeAddress() {
 				var youUser = document.getElementsByName('u-${userId}');
 				if (youUser) {
-					youUser[0].className += ' alert-success you';
+					youUser[0].className += ' alert-info you';
 					document.getElementsByName('ui-${userId}')[0].className = 'fa fa-sm fa-star';
 				}
 			}
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_learning/web/includes/javascript/nprogress.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/includes/javascript/presence.js
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_learning/web/includes/javascript/presence.js	(.../presence.js)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_learning/web/includes/javascript/presence.js	(.../presence.js)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -73,7 +73,7 @@
 					// create listing div
 					var listingDiv = $('<div id="' + listingName
 							            + '" onClick="javascript:roster.handleUserClicked(' 
-							            + localId + ');" class="presenceListing">'
+							            + localId + ');" class="presenceListing bg-primary-hover">'
 							            + createPresenceListing(nick, tag)
 							            + '</div>');
 					
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -29,12 +29,11 @@
 <c:set var="learnerAppUrl">
 	<lams:WebAppURL />
 </c:set>
-<link href="${learnerAppUrl}css/nprogress.css" rel="stylesheet" type="text/css" />
+<lams:css/>
+<%-- nprogress.css contents in learner.css --%>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${learnerAppUrl}includes/javascript/nprogress.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/nprogress.js"></script>
 
-
-
 <c:if test="${!empty activityForm.activityURLs}">
 
 	<script type="text/javascript">
@@ -44,6 +43,7 @@
 				speed : 30
 			});
 			NProgress.configure({
+				showSpinner: false, 
 				trickleRate : 0.2,
 				trickleSpeed : 110
 			});
Index: lams_learning/web/presenceChat.jsp
===================================================================
diff -u -rfb1e4ed83170cf87f100a0c5b02f86e1b6480b2d -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_learning/web/presenceChat.jsp	(.../presenceChat.jsp)	(revision fb1e4ed83170cf87f100a0c5b02f86e1b6480b2d)
+++ lams_learning/web/presenceChat.jsp	(.../presenceChat.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -10,7 +10,6 @@
 	
 	<%-- css --%>
 	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css">
-	<link type="text/css" rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap.min.css" />
 	<link type="text/css" rel="stylesheet" href="<lams:WebAppURL />css/presence.css" />
 
 	<%-- javascript --%>
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_monitoring/web/css/_monitorLesson_base.scss
===================================================================
diff -u
--- lams_monitoring/web/css/_monitorLesson_base.scss	(revision 0)
+++ lams_monitoring/web/css/_monitorLesson_base.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,402 @@
+@mixin checkboxInTable {
+	margin: 0 5px 0px 0px;
+	border: none;
+}
+
+/********** GENERAL/DIALOG STYLES **********/
+#loadingOverlay {
+	width: 100%;
+	height: 100%;
+	z-index: 2000;
+	position: absolute;
+	background-color: $body-bg;
+	text-align: center;
+}
+
+#loadingOverlay img {
+	margin-top: 30%;
+}
+
+dd {
+	margin-bottom: 10px;
+}
+
+#content {
+	width: 100%;
+	padding: 0;
+}
+
+#content > .panel {
+	border: none;
+	border-shadow: none;
+	box-shadow: none;
+}
+
+#content .panel-monitor-page, #content .panel-monitor-body  {
+	margin-bottom: 0;
+	padding-bottom: 0;
+}
+
+input[type="checkbox"] {
+	@include checkboxInTable;
+}
+
+.modal-header button .fa {
+    font-size: 16px;
+    margin-left: 10px;
+}
+
+.ui-front {
+	z-index: 1100;
+}
+
+.dialogContainer {
+	display: none;
+	-webkit-overflow-scrolling: touch !important;
+	overflow: auto;
+}
+
+.dialogContainer iframe {
+	width: 100%;
+	height: 100%;
+	border: none;
+}
+
+.dialogContainer .dialogList {
+	overflow: auto;
+	padding: 5px;
+	padding-bottom: 2px;
+}
+
+.dialogContainer .modal-body {
+	height : 100%;
+	max-height: calc(100% - 56px);
+	padding: 10px;
+	overflow: auto;
+}
+
+div.dialogListItem {
+	padding: 3px 0px 3px 0px;
+	cursor: pointer;
+}
+
+div.dialogListItemSelected {
+	background-color: $brand-primary-mid !important;
+	color: white !important;
+}
+
+div.dialogListItemDisabled {
+	color: grey !important;
+}
+
+.dialogTitle {
+	padding: 0px 0px 5px 0px;
+	height: 15px;
+	font-size: small;
+	font-weight: bold;
+	text-align: center;
+}
+
+div.dialogContainer td {
+	padding: 0;
+}
+
+div.dialogContainer td.navCell {
+	padding: 5px 0;
+	cursor: pointer;
+}
+
+div.dialogContainer td.navCell:hover {
+	background-color: $brand-primary-light;
+}
+
+div.dialogContainer td.navCell span {
+	margin: auto;
+}
+
+div.dialogContainer td.pageCell {
+	text-align: center;
+	width: 100px;
+}
+
+span#learnerGroupMultiSelectLabel {
+	font-size: 10px;
+}
+
+#learnerGroupDialogContents .btn-group {
+	margin-top: 10px;
+}
+
+#forceBackwardsDialog .modal-body {
+	padding: 10px;
+}
+#forceBackwardsDialog .ui-resizable-s {
+	bottom: 0px;	
+}
+
+/********** LESSON TAB STYLES **********/
+div#tabLesson {
+/*	height: 540px;*/
+	overflow: auto;
+}
+
+table#tabLessonTable {
+	table-layout: fixed;
+}
+
+table#tabLessonTable td {
+	padding: 7px;
+}
+
+td.fieldLabel {
+	font-weight: bold;
+	width: 150px;
+}
+
+td.sectionHeader {
+	font-weight: bold;
+	background-color: $brand-primary-light;
+}
+
+.topButtonsContainer {
+	height: 30px;
+	padding: 0px !important;
+}
+
+.topButtonsContainer a {
+	float: right;
+	margin: 5px 5px 5px 0;
+}
+
+.topButtonsContainer button {
+	float: right;
+	margin: 5px 5px 5px 0;
+}
+
+.lessonManageField {
+	margin-right: 5px;
+}
+
+#lessonStateField {
+	width: 114px;
+}
+
+#learnerURLField {
+	width: 450px;
+}
+
+#copyLearnerURL {
+	display: none;
+}
+
+#lessonStartDateCell *, #presenceAvailableCount {
+	display: none;
+}
+
+table#tabLessonTable #contributeHeader {
+	display: none;
+}
+
+table#tabLessonTable td.contributeActivityCell {
+	padding: 0 0 0 5px;
+	font-weight: bold;
+}
+
+table#tabLessonTable td.contributeEntryCell {
+	padding: 0 5px 0 15px;
+}
+
+td.contributeEntryCell a {
+	float: right;
+}
+
+#classDialogTable > tbody > tr > td {
+	vertical-align: top;
+}
+
+#classDialogTable #classMonitorSearchRow {
+	height: 23px;
+}
+
+#classDialogTable input[type="checkbox"] {
+	@include checkboxInTable;
+}
+
+#classLearnerTable #addAllLearnersButton {
+	margin-right: 10px;
+}
+
+#leftLearnerTable {
+	float: left;
+	min-width: 250px;
+	height: 100%;
+}
+
+#rightMonitorTable {
+	height: 100%;
+	min-width: 250px;
+}
+
+.dialogSearchPhrase {
+	width: 90%;
+}
+
+.dialogSearchPhraseIcon {
+	margin-top: 2px;
+}
+
+.dialogSearchPhraseClear {
+	visibility: hidden;
+	margin-top: 3px;
+	cursor: pointer;
+}
+
+#emailDialog {
+	width: 100%;
+}
+
+#chartDiv {
+	width: 150px;
+	height: 150px;
+	padding: 0;
+}
+
+#emailProgressTable input[type="checkbox"] {
+	@include checkboxInTable;
+}
+
+/********** SEQUENCE TAB STYLES **********/
+div#sequenceCanvas {
+	text-align: center;
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+}
+
+div#sequenceCanvas svg {
+	display: block;
+	overflow: hidden;
+}
+
+img#sequenceCanvasLoading {
+	padding: 5px 0 0 100px;
+	display: none;
+}
+
+.topButtonsContainer #sequenceSearchPhrase {
+	float: right;
+	margin: 6px 5px 5px 0;
+}
+
+.topButtonsContainer #sequenceSearchPhraseIcon {
+	float: right;
+	margin: 9px 7px 5px 0;
+}
+
+.topButtonsContainer #sequenceSearchPhraseClear {
+	float: right;
+	cursor: pointer;
+	margin: 9px 25px 5px 0;
+	visibility: hidden;
+}
+
+img#sequenceSearchedLearnerHighlighter {
+	position: absolute;
+	display: none;
+}
+
+div#completedLearnersContainer {
+	padding: 4px 0px 3px 5px;
+	border-top: $border-thin-dotted;
+}
+
+div#completedLearnersContainer span {
+	font-family: Verdana;
+	font-size: 10px;
+	cursor: default;
+	vertical-align: top;
+	margin-right: 5px;
+}
+
+#sequenceInfoDialog {
+	cursor: pointer;
+}
+
+/********** LEARNERS TAB STYLES **********/
+#tabLearnerControlTable td {
+	padding: 0px;
+	text-align: center;
+}
+
+td.learnersHeaderCell {
+	font-size: 10px;
+	border-right: $border-thin-solid;
+}
+
+#learnersSearchPhraseIcon {
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 4px;
+}
+
+#learnersSearchPhrase {
+	width: 80%;
+}
+
+#learnersSearchPhraseClear {
+	cursor: pointer;
+	float: right;
+	margin: 3px 2px 0 0;
+	display: none; 
+}
+
+td.learnersHeaderPageCell, td.learnersPageShifter {
+	min-width: 25px;
+	cursor: pointer;
+}
+
+td.learnersPageShifter span {
+	margin: auto;
+}
+
+td.learnersHeaderPageCell:hover,td.learnersPageShifter:hover {
+	background-color: $brand-primary-light;
+}
+
+td.selectedLearnersHeaderPageCell {
+	background-color: $brand-primary-mid;
+}
+
+div#tabLearnersContainer {
+	overflow: auto;
+}
+
+td.progressBarLabel {
+	padding: 0;
+	background-color: $brand-primary-light;
+}
+
+td.progressBarLabel div {
+	float: left;
+	padding: 10px 0 4px 20px;
+	font-weight: bold;
+}
+
+td.progressBarLabel a {
+	float: right;
+	margin: 6px 5px 4px 0;
+}
+
+
+/********** BOOTSTRAP ADDITIONS **********/
+
+.contributeActivityCell {
+	font-weight: 600;
+	margin-top: 10px;
+}
+
+.contributeEntryCell {
+	height: 25px;
+	margin-left: 25px;
+	
+}
Index: lams_monitoring/web/css/defaultHTML_monitorLesson.scss
===================================================================
diff -u
--- lams_monitoring/web/css/defaultHTML_monitorLesson.scss	(revision 0)
+++ lams_monitoring/web/css/defaultHTML_monitorLesson.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,2 @@
+@import "_lams_variables.scss";
+@import "_monitorLesson_base.scss";
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_monitoring/web/css/monitorLesson.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 8a6afcdd450adc0cd87ea7dbc69cac9fb14a3fb9)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -17,9 +17,9 @@
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery.jqGrid.css" type="text/css" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap-tour.min.css"> 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/chart.css" type="text/css" />
-	<link rel="stylesheet" href="<lams:WebAppURL/>css/monitorLesson.css" type="text/css" media="screen" />
+	<lams:css suffix="progressBar"/>
+	<lams:css suffix="chart"/>
+	<lams:css webapp="monitoring" suffix="monitorLesson"/>
   
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" >
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7cacaf3ab86dd7b0e794e7b4c710fb73ecb61344 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7cacaf3ab86dd7b0e794e7b4c710fb73ecb61344)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -11,7 +11,8 @@
 		<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css" >
 		<link href="${lams}css/thickbox.css" rel="stylesheet" rel="stylesheet" type="text/css">
 		<link href="${lams}css/jquery.jqGrid.css" rel="stylesheet" type="text/css"/>
-		<link href="${lams}css/chart.css" rel="stylesheet" type="text/css"/>
+		<lams:css suffix="main"/>
+		
 		<style type="text/css">
 			.ui-jqgrid tr.jqgrow td {
 			    white-space: normal !important;
Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Fisheye: Tag 4583983b64efe1d91fbb47cdde6a759a6a30e859 refers to a dead (removed) revision in file `lams_tool_forum/web/css/jquery.treetable.forum.scss'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/css/treetable.forum.scss
===================================================================
diff -u
--- lams_tool_forum/web/css/treetable.forum.scss	(revision 0)
+++ lams_tool_forum/web/css/treetable.forum.scss	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -0,0 +1,17 @@
+table.treetable span.indenter {
+	text-align: left;
+	width: 250px;
+}
+
+table.treetable tr span.indenter a {
+  outline: none; /* Expander shows outline after upgrading to 3.0 (#141) */
+  border-bottom: none; /* Hide the dotted line underneath */
+  width: 250px;
+  font-size: x-small;
+}
+
+#clearfix:after { 
+    content: " "; 
+    display: block;
+    clear: both;
+} 
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -r928adfaf58620e05a4bed319eac3c23bc651269a -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 928adfaf58620e05a4bed319eac3c23bc651269a)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -21,9 +21,9 @@
 	<!-- ********************  CSS ********************** -->
 
 	<lams:css />
-	<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet" />
-	<link type="text/css" href="${lams}css/jquery.treetable.css" rel="stylesheet" />
-	<link type="text/css" href="${tool}css/jquery.treetable.forum.css" rel="stylesheet" />
+	<lams:css suffix="jquery.jRating"/>
+	<lams:css suffix="treetable"/>
+	<link type="text/css" href="${tool}css/treetable.forum.css" rel="stylesheet" />
 
 	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_images/web/includes/css/imageGallery.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_images/web/includes/css/imageGallery.scss	(.../imageGallery.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_images/web/includes/css/imageGallery.scss	(.../imageGallery.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -24,23 +24,6 @@
 .button.add-comment {
 	margin-right: 12px;
 }
-.fotorama__thumb {
-    background-color: $gray-base;
-}
-.fotorama__wrap {
-	margin: auto;
-}
-.fotorama__caption {
-	text-align: left;
-}
-.fotorama__thumb-border {
-	border-color: $link-color;
-}
-
-.fotorama-container {
-	text-align: center;
-	padding-top: 10px;
-}
 #image-info:after {
    content: " ";
    display: block; 
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/fotorama.css'/>"/>
 	<link href="<html:rewrite page='/includes/css/imageGallery.css'/>" rel="stylesheet" type="text/css">
 	
-    <link rel="stylesheet" type="text/css" href="${lams}css/jquery.jRating.css">
+    <lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css">
     
Index: lams_tool_images/web/pages/monitoring/imagesummary.jsp
===================================================================
diff -u -rf8b98e45847fcee40188af4c9db5d13e1bd61e25 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision f8b98e45847fcee40188af4c9db5d13e1bd61e25)
+++ lams_tool_images/web/pages/monitoring/imagesummary.jsp	(.../imagesummary.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -12,7 +12,7 @@
 		<c:set var="imageGallery" value="${sessionMap.imageGallery}" />		
 		
 		<%@ include file="/common/header.jsp"%>
-		<link href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+		<lams:css suffix="jquery.jRating"/>
 		
 		<script type="text/javascript">
 			//var for jquery.jRating.js
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r2228652cfb59ec7c0fcbb1914a94f65d22815911 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 2228652cfb59ec7c0fcbb1914a94f65d22815911)
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -22,7 +22,7 @@
 		<%@ include file="/common/tabbedheader.jsp" %>
 		
 		<link href="${lams}css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
-		<link href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+		<lams:css suffix="jquery.jRating"/>
 		<link href="${lams}css/jquery.tablesorter.theme.bootstrap.css" rel="stylesheet" >
 		<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 		<style media="screen,projection" type="text/css">
Index: lams_tool_images/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_images/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -126,7 +126,7 @@
 							</td>
 							
 							<c:if test="${sessionMap.isCommentsEnabled}">
-								<td style="vertical-align:middle; padding-left:0px; text-align:center;">
+								<td style="min-width: 250px;vertical-align:middle; padding-left:0px;">
 									<c:forEach var="commentDto" items="${summary.itemRatingDto.commentDtos}">
 										<div class="rating-comment">
 											${commentDto.comment}
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_laqa/web/includes/css/qalearning.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_laqa/web/includes/css/qalearning.scss	(.../qalearning.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_laqa/web/includes/css/qalearning.scss	(.../qalearning.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -8,16 +8,6 @@
 .extra-controls-inner:after {
    margin-top: -10px;
 }
-.rating-comment{
-	background-image: none;
-	background-color: $gray-lighter;
-	border: $border-thin-default-light;
-}
-.rating-comment-posted-by{
-	color: $brand-primary;
-	text-align: left;
-	font-size: x-small;
-}
 textarea {
     margin: 10px 0px;
     width: 88%;
@@ -27,6 +17,5 @@
 }
  
 .hiddenEntryInMonitoring {
-	color: $brand-danger !important;
 	font-style: italic;
 }
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -16,7 +16,7 @@
 <lams:html>
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
-	<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet" />
+	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -15,7 +15,7 @@
 <lams:html>
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
-	<link rel="stylesheet" href="${lams}css/jquery.jRating.css" />
+	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -20,7 +20,7 @@
 	<lams:css />
 	<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css"> 
 	<link type="text/css" rel="stylesheet" href="<html:rewrite page='/includes/css/qalearning.css'/>">
@@ -303,6 +303,7 @@
 	            			return false;
 	            		}
 	            		$("#td-response-" + responseUid).addClass( "hiddenEntryInMonitoring" );
+	            		$("#td-response-" + responseUid).addClass( "text-danger" );
 	            		
 	            	} else {
 	            		linkObject.innerHTML = '<img src="<c:out value="${tool}"/>images/display-eye.png" border="0">' ;
@@ -312,6 +313,7 @@
 	            			return false;
 	            		}
 	            		$("#td-response-" + responseUid).removeClass( "hiddenEntryInMonitoring" );
+	            		$("#td-response-" + responseUid).removeClass( "text-danger" );
 	            	}
 	            }
 	       	});
Index: lams_tool_laqa/web/monitoring/Reflections.jsp
===================================================================
diff -u -r6f53dcc0016b4e9c777dcf89595faf121a5da8c9 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 6f53dcc0016b4e9c777dcf89595faf121a5da8c9)
+++ lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -15,7 +15,7 @@
 		<lams:css />
 		<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+		<lams:css suffix="jquery.jRating"/>
 		<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 		<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css">
 		 
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rf02ad979de7acb111774f80ac4096ab8f2eadb38 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f02ad979de7acb111774f80ac4096ab8f2eadb38)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -9,7 +9,7 @@
 	<title><fmt:message key="label.learning.title" />
 	</title>
 	<%@ include file="/common/header.jsp"%>
-	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.jRating.css">
+	<lams:css suffix="jquery.jRating"/>
 
 	<%-- param has higher level for request attribute --%>
 	<c:if test="${not empty param.sessionMapID}">
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r7ad8db11217762eb504c91f7b09a4deba9a22b88 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 7ad8db11217762eb504c91f7b09a4deba9a22b88)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -3,7 +3,7 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+<lams:css suffix="jquery.jRating"/>
 <link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet"/>
 <link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 <style media="screen,projection" type="text/css">
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,16 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-      
-      <attribute>
-         <description>Output stylesheet based on the user preferences.</description>
-         <name>style</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_preview/web/includes/css/learning.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/includes/css/learning.scss	(.../learning.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_preview/web/includes/css/learning.scss	(.../learning.scss)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -14,11 +14,6 @@
 .extra-controls-inner:after {
    margin-top: -10px;
 }
-.rating-comment{
-	background-image: none;
-	background-color: $gray-lighter;
-	border: $border-thin-default-light;
-}
 .criteria-title{
 	margin-top: 10px;
 	font-weight: bold;	
@@ -75,16 +70,9 @@
     padding: 5px;
 }
 
-.drop-target {
-  	background-color: $brand-primary;
-}
 .draggable {
 	width: 290px;
 }
-.draggable.can-drop {
-  	background-color: $brand-primary;
-}
-
 .email-button {
 	margin: 2px;
 }
Index: lams_tool_preview/web/includes/javascript/ranking.js
===================================================================
diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/includes/javascript/ranking.js	(.../ranking.js)	(revision d2f1cafab9126e3848663764c082b76ccf2de0c5)
+++ lams_tool_preview/web/includes/javascript/ranking.js	(.../ranking.js)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -36,7 +36,17 @@
 			target.setAttribute('data-x', 0);
 			target.setAttribute('data-y', 0);
 		}
-		    
+		
+		function addClassWithHighlight(item, styleClass) {
+			item.classList.add(styleClass);
+			item.classList.add('draggableSelected');
+		}
+		
+		function removeClassWithHighlight(item, styleClass) {
+			item.classList.remove(styleClass);
+			item.classList.remove('draggableSelected');
+		}
+		
 		// enable draggables to be dropped into this
 		  interact('.dropzone').dropzone({
 		    // only accept elements matching this CSS selector
@@ -54,13 +64,13 @@
 		          dropzoneElement = event.target;
 
 		      // feedback the possibility of a drop
-		      dropzoneElement.classList.add('drop-target');
-		      draggableElement.classList.add('can-drop');
+		      addClassWithHighlight(dropzoneElement, 'drop-target');
+		      addClassWithHighlight(draggableElement, 'can-drop');
 		    },
 		    ondragleave: function (event) {
 		      // remove the drop feedback style
-		      event.target.classList.remove('drop-target');
-		      event.relatedTarget.classList.remove('can-drop');
+		      removeClassWithHighlight(event.target, 'drop-target');
+		      removeClassWithHighlight(event.relatedTarget, 'can-drop');
 		    },
 		    ondrop: function (event) {
 		    	doDrop(event);
@@ -70,6 +80,6 @@
 		      resetXY(event.relatedTarget);
 		      // remove active dropzone feedback
 		      event.target.classList.remove('drop-active');
-		      event.target.classList.remove('drop-target');
+		      removeClassWithHighlight(event.target, 'drop-target');
 		    }
 		  });
Index: lams_tool_preview/web/pages/learning/comment.jsp
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -1,4 +1,4 @@
-	<link rel="stylesheet" href="${lams}css/jquery.jRating.css">
+	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<link rel="stylesheet" href="<lams:WebAppURL/>/includes/css/learning.css'/>">
Index: lams_tool_preview/web/pages/learning/hedging.jsp
===================================================================
diff -u -rb949dad84953ebb7e06117c001d10ea568f5186e -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision b949dad84953ebb7e06117c001d10ea568f5186e)
+++ lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -132,7 +132,7 @@
 				<span>${criteriaRatings.justificationComment}</span>
 			</c:when>
 			<c:otherwise>
-				<textarea id="justify" name="justify" rows="4" cols="60" class="mark-hedging-select" onblur="updateMark()">${criteriaRatings.justificationComment}</textarea>
+				<textarea id="justify" name="justify" rows="4" cols="60" class="mark-hedging-select form-control" onblur="updateMark()">${criteriaRatings.justificationComment}</textarea>
 			</c:otherwise>
 			</c:choose>
 			</div>
Index: lams_tool_preview/web/pages/learning/rankall.jsp
===================================================================
diff -u -rc260f6f3f855894e54d3725095e56d39a139d893 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/pages/learning/rankall.jsp	(.../rankall.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
+++ lams_tool_preview/web/pages/learning/rankall.jsp	(.../rankall.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -79,8 +79,8 @@
 		    	var parent = theTarget.parentNode;
 		    	parent.insertBefore(newChild, theTarget);
 		    }
-		    newChild.classList.remove('can-drop');
-		    newChild.classList.add('${rowdrop}');
+	    	removeClassWithHighlight(newChild, 'can-drop');
+	    	addClassWithHighlight(newChild, '${rowdrop}');
 		    resetXY(newChild);
 		    updateAddLabel();
 		    
Index: lams_tool_preview/web/pages/learning/ranking.jsp
===================================================================
diff -u -rc260f6f3f855894e54d3725095e56d39a139d893 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/pages/learning/ranking.jsp	(.../ranking.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
+++ lams_tool_preview/web/pages/learning/ranking.jsp	(.../ranking.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -49,7 +49,7 @@
 			    } 
 			    theTarget.appendChild(newChild);
 	    	}
-		    newChild.classList.remove('can-drop');
+	    	removeClassWithHighlight(newChild, 'can-drop');
 		    resetXY(newChild);
 		    
 			testButtons();
Index: lams_tool_preview/web/pages/learning/results.jsp
===================================================================
diff -u -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
+++ lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -17,7 +17,7 @@
 	</title>
 	<%@ include file="/common/header.jsp"%>
 
-	<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<link rel="stylesheet" href="<html:rewrite page='/includes/css/learning.css'/>">
Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -1,4 +1,4 @@
-	<link rel="stylesheet" href="${lams}css/jquery.jRating.css">
+	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<style media="screen,projection" type="text/css">
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
diff -u -r0a6765ac7eb73c6b99c343a021877c48236241b8 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 0a6765ac7eb73c6b99c343a021877c48236241b8)
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -11,10 +11,9 @@
 	</title>
 	<%@ include file="/common/header.jsp"%>
 
-	<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+	<lams:css suffix="jquery.jRating"/>
 	<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
-	<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
 	<link rel="stylesheet" href="<html:rewrite page='/includes/css/learning.css'/>">
 
 <script type="text/javascript">
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ra0430f6a63b52c4ea0cdfc1c9d5c4aba0b4d5e68 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a0430f6a63b52c4ea0cdfc1c9d5c4aba0b4d5e68)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -7,7 +7,7 @@
 
 <link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
-<link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
+<lams:css suffix="jquery.jRating"/>
 <link rel="stylesheet" href="${webapp}includes/css/learning.css'/>">
 <style type="text/css">
 	#common-buttons-area {
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r911eb9cfa3db76d9b0f495f76833dc82545bee9d -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 911eb9cfa3db76d9b0f495f76833dc82545bee9d)
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -14,7 +14,7 @@
 	<link type="text/css" href="${lams}css/thickbox.css" rel="stylesheet"  media="screen">
 	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 	<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css" >
-	<link href="${lams}css/chart.css" rel="stylesheet" type="text/css"/>
+	<lams:css suffix="main"/>
 		
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7cb18d1521c69062337439737a624a60a27013d4 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7cb18d1521c69062337439737a624a60a27013d4)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -46,7 +46,7 @@
 	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<lams:css suffix="progressBar"/>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
@@ -277,7 +277,7 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
-							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<i class="pull-right fa fa-bars"></i>
 							<p class="lessonName"></p></a></li>
 						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
 						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r4583983b64efe1d91fbb47cdde6a759a6a30e859
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fab2e212d7c46f61829635d0834821eb5484837)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
@@ -178,7 +178,18 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>