Merge pull request #23 from UdashFramework/layout-update

Layout update

Author: Starzu

commons/src/main/assets/svg/gitter.svg

@@ -10,28 +10,29 @@ import scalacss.ScalatagsCss._
 import scalatags.JsDom.all._
 
 object Footer {
-  private lazy val template = footer(FooterStyles.footer)(
+  private val styles = FooterStyles.get
+  private lazy val template = footer(styles.footer)(
     div(GlobalStyles.body)(
-      div(FooterStyles.footerInner)(
-        a(FooterStyles.footerLogo, href := ExternalUrls.homepage)(
+      div(styles.footerInner)(
+        a(styles.footerLogo, href := ExternalUrls.homepage)(
           Image("udash_logo.png", "Udash Framework", GlobalStyles.block)
         ),
-        div(FooterStyles.footerLinks)(
-          p(FooterStyles.footerMore)("See more"),
+        div(styles.footerLinks)(
+          p(styles.footerMore)("See more"),
           ul(
-            li(FooterStyles.navItem)(
+            li(styles.navItem)(
               a(href := ExternalUrls.udashDemos, target := "_blank", GlobalStyles.underlineLink)("Github demo")
             ),
             // TODO: unccoment
             /*li(UdashGuideStyles.linkWrapper)(
               a(href := ExternalUrls.todoMvc, target := "_blank", UdashGuideStyles.link)("Todomvc.com demo")
             ),*/
-            li(FooterStyles.navItem)(
+            li(styles.navItem)(
               a(href := ExternalUrls.stackoverflow, target := "_blank", GlobalStyles.underlineLink)("StackOverflow questions")
             )
           )
         ),
-        p(FooterStyles.footerCopyrights)("Proudly made by ", a(FooterStyles.footerAvsystemLink, href := ExternalUrls.avsystem, target := "_blank")("AVSystem"))
+        p(styles.footerCopyrights)("Proudly made by ", a(styles.footerAvsystemLink, href := ExternalUrls.avsystem, target := "_blank")("AVSystem"))
       )
     )
   ).render

commons/src/main/scala/io/udash/web/commons/components/Footer.scala

@@ -13,6 +13,12 @@ trait HeaderButtons {
   def buttons = {
     div(buttonStyles.headerRight)(
       ul(buttonStyles.headerSocial)(
+        li(buttonStyles.headerSocialItem)(
+          a(href := ExternalUrls.udashGitter, buttonStyles.headerSocialLink, target := "_blank")(
+            SVG("gitter.svg#gitter", Size(124, 127))
+          )
+        ),
+
         li(buttonStyles.headerSocialItem)(
           a(href := ExternalUrls.udashGithub, buttonStyles.headerSocialLink, target := "_blank")(
             SVG("github.svg#github", Size(33, 32))

commons/src/main/scala/io/udash/web/commons/components/HeaderButtons.scala

@@ -16,7 +16,7 @@ trait HeaderNav {
 
   def navigation(items: Seq[NavItem]): Element =
     nav(navStyles.headerNav)(
-      ul(
+      ul(navStyles.headerLinkList)(
         items.map(item =>
           li(navStyles.headerLinkWrapper)(
             a(href := item.url, navStyles.headerLink)(item.title)

commons/src/main/scala/io/udash/web/commons/components/HeaderNav.scala

@@ -4,6 +4,7 @@ package io.udash.web.commons.config
   * Created by malchik on 2016-04-07.
   */
 object ExternalUrls {
+  val udashGitter = "https://gitter.im/UdashFramework/udash-core?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"
   val udashGithub = "https://github.com/UdashFramework/"
   val udashDemos = "https://github.com/UdashFramework/udash-demos"
   val stackoverflow = "http://stackoverflow.com/questions/tagged/udash"
@@ -13,5 +14,5 @@ object ExternalUrls {
   val scalajs = "https://www.scala-js.org/"
 
   val releases = "https://github.com/UdashFramework/udash-core/releases"
-  val license = "https://guide.udash.io/#/license"
+  val license = "http://guide.udash.io/#/license"
 }

commons/src/main/scala/io/udash/web/commons/config/ExternalUrls.scala

@@ -7,7 +7,7 @@ import scala.language.postfixOps
 import scalacss.Attr
 import scalacss.Defaults._
 
-object GlobalStyles extends StyleSheet.Inline {
+object GlobalStyles extends UdashStylesheet {
   import dsl._
 
   val clearfix = style(

commons/src/main/scala/io/udash/web/commons/styles/GlobalStyles.scala

@@ -0,0 +1,26 @@
+package io.udash.web.commons.styles
+
+import io.udash.wrappers.jquery.jQ
+
+import scala.collection.mutable
+import scalacss.Defaults._
+import scalacss.mutable.StyleSheet.{Inline => ISS}
+import scalatags.JsDom.all._
+import scalatags.JsDom.tags2.style
+
+/**
+  * Created by malchik on 2015-12-10.
+  */
+object StyleRegistry {
+  val styleSheet = style(`type` := "text/css").render
+
+  private val jqStyleSheet = jQ(styleSheet)
+  private val registrations: mutable.HashSet[ISS] = mutable.HashSet[ISS]()
+
+  private[styles] def register(ss: ISS*): Unit = {
+    ss.foreach( s => {
+      registrations += s
+      jqStyleSheet.append(s.render[String])
+    })
+  }
+}

commons/src/main/scala/io/udash/web/commons/styles/StyleRegistry.scala

@@ -0,0 +1,25 @@
+package io.udash.web.commons.styles
+
+import scalacss.Defaults._
+
+/**
+  * Created by malchik on 2016-04-29.
+  */
+
+/**
+  * Use "get" to register and get static styles object
+  * Every stylesheet extends UMPStylesheet must override type member T
+  */
+trait UdashStylesheet extends StyleSheet.Inline {
+  type T = this.type
+  private lazy val styleSheet: T = {
+    StyleRegistry.register(this)
+    this
+  }
+
+  /**
+    * Dirty hack fixes the scala plugin bug
+    * @return
+    */
+  def get = styleSheet
+}

commons/src/main/scala/io/udash/web/commons/styles/UdashStylesheet.scala

@@ -0,0 +1,34 @@
+package io.udash.web.commons.styles.attributes
+
+/**
+  * Created by malchik on 2016-05-19.
+  */
+object Attributes {
+  /**
+    * States
+    */
+  val Hidden = "hidden"
+
+  val Active = "active"
+
+  val Disabled = "disabled"
+
+  val Enabled = "enabled"
+
+  val Checked = "checked"
+
+  val Show = "show"
+
+  val Expanded = "expanded"
+
+  val State = "state"
+
+  val Pinned = "pinned"
+
+  /**
+    * Generate attribute data-attr
+    * @param attr name of attribute
+    * @return attribute data-attr
+    */
+  def data(attr: String) = s"data-$attr"
+}

commons/src/main/scala/io/udash/web/commons/styles/attributes/Attributes.scala

@@ -1,6 +1,6 @@
 package io.udash.web.commons.styles.components
 
-import io.udash.web.commons.styles.GlobalStyles
+import io.udash.web.commons.styles.{GlobalStyles, UdashStylesheet}
 import io.udash.web.commons.styles.utils._
 
 import scala.language.postfixOps
@@ -9,7 +9,7 @@ import scalacss.Defaults._
 /**
   * Created by malchik on 2016-04-04.
   */
-object FooterStyles extends StyleSheet.Inline {
+object FooterStyles extends UdashStylesheet {
   import dsl._
 
   val footer = style(