Index: lams_central/conf/scss/_bootstrap-variables.scss =================================================================== diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r9946788a0f2d89cd298e289eddbf59d3b38ba197 --- lams_central/conf/scss/_bootstrap-variables.scss (.../_bootstrap-variables.scss) (revision 4583983b64efe1d91fbb47cdde6a759a6a30e859) +++ lams_central/conf/scss/_bootstrap-variables.scss (.../_bootstrap-variables.scss) (revision 9946788a0f2d89cd298e289eddbf59d3b38ba197) @@ -681,7 +681,7 @@ // //## -// $panel-bg: #fff +$panel-bg: #fff; // $panel-body-padding: 15px // $panel-heading-padding: 10px 15px // $panel-footer-padding: $panel-heading-padding Index: lams_central/conf/scss/_lams_variables.scss =================================================================== diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r9946788a0f2d89cd298e289eddbf59d3b38ba197 --- lams_central/conf/scss/_lams_variables.scss (.../_lams_variables.scss) (revision c90250258ad030c59157aa61c61e47583e26df5e) +++ lams_central/conf/scss/_lams_variables.scss (.../_lams_variables.scss) (revision 9946788a0f2d89cd298e289eddbf59d3b38ba197) @@ -59,6 +59,11 @@ $main_blue_light_highlight: #A6E5FD; $main_fav_org_link: #A7B1C2; $main_offcanvas_link: #2B5B95; +$main_offcanvas_link_color: $body-bg; +$main_offcanvas_background: $brand-primary-darker; +$main_offcanvas_color: $gray-lighter; +$main_offcanvas_logo_background: $brand-primary-darkest; +$main_offcanvas_search_background: $brand-primary-darkest; $main_dropdown_border: #D9DEE4; $main_navbar_link: #515356; $main_singlelesson_hover_border: #9be0f9; @@ -74,10 +79,15 @@ // Text & typography // $headings-default-color: $brand-primary-darker; +$stripes_background: url('/lams/images/css/light-fabric.jpg'); $url_css_directory: "/lams/images/css/"; $login_logo: "/lams/images/svg/lams_logo_black.svg"; $login_logo_size: auto 20px; +$login-logo_div_width: 100px; +$offcanvas_logo: "/lams/images/svg/lams_logo_white.svg"; +$offcanvas_height: 31px; + // generic portrait colors $portrait-color-0:#001f3f; $portrait-color-1:#FF851B; Index: lams_central/conf/scss/_lams_variables_purple.scss =================================================================== diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r9946788a0f2d89cd298e289eddbf59d3b38ba197 --- lams_central/conf/scss/_lams_variables_purple.scss (.../_lams_variables_purple.scss) (revision c90250258ad030c59157aa61c61e47583e26df5e) +++ lams_central/conf/scss/_lams_variables_purple.scss (.../_lams_variables_purple.scss) (revision 9946788a0f2d89cd298e289eddbf59d3b38ba197) @@ -63,11 +63,17 @@ $main_blue_light_highlight: #b57bb1; $main_fav_org_link: #fefefe; // #A7B1C2; $main_offcanvas_link: #85237D; +$main_offcanvas_link_color: $body-bg; +$main_offcanvas_background: $brand-primary-darker; +$main_offcanvas_color: $gray-lighter; +$main_offcanvas_logo_background: $brand-primary-darkest; +$main_offcanvas_search_background: $brand-primary-darkest; $main_dropdown_border: #D9DEE4; $main_navbar_link: #515356; $main_singlelesson_hover_border: #dabdd8; $main_singlelesson_hover_background: #e6d3e5; + // navbar login bar $navbar-brand-login-color: #f6f6f6; $navbar-login-background: #56004e; @@ -78,10 +84,14 @@ // Text & typography $headings-default-color: $brand-primary-darker; +$stripes_background: url('/lams/images/css/light-fabric.jpg'); $url_css_directory: "/lams/images/css/"; $login_logo: "/lams/images/svg/lams_logo_white.svg"; $login_logo_size: auto 20px; +$login-logo_div_width: 100px; +$offcanvas_logo: "/lams/images/svg/lams_logo_white.svg"; +$offcanvas_height: 31px; // Forms - Overridden bootstrap settings $input-border-focus: lighten($brand-primary-bright, 20%); Index: lams_central/conf/scss/_mixins.scss =================================================================== diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r9946788a0f2d89cd298e289eddbf59d3b38ba197 --- lams_central/conf/scss/_mixins.scss (.../_mixins.scss) (revision c90250258ad030c59157aa61c61e47583e26df5e) +++ lams_central/conf/scss/_mixins.scss (.../_mixins.scss) (revision 9946788a0f2d89cd298e289eddbf59d3b38ba197) @@ -108,6 +108,19 @@ } } +// Typography + +// [converter] $parent hack +@mixin text-emphasis-variant($parent, $color) { + #{$parent} { + color: $color; + } + a#{$parent}:hover, + a#{$parent}:focus { + color: darken($color, 10%); + } +} + // Generic avatars used in place of profile pictures @mixin portrait($size) { width: $size; @@ -116,12 +129,14 @@ } // Generic avatars used in place of profile pictures -@mixin portrait-generic($fontsize) { +@mixin portrait-generic($height) { display: inline-block; + height: $height; + vertical-align: middle; &:before { content: "\f2be"; font-family: FontAwesome; font-style: normal; - font-size: $fontsize; + font-size: $height - 4; font-weight: normal; } } Index: lams_central/web/comments/msgview.jsp =================================================================== diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r9946788a0f2d89cd298e289eddbf59d3b38ba197 --- lams_central/web/comments/msgview.jsp (.../msgview.jsp) (revision c90250258ad030c59157aa61c61e47583e26df5e) +++ lams_central/web/comments/msgview.jsp (.../msgview.jsp) (revision 9946788a0f2d89cd298e289eddbf59d3b38ba197) @@ -65,7 +65,7 @@
-
+
Index: lams_central/web/css/_learner_base.scss =================================================================== diff -u -r9832d1f0f1e57a22b92883c0a89d03b77e84ec8b -r9946788a0f2d89cd298e289eddbf59d3b38ba197 --- lams_central/web/css/_learner_base.scss (.../_learner_base.scss) (revision 9832d1f0f1e57a22b92883c0a89d03b77e84ec8b) +++ lams_central/web/css/_learner_base.scss (.../_learner_base.scss) (revision 9946788a0f2d89cd298e289eddbf59d3b38ba197) @@ -261,7 +261,7 @@ } body.stripes { - background: url('/lams/images/css/light-fabric.jpg'); + background: $stripes_background; } .sbox { border-bottom: 2px solid $gray-lighter; @@ -715,7 +715,7 @@ .login-logo { background: url($login_logo) no-repeat center right; background-size: $login_logo_size; - width:100px; + width:$login-logo_div_width; height:50px; } @@ -728,6 +728,7 @@ min-height:100%; position:relative; padding-bottom:50px; + background: $body-bg; } .login-footer { width: 100%; @@ -1011,17 +1012,17 @@ } .portrait-generic-sm { - @include portrait-generic($portrait-size-image-sm - 2); + @include portrait-generic($portrait-size-image-sm); } .portrait-generic-md { - @include portrait-generic($portrait-size-image-md - 2); + @include portrait-generic($portrait-size-image-md); } .portrait-generic-lg { - @include portrait-generic($portrait-size-image-lg - 2); + @include portrait-generic($portrait-size-image-lg); } .portrait-generic-xl { - @include portrait-generic($portrait-size-image-xl - 2); + @include portrait-generic($portrait-size-image-xl); } Index: lams_central/web/css/_main_base.scss =================================================================== diff -u -r9832d1f0f1e57a22b92883c0a89d03b77e84ec8b -r9946788a0f2d89cd298e289eddbf59d3b38ba197 --- lams_central/web/css/_main_base.scss (.../_main_base.scss) (revision 9832d1f0f1e57a22b92883c0a89d03b77e84ec8b) +++ lams_central/web/css/_main_base.scss (.../_main_base.scss) (revision 9946788a0f2d89cd298e289eddbf59d3b38ba197) @@ -3,7 +3,7 @@ width: 100%; overflow-x: hidden; font-size: 13px; - background: url(/lams/images/css/light-fabric.jpg); + background: $stripes_background; } html { height: 100%; @@ -13,8 +13,8 @@ width: 220px; z-index: 10; height: 100%; - background: $brand-primary-darker; - color: $gray-lighter; + background: $main_offcanvas_background; + color: $main_offcanvas_color; } .courses-title { text-overflow: ellipsis; @@ -116,18 +116,19 @@ background: $main_offcanvas_link; } #offcanvas .active > a { - color: $body-bg; + color: $main_offcanvas_link_color; } #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; + background-color: $main_offcanvas_logo_background; } -.offcanvas-logo img{ - width: 100px; +.offcanvas-logo .logo { + background: url($offcanvas_logo) no-repeat center left; + height: $offcanvas_height; } .offcanvas-header { padding: 15px 0px 0px 0px; @@ -142,7 +143,7 @@ padding: 2px 5px; line-height: 1; border: 1px solid rgba(221, 226, 232, 0.49); - background: $brand-primary-darkest; + background: $main_offcanvas_search_background; color: $main_fav_org_link; } .offcanvas-search .form-control::-webkit-input-placeholder { /* WebKit, Blink, Edge */ Fisheye: Tag 9946788a0f2d89cd298e289eddbf59d3b38ba197 refers to a dead (removed) revision in file `lams_central/web/less/defaultHTML_learner.less'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 9946788a0f2d89cd298e289eddbf59d3b38ba197 refers to a dead (removed) revision in file `lams_central/web/less/main.less'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp =================================================================== diff -u -rc90250258ad030c59157aa61c61e47583e26df5e -r9946788a0f2d89cd298e289eddbf59d3b38ba197 --- lams_tool_forum/web/jsps/learning/message/msgview.jsp (.../msgview.jsp) (revision c90250258ad030c59157aa61c61e47583e26df5e) +++ lams_tool_forum/web/jsps/learning/message/msgview.jsp (.../msgview.jsp) (revision 9946788a0f2d89cd298e289eddbf59d3b38ba197) @@ -42,7 +42,6 @@
- @@ -52,10 +51,9 @@ - - - +
@@ -67,6 +65,7 @@
+