From 53f97af8146324d4faa8a262dd0e79aa0482e012 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 31 Aug 2016 11:22:14 -0400 Subject: [PATCH] (css) Cleanup --- UI/WebServerResources/scss/_shame.scss | 27 -------------------- UI/WebServerResources/scss/core/angular.scss | 2 +- UI/WebServerResources/scss/styles.scss | 13 ++-------- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 UI/WebServerResources/scss/_shame.scss diff --git a/UI/WebServerResources/scss/_shame.scss b/UI/WebServerResources/scss/_shame.scss deleted file mode 100644 index bdc43b8ff..000000000 --- a/UI/WebServerResources/scss/_shame.scss +++ /dev/null @@ -1,27 +0,0 @@ -/// -// -// This is the shame file (http://csswizardry.com/2013/04/shame-css/) -// RULES -// 1. If it’s a hack, it goes in shame.css. -// 2. Document all hacks fully: -// 1. What part of the codebase does it relate to? -// 2. Why was this needed? -// 3. How does this fix it? -// 4. How might you fix it properly, given more time? -// 3. Do not blame the developer; if they explained why they had to do it -// then their reasons are probably (hopefully) valid. -// 4. Try and clean shame.css up when you have some down time. -// Even better, get a tech-debt story in which you can dedicate actual sprint time to it. -// - -// 1. Component : autoScrollList -// 2. Suddently, the date span of the first list item of the messagae-list do not -// justify to the extreme right of his container (flex-box) -// After more than an hour spent analysing trying to find differences with other -// list element. I still can't find any. -// 3. I decide to apply a minimal width to the left element until I found a culprit. - -.sg-tile-content .sg-md-subhead-multi, -.sg-tile-content .sg-md-subhead-solo { - //min-width: 65%; -} \ No newline at end of file diff --git a/UI/WebServerResources/scss/core/angular.scss b/UI/WebServerResources/scss/core/angular.scss index 4cc13d626..c8d7e53c7 100644 --- a/UI/WebServerResources/scss/core/angular.scss +++ b/UI/WebServerResources/scss/core/angular.scss @@ -1,4 +1,4 @@ -/// styles.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- +/// angular.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*- // ngCloak directive [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss index d4fe393bb..81b6a42fd 100755 --- a/UI/WebServerResources/scss/styles.scss +++ b/UI/WebServerResources/scss/styles.scss @@ -15,15 +15,13 @@ @import 'core/functions'; @import 'core/angular'; -/* Local overrides from angular-material src */ -// fixme : refactor all this to meet our practices +// Original angular-material core style and services // ------------------------------------------------------------------------------ @import 'core/mixins'; @import 'core/layout-attributes'; @import 'core/structure'; @import 'core/layout'; @import 'core/typography'; -@import 'core/print'; // Original angular-material components // ------------------------------------------------------------------------------ @@ -69,16 +67,9 @@ @import 'components/draggable-droppable/droppable'; @import 'components/ripple/ripple'; @import 'components/timepicker/timepicker'; - -// @import '../angular-material/src/core/style/color-palette'; - -// COMPONENTS -// todo : configure manual and glob imports @import 'components/pseudo-input/pseudo-input'; @import 'views/view'; - -// Make sure this is last to override anything else -//@import 'shame'; +@import 'core/print'; // dev-tools - NOT FOR PRODUCTION // ------------------------------------------------------------------------------