diff options
| author | Marvin Borner | 2018-04-18 17:48:45 +0200 |
|---|---|---|
| committer | Marvin Borner | 2018-04-18 17:48:45 +0200 |
| commit | 696356df88011344bab6cf42273dee74460e6474 (patch) | |
| tree | f0af849bd9eec85362051780addd95ba807861f8 | |
| parent | 279a1586815de16c1f879933d805823d33f14d7f (diff) | |
Fixed color issues on several browsers and added authentication
21 files changed, 642 insertions, 84 deletions
diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index c44727b..25c492a 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -1,3 +1,7 @@ +svg path { + fill: green; +} + /****** GENERAL ******/ @@ -103,7 +107,7 @@ HEADER GENERAL TABS ***********/ .MainInTab { - height: 100%; + height: 100% } /********** @@ -226,9 +230,6 @@ NAVBAR .NavbarIconWrap img { height: 30px; width: 30px; - filter: invert(.5); - -webkit-filter: invert(.5); - -moz-filter: invert(.5); } .NavbarLine { @@ -240,11 +241,3 @@ NAVBAR background: #eb12b5; } -.ActiveTab { - -webkit-transition: -moz-transform .3s ease-out; - -moz-transition: -webkit-transform .3s ease-out; - - filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); - -webkit-filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); - -moz-filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg index e8e825e..86f3718 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg @@ -4,11 +4,11 @@ viewBox="0 0 384.97 384.97" style="enable-background:new 0 0 384.97 384.97;" xml:space="preserve"> <g> <g id="Menu_1_"> - <path d="M12.03,120.303h360.909c6.641,0,12.03-5.39,12.03-12.03c0-6.641-5.39-12.03-12.03-12.03H12.03 + <path style="fill: #848586;" d="M12.03,120.303h360.909c6.641,0,12.03-5.39,12.03-12.03c0-6.641-5.39-12.03-12.03-12.03H12.03 c-6.641,0-12.03,5.39-12.03,12.03C0,114.913,5.39,120.303,12.03,120.303z"/> - <path d="M372.939,180.455H12.03c-6.641,0-12.03,5.39-12.03,12.03s5.39,12.03,12.03,12.03h360.909c6.641,0,12.03-5.39,12.03-12.03 + <path style="fill: #848586;" d="M372.939,180.455H12.03c-6.641,0-12.03,5.39-12.03,12.03s5.39,12.03,12.03,12.03h360.909c6.641,0,12.03-5.39,12.03-12.03 S379.58,180.455,372.939,180.455z"/> - <path d="M372.939,264.667H132.333c-6.641,0-12.03,5.39-12.03,12.03c0,6.641,5.39,12.03,12.03,12.03h240.606 + <path style="fill: #848586;" d="M372.939,264.667H132.333c-6.641,0-12.03,5.39-12.03,12.03c0,6.641,5.39,12.03,12.03,12.03h240.606 c6.641,0,12.03-5.39,12.03-12.03C384.97,270.056,379.58,264.667,372.939,264.667z"/> </g> <g> diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg new file mode 100644 index 0000000..fa3c428 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 384.97 384.97" style="enable-background:new 0 0 384.97 384.97;" xml:space="preserve"> +<g> + <g id="Menu_1_"> + <path style="fill: #eb12b5;" d="M12.03,120.303h360.909c6.641,0,12.03-5.39,12.03-12.03c0-6.641-5.39-12.03-12.03-12.03H12.03 + c-6.641,0-12.03,5.39-12.03,12.03C0,114.913,5.39,120.303,12.03,120.303z"/> + <path style="fill: #eb12b5;" d="M372.939,180.455H12.03c-6.641,0-12.03,5.39-12.03,12.03s5.39,12.03,12.03,12.03h360.909c6.641,0,12.03-5.39,12.03-12.03 + S379.58,180.455,372.939,180.455z"/> + <path style="fill: #eb12b5;" d="M372.939,264.667H132.333c-6.641,0-12.03,5.39-12.03,12.03c0,6.641,5.39,12.03,12.03,12.03h240.606 + c6.641,0,12.03-5.39,12.03-12.03C384.97,270.056,379.58,264.667,372.939,264.667z"/> + </g> + <g> + </g> + <g> + </g> + <g> + </g> + <g> + </g> + <g> + </g> + <g> + </g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +</svg> diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg index 3bd2b1c..ebec16b 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg @@ -4,176 +4,176 @@ viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"> <g> <g> - <path d="M256,0C114.842,0,0,114.842,0,256s114.842,256,256,256s256-114.842,256-256S397.158,0,256,0z M256,494.933 + <path style="fill: #848586;" d="M256,0C114.842,0,0,114.842,0,256s114.842,256,256,256s256-114.842,256-256S397.158,0,256,0z M256,494.933 C124.254,494.933,17.067,387.746,17.067,256S124.254,17.067,256,17.067S494.933,124.254,494.933,256S387.746,494.933,256,494.933z "/> </g> </g> <g> <g> - <path d="M145.067,128h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M145.067,128h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 S149.777,128,145.067,128z"/> </g> </g> <g> <g> - <path d="M85.333,170.667H68.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h17.067c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M85.333,170.667H68.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h17.067c4.71,0,8.533-3.823,8.533-8.533 S90.044,170.667,85.333,170.667z"/> </g> </g> <g> <g> - <path d="M452.267,170.667H435.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h17.067c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M452.267,170.667H435.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h17.067c4.71,0,8.533-3.823,8.533-8.533 S456.977,170.667,452.267,170.667z"/> </g> </g> <g> <g> - <path d="M460.8,221.867h-34.133c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H460.8c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M460.8,221.867h-34.133c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H460.8c4.71,0,8.533-3.823,8.533-8.533 S465.51,221.867,460.8,221.867z"/> </g> </g> <g> <g> - <path d="M418.133,128h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M418.133,128h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 S422.844,128,418.133,128z"/> </g> </g> <g> <g> - <path d="M315.733,128H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M315.733,128H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467c4.71,0,8.533-3.823,8.533-8.533 S320.444,128,315.733,128z"/> </g> </g> <g> <g> - <path d="M315.733,42.667H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 + <path style="fill: #848586;" d="M315.733,42.667H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 c4.71,0,8.533-3.823,8.533-8.533S320.444,42.667,315.733,42.667z"/> </g> </g> <g> <g> - <path d="M384,85.333h-76.8c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533H384c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M384,85.333h-76.8c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533H384c4.71,0,8.533-3.823,8.533-8.533 C392.533,89.156,388.71,85.333,384,85.333z"/> </g> </g> <g> <g> - <path d="M264.533,85.333h-128c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h128 + <path style="fill: #848586;" d="M264.533,85.333h-128c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h128 c4.71,0,8.533-3.823,8.533-8.533C273.067,89.156,269.244,85.333,264.533,85.333z"/> </g> </g> <g> <g> - <path d="M213.333,170.667h-76.8c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h76.8c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M213.333,170.667h-76.8c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h76.8c4.71,0,8.533-3.823,8.533-8.533 S218.044,170.667,213.333,170.667z"/> </g> </g> <g> <g> - <path d="M384,170.667H256c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M384,170.667H256c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 S388.71,170.667,384,170.667z"/> </g> </g> <g> <g> - <path d="M110.933,221.867H51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h59.733c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M110.933,221.867H51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h59.733c4.71,0,8.533-3.823,8.533-8.533 S115.644,221.867,110.933,221.867z"/> </g> </g> <g> <g> - <path d="M384,221.867h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H384c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M384,221.867h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H384c4.71,0,8.533-3.823,8.533-8.533 S388.71,221.867,384,221.867z"/> </g> </g> <g> <g> - <path d="M281.6,221.867H162.133c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H281.6c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M281.6,221.867H162.133c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H281.6c4.71,0,8.533-3.823,8.533-8.533 S286.31,221.867,281.6,221.867z"/> </g> </g> <g> <g> - <path d="M418.133,366.933h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M418.133,366.933h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 S422.844,366.933,418.133,366.933z"/> </g> </g> <g> <g> - <path d="M443.733,324.267h-17.067c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h17.067 + <path style="fill: #848586;" d="M443.733,324.267h-17.067c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h17.067 c4.71,0,8.533-3.823,8.533-8.533C452.267,328.09,448.444,324.267,443.733,324.267z"/> </g> </g> <g> <g> - <path d="M76.8,324.267H59.733c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533H76.8 + <path style="fill: #848586;" d="M76.8,324.267H59.733c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533H76.8 c4.71,0,8.533-3.823,8.533-8.533C85.333,328.09,81.51,324.267,76.8,324.267z"/> </g> </g> <g> <g> - <path d="M85.333,273.067H51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h34.133c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M85.333,273.067H51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h34.133c4.71,0,8.533-3.823,8.533-8.533 S90.044,273.067,85.333,273.067z"/> </g> </g> <g> <g> - <path d="M145.067,366.933h-51.2c-4.71,0-8.533,3.823-8.533,8.533S89.156,384,93.867,384h51.2c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M145.067,366.933h-51.2c-4.71,0-8.533,3.823-8.533,8.533S89.156,384,93.867,384h51.2c4.71,0,8.533-3.823,8.533-8.533 S149.777,366.933,145.067,366.933z"/> </g> </g> <g> <g> - <path d="M315.733,366.933H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 + <path style="fill: #848586;" d="M315.733,366.933H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 c4.71,0,8.533-3.823,8.533-8.533S320.444,366.933,315.733,366.933z"/> </g> </g> <g> <g> - <path d="M315.733,452.267H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 + <path style="fill: #848586;" d="M315.733,452.267H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 c4.71,0,8.533-3.823,8.533-8.533S320.444,452.267,315.733,452.267z"/> </g> </g> <g> <g> - <path d="M204.8,409.6H128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h76.8c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M204.8,409.6H128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h76.8c4.71,0,8.533-3.823,8.533-8.533 S209.51,409.6,204.8,409.6z"/> </g> </g> <g> <g> - <path d="M375.467,409.6h-128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M375.467,409.6h-128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 S380.177,409.6,375.467,409.6z"/> </g> </g> <g> <g> - <path d="M375.467,324.267h-76.8c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h76.8 + <path style="fill: #848586;" d="M375.467,324.267h-76.8c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h76.8 c4.71,0,8.533-3.823,8.533-8.533C384,328.09,380.177,324.267,375.467,324.267z"/> </g> </g> <g> <g> - <path d="M256,324.267H128c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M256,324.267H128c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 C264.533,328.09,260.71,324.267,256,324.267z"/> </g> </g> <g> <g> - <path d="M460.8,273.067h-59.733c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H460.8c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M460.8,273.067h-59.733c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H460.8c4.71,0,8.533-3.823,8.533-8.533 S465.51,273.067,460.8,273.067z"/> </g> </g> <g> <g> - <path d="M179.2,273.067H128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M179.2,273.067H128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 S183.91,273.067,179.2,273.067z"/> </g> </g> <g> <g> - <path d="M349.867,273.067H230.4c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467c4.71,0,8.533-3.823,8.533-8.533 + <path style="fill: #848586;" d="M349.867,273.067H230.4c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467c4.71,0,8.533-3.823,8.533-8.533 S354.577,273.067,349.867,273.067z"/> </g> </g> diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg new file mode 100644 index 0000000..193a92f --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg @@ -0,0 +1,210 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"> +<g> + <g> + <path style="fill: #eb12b5;" d="M256,0C114.842,0,0,114.842,0,256s114.842,256,256,256s256-114.842,256-256S397.158,0,256,0z M256,494.933 + C124.254,494.933,17.067,387.746,17.067,256S124.254,17.067,256,17.067S494.933,124.254,494.933,256S387.746,494.933,256,494.933z + "/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M145.067,128h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 + S149.777,128,145.067,128z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M85.333,170.667H68.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h17.067c4.71,0,8.533-3.823,8.533-8.533 + S90.044,170.667,85.333,170.667z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M452.267,170.667H435.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h17.067c4.71,0,8.533-3.823,8.533-8.533 + S456.977,170.667,452.267,170.667z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M460.8,221.867h-34.133c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H460.8c4.71,0,8.533-3.823,8.533-8.533 + S465.51,221.867,460.8,221.867z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M418.133,128h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 + S422.844,128,418.133,128z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M315.733,128H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467c4.71,0,8.533-3.823,8.533-8.533 + S320.444,128,315.733,128z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M315.733,42.667H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 + c4.71,0,8.533-3.823,8.533-8.533S320.444,42.667,315.733,42.667z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M384,85.333h-76.8c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533H384c4.71,0,8.533-3.823,8.533-8.533 + C392.533,89.156,388.71,85.333,384,85.333z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M264.533,85.333h-128c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h128 + c4.71,0,8.533-3.823,8.533-8.533C273.067,89.156,269.244,85.333,264.533,85.333z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M213.333,170.667h-76.8c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h76.8c4.71,0,8.533-3.823,8.533-8.533 + S218.044,170.667,213.333,170.667z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M384,170.667H256c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 + S388.71,170.667,384,170.667z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M110.933,221.867H51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h59.733c4.71,0,8.533-3.823,8.533-8.533 + S115.644,221.867,110.933,221.867z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M384,221.867h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H384c4.71,0,8.533-3.823,8.533-8.533 + S388.71,221.867,384,221.867z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M281.6,221.867H162.133c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H281.6c4.71,0,8.533-3.823,8.533-8.533 + S286.31,221.867,281.6,221.867z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M418.133,366.933h-51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 + S422.844,366.933,418.133,366.933z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M443.733,324.267h-17.067c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h17.067 + c4.71,0,8.533-3.823,8.533-8.533C452.267,328.09,448.444,324.267,443.733,324.267z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M76.8,324.267H59.733c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533H76.8 + c4.71,0,8.533-3.823,8.533-8.533C85.333,328.09,81.51,324.267,76.8,324.267z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M85.333,273.067H51.2c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h34.133c4.71,0,8.533-3.823,8.533-8.533 + S90.044,273.067,85.333,273.067z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M145.067,366.933h-51.2c-4.71,0-8.533,3.823-8.533,8.533S89.156,384,93.867,384h51.2c4.71,0,8.533-3.823,8.533-8.533 + S149.777,366.933,145.067,366.933z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M315.733,366.933H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 + c4.71,0,8.533-3.823,8.533-8.533S320.444,366.933,315.733,366.933z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M315.733,452.267H196.267c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467 + c4.71,0,8.533-3.823,8.533-8.533S320.444,452.267,315.733,452.267z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M204.8,409.6H128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h76.8c4.71,0,8.533-3.823,8.533-8.533 + S209.51,409.6,204.8,409.6z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M375.467,409.6h-128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 + S380.177,409.6,375.467,409.6z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M375.467,324.267h-76.8c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h76.8 + c4.71,0,8.533-3.823,8.533-8.533C384,328.09,380.177,324.267,375.467,324.267z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M256,324.267H128c-4.71,0-8.533,3.823-8.533,8.533c0,4.71,3.823,8.533,8.533,8.533h128c4.71,0,8.533-3.823,8.533-8.533 + C264.533,328.09,260.71,324.267,256,324.267z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M460.8,273.067h-59.733c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533H460.8c4.71,0,8.533-3.823,8.533-8.533 + S465.51,273.067,460.8,273.067z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M179.2,273.067H128c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h51.2c4.71,0,8.533-3.823,8.533-8.533 + S183.91,273.067,179.2,273.067z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M349.867,273.067H230.4c-4.71,0-8.533,3.823-8.533,8.533s3.823,8.533,8.533,8.533h119.467c4.71,0,8.533-3.823,8.533-8.533 + S354.577,273.067,349.867,273.067z"/> + </g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +</svg> diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg index 1facc93..d4fd052 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg @@ -4,7 +4,7 @@ viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"> <g> <g> - <path d="M437.987,364.012c-16.803,0-32.306,5.639-44.741,15.111l-78.364-78.364c9.472-12.435,15.113-27.941,15.113-44.743 + <path style="fill: #848586;" d="M437.987,364.012c-16.803,0-32.306,5.639-44.741,15.111l-78.364-78.364c9.472-12.435,15.113-27.941,15.113-44.743 c0-8.022-1.3-15.743-3.673-22.982l80.656-39.105c10.544,14.579,27.682,24.091,47.009,24.091c31.978,0,57.995-26.017,57.995-57.995 s-26.017-57.995-57.995-57.995c-31.978,0-57.995,26.017-57.995,57.995c0,5.522,0.792,10.858,2.24,15.921l-80.651,39.103 c-11.522-17.262-30.101-29.415-51.58-32.331v-26.583c13.881-4.281,23.998-17.228,23.998-32.494 @@ -28,14 +28,14 @@ </g> <g> <g> - <path d="M140.333,24.394l-0.359-0.361c-3.914-3.895-10.244-3.881-14.141,0.034c-3.896,3.915-3.881,10.245,0.034,14.141 + <path style="fill: #848586;" d="M140.333,24.394l-0.359-0.361c-3.914-3.895-10.244-3.881-14.141,0.034c-3.896,3.915-3.881,10.245,0.034,14.141 l0.258,0.261c1.956,1.974,4.53,2.962,7.104,2.962c2.543,0,5.087-0.964,7.036-2.896C144.19,34.649,144.22,28.318,140.333,24.394z" /> </g> </g> <g> <g> - <path d="M165.827,346.187c-3.905-3.905-10.236-3.905-14.141,0L91.31,406.563c-9.431-6.638-20.911-10.553-33.296-10.553 + <path style="fill: #848586;" d="M165.827,346.187c-3.905-3.905-10.236-3.905-14.141,0L91.31,406.563c-9.431-6.638-20.911-10.553-33.296-10.553 c-31.978,0-57.995,26.017-57.995,57.995C0.019,485.983,26.036,512,58.014,512c31.978,0,57.995-26.017,57.995-57.995 c0-12.387-3.916-23.869-10.557-33.301l60.375-60.375C169.732,356.424,169.732,350.092,165.827,346.187z M58.014,492.002 c-20.951,0-37.997-17.046-37.997-37.997c0-20.951,17.046-37.997,37.997-37.997c20.951,0,37.997,17.046,37.997,37.997 @@ -44,7 +44,7 @@ </g> <g> <g> - <path d="M189.575,322.44c-1.86-1.86-4.44-2.93-7.069-2.93s-5.21,1.07-7.069,2.93c-1.86,1.86-2.93,4.44-2.93,7.069 + <path style="fill: #848586;" d="M189.575,322.44c-1.86-1.86-4.44-2.93-7.069-2.93s-5.21,1.07-7.069,2.93c-1.86,1.86-2.93,4.44-2.93,7.069 s1.07,5.21,2.93,7.069c1.86,1.86,4.44,2.93,7.069,2.93c2.63,0,5.21-1.07,7.069-2.93c1.86-1.86,2.93-4.44,2.93-7.069 S191.434,324.299,189.575,322.44z"/> </g> diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg new file mode 100644 index 0000000..cfeea52 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"> +<g> + <g> + <path style="fill: #eb12b5;" d="M437.987,364.012c-16.803,0-32.306,5.639-44.741,15.111l-78.364-78.364c9.472-12.435,15.113-27.941,15.113-44.743 + c0-8.022-1.3-15.743-3.673-22.982l80.656-39.105c10.544,14.579,27.682,24.091,47.009,24.091c31.978,0,57.995-26.017,57.995-57.995 + s-26.017-57.995-57.995-57.995c-31.978,0-57.995,26.017-57.995,57.995c0,5.522,0.792,10.858,2.24,15.921l-80.651,39.103 + c-11.522-17.262-30.101-29.415-51.58-32.331v-26.583c13.881-4.281,23.998-17.228,23.998-32.494 + c0-18.747-15.251-33.997-33.997-33.997s-33.997,15.251-33.997,33.997c0,15.268,10.117,28.215,23.998,32.494v26.583 + c-12.937,1.756-24.82,6.858-34.744,14.418l-64.638-64.638c15.761-20.207,21.332-46.978,14.505-72.065 + c-1.451-5.33-6.947-8.475-12.274-7.022c-5.329,1.45-8.472,6.945-7.022,12.274c5.81,21.349-0.244,44.309-15.794,59.993 + c-0.065,0.062-0.134,0.115-0.198,0.179c-0.056,0.056-0.104,0.118-0.158,0.175c-24.185,24.003-63.387,23.951-87.501-0.164 + c-24.172-24.171-24.172-63.502,0-87.674c15.287-15.288,36.997-21.459,58.076-16.511c5.373,1.26,10.757-2.072,12.02-7.449 + c1.262-5.376-2.073-10.757-7.449-12.02C72.958-4.328,44.252,3.834,24.035,24.05c-31.969,31.969-31.969,83.987,0,115.957 + c15.985,15.985,36.981,23.977,57.978,23.977c17.851,0,35.688-5.799,50.459-17.352l64.643,64.643 + c-9.471,12.435-15.11,27.939-15.11,44.739c0,40.801,33.193,73.994,73.994,73.994c16.802,0,32.305-5.639,44.739-15.11 + l78.365,78.364c-9.472,12.435-15.111,27.94-15.111,44.741c0,40.801,33.193,73.994,73.994,73.994 + c40.801,0,73.994-33.193,73.994-73.994C511.981,397.204,478.787,364.012,437.987,364.012z M453.985,122.026 + c20.951,0,37.997,17.046,37.997,37.997c0,20.951-17.046,37.997-37.997,37.997c-20.951,0-37.997-17.046-37.997-37.997 + C415.988,139.071,433.034,122.026,453.985,122.026z M242,123.637c0-7.719,6.279-13.999,13.999-13.999 + c7.719,0,13.999,6.279,13.999,13.999c0,7.719-6.279,13.999-13.999,13.999C248.28,137.636,242,131.357,242,123.637z + M255.999,310.011c-29.774,0-53.996-24.222-53.996-53.996c0-29.774,24.222-53.996,53.996-53.996s53.996,24.222,53.996,53.996 + C309.995,285.788,285.773,310.011,255.999,310.011z M437.987,492.002c-29.774,0-53.996-24.222-53.996-53.996 + c0-29.774,24.222-53.996,53.996-53.996s53.996,24.222,53.996,53.996C491.982,467.78,467.76,492.002,437.987,492.002z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M140.333,24.394l-0.359-0.361c-3.914-3.895-10.244-3.881-14.141,0.034c-3.896,3.915-3.881,10.245,0.034,14.141 + l0.258,0.261c1.956,1.974,4.53,2.962,7.104,2.962c2.543,0,5.087-0.964,7.036-2.896C144.19,34.649,144.22,28.318,140.333,24.394z" + /> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M165.827,346.187c-3.905-3.905-10.236-3.905-14.141,0L91.31,406.563c-9.431-6.638-20.911-10.553-33.296-10.553 + c-31.978,0-57.995,26.017-57.995,57.995C0.019,485.983,26.036,512,58.014,512c31.978,0,57.995-26.017,57.995-57.995 + c0-12.387-3.916-23.869-10.557-33.301l60.375-60.375C169.732,356.424,169.732,350.092,165.827,346.187z M58.014,492.002 + c-20.951,0-37.997-17.046-37.997-37.997c0-20.951,17.046-37.997,37.997-37.997c20.951,0,37.997,17.046,37.997,37.997 + C96.011,474.956,78.965,492.002,58.014,492.002z"/> + </g> +</g> +<g> + <g> + <path style="fill: #eb12b5;" d="M189.575,322.44c-1.86-1.86-4.44-2.93-7.069-2.93s-5.21,1.07-7.069,2.93c-1.86,1.86-2.93,4.44-2.93,7.069 + s1.07,5.21,2.93,7.069c1.86,1.86,4.44,2.93,7.069,2.93c2.63,0,5.21-1.07,7.069-2.93c1.86-1.86,2.93-4.44,2.93-7.069 + S191.434,324.299,189.575,322.44z"/> + </g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +</svg> diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg index 14322ff..b2706bc 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg @@ -4,10 +4,10 @@ <svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 60 60" style="enable-background:new 0 0 60 60;" xml:space="preserve"> <g> - <path d="M19.5,27h14c0.552,0,1-0.447,1-1s-0.448-1-1-1h-14c-0.552,0-1,0.447-1,1S18.948,27,19.5,27z"/> - <path d="M39,32H14c-0.552,0-1,0.447-1,1s0.448,1,1,1h25c0.552,0,1-0.447,1-1S39.552,32,39,32z"/> - <path d="M39,39H14c-0.552,0-1,0.447-1,1s0.448,1,1,1h25c0.552,0,1-0.447,1-1S39.552,39,39,39z"/> - <path d="M55.894,37.041C58.582,33.271,60,28.913,60,24.414C60,11.504,48.337,1,34,1c-9.871,0-18.998,5.142-23.344,13.114 + <path style="fill: #848586;" d="M19.5,27h14c0.552,0,1-0.447,1-1s-0.448-1-1-1h-14c-0.552,0-1,0.447-1,1S18.948,27,19.5,27z"/> + <path style="fill: #848586;" d="M39,32H14c-0.552,0-1,0.447-1,1s0.448,1,1,1h25c0.552,0,1-0.447,1-1S39.552,32,39,32z"/> + <path style="fill: #848586;" d="M39,39H14c-0.552,0-1,0.447-1,1s0.448,1,1,1h25c0.552,0,1-0.447,1-1S39.552,39,39,39z"/> + <path style="fill: #848586;" d="M55.894,37.041C58.582,33.271,60,28.913,60,24.414C60,11.504,48.337,1,34,1c-9.871,0-18.998,5.142-23.344,13.114 C4.201,18.379,0,25.255,0,33c0,4.499,1.418,8.856,4.106,12.627c-0.51,5.578-1.86,9.713-3.813,11.666 c-0.304,0.304-0.38,0.769-0.188,1.153C0.276,58.789,0.625,59,1,59c0.046,0,0.093-0.003,0.139-0.01 c0.35-0.049,8.433-1.213,14.317-4.586c3.33,1.334,6.875,2.01,10.544,2.01c8.525,0,16.104-3.714,20.848-9.44 diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutlineActivated.svg new file mode 100644 index 0000000..a638d21 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutlineActivated.svg @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 60 60" style="enable-background:new 0 0 60 60;" xml:space="preserve"> +<g> + <path style="fill: #eb12b5;" d="M19.5,27h14c0.552,0,1-0.447,1-1s-0.448-1-1-1h-14c-0.552,0-1,0.447-1,1S18.948,27,19.5,27z"/> + <path style="fill: #eb12b5;" d="M39,32H14c-0.552,0-1,0.447-1,1s0.448,1,1,1h25c0.552,0,1-0.447,1-1S39.552,32,39,32z"/> + <path style="fill: #eb12b5;" d="M39,39H14c-0.552,0-1,0.447-1,1s0.448,1,1,1h25c0.552,0,1-0.447,1-1S39.552,39,39,39z"/> + <path style="fill: #eb12b5;" d="M55.894,37.041C58.582,33.271,60,28.913,60,24.414C60,11.504,48.337,1,34,1c-9.871,0-18.998,5.142-23.344,13.114 + C4.201,18.379,0,25.255,0,33c0,4.499,1.418,8.856,4.106,12.627c-0.51,5.578-1.86,9.713-3.813,11.666 + c-0.304,0.304-0.38,0.769-0.188,1.153C0.276,58.789,0.625,59,1,59c0.046,0,0.093-0.003,0.139-0.01 + c0.35-0.049,8.433-1.213,14.317-4.586c3.33,1.334,6.875,2.01,10.544,2.01c8.525,0,16.104-3.714,20.848-9.44 + c5.512,2.486,11.738,3.392,12.012,3.43c0.047,0.007,0.094,0.01,0.14,0.01c0.375,0,0.724-0.211,0.895-0.554 + c0.192-0.385,0.116-0.85-0.188-1.153C57.754,46.754,56.404,42.619,55.894,37.041z M26,54.414c-2.891,0-5.694-0.458-8.364-1.349 + c3.334-2.09,3.338-2.255,3.335-2.82c-0.001-0.349-0.19-0.68-0.488-0.86c-0.449-0.271-1.026-0.146-1.328,0.271 + c-0.492,0.385-2.502,1.673-4.294,2.778l0,0c-3.701,2.236-8.645,3.518-11.559,4.128c1.797-3.174,2.535-7.623,2.83-11.136 + c0.02-0.242-0.048-0.482-0.192-0.678C3.362,41.255,2,37.192,2,33c0-7.219,4.028-13.61,10.18-17.491 + c0.388-0.245,0.781-0.48,1.182-0.702c0.09-0.05,0.179-0.102,0.271-0.151c0.42-0.227,0.849-0.437,1.282-0.639 + c0.158-0.074,0.316-0.147,0.475-0.218c0.44-0.195,0.885-0.379,1.336-0.548c0.157-0.059,0.317-0.112,0.476-0.168 + c0.357-0.126,0.717-0.244,1.08-0.354c0.166-0.05,0.33-0.103,0.498-0.151c0.471-0.133,0.946-0.251,1.426-0.357 + c0.166-0.037,0.334-0.07,0.502-0.104c0.432-0.087,0.866-0.165,1.304-0.23c0.1-0.015,0.199-0.034,0.3-0.048 + c0.528-0.073,1.061-0.126,1.596-0.167c0.139-0.011,0.279-0.02,0.419-0.029c0.555-0.034,1.113-0.058,1.674-0.058 + c10.752,0,19.876,6.342,22.919,15.053C49.622,28.65,50,30.786,50,33c0,0.484-0.025,0.964-0.061,1.443 + c-0.009,0.124-0.02,0.248-0.032,0.372c-0.042,0.446-0.096,0.89-0.169,1.33c-0.006,0.034-0.009,0.068-0.015,0.102 + c-0.078,0.459-0.18,0.914-0.292,1.367c-0.033,0.133-0.068,0.266-0.103,0.399c-0.109,0.406-0.23,0.81-0.366,1.21 + c-0.029,0.084-0.057,0.168-0.087,0.252c-0.14,0.395-0.297,0.785-0.463,1.171c-0.061,0.142-0.124,0.284-0.188,0.425 + c-0.186,0.406-0.381,0.809-0.595,1.205c-0.05,0.092-0.105,0.181-0.156,0.272c-0.185,0.33-0.381,0.656-0.586,0.979 + c-0.085,0.133-0.169,0.267-0.257,0.398c-0.248,0.371-0.506,0.737-0.78,1.096C41.528,50.686,34.243,54.414,26,54.414z + M48.094,45.343c0.042-0.06,0.076-0.123,0.117-0.184c0.233-0.343,0.456-0.693,0.669-1.047c0.119-0.199,0.23-0.4,0.343-0.601 + c0.124-0.222,0.245-0.445,0.362-0.671c0.105-0.203,0.21-0.407,0.308-0.612c0.152-0.319,0.295-0.641,0.432-0.967 + c0.096-0.229,0.186-0.46,0.274-0.691c0.109-0.286,0.213-0.573,0.31-0.863c0.062-0.188,0.122-0.376,0.179-0.565 + c0.096-0.316,0.182-0.635,0.263-0.957c0.035-0.14,0.075-0.278,0.108-0.419c0.104-0.45,0.191-0.905,0.265-1.364 + c0.023-0.141,0.04-0.283,0.06-0.424c0.051-0.356,0.092-0.715,0.125-1.076c0.013-0.145,0.027-0.289,0.037-0.434 + C51.977,33.981,52,33.493,52,33C52,20.09,40.337,9.586,26,9.586c-0.479,0-0.955,0.014-1.428,0.037 + c-0.171,0.008-0.341,0.024-0.512,0.035c-0.298,0.02-0.595,0.04-0.89,0.069c-0.212,0.021-0.423,0.047-0.634,0.073 + c-0.248,0.03-0.495,0.06-0.74,0.097c-0.235,0.034-0.469,0.073-0.702,0.113c-0.213,0.037-0.425,0.076-0.636,0.117 + c-0.254,0.05-0.508,0.102-0.76,0.158c-0.178,0.04-0.354,0.084-0.53,0.127c-0.275,0.068-0.551,0.135-0.823,0.211 + c-0.122,0.034-0.242,0.072-0.363,0.108c-1.042,0.304-2.061,0.668-3.055,1.091c-0.076,0.032-0.152,0.062-0.228,0.095 + c-0.09,0.039-0.182,0.073-0.272,0.113C18.882,6.45,26.186,3,34,3c13.234,0,24,9.606,24,21.414c0,4.191-1.362,8.255-3.939,11.749 + c-0.144,0.195-0.212,0.436-0.192,0.678c0.295,3.513,1.032,7.96,2.829,11.134C54.51,47.516,51.182,46.678,48.094,45.343z"/> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +</svg> diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg index 0a8c0f4..dd98e46 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg @@ -5,12 +5,12 @@ <g> <g> <g> - <path d="M151.549,145.274c0,23.39,9.145,50.385,24.462,72.214c17.389,24.78,39.376,38.427,61.911,38.427 + <path style="fill: #848586;" d="M151.549,145.274c0,23.39,9.145,50.385,24.462,72.214c17.389,24.78,39.376,38.427,61.911,38.427 c22.534,0,44.521-13.647,61.91-38.428c15.317-21.828,24.462-48.824,24.462-72.213c0-47.626-38.746-86.372-86.372-86.372 C190.296,58.902,151.549,97.648,151.549,145.274z M237.922,73.902c39.354,0,71.372,32.018,71.372,71.372 c0,20.118-8.33,44.487-21.74,63.598c-14.29,20.364-32.38,32.043-49.632,32.043c-17.252,0-35.342-11.679-49.632-32.043 c-13.41-19.11-21.741-43.479-21.741-63.598C166.549,105.919,198.567,73.902,237.922,73.902z"/> - <path d="M302.372,239.167c-2.862-1.363-6.273-0.778-8.52,1.461c-16.775,16.728-36.117,25.569-55.935,25.569 + <path style="fill: #848586;" d="M302.372,239.167c-2.862-1.363-6.273-0.778-8.52,1.461c-16.775,16.728-36.117,25.569-55.935,25.569 c-19.821,0-39.158-8.841-55.923-25.567c-2.246-2.241-5.659-2.826-8.521-1.463c-25.254,12.022-46.628,30.829-61.811,54.388 c-15.596,24.2-23.84,52.277-23.84,81.195v0.121c0,2.116,0.894,4.134,2.461,5.556c40.492,36.722,92.922,56.945,147.633,56.945 s107.141-20.224,147.632-56.945c1.568-1.422,2.462-3.439,2.462-5.556v-0.121c0-28.918-8.242-56.995-23.834-81.194 @@ -18,28 +18,28 @@ c0.583-24.896,7.956-48.986,21.411-69.865c12.741-19.77,30.322-35.823,51.058-46.676c18.746,17.157,40.285,26.193,62.588,26.193 c22.3,0,43.842-9.035,62.598-26.193c20.734,10.853,38.313,26.906,51.053,46.676c13.452,20.877,20.823,44.968,21.406,69.865 C335.602,404.349,287.778,422.372,237.918,422.372z"/> - <path d="M455.077,243.89c-13.23-20.532-31.856-36.923-53.864-47.399c-2.862-1.363-6.275-0.778-8.52,1.461 + <path style="fill: #848586;" d="M455.077,243.89c-13.23-20.532-31.856-36.923-53.864-47.399c-2.862-1.363-6.275-0.778-8.52,1.461 c-14.312,14.271-30.79,21.815-47.654,21.815c-9.142,0-18.184-2.205-26.873-6.553c-3.706-1.853-8.209-0.353-10.063,3.351 c-1.854,3.705-0.354,8.21,3.351,10.063c10.793,5.401,22.093,8.139,33.586,8.139c19.335,0,38.004-7.737,54.288-22.437 c17.504,9.298,32.348,22.934,43.141,39.685c11.445,17.763,17.756,38.243,18.338,59.416 c-18.524,16.158-40.553,28.449-63.91,35.634c-3.959,1.218-6.182,5.415-4.964,9.374c0.992,3.225,3.96,5.297,7.166,5.297 c0.73,0,1.474-0.107,2.208-0.333c26.509-8.154,51.435-22.362,72.082-41.088c1.568-1.422,2.462-3.439,2.462-5.556v-0.105 C475.85,289.45,468.666,264.98,455.077,243.89z"/> - <path d="M130.493,210.473c7.93,0,15.841-1.934,23.516-5.748c3.709-1.843,5.222-6.345,3.379-10.054 + <path style="fill: #848586;" d="M130.493,210.473c7.93,0,15.841-1.934,23.516-5.748c3.709-1.843,5.222-6.345,3.379-10.054 c-1.843-3.71-6.345-5.222-10.054-3.379c-5.582,2.774-11.248,4.18-16.841,4.18c-14.541,0-29.836-9.914-41.964-27.2 c-11.449-16.318-18.562-37.112-18.562-54.266c0-33.375,27.152-60.527,60.526-60.527c15.752,0,30.67,6.022,42.006,16.958 c2.98,2.875,7.729,2.792,10.604-0.19c2.876-2.981,2.791-7.729-0.19-10.604c-14.146-13.647-32.763-21.163-52.42-21.163 c-41.646,0-75.526,33.881-75.526,75.527c0,20.38,7.957,43.887,21.283,62.881C91.445,198.545,110.709,210.473,130.493,210.473z"/> - <path d="M61.034,340.143c-16.753-7.222-32.209-16.972-45.989-29.004c0.582-21.112,6.875-41.53,18.291-59.243 + <path style="fill: #848586;" d="M61.034,340.143c-16.753-7.222-32.209-16.972-45.989-29.004c0.582-21.112,6.875-41.53,18.291-59.243 c10.761-16.698,25.561-30.294,43.01-39.566c16.239,14.662,34.856,22.376,54.139,22.376c11.587,0,22.969-2.785,33.829-8.277 c3.696-1.87,5.177-6.381,3.308-10.078c-1.869-3.697-6.381-5.177-10.078-3.308c-8.742,4.421-17.846,6.663-27.059,6.663 c-16.811,0-33.238-7.522-47.504-21.754c-2.246-2.24-5.658-2.825-8.521-1.462c-21.954,10.451-40.534,26.8-53.733,47.28 C7.167,264.811,0,289.221,0,314.362v0.103c0,2.116,0.894,4.134,2.461,5.556c15.629,14.174,33.338,25.579,52.634,33.897 c0.968,0.417,1.975,0.615,2.966,0.615c2.904,0,5.668-1.697,6.891-4.533C66.591,346.196,64.837,341.783,61.034,340.143z"/> - <path d="M69.854,351.003c-2.671,6.443,4.532,12.832,10.617,9.387c3.238-1.834,4.683-5.937,3.227-9.385 + <path style="fill: #848586;" d="M69.854,351.003c-2.671,6.443,4.532,12.832,10.617,9.387c3.238-1.834,4.683-5.937,3.227-9.385 C81.291,344.86,72.32,345.053,69.854,351.003z"/> - <path d="M83.698,351.005C83.888,351.455,83.518,350.545,83.698,351.005L83.698,351.005z"/> - <path d="M303.345,70.438c11.336-10.936,26.254-16.958,42.006-16.958c33.374,0,60.526,27.152,60.526,60.527 + <path style="fill: #848586;" d="M83.698,351.005C83.888,351.455,83.518,350.545,83.698,351.005L83.698,351.005z"/> + <path style="fill: #848586;" d="M303.345,70.438c11.336-10.936,26.254-16.958,42.006-16.958c33.374,0,60.526,27.152,60.526,60.527 c0,17.154-7.112,37.947-18.563,54.266c-12.128,17.286-27.424,27.2-41.964,27.2c-5.593,0-11.259-1.406-16.841-4.18 c-3.711-1.844-8.212-0.331-10.055,3.379c-1.843,3.709-0.33,8.21,3.379,10.054c7.675,3.814,15.587,5.748,23.517,5.748 c19.783,0,39.048-11.927,54.243-33.585c13.327-18.994,21.283-42.501,21.283-62.881c0-41.646-33.881-75.527-75.526-75.527 diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutlineActivated.svg new file mode 100644 index 0000000..3c385f9 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutlineActivated.svg @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 475.851 475.851" style="enable-background:new 0 0 475.851 475.851;" xml:space="preserve"> +<g> + <g> + <g> + <path style="fill: #eb12b5;" d="M151.549,145.274c0,23.39,9.145,50.385,24.462,72.214c17.389,24.78,39.376,38.427,61.911,38.427 + c22.534,0,44.521-13.647,61.91-38.428c15.317-21.828,24.462-48.824,24.462-72.213c0-47.626-38.746-86.372-86.372-86.372 + C190.296,58.902,151.549,97.648,151.549,145.274z M237.922,73.902c39.354,0,71.372,32.018,71.372,71.372 + c0,20.118-8.33,44.487-21.74,63.598c-14.29,20.364-32.38,32.043-49.632,32.043c-17.252,0-35.342-11.679-49.632-32.043 + c-13.41-19.11-21.741-43.479-21.741-63.598C166.549,105.919,198.567,73.902,237.922,73.902z"/> + <path style="fill: #eb12b5;" d="M302.372,239.167c-2.862-1.363-6.273-0.778-8.52,1.461c-16.775,16.728-36.117,25.569-55.935,25.569 + c-19.821,0-39.158-8.841-55.923-25.567c-2.246-2.241-5.659-2.826-8.521-1.463c-25.254,12.022-46.628,30.829-61.811,54.388 + c-15.596,24.2-23.84,52.277-23.84,81.195v0.121c0,2.116,0.894,4.134,2.461,5.556c40.492,36.722,92.922,56.945,147.633,56.945 + s107.141-20.224,147.632-56.945c1.568-1.422,2.462-3.439,2.462-5.556v-0.121c0-28.918-8.242-56.995-23.834-81.194 + C348.997,269.995,327.625,251.188,302.372,239.167z M237.918,422.372c-49.861,0-97.685-18.023-135.057-50.827 + c0.583-24.896,7.956-48.986,21.411-69.865c12.741-19.77,30.322-35.823,51.058-46.676c18.746,17.157,40.285,26.193,62.588,26.193 + c22.3,0,43.842-9.035,62.598-26.193c20.734,10.853,38.313,26.906,51.053,46.676c13.452,20.877,20.823,44.968,21.406,69.865 + C335.602,404.349,287.778,422.372,237.918,422.372z"/> + <path style="fill: #eb12b5;" d="M455.077,243.89c-13.23-20.532-31.856-36.923-53.864-47.399c-2.862-1.363-6.275-0.778-8.52,1.461 + c-14.312,14.271-30.79,21.815-47.654,21.815c-9.142,0-18.184-2.205-26.873-6.553c-3.706-1.853-8.209-0.353-10.063,3.351 + c-1.854,3.705-0.354,8.21,3.351,10.063c10.793,5.401,22.093,8.139,33.586,8.139c19.335,0,38.004-7.737,54.288-22.437 + c17.504,9.298,32.348,22.934,43.141,39.685c11.445,17.763,17.756,38.243,18.338,59.416 + c-18.524,16.158-40.553,28.449-63.91,35.634c-3.959,1.218-6.182,5.415-4.964,9.374c0.992,3.225,3.96,5.297,7.166,5.297 + c0.73,0,1.474-0.107,2.208-0.333c26.509-8.154,51.435-22.362,72.082-41.088c1.568-1.422,2.462-3.439,2.462-5.556v-0.105 + C475.85,289.45,468.666,264.98,455.077,243.89z"/> + <path style="fill: #eb12b5;" d="M130.493,210.473c7.93,0,15.841-1.934,23.516-5.748c3.709-1.843,5.222-6.345,3.379-10.054 + c-1.843-3.71-6.345-5.222-10.054-3.379c-5.582,2.774-11.248,4.18-16.841,4.18c-14.541,0-29.836-9.914-41.964-27.2 + c-11.449-16.318-18.562-37.112-18.562-54.266c0-33.375,27.152-60.527,60.526-60.527c15.752,0,30.67,6.022,42.006,16.958 + c2.98,2.875,7.729,2.792,10.604-0.19c2.876-2.981,2.791-7.729-0.19-10.604c-14.146-13.647-32.763-21.163-52.42-21.163 + c-41.646,0-75.526,33.881-75.526,75.527c0,20.38,7.957,43.887,21.283,62.881C91.445,198.545,110.709,210.473,130.493,210.473z"/> + <path style="fill: #eb12b5;" d="M61.034,340.143c-16.753-7.222-32.209-16.972-45.989-29.004c0.582-21.112,6.875-41.53,18.291-59.243 + c10.761-16.698,25.561-30.294,43.01-39.566c16.239,14.662,34.856,22.376,54.139,22.376c11.587,0,22.969-2.785,33.829-8.277 + c3.696-1.87,5.177-6.381,3.308-10.078c-1.869-3.697-6.381-5.177-10.078-3.308c-8.742,4.421-17.846,6.663-27.059,6.663 + c-16.811,0-33.238-7.522-47.504-21.754c-2.246-2.24-5.658-2.825-8.521-1.462c-21.954,10.451-40.534,26.8-53.733,47.28 + C7.167,264.811,0,289.221,0,314.362v0.103c0,2.116,0.894,4.134,2.461,5.556c15.629,14.174,33.338,25.579,52.634,33.897 + c0.968,0.417,1.975,0.615,2.966,0.615c2.904,0,5.668-1.697,6.891-4.533C66.591,346.196,64.837,341.783,61.034,340.143z"/> + <path style="fill: #eb12b5;" d="M69.854,351.003c-2.671,6.443,4.532,12.832,10.617,9.387c3.238-1.834,4.683-5.937,3.227-9.385 + C81.291,344.86,72.32,345.053,69.854,351.003z"/> + <path style="fill: #eb12b5;" d="M83.698,351.005C83.888,351.455,83.518,350.545,83.698,351.005L83.698,351.005z"/> + <path style="fill: #eb12b5;" d="M303.345,70.438c11.336-10.936,26.254-16.958,42.006-16.958c33.374,0,60.526,27.152,60.526,60.527 + c0,17.154-7.112,37.947-18.563,54.266c-12.128,17.286-27.424,27.2-41.964,27.2c-5.593,0-11.259-1.406-16.841-4.18 + c-3.711-1.844-8.212-0.331-10.055,3.379c-1.843,3.709-0.33,8.21,3.379,10.054c7.675,3.814,15.587,5.748,23.517,5.748 + c19.783,0,39.048-11.927,54.243-33.585c13.327-18.994,21.283-42.501,21.283-62.881c0-41.646-33.881-75.527-75.526-75.527 + c-19.657,0-38.273,7.516-52.42,21.163c-2.981,2.875-3.066,7.624-0.19,10.604C295.614,73.229,300.363,73.314,303.345,70.438z"/> + </g> + </g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +</svg> diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg index 32062dc..a15f174 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg @@ -5,12 +5,12 @@ <g> <g> <g> - <path d="M202.178,209.972c23.96,0,47.357-14.538,65.881-40.936c16.348-23.296,26.107-52.099,26.107-77.048 + <path style="fill: #848586;" d="M202.178,209.972c23.96,0,47.357-14.538,65.881-40.936c16.348-23.296,26.107-52.099,26.107-77.048 C294.167,41.266,252.9,0,202.178,0c-50.722,0-91.988,41.266-91.988,91.988c0,24.949,9.759,53.752,26.107,77.048 C154.821,195.434,178.218,209.972,202.178,209.972z M202.178,15c42.451,0,76.988,34.537,76.988,76.988 c0,21.655-8.961,47.876-23.385,68.432c-15.409,21.958-34.946,34.552-53.603,34.552c-18.657,0-38.194-12.594-53.603-34.552 c-14.424-20.556-23.385-46.777-23.385-68.432C125.19,49.537,159.727,15,202.178,15z"/> - <path d="M336.974,251.115c-16.208-25.154-39.025-45.233-65.987-58.068c-2.864-1.363-6.274-0.778-8.52,1.461 + <path style="fill: #848586;" d="M336.974,251.115c-16.208-25.154-39.025-45.233-65.987-58.068c-2.864-1.363-6.274-0.778-8.52,1.461 c-18.071,18.021-38.92,27.545-60.293,27.545c-21.376,0-42.222-9.524-60.282-27.544c-2.246-2.241-5.658-2.827-8.521-1.463 c-26.962,12.835-49.782,32.915-65.992,58.068c-16.651,25.837-25.452,55.813-25.452,86.686v0.13c0,2.116,0.894,4.134,2.461,5.556 c43.276,39.247,99.312,60.861,157.785,60.861s114.508-21.614,157.785-60.861c1.567-1.422,2.461-3.439,2.461-5.556v-0.13 diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutlineActivated.svg new file mode 100644 index 0000000..f3a2bc6 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutlineActivated.svg @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 404.347 404.347" style="enable-background:new 0 0 404.347 404.347;" xml:space="preserve"> +<g> + <g> + <g> + <path style="fill: #eb12b5;" d="M202.178,209.972c23.96,0,47.357-14.538,65.881-40.936c16.348-23.296,26.107-52.099,26.107-77.048 + C294.167,41.266,252.9,0,202.178,0c-50.722,0-91.988,41.266-91.988,91.988c0,24.949,9.759,53.752,26.107,77.048 + C154.821,195.434,178.218,209.972,202.178,209.972z M202.178,15c42.451,0,76.988,34.537,76.988,76.988 + c0,21.655-8.961,47.876-23.385,68.432c-15.409,21.958-34.946,34.552-53.603,34.552c-18.657,0-38.194-12.594-53.603-34.552 + c-14.424-20.556-23.385-46.777-23.385-68.432C125.19,49.537,159.727,15,202.178,15z"/> + <path style="fill: #eb12b5;" d="M336.974,251.115c-16.208-25.154-39.025-45.233-65.987-58.068c-2.864-1.363-6.274-0.778-8.52,1.461 + c-18.071,18.021-38.92,27.545-60.293,27.545c-21.376,0-42.222-9.524-60.282-27.544c-2.246-2.241-5.658-2.827-8.521-1.463 + c-26.962,12.835-49.782,32.915-65.992,58.068c-16.651,25.837-25.452,55.813-25.452,86.686v0.13c0,2.116,0.894,4.134,2.461,5.556 + c43.276,39.247,99.312,60.861,157.785,60.861s114.508-21.614,157.785-60.861c1.567-1.422,2.461-3.439,2.461-5.556v-0.13 + C362.421,306.927,353.622,276.951,336.974,251.115z M202.174,389.348c-53.621,0-105.055-19.417-145.212-54.743 + c0.583-26.855,8.514-52.847,23.026-75.365c13.767-21.361,32.788-38.686,55.227-50.357c20.045,18.453,43.094,28.17,66.959,28.17 + c23.861,0,46.914-9.719,66.969-28.171c22.437,11.67,41.458,28.996,55.222,50.357c14.509,22.517,22.438,48.508,23.021,75.365 + C307.229,369.93,255.795,389.348,202.174,389.348z"/> + </g> + </g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +<g> +</g> +</svg> diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js index b359d2d..102b102 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js @@ -14,7 +14,7 @@ NavbarLine .data("origWidth", NavbarLine.width()); NavbarIconWrap.on("click", function () { NavbarIconWrap.removeClass("ActiveTab"); - $(this).addClass("ActiveTab"); + $(this).children().attr("src", $(this).children().attr("src").split('.svg')[0] + "Activated.svg"); var index = $(this).attr('id'); MainTabWindows.slick('slickGoTo', index); //$('.MainTabWindows').flickity().flickity('select', index); @@ -39,9 +39,13 @@ MainTabWindows.slick({ }); MainTabWindows.on('beforeChange', function (event, slick, currentSlide, nextSlide) { + currentSlide = $("#" + currentSlide); + nextSlide = $("#" + nextSlide); //console.log(nextSlide); - NavbarIconWrap.removeClass("ActiveTab"); - $el = $("#" + nextSlide); + console.log(currentSlide.children().attr("src")); + currentSlide.children().attr("src", (currentSlide.children().attr("src").split('.svg')[0].replace('Activated','') + ".svg")); + nextSlide.children().attr("src", nextSlide.children().attr("src").split('.svg')[0] + "Activated.svg"); + $el = nextSlide; $el.addClass("ActiveTab"); leftPos = $el.position().left; NavbarLine.stop().animate({ diff --git a/main/app/sprinkles/core/config/default.php b/main/app/sprinkles/core/config/default.php index 134b5d4..3478fb6 100644 --- a/main/app/sprinkles/core/config/default.php +++ b/main/app/sprinkles/core/config/default.php @@ -124,8 +124,8 @@ ], 'analytics' => [ 'google' => [ - 'code' => '', - 'enabled' => false + 'code' => 'UA-109245179-2', + 'enabled' => true ] ], 'author' => 'Author', diff --git a/main/app/sprinkles/core/locale/de_DE/main.php b/main/app/sprinkles/core/locale/de_DE/main.php index 4677206..cd9e00c 100644 --- a/main/app/sprinkles/core/locale/de_DE/main.php +++ b/main/app/sprinkles/core/locale/de_DE/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} ist der Gruppe beigetreten", - "YOU_GROUP_JOIN" => "Du bist der Gruppe beigetreten", + "YOU_GROUP_JOIN" => "Du bist der Gruppe {{group}} beigetreten", "USER_DISCONNECT" => "{{user}} hat sich vom Server getrennt" ] ];
\ No newline at end of file diff --git a/main/app/sprinkles/core/locale/en_US/main.php b/main/app/sprinkles/core/locale/en_US/main.php index 58393d8..06585fc 100644 --- a/main/app/sprinkles/core/locale/en_US/main.php +++ b/main/app/sprinkles/core/locale/en_US/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} joined the group", - "YOU_GROUP_JOIN" => "You joined the group", + "YOU_GROUP_JOIN" => "You joined the group {{group}}", "USER_DISCONNECT" => "{{user}} has disconnected from the server" ] ];
\ No newline at end of file diff --git a/main/app/sprinkles/core/locale/fr_FR/main.php b/main/app/sprinkles/core/locale/fr_FR/main.php index 6e28f6e..f9e2f79 100644 --- a/main/app/sprinkles/core/locale/fr_FR/main.php +++ b/main/app/sprinkles/core/locale/fr_FR/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} s'est joint au groupe", - "YOU_GROUP_JOIN" => "Vous avez rejoint le groupe", + "YOU_GROUP_JOIN" => "Vous avez rejoint le groupe {{group}}", "USER_DISCONNECT" => "{{user}} s'est déconnecté du serveur" ] ]; diff --git a/main/app/sprinkles/core/routes/routes.php b/main/app/sprinkles/core/routes/routes.php index 3598b7e..56a72ea 100644 --- a/main/app/sprinkles/core/routes/routes.php +++ b/main/app/sprinkles/core/routes/routes.php @@ -11,6 +11,7 @@ $config = $app->getContainer()->get('config'); $app->get('/', 'UserFrosting\Sprinkle\Core\Controller\CoreController:pageIndex') ->add('checkEnvironment') + ->add('authGuard') ->setName('index'); $app->get('/about','UserFrosting\Sprinkle\Core\Controller\CoreController:pageAbout')->add('checkEnvironment'); diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index 5de2d30..3a78a16 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -32,10 +32,11 @@ <hr> </div> </div> - <div class="carousel-cell"> + + <div class="carousel-cell ChatTab"> <div class="headerWrap"> <div class="header"> - <span class="LeftButtonHeader"><img draggable="false" ondragstart="return false;" + <span class="LeftButtonHeader"><img class="svg" draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span> <span class="HeaderCaption">{{ translate("TAB_CAPTIONS.CHAT") }}</span> <span class="RightButtonHeader"><i class="fas fa-bell"></i></span> @@ -52,6 +53,7 @@ </div> </div> </div> + <div class="carousel-cell"> <div class="headerWrap"> <div class="header"> @@ -73,6 +75,10 @@ </div> <hr> </div> + <div class="MainInTab"> + {{current_user.first_name}} {{current_user.last_name}} + <small>({{current_user.user_name}})</small> + </div> </div> </div> @@ -84,7 +90,7 @@ <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/ExploreGlobeOutline.svg') }}"> </span> <span id="2" class="NavbarIconWrap ActiveTab"> - <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutline.svg') }}"> + <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutlineActivated.svg') }}"> </span> <span id="3" class="NavbarIconWrap"> <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/UserGroupOutline.svg') }}"> diff --git a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig index a160087..7ae258b 100644 --- a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig +++ b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig @@ -2,8 +2,8 @@ /************ GENERATE KEYS - ************/ -if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { + ************ + if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { // GENERATE -- LATER ON LOGIN! var EncryptionPhrase = "PASSWORD 123"; // THE USERS PASSWORD -- needs to generate on login! var RSABitLength = 1024; @@ -28,10 +28,9 @@ if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('Keys } -/****** + /****** GENERAL ******/ - var ChatTextInput = $("#ChatTextInput"); var SubscribeTextInput = $("#SubscribeTextInput"); var ChatMessages = $("#ChatMessages"); @@ -82,17 +81,16 @@ WebSocket.onmessage = function (e) { } else if (MessageObject.ServerMessage === true) { if (MessageObject.ServerMessageType === "GroupJoin") { if (MessageObject.WasHimself === false) { - var TempJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}"; - var GeneratedJoinMessage = TempJoinMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("<div class='ServerChatMessage'>" + GeneratedJoinMessage + ".</div><br><br>"); + var TranslatedUserJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("<div class='ServerChatMessage'>" + TranslatedUserJoinMessage + ".</div><br><br>"); } else if (MessageObject.WasHimself === true) { ChatMessages.empty(); - ChatMessages.append("<div class='ServerChatMessage'>{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN") }} " + MessageObject.GroupName + "</span>.</div><br><br>"); + var TranslatedYouJoinMessage = "{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN", {group: "ConvertTranslatedMessageWithGroupName"}) }}".replace("ConvertTranslatedMessageWithGroupName", '"' + MessageObject.GroupName + '"'); + ChatMessages.append("<div class='ServerChatMessage'>" + TranslatedYouJoinMessage + "</span>.</div><br><br>"); } } else if (MessageObject.ServerMessageType === "UserDisconnect") { - var TempDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}"; - var GeneratedDisconnectMessage = TempDisconnectMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("<div class='ServerChatMessage'>" + GeneratedDisconnectMessage + ".</div><br><br>"); + var TranslatedDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("<div class='ServerChatMessage'>" + TranslatedDisconnectMessage + ".</div><br><br>"); } } }; |
