From d262fcd9cf754b3fc85eb9b27d782087caebf476 Mon Sep 17 00:00:00 2001 From: phette23 Date: Mon, 10 Aug 2015 12:25:44 -0700 Subject: [PATCH] Portlets: scss-lint copy .scss-lint.yml from equella_theme repo clean up a few SCSS files to reduce linting warnings --- .scss-lint.yml | 17 ++++++++++++++++ Portlets/dashboard-base.scss | 23 +--------------------- Portlets/dashboard-non-cca.scss | 29 ++++++++++++++++++++++++---- Portlets/dashboard-student-work.scss | 6 +++--- Portlets/server-js-test.js | 20 ------------------- 5 files changed, 46 insertions(+), 49 deletions(-) create mode 100644 .scss-lint.yml delete mode 100644 Portlets/server-js-test.js diff --git a/.scss-lint.yml b/.scss-lint.yml new file mode 100644 index 0000000..98380d0 --- /dev/null +++ b/.scss-lint.yml @@ -0,0 +1,17 @@ +linters: + # so many color references, some of which are fine (e.g. black, white) + # we'll ignore this but could activatve once the code base is cleaner + ColorVariable: + enabled: false + Comment: + enabled: false + # IDs are sadly necessary when customizing vendor sites + IdSelector: + enabled: false + # many selectors target EQUELLA HTML where we don't control format + # of IDs & class names, unable to meet this standard + SelectorFormat: + enabled: false + + Indentation: + width: 4 diff --git a/Portlets/dashboard-base.scss b/Portlets/dashboard-base.scss index 965837b..1f0a879 100644 --- a/Portlets/dashboard-base.scss +++ b/Portlets/dashboard-base.scss @@ -22,33 +22,12 @@ body #helpAndOptions { } .box_content { - border-top: 0px !important; + border-top: 0 !important; padding-top: 0; } // END Fixing Equella Styles -// gallery container & images -.imgContainer { - border: 1px solid #ddd; - border-radius: 5px; - box-sizing: border-box; - display: none; - width: 100%; - - &.active img { - display: none; - } - - &.active { - display: block !important; - - a img:hover { - opacity: .8; - } - } -} - // collection tabs for gallery #mainTabs { box-sizing: border-box; diff --git a/Portlets/dashboard-non-cca.scss b/Portlets/dashboard-non-cca.scss index 0971b4a..a5c1061 100644 --- a/Portlets/dashboard-non-cca.scss +++ b/Portlets/dashboard-non-cca.scss @@ -1,4 +1,25 @@ -@import 'dashboard-base.scss'; -@import 'quick-search.scss'; -@import 'tour.scss'; -@import 'campus-planning.scss'; +@import 'dashboard-base'; +@import 'quick-search'; +@import 'tour'; +@import 'campus-planning'; + +// gallery container & images +.imgContainer { + border: 1px solid #ddd; + border-radius: 5px; + box-sizing: border-box; + display: none; + width: 100%; + + &.active { + display: block !important; + + a img:hover { + opacity: .8; + } + + img { + display: none; + } + } +} diff --git a/Portlets/dashboard-student-work.scss b/Portlets/dashboard-student-work.scss index 42e71f1..189c9b1 100644 --- a/Portlets/dashboard-student-work.scss +++ b/Portlets/dashboard-student-work.scss @@ -1,3 +1,3 @@ -@import 'dashboard-base.scss'; -@import 'quick-search.scss'; -@import 'tour.scss'; +@import 'dashboard-base'; +@import 'quick-search'; +@import 'tour'; diff --git a/Portlets/server-js-test.js b/Portlets/server-js-test.js deleted file mode 100644 index 886e22e..0000000 --- a/Portlets/server-js-test.js +++ /dev/null @@ -1,20 +0,0 @@ -// server-side JS -// not used—how do I pass values from this to client-side portlet? - -// parameters are: -// query — free text query -// where — xpath/SQL clause -// onlyLive — boolean for whether to only return live items -// orderType — 0: Ranking, 1: Date Modified, 2: Name -// reverse — boolean for reverse order -// offset — first result index -// maxResults — integer number of results to get - -// min exclusive, max inclusive -var rand = function (min, max) { - return Math.round(Math.random() * max + min) -} -var order = rand(0, 2) -var reverse = !!(rand(0, 1)) -var offset = rand(0, 10) -var results = utils.searchAdvanced('', "/xml/local/rating like 'High'", true, order, reverse, offset, 40)