From d8a6a31525e0fdf99a99ea0f78faca8d89c106d9 Mon Sep 17 00:00:00 2001 From: Wynne Crisman Date: Sat, 25 Nov 2017 15:07:14 -0800 Subject: [PATCH] Continued to improve the layout. --- .idea/PetitTetonMeteor.iml | 16 ----- .idea/codeStyleSettings.xml | 9 --- .idea/dictionaries/Grumpy.xml | 13 ---- .idea/jsLibraryMappings.xml | 9 --- .idea/markdown-navigator.xml | 68 ------------------- .../markdown-navigator/profiles_settings.xml | 3 - .idea/misc.xml | 6 -- .idea/modules.xml | 8 --- .idea/vagrant.xml | 7 -- .idea/vcs.xml | 6 -- .idea/watcherTasks.xml | 24 ------- imports/ui/layouts/Body.html | 14 ++-- imports/ui/layouts/Body.import.styl | 49 +++++++++---- imports/ui/layouts/Body.js | 3 + imports/ui/styles/effects.import.styl | 18 +++++ 15 files changed, 63 insertions(+), 190 deletions(-) delete mode 100644 .idea/PetitTetonMeteor.iml delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/dictionaries/Grumpy.xml delete mode 100644 .idea/jsLibraryMappings.xml delete mode 100644 .idea/markdown-navigator.xml delete mode 100644 .idea/markdown-navigator/profiles_settings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vagrant.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/watcherTasks.xml diff --git a/.idea/PetitTetonMeteor.iml b/.idea/PetitTetonMeteor.iml deleted file mode 100644 index 743d822..0000000 --- a/.idea/PetitTetonMeteor.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index c4c9543..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/dictionaries/Grumpy.xml b/.idea/dictionaries/Grumpy.xml deleted file mode 100644 index e75d550..0000000 --- a/.idea/dictionaries/Grumpy.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - clickable - dataset - noselect - perserve - signup - styl - yorkville - - - \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml deleted file mode 100644 index 1d5cb76..0000000 --- a/.idea/jsLibraryMappings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml deleted file mode 100644 index 1f63c27..0000000 --- a/.idea/markdown-navigator.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml deleted file mode 100644 index 57927c5..0000000 --- a/.idea/markdown-navigator/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 28a804d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index bdd6de1..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vagrant.xml b/.idea/vagrant.xml deleted file mode 100644 index a5aa786..0000000 --- a/.idea/vagrant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml deleted file mode 100644 index 628a0f5..0000000 --- a/.idea/watcherTasks.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/imports/ui/layouts/Body.html b/imports/ui/layouts/Body.html index fde721f..7c335c8 100644 --- a/imports/ui/layouts/Body.html +++ b/imports/ui/layouts/Body.html @@ -26,17 +26,17 @@ {{/if}}
  • - Sales Test Tag - -
  • -
  • - - Sales Sheets + Sales Sales Sheets
  • + + + + +
  • - Production sample + Production
  • diff --git a/imports/ui/layouts/Body.import.styl b/imports/ui/layouts/Body.import.styl index b166f16..0e423e6 100644 --- a/imports/ui/layouts/Body.import.styl +++ b/imports/ui/layouts/Body.import.styl @@ -45,11 +45,11 @@ position: absolute right: -30px top: 10px - -webkit-transition: .25s ease-in - -moz-transition: .25s ease-in - -o-transition: .25s ease-in - -ms-transition: .25s ease-in - transition: .25s ease-in + -webkit-transition: .5s ease-in + -moz-transition: .5s ease-in + -o-transition: .5s ease-in + -ms-transition: .5s ease-in + transition: .5s ease-in -webkit-border-top-right-radius: 5px -webkit-border-bottom-right-radius: 5px -moz-border-radius-topright: 5px @@ -148,26 +148,47 @@ text-decoration: none display: block .tag - padding: .2em .5em - font-size: .7em + padding: .3em .6em + margin-top: -.2em + font-size: .8em + color: #ddd + white-space: nowrap + vertical-align: baseline + border-radius: .5em + border: 1px solid #000000 + float: right + .subMenu + background-color: #999 + padding: .3em .6em + margin-top: -.2em + font-size: .8em color: #fff white-space: nowrap vertical-align: baseline - border-radius: .25em + border-radius: .5em border: 1px solid #000000 float: right + .subMenu.active + background-color: #333 li:hover - background-color: #333 - -webkit-animation: neon6 1.5s ease-in-out infinite alternate; - -moz-animation: neon6 1.5s ease-in-out infinite alternate; - animation: neon6 1.5s ease-in-out infinite alternate; + // Note: neon6 is defined in effects.import.styl + background-color: #666 + -webkit-animation: neon6 1.5s ease-in-out infinite alternate + -moz-animation: neon6 1.5s ease-in-out infinite alternate + animation: neon6 1.5s ease-in-out infinite alternate + .subMenu + // Note: neon6 is defined in effects.import.styl + background-color: #999 + -webkit-animation: neon7 1.5s ease-in-out infinite alternate + -moz-animation: neon7 1.5s ease-in-out infinite alternate + animation: neon7 1.5s ease-in-out infinite alternate li.active background-color: #333 - a + > a color: #96a2ae li.active:hover background-color: #333 - a + > a color: white .footer flex: 0 0 auto diff --git a/imports/ui/layouts/Body.js b/imports/ui/layouts/Body.js index 16a31f8..b15f9ff 100644 --- a/imports/ui/layouts/Body.js +++ b/imports/ui/layouts/Body.js @@ -12,5 +12,8 @@ Template.Body.events({ }, "click .menuArea a": function(event, template) { $('nav.leftSidebarContainer').toggleClass('menuShow'); + }, + "click .menuArea a .subMenu": function(event, template) { + $('nav.leftSidebarContainer').toggleClass('menuShow'); } }); \ No newline at end of file diff --git a/imports/ui/styles/effects.import.styl b/imports/ui/styles/effects.import.styl index 56ec9ad..407a90f 100644 --- a/imports/ui/styles/effects.import.styl +++ b/imports/ui/styles/effects.import.styl @@ -1,3 +1,4 @@ +// For black text. @-webkit-keyframes neon6 from text-shadow: 0 0 10px #fff, 0 0 20px #fff, 0 0 30px #fff, 0 0 40px #ff00de, 0 0 70px #ff00de, 0 0 80px #ff00de, 0 0 100px #ff00de, 0 0 150px #ff00de @@ -13,6 +14,23 @@ text-shadow: 0 0 10px #fff, 0 0 20px #fff, 0 0 30px #fff, 0 0 40px #ff00de, 0 0 70px #ff00de, 0 0 80px #ff00de, 0 0 100px #ff00de, 0 0 150px #ff00de to text-shadow: 0 0 5px #fff, 0 0 10px #fff, 0 0 15px #fff, 0 0 20px #ff00de, 0 0 35px #ff00de, 0 0 40px #ff00de, 0 0 50px #ff00de, 0 0 75px #ff00de + +// For white text. +@-webkit-keyframes neon7 + from + text-shadow: 0 0 10px #bbb, 0 0 20px #bbb, 0 0 30px #bbb, 0 0 40px #ff00de, 0 0 70px #ff00de, 0 0 80px #ff00de, 0 0 100px #ff00de, 0 0 150px #ff00de + to + text-shadow: 0 0 5px #bbb, 0 0 10px #bbb, 0 0 15px #bbb, 0 0 20px #ff00de, 0 0 35px #ff00de, 0 0 40px #ff00de, 0 0 50px #ff00de, 0 0 75px #ff00de +@-moz-keyframes neon7 + from + text-shadow: 0 0 10px #bbb, 0 0 20px #bbb, 0 0 30px #bbb, 0 0 40px #ff00de, 0 0 70px #ff00de, 0 0 80px #ff00de, 0 0 100px #ff00de, 0 0 150px #ff00de + to + text-shadow: 0 0 5px #bbb, 0 0 10px #bbb, 0 0 15px #bbb, 0 0 20px #ff00de, 0 0 35px #ff00de, 0 0 40px #ff00de, 0 0 50px #ff00de, 0 0 75px #ff00de +@keyframes neon7 + from + text-shadow: 0 0 10px #bbb, 0 0 20px #bbb, 0 0 30px #bbb, 0 0 40px #ff00de, 0 0 70px #ff00de, 0 0 80px #ff00de, 0 0 100px #ff00de, 0 0 150px #ff00de + to + text-shadow: 0 0 5px #bbb, 0 0 10px #bbb, 0 0 15px #bbb, 0 0 20px #ff00de, 0 0 35px #ff00de, 0 0 40px #ff00de, 0 0 50px #ff00de, 0 0 75px #ff00de //@-webkit-keyframes neon6_drop // from