diff --git a/benchmarks/.js/src/main/scala/io/udash/benchmarks/css/CssStylesApply.scala b/benchmarks/.js/src/main/scala/io/udash/benchmarks/css/CssStylesApply.scala index 471c81ccb..9e0f318a1 100644 --- a/benchmarks/.js/src/main/scala/io/udash/benchmarks/css/CssStylesApply.scala +++ b/benchmarks/.js/src/main/scala/io/udash/benchmarks/css/CssStylesApply.scala @@ -5,7 +5,7 @@ import japgolly.scalajs.benchmark._ import japgolly.scalajs.benchmark.gui._ import scalatags.JsDom.all._ -object CssStylesApply extends CssView { +object CssStylesApply { val styles = Benchmark("three styles") { div( diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/DismissibleUdashAlert.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/DismissibleUdashAlert.scala index 0429c0373..7da25e2cd 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/DismissibleUdashAlert.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/DismissibleUdashAlert.scala @@ -11,7 +11,6 @@ import scalatags.JsDom.all._ final class DismissibleUdashAlert private[alert]( alertStyle: ReadableProperty[BootstrapStyles.Color], override val componentId: ComponentId )(content: Binding.NestedInterceptor => Modifier) extends UdashAlertBase(alertStyle, componentId) { - import io.udash.css.CssView._ private val _dismissed = Property[Boolean](false) diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/UdashAlertBase.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/UdashAlertBase.scala index 98097a41f..96b7eaeb1 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/UdashAlertBase.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/UdashAlertBase.scala @@ -4,7 +4,6 @@ package alert import io.udash._ import io.udash.bindings.modifiers.Binding import io.udash.bootstrap.utils.{BootstrapStyles, UdashBootstrapComponent} -import io.udash.css.CssView._ import io.udash.wrappers.jquery.{JQuery, jQ} import org.scalajs.dom.html.Div import scalatags.JsDom.TypedTag diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/badge/UdashBadge.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/badge/UdashBadge.scala index e1d2cd6aa..7689cbb92 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/badge/UdashBadge.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/badge/UdashBadge.scala @@ -15,8 +15,6 @@ class UdashBadge private[badge]( )(content: Binding.NestedInterceptor => Modifier) extends UdashBootstrapComponent { - import io.udash.css.CssView._ - protected def baseTag: TypedTag[Element] = span override val render: Element = { diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/breadcrumb/UdashBreadcrumbs.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/breadcrumb/UdashBreadcrumbs.scala index 6cfbf9602..8c73ae998 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/breadcrumb/UdashBreadcrumbs.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/breadcrumb/UdashBreadcrumbs.scala @@ -16,8 +16,6 @@ final class UdashBreadcrumbs[ItemType, ElemType <: ReadableProperty[ItemType]] p isActive: ItemType => Boolean ) extends UdashBootstrapComponent { - import io.udash.css.CssView._ - override val render: Element = { import scalatags.JsDom.all._ import scalatags.JsDom.tags2.nav diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButton.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButton.scala index a4bf548ce..40ef77b11 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButton.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButton.scala @@ -25,7 +25,6 @@ final class UdashButton private( override val componentId: ComponentId, tag: UdashButton.ButtonTag )(content: Binding.NestedInterceptor => Modifier) extends UdashBootstrapComponent with Listenable[UdashButton, ButtonClickEvent] { - import io.udash.css.CssView._ private val classes: List[Modifier] = { (BootstrapStyles.Button.btn: Modifier) :: diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButtonGroup.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButtonGroup.scala index e75ebe808..2b83887e4 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButtonGroup.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButtonGroup.scala @@ -16,8 +16,6 @@ final class UdashButtonGroup[ItemType, ElemType <: ReadableProperty[ItemType]] p override val componentId: ComponentId )(itemFactory: (ElemType, Binding.NestedInterceptor) => Seq[Element]) extends UdashBootstrapComponent { - import io.udash.css.CssView._ - private def buttonFullWidth: Binding = BootstrapStyles.Sizing.width100.styleIf(justified) diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButtonToolbar.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButtonToolbar.scala index f78efe6f2..e1b7ae274 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButtonToolbar.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButtonToolbar.scala @@ -13,8 +13,6 @@ final class UdashButtonToolbar[ItemType, ElemType <: ReadableProperty[ItemType]] override val componentId: ComponentId )(itemFactory: (ElemType, Binding.NestedInterceptor) => Seq[Element]) extends UdashBootstrapComponent { - import io.udash.css.CssView._ - override val render: Element = div(role := "toolbar", BootstrapStyles.Button.toolbar, id := componentId)( repeatWithNested(items)(itemFactory) diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/card/UdashCard.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/card/UdashCard.scala index 7a8971059..94842e291 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/card/UdashCard.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/card/UdashCard.scala @@ -6,7 +6,6 @@ import io.udash.bindings.modifiers.Binding import io.udash.bootstrap.list.UdashListGroup import io.udash.bootstrap.nav.UdashNav import io.udash.bootstrap.utils.{BootstrapStyles, UdashBootstrapComponent} -import io.udash.css.CssView._ import org.scalajs.dom.Element import scalatags.JsDom.all._ @@ -98,19 +97,19 @@ final class UdashCard private( /** Puts the provided list group into the card with additional `list-group-flush` style. * More: Bootstrap Docs. */ def listGroup(list: Binding.NestedInterceptor => UdashListGroup[_, _]): Modifier = { - list(externalBinding).render.styles(BootstrapStyles.ListGroup.flush) + list(externalBinding).render +: BootstrapStyles.ListGroup.flush } /** Puts the provided navigation tabs into the card with additional `card-header-tabs` style. * More: Bootstrap Docs. */ def navigationTabs(navigation: Binding.NestedInterceptor => UdashNav[_, _]): Modifier = { - navigation(externalBinding).render.styles(BootstrapStyles.Card.navTabs) + navigation(externalBinding).render +: BootstrapStyles.Card.navTabs } /** Puts the provided navigation tabs into the card with additional `card-header-pills` style. * More: Bootstrap Docs. */ def navigationPills(navigation: Binding.NestedInterceptor => UdashNav[_, _]): Modifier = { - navigation(externalBinding).render.styles(BootstrapStyles.Card.navPills) + navigation(externalBinding).render +: BootstrapStyles.Card.navPills } } diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/carousel/UdashCarousel.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/carousel/UdashCarousel.scala index c743bd649..c460989bf 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/carousel/UdashCarousel.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/carousel/UdashCarousel.scala @@ -33,7 +33,6 @@ final class UdashCarousel[ItemType, ElemType <: ReadableProperty[ItemType]] priv import UdashCarousel._ import io.udash.bootstrap.utils.BootstrapStyles.Carousel import io.udash.bootstrap.utils.BootstrapTags._ - import io.udash.css.CssView._ import io.udash.wrappers.jquery._ if (activeSlide.get >= slides.size) activeSlide.set(slides.size - 1) @@ -300,7 +299,7 @@ object UdashCarousel { * @param caption Slide caption content. */ case class UdashCarouselSlide(imgSrc: Url)(caption: Modifier*) { - import io.udash.css.CssView._ + lazy val render: Node = { Seq( diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/collapse/UdashAccordion.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/collapse/UdashAccordion.scala index ed62093fb..c948c7745 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/collapse/UdashAccordion.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/collapse/UdashAccordion.scala @@ -21,7 +21,6 @@ final class UdashAccordion[ItemType, ElemType <: ReadableProperty[ItemType]] pri with Listenable[UdashAccordion[ItemType, ElemType], UdashAccordion.AccordionEvent[ItemType, ElemType]] { import io.udash.bootstrap.utils.BootstrapTags._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ private val collapses = mutable.Map.empty[ElemType, UdashCollapse] diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/collapse/UdashCollapse.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/collapse/UdashCollapse.scala index 591c90978..ea0372e19 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/collapse/UdashCollapse.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/collapse/UdashCollapse.scala @@ -21,7 +21,6 @@ final class UdashCollapse private( import UdashCollapse._ import io.udash.bootstrap.utils.BootstrapTags._ - import io.udash.css.CssView._ import io.udash.wrappers.jquery._ /** Toggle state of this collapse. */ diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/datepicker/UdashDatePicker.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/datepicker/UdashDatePicker.scala index 7fe6775e4..ac920c16d 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/datepicker/UdashDatePicker.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/datepicker/UdashDatePicker.scala @@ -27,7 +27,6 @@ final class UdashDatePicker private[datepicker]( ) extends UdashBootstrapComponent with Listenable[UdashDatePicker, UdashDatePicker.DatePickerEvent] with CrossLogging { import UdashDatePicker._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ private val inp = input( diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/dropdown/UdashDropdown.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/dropdown/UdashDropdown.scala index f653ab485..529a1484c 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/dropdown/UdashDropdown.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/dropdown/UdashDropdown.scala @@ -30,7 +30,6 @@ final class UdashDropdown[ItemType, ElemType <: ReadableProperty[ItemType]] priv import UdashDropdown._ import io.udash.bootstrap.dropdown.UdashDropdown.DropdownEvent._ - import io.udash.css.CssView._ /** Dropdown menu list ID. */ val menuId: ComponentId = componentId.subcomponent("menu") @@ -144,7 +143,7 @@ object UdashDropdown { /** Renders DOM element for [[io.udash.bootstrap.dropdown.UdashDropdown.DefaultDropdownItem]]. */ def defaultItemFactory(item: DefaultDropdownItem, nested: Binding.NestedInterceptor): Element = { import DefaultDropdownItem._ - import io.udash.css.CssView._ + item match { case Text(text) => span(BootstrapStyles.Dropdown.itemText, text).render @@ -157,7 +156,7 @@ object UdashDropdown { case Header(title) => h6(BootstrapStyles.Dropdown.header)(title).render case Disabled(item) => - val res = defaultItemFactory(item, nested).styles(BootstrapStyles.disabled) + val res = defaultItemFactory(item, nested) +: BootstrapStyles.disabled res.addEventListener("click", (ev: Event) => { ev.preventDefault() ev.stopPropagation() diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashForm.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashForm.scala index 54c2f5188..c8a566e76 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashForm.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashForm.scala @@ -29,8 +29,6 @@ final class UdashForm private( )(content: FormElementsFactory => Modifier) extends UdashBootstrapComponent with Listenable[UdashForm, UdashForm.FormEvent] with CrossLogging { - import io.udash.css.CssView._ - private[form] val validationProperties: MSet[Property[Option[ValidationResult]]] = MSet.empty def clearValidationResults(): Unit = { @@ -134,7 +132,7 @@ final class FormElementsFactory( form: OptArg[UdashForm] = OptArg.Empty ) extends CrossLogging { - import io.udash.css.CssView._ + /** Use this method to bond the external binding's lifecycle with the lifecycle of the elements created via this factory. */ def externalBinding[T <: Binding](binding: T): T = { @@ -582,7 +580,7 @@ final class FormElementsFactory( override val render: Element = div( id := groupId, BootstrapStyles.Form.customControl, BootstrapStyles.Form.customCheckbox, - input.render.styles(BootstrapStyles.Form.customControlInput), + input.render +: BootstrapStyles.Form.customControlInput, nestedInterceptor(BootstrapStyles.Form.customControlInline.styleIf(inline)), label(`for` := inputId, BootstrapStyles.Form.customControlLabel)( labelContent.map(_.apply(nestedInterceptor)).getOrElse(span("\u00a0")) diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashInputGroup.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashInputGroup.scala index 70591474d..1b17b6dfb 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashInputGroup.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashInputGroup.scala @@ -11,8 +11,6 @@ final class UdashInputGroup private( override val componentId: ComponentId )(content: Modifier*) extends UdashBootstrapComponent { - import io.udash.css.CssView._ - override val render: Element = div( BootstrapStyles.InputGroup.inputGroup, @@ -21,7 +19,7 @@ final class UdashInputGroup private( } object UdashInputGroup { - import io.udash.css.CssView._ + /** * Creates an inputs group. @@ -42,15 +40,15 @@ object UdashInputGroup { /** Adds `form-control` style to provided element. It's required to properly display input as part of group. */ def input(el: Element): Element = - el.styles(BootstrapStyles.Form.control) + el +: BootstrapStyles.Form.control /** Adds `custom-select` style to provided element. It's required to properly display select as part of group. */ def select(el: Element): Element = - el.styles(BootstrapStyles.Form.control, BootstrapStyles.InputGroup.customSelect) + (el +: BootstrapStyles.Form.control) +: BootstrapStyles.InputGroup.customSelect /** Adds `custom-file` style to provided element. It's required to properly display file input as part of group. */ def file(el: Element): Element = - el.styles(BootstrapStyles.Form.control, BootstrapStyles.InputGroup.customFile) + (el +: BootstrapStyles.Form.control) +: BootstrapStyles.InputGroup.customFile /** Creates an element to be prepended to the input of this input group. */ def prepend(content: Modifier*): Modifier = diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/jumbotron/UdashJumbotron.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/jumbotron/UdashJumbotron.scala index db7093417..27858c457 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/jumbotron/UdashJumbotron.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/jumbotron/UdashJumbotron.scala @@ -12,8 +12,6 @@ final class UdashJumbotron private( override val componentId: ComponentId )(content: Binding.NestedInterceptor => Modifier) extends UdashBootstrapComponent { - import io.udash.css.CssView._ - override val render: Element = { div( id := componentId, diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/list/UdashListGroup.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/list/UdashListGroup.scala index fcdfb2920..1dedb2d0d 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/list/UdashListGroup.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/list/UdashListGroup.scala @@ -12,7 +12,6 @@ final class UdashListGroup[ItemType, ElemType <: ReadableProperty[ItemType]] pri flush: ReadableProperty[Boolean], override val componentId: ComponentId )(itemFactory: (ElemType, Binding.NestedInterceptor) => Element) extends UdashBootstrapComponent { - import io.udash.css.CssView._ import scalatags.JsDom.all._ override val render: Element = @@ -22,7 +21,7 @@ final class UdashListGroup[ItemType, ElemType <: ReadableProperty[ItemType]] pri )( nestedInterceptor( repeatWithNested(items) { (item, nested) => - itemFactory(item, nested).styles(BootstrapStyles.ListGroup.item) + itemFactory(item, nested) +: BootstrapStyles.ListGroup.item } ) ).render diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/modal/UdashModal.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/modal/UdashModal.scala index 84cf245b1..bfc6d3691 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/modal/UdashModal.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/modal/UdashModal.scala @@ -24,7 +24,6 @@ final class UdashModal private( ) extends UdashBootstrapComponent with Listenable[UdashModal, UdashModal.ModalEvent] { import UdashModal._ - import io.udash.css.CssView._ import io.udash.wrappers.jquery._ import scalatags.JsDom.all._ @@ -44,7 +43,7 @@ final class UdashModal private( (bodyFactory, BootstrapStyles.Modal.body), (footerFactory, BootstrapStyles.Modal.footer) ).collect { case (Some(factory), styleName) => - factory(nestedInterceptor).styles(styleName) + factory(nestedInterceptor) +: styleName } val el = div( diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/nav/UdashNav.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/nav/UdashNav.scala index 208fdf707..7501b8458 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/nav/UdashNav.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/nav/UdashNav.scala @@ -27,7 +27,6 @@ final class UdashNav[ItemType, ElemType <: ReadableProperty[ItemType]] private( isDisabled: ElemType => ReadableProperty[Boolean], isDropdown: ElemType => ReadableProperty[Boolean] ) extends UdashBootstrapComponent { - import io.udash.css.CssView._ override val render: Element = { ul( @@ -67,7 +66,7 @@ final class UdashNav[ItemType, ElemType <: ReadableProperty[ItemType]] private( } object UdashNav { - import io.udash.css.CssView._ + /** Default navigation model. */ class NavItem(val name: String, val link: Url) diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/nav/UdashNavbar.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/nav/UdashNavbar.scala index 701679353..3bdb99cc4 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/nav/UdashNavbar.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/nav/UdashNavbar.scala @@ -19,11 +19,9 @@ final class UdashNavbar[ItemType, ElemType <: ReadableProperty[ItemType]] privat )( navigationFactory: Binding.NestedInterceptor => Modifier, brand: Modifier -) - extends UdashBootstrapComponent { +) extends UdashBootstrapComponent { import io.udash.bootstrap.utils.BootstrapTags._ - import io.udash.css.CssView._ private val collapseId = ComponentId.newId() @@ -87,9 +85,9 @@ object UdashNavbar { navigationFactory: Binding.NestedInterceptor => UdashNav[ItemType, ElemType], brand: Modifier = () ): UdashNavbar[ItemType, ElemType] = { - import io.udash.css.CssView._ + new UdashNavbar(expandBreakpoint, darkStyle, backgroundStyle, position, componentId)( - interceptor => navigationFactory(interceptor).render.styles(BootstrapStyles.NavigationBar.nav), + interceptor => navigationFactory(interceptor).render +: BootstrapStyles.NavigationBar.nav, brand ) } diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/pagination/UdashPagination.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/pagination/UdashPagination.scala index b51d30f16..8764f6138 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/pagination/UdashPagination.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/pagination/UdashPagination.scala @@ -24,8 +24,6 @@ final class UdashPagination[PageType : PropertyCreator, ElemType <: ReadableProp additionalListModifiers: Binding.NestedInterceptor => Modifier ) extends UdashBootstrapComponent { - import io.udash.css.CssView._ - // keep track of pages sequence changes and update selected page propertyListeners += pages.listenStructure { patch => if (patch.idx <= selectedPageIdx.get && patch.idx + patch.removed.size > selectedPageIdx.get) { diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/progressbar/UdashProgressBar.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/progressbar/UdashProgressBar.scala index 755f85dd1..ef1b3bf7b 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/progressbar/UdashProgressBar.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/progressbar/UdashProgressBar.scala @@ -19,7 +19,6 @@ final class UdashProgressBar private[progressbar]( override val componentId: ComponentId )(labelFactory: (ReadableProperty[Int], ReadableProperty[Int], ReadableProperty[Int], Binding.NestedInterceptor) => Modifier) extends UdashBootstrapComponent { - import io.udash.css.CssView._ protected def barModifiers: Seq[Modifier] = Seq[Modifier]( role := "progressbar", BootstrapStyles.ProgressBar.progressBar, diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/table/UdashTable.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/table/UdashTable.scala index 19721941f..8cb09d488 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/table/UdashTable.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/table/UdashTable.scala @@ -24,8 +24,6 @@ final class UdashTable[ItemType, ElemType <: ReadableProperty[ItemType]] private rowFactory: (ElemType, Binding.NestedInterceptor) => Element ) extends UdashBootstrapComponent { - import io.udash.css.CssView._ - override val render: Element = { div( nestedInterceptor((BootstrapStyles.Table.responsive _).reactiveOptionApply(responsive)), diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashPopover.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashPopover.scala index 47e6ea2a1..4c7edf000 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashPopover.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashPopover.scala @@ -49,7 +49,6 @@ object UdashPopover extends TooltipUtils[UdashPopover] { override protected val defaultPlacement = Placement.Right override protected val defaultTemplate: String = { - import io.udash.css.CssView._ import scalatags.Text.all._ div(BootstrapStyles.Popover.popover, role := "tooltip")( div(BootstrapStyles.arrow), diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashTooltip.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashTooltip.scala index 2e2585f5d..0eb8aecf0 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashTooltip.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashTooltip.scala @@ -48,7 +48,6 @@ object UdashTooltip extends TooltipUtils[UdashTooltip] { override protected val defaultPlacement = Placement.Top override protected val defaultTemplate: String = { - import io.udash.css.CssView._ import scalatags.Text.all._ div(BootstrapStyles.Tooltip.tooltip, role := "tooltip")( div(BootstrapStyles.Tooltip.arrow), diff --git a/bootstrap4/.js/src/test/scala/io/udash/bootstrap/BootstrapImplicitsTest.scala b/bootstrap4/.js/src/test/scala/io/udash/bootstrap/BootstrapImplicitsTest.scala index bd27e41f6..5313eb276 100644 --- a/bootstrap4/.js/src/test/scala/io/udash/bootstrap/BootstrapImplicitsTest.scala +++ b/bootstrap4/.js/src/test/scala/io/udash/bootstrap/BootstrapImplicitsTest.scala @@ -6,7 +6,6 @@ import io.udash.testing.UdashCoreFrontendTest import org.scalajs.dom.Element class BootstrapImplicitsTest extends UdashCoreFrontendTest { - import io.udash.css.CssView._ "StyleOps" should { "apply style conditionally" in { diff --git a/bootstrap4/.js/src/test/scala/io/udash/bootstrap/utils/UdashIconsTest.scala b/bootstrap4/.js/src/test/scala/io/udash/bootstrap/utils/UdashIconsTest.scala index 996ca7f93..14caa2c20 100644 --- a/bootstrap4/.js/src/test/scala/io/udash/bootstrap/utils/UdashIconsTest.scala +++ b/bootstrap4/.js/src/test/scala/io/udash/bootstrap/utils/UdashIconsTest.scala @@ -12,7 +12,7 @@ import scalatags.JsDom.all._ import scala.concurrent.Future -class UdashIconsTest extends AsyncUdashCoreFrontendTest with CssView { +class UdashIconsTest extends AsyncUdashCoreFrontendTest { override protected def beforeAll(): Unit = document.body.appendChild(UdashBootstrap.loadFontAwesome()) "Bootstrap icons" should { diff --git a/build.sbt b/build.sbt index 82f7f8eaa..1b88a75ea 100644 --- a/build.sbt +++ b/build.sbt @@ -3,6 +3,7 @@ import org.openqa.selenium.firefox.{FirefoxDriverLogLevel, FirefoxOptions} import org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv import org.scalajs.jsenv.selenium.SeleniumJSEnv import org.scalajs.sbtplugin.JSModuleID +import sbt.Def name := "udash" @@ -127,7 +128,7 @@ val aggregateProjectSettings = noPublishSettings ++ Seq( crossScalaVersions := Nil, ) -def sourceDirsSettings(baseMapper: File => File) = { +def sourceDirsSettings(baseMapper: File => File): Seq[Def.Setting[Seq[File]]] = { def mkSourceDirs(base: File, scalaBinary: String, conf: String): Seq[File] = Seq( base / "src" / conf / "scala", base / "src" / conf / s"scala-$scalaBinary", diff --git a/css/.js/src/main/scala/io/udash/css/CssView.scala b/css/.js/src/main/scala/io/udash/css/CssView.scala index 45adb1f0a..e09660704 100644 --- a/css/.js/src/main/scala/io/udash/css/CssView.scala +++ b/css/.js/src/main/scala/io/udash/css/CssView.scala @@ -7,31 +7,25 @@ import scalatags.JsDom.all.Modifier import scala.annotation.tailrec -/** Contains integration of CSS structures with Scalatags. */ trait CssView extends CssText { - import CssView._ implicit def style2Mod(style: CssStyle): Modifier = new StyleModifier(style) - implicit def elementOps(element: Element): ElementOps = new ElementOps(element) implicit def styleOps(style: CssStyle): StyleOps = new StyleOps(style) implicit def styleFactoryOps[T](factory: T => CssStyle): StyleFactoryOps[T] = new StyleFactoryOps[T](factory) } object CssView extends CssView { - private final class StyleModifier(styles: CssStyle*) extends Modifier { - override def applyTo(t: Element): Unit = - styles.foreach(_.addTo(t)) + private final class StyleModifier(style: CssStyle) extends Modifier { + override def applyTo(t: Element): Unit = style.addTo(t) } - final class ElementOps(private val element: Element) extends AnyVal { - def styles(styles: CssStyle*): Element = { - styles.foreach(_.addTo(element)) + final class StyleOps(private val style: CssStyle) extends AnyVal { + def +:(element: Element): Element = { + addTo(element) element } - } - final class StyleOps(private val style: CssStyle) extends AnyVal { def addTo(element: Element): Unit = style.classNames.foreach(element.classList.add) @@ -83,4 +77,4 @@ object CssView extends CssView { } } } -} +} \ No newline at end of file diff --git a/css/.js/src/test/scala/io/udash/css/CssViewTest.scala b/css/.js/src/test/scala/io/udash/css/CssViewTest.scala index a7735dd8b..68347d222 100644 --- a/css/.js/src/test/scala/io/udash/css/CssViewTest.scala +++ b/css/.js/src/test/scala/io/udash/css/CssViewTest.scala @@ -5,7 +5,6 @@ import io.udash.testing.UdashFrontendTest class CssViewTest extends UdashFrontendTest { - import CssView._ import StylesheetExample._ import scalatags.JsDom.all._ diff --git a/css/.jvm/src/main/scala/io/udash/css/CssView.scala b/css/.jvm/src/main/scala/io/udash/css/CssView.scala new file mode 100644 index 000000000..5cd2cbd65 --- /dev/null +++ b/css/.jvm/src/main/scala/io/udash/css/CssView.scala @@ -0,0 +1,5 @@ +package io.udash +package css + +//backend provides only text renderers +trait CssView extends CssText \ No newline at end of file diff --git a/css/src/main/scala/io/udash/css/CssStyle.scala b/css/src/main/scala/io/udash/css/CssStyle.scala index 1d022fa85..8816fec16 100644 --- a/css/src/main/scala/io/udash/css/CssStyle.scala +++ b/css/src/main/scala/io/udash/css/CssStyle.scala @@ -1,23 +1,26 @@ package io.udash.css +import com.avsystem.commons.misc.AbstractCase import scalacss.internal.{FontFace, StyleS} /** Representation of stylesheet elements. In JS it's always `CssStyleName`. */ -sealed trait CssStyle { +sealed trait CssStyle extends AbstractCase { def className: String // Primarily introduced for FontAwesome support, which requires adding two classes, e.g. "fa fa-adjust" def commonPrefixClass: Option[String] = None def classNames: Seq[String] = commonPrefixClass.toList :+ className } -case class CssStyleName(className: String) extends CssStyle -case class CssPrefixedStyleName(prefixClass: String, actualClassSuffix: String) extends CssStyle { +object CssStyle extends CssView + +final case class CssStyleName(className: String) extends CssStyle +final case class CssPrefixedStyleName(prefixClass: String, actualClassSuffix: String) extends CssStyle { val className = s"$prefixClass-$actualClassSuffix" override val commonPrefixClass: Option[String] = Some(prefixClass) } -case class CssStyleNameWithSharedCompanion(companionClass: String, commonPrefix: String, className: String) extends CssStyle { +final case class CssStyleNameWithSharedCompanion(companionClass: String, commonPrefix: String, className: String) extends CssStyle { override val commonPrefixClass: Option[String] = Some(commonPrefix) override def classNames: Seq[String] = Seq(companionClass, className) } -case class CssStyleImpl(className: String, impl: StyleS) extends CssStyle -case class CssKeyframes(className: String, steps: Seq[(Double, StyleS)]) extends CssStyle -case class CssFontFace(className: String, font: FontFace[Option[String]]) extends CssStyle +final case class CssStyleImpl(className: String, impl: StyleS) extends CssStyle +final case class CssKeyframes(className: String, steps: Seq[(Double, StyleS)]) extends CssStyle +final case class CssFontFace(className: String, font: FontFace[Option[String]]) extends CssStyle diff --git a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/CodeBlock.scala b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/CodeBlock.scala index 437570a82..f36963ba8 100644 --- a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/CodeBlock.scala +++ b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/CodeBlock.scala @@ -15,7 +15,6 @@ import scala.scalajs.js import scala.scalajs.js.annotation.JSGlobal object CodeBlock { - import io.udash.css.CssView._ @js.native @JSGlobal("Prism") diff --git a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/Footer.scala b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/Footer.scala index e599db218..c75b17039 100644 --- a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/Footer.scala +++ b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/Footer.scala @@ -11,7 +11,7 @@ import scalatags.JsDom import scalatags.JsDom.all._ object Footer { - import io.udash.css.CssView._ + private val styles = FooterStyles private def template(wrapperStyle: Opt[CssStyle]): JsDom.TypedTag[Element] = footer(styles.footer)( diff --git a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/HeaderButtons.scala b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/HeaderButtons.scala index f950603db..4614a37e2 100644 --- a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/HeaderButtons.scala +++ b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/HeaderButtons.scala @@ -8,7 +8,6 @@ import scalatags.JsDom import scalatags.JsDom.all._ trait HeaderButtons { - import io.udash.css.CssView._ val buttonStyles: HeaderButtonsStyles diff --git a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/HeaderNav.scala b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/HeaderNav.scala index 491ce106a..9f0a33cd1 100644 --- a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/HeaderNav.scala +++ b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/HeaderNav.scala @@ -4,7 +4,7 @@ import io.udash.web.commons.styles.components.HeaderNavStyles import org.scalajs.dom.Element trait HeaderNav { - import io.udash.css.CssView._ + import scalatags.JsDom.all._ import scalatags.JsDom.tags2.nav diff --git a/guide/commons/.js/src/main/scala/io/udash/web/commons/views/Component.scala b/guide/commons/.js/src/main/scala/io/udash/web/commons/views/Component.scala index b3092a46c..e6b1ab3f9 100644 --- a/guide/commons/.js/src/main/scala/io/udash/web/commons/views/Component.scala +++ b/guide/commons/.js/src/main/scala/io/udash/web/commons/views/Component.scala @@ -6,7 +6,7 @@ import org.scalajs.dom._ import scalatags.generic.Modifier -trait Component extends Modifier[dom.Element] with CssView { +trait Component extends Modifier[dom.Element] { def getTemplate: Modifier[dom.Element] def apply(): Modifier[dom.Element] = getTemplate diff --git a/guide/commons/.js/src/main/scala/io/udash/web/commons/views/MarkdownView.scala b/guide/commons/.js/src/main/scala/io/udash/web/commons/views/MarkdownView.scala index e0cf2549c..31c1ffc57 100644 --- a/guide/commons/.js/src/main/scala/io/udash/web/commons/views/MarkdownView.scala +++ b/guide/commons/.js/src/main/scala/io/udash/web/commons/views/MarkdownView.scala @@ -45,7 +45,7 @@ final class MarkdownPresenter[T <: MarkdownPageState]( } final class MarkdownView(model: ReadableModelProperty[MarkdownModel]) extends View { - import io.udash.css.CssView._ + import scalatags.JsDom.all._ override val getTemplate: Modifier = ISeq( diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/components/GuideMenu.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/components/GuideMenu.scala index 41b3496ce..dafbf79ee 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/components/GuideMenu.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/components/GuideMenu.scala @@ -23,7 +23,6 @@ case class MenuLink(override val name: String, state: RoutingState, fragment: Op class GuideMenu(entries: Seq[MenuEntry], property: Property[String]) { - import io.udash.css.CssView._ import scalatags.JsDom.all._ private val ClickEvent = "click" diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/components/Header.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/components/Header.scala index 1530a0d82..f88883d55 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/components/Header.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/components/Header.scala @@ -10,7 +10,7 @@ import io.udash.web.guide.styles.partials.HeaderStyles import scalatags.JsDom.all._ object Header extends HeaderButtons with HeaderNav { - import io.udash.css.CssView._ + private lazy val template = header(HeaderStyles.header)( div(GlobalStyles.body, GlobalStyles.clearfix)( div(HeaderStyles.headerLeft)( diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ContentView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ContentView.scala index 49596951c..7a4a70a4d 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ContentView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ContentView.scala @@ -11,7 +11,6 @@ import scalatags.JsDom.tags2._ object ContentViewFactory extends StaticViewFactory[ContentState.type](() => new ContentView) class ContentView extends ViewContainer { - import io.udash.css.CssView._ import scalatags.JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ErrorView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ErrorView.scala index c8d2292de..910f469af 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ErrorView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ErrorView.scala @@ -14,7 +14,7 @@ import scalatags.JsDom.tags2._ object ErrorViewFactory extends StaticViewFactory[ErrorState.type](() => new ErrorView) -class ErrorView extends View with CssView { +class ErrorView extends View { import scalatags.JsDom.all._ private val content = section(GuideStyles.sectionError)( diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/AdvancedBootstrappingSbtView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/AdvancedBootstrappingSbtView.scala index fa604103f..d824a5a77 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/AdvancedBootstrappingSbtView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/AdvancedBootstrappingSbtView.scala @@ -14,7 +14,7 @@ import scala.concurrent.Future case object AdvancedBootstrappingSbtViewFactory extends StaticViewFactory[AdvancedBootstrappingSbtState.type](() => new AdvancedBootstrappingSbtView) -final class AdvancedBootstrappingSbtView extends View with CssView { +final class AdvancedBootstrappingSbtView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingBackendView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingBackendView.scala index 042564668..af27354dc 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingBackendView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingBackendView.scala @@ -9,7 +9,7 @@ import scalatags.JsDom case object BootstrappingBackendViewFactory extends StaticViewFactory[BootstrappingBackendState.type](() => new BootstrappingBackendView) -class BootstrappingBackendView extends View with CssView { +class BootstrappingBackendView extends View { import Context._ import JsDom.all._ import io.udash.web.guide.views.References._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingFrontendView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingFrontendView.scala index 16a4999ce..e297d128c 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingFrontendView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingFrontendView.scala @@ -12,7 +12,7 @@ import scalatags.JsDom case object BootstrappingFrontendViewFactory extends StaticViewFactory[BootstrappingFrontendState.type](() => new BootstrappingFrontendView) -class BootstrappingFrontendView extends View with CssView { +class BootstrappingFrontendView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingIntroView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingIntroView.scala index 47baf65c1..a996400f1 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingIntroView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingIntroView.scala @@ -9,7 +9,7 @@ import scalatags.JsDom case object BootstrappingIntroViewFactory extends StaticViewFactory[BootstrappingIntroState.type](() => new BootstrappingIntroView) -class BootstrappingIntroView extends View with CssView { +class BootstrappingIntroView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingRpcView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingRpcView.scala index 34d807a42..b2d6226af 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingRpcView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingRpcView.scala @@ -9,7 +9,7 @@ import scalatags.JsDom case object BootstrappingRpcViewFactory extends StaticViewFactory[BootstrappingRpcState.type](() => new BootstrappingRpcView) -class BootstrappingRpcView extends View with CssView { +class BootstrappingRpcView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingSbtView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingSbtView.scala index 207afd0cf..b648f7512 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingSbtView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingSbtView.scala @@ -8,7 +8,7 @@ import scalatags.JsDom case object BootstrappingSbtViewFactory extends StaticViewFactory[BootstrappingSbtState.type](() => new BootstrappingSbtView) -final class BootstrappingSbtView extends View with CssView { +final class BootstrappingSbtView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/AuthorizationExtView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/AuthorizationExtView.scala index c999c092f..a675fad9a 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/AuthorizationExtView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/AuthorizationExtView.scala @@ -11,7 +11,7 @@ import scalatags.JsDom case object AuthorizationExtViewFactory extends StaticViewFactory[AuthorizationExtState.type](() => new AuthorizationExtView) -class AuthorizationExtView extends View with CssView { +class AuthorizationExtView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/BootstrapExtView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/BootstrapExtView.scala index fc48b24a1..512b952b0 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/BootstrapExtView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/BootstrapExtView.scala @@ -61,7 +61,7 @@ class BootstrapExtView extends View { h2("Statics"), p( "All Bootstrap tags and styles are available as UdashCSS styles. If you want to use ", - i("BootstrapStyles"), " import ", i("io.udash.css.CssView._"), ". It enables implicit conversion ", + i("BootstrapStyles"), " import ", i("io.udash.css.CssView._"), ". It enables implicit conversion ", //todo "from these styles into Scalatags modifiers." ), staticsSnippet, diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/I18NExtView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/I18NExtView.scala index 973781b58..6bc80e439 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/I18NExtView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/I18NExtView.scala @@ -10,7 +10,7 @@ import scalatags.JsDom case object I18NExtViewFactory extends StaticViewFactory[I18NExtState.type](() => new I18NExtView) -final class I18NExtView extends View with CssView { +final class I18NExtView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/DynamicRemoteTranslationsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/DynamicRemoteTranslationsDemo.scala index bbec7ae8e..224101fa2 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/DynamicRemoteTranslationsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/DynamicRemoteTranslationsDemo.scala @@ -9,7 +9,6 @@ object DynamicRemoteTranslationsDemo extends AutoDemo { private val (rendered, source) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import io.udash.i18n._ import io.udash.web.guide.Context.serverRpc import io.udash.web.guide.demos.i18n.Translations @@ -70,7 +69,6 @@ object DynamicRemoteTranslationsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ ( div( id := "dynamic-rpc-translations-demo", diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/FrontendTranslationsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/FrontendTranslationsDemo.scala index b1a3c3674..e206e2a56 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/FrontendTranslationsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/FrontendTranslationsDemo.scala @@ -6,7 +6,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object FrontendTranslationsDemo extends AutoDemo with CssView { +object FrontendTranslationsDemo extends AutoDemo { private val (rendered, source) = { import io.udash.i18n._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/JQueryCallbacksDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/JQueryCallbacksDemo.scala index e03778ba0..42123d0fc 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/JQueryCallbacksDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/JQueryCallbacksDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object JQueryCallbacksDemo extends AutoDemo with CssView { +object JQueryCallbacksDemo extends AutoDemo { private val (rendered, source) = { import io.udash.bootstrap.button.UdashButton diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/JQueryEventsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/JQueryEventsDemo.scala index 5c11a0900..87dc0fc57 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/JQueryEventsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/JQueryEventsDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object JQueryEventsDemo extends AutoDemo with CssView { +object JQueryEventsDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/RemoteTranslationsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/RemoteTranslationsDemo.scala index a9ae8d1e8..55d5566c4 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/RemoteTranslationsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/RemoteTranslationsDemo.scala @@ -6,7 +6,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object RemoteTranslationsDemo extends AutoDemo with CssView { +object RemoteTranslationsDemo extends AutoDemo { private val (rendered, source) = { import io.udash.i18n._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/RpcLoggingDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/RpcLoggingDemo.scala index a2c4c56cc..b29c46667 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/RpcLoggingDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/RpcLoggingDemo.scala @@ -10,7 +10,6 @@ import org.scalajs.dom._ import scalatags.JsDom.all._ object RpcLoggingDemo { - import io.udash.css.CssView._ def apply(model: ReadableSeqProperty[Call], loadCalls: () => Any): dom.Element = span(GuideStyles.frame, GuideStyles.useBootstrap)( button( diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/UrlLoggingDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/UrlLoggingDemo.scala index 244e811a9..c003f365f 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/UrlLoggingDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/UrlLoggingDemo.scala @@ -6,7 +6,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object UrlLoggingDemo extends AutoDemo with CssView { +object UrlLoggingDemo extends AutoDemo { private val ((enabled, history, add), source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/AccordionDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/AccordionDemo.scala index 80ae87ddc..f5332aac8 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/AccordionDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/AccordionDemo.scala @@ -10,7 +10,6 @@ object AccordionDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.collapse.{UdashAccordion, UdashCollapse} import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ val events = SeqProperty.blank[UdashCollapse.CollapseEvent] @@ -33,7 +32,6 @@ object AccordionDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/AlertsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/AlertsDemo.scala index f292512e7..7c99eb107 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/AlertsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/AlertsDemo.scala @@ -12,7 +12,6 @@ object AlertsDemo extends AutoDemo { import BootstrapStyles._ import io.udash.bootstrap.alert._ import io.udash.bootstrap.button.UdashButton - import io.udash.css.CssView._ import org.scalajs.dom.Element import scalatags.JsDom.all._ @@ -63,7 +62,6 @@ object AlertsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/BadgesDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/BadgesDemo.scala index ff7671b5c..bb2fba192 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/BadgesDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/BadgesDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object BadgesDemo extends AutoDemo with CssView { +object BadgesDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/BreadcrumbsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/BreadcrumbsDemo.scala index deaf516e5..50b97789d 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/BreadcrumbsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/BreadcrumbsDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object BreadcrumbsDemo extends AutoDemo with CssView { +object BreadcrumbsDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonDropdownDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonDropdownDemo.scala index 50fc79e02..4c4453f56 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonDropdownDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonDropdownDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object ButtonDropdownDemo extends AutoDemo with CssView { +object ButtonDropdownDemo extends AutoDemo { import io.udash.web.guide.Context._ import io.udash.web.guide.{BootstrapExtState, IntroState} diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonToolbarDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonToolbarDemo.scala index 2ccb575c0..d23c67658 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonToolbarDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonToolbarDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object ButtonToolbarDemo extends AutoDemo with CssView { +object ButtonToolbarDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonsDemo.scala index 99e781f61..5b6ace623 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonsDemo.scala @@ -13,7 +13,6 @@ object ButtonsDemo extends AutoDemo { import BootstrapStyles._ import io.udash.bootstrap.button.UdashButton import io.udash.css.CssStyle - import io.udash.css.CssView._ import scalatags.JsDom.all._ import scala.util.Random @@ -74,7 +73,6 @@ object ButtonsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CardsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CardsDemo.scala index b46041642..38efeb2ce 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CardsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CardsDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object CardsDemo extends AutoDemo with CssView { +object CardsDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CarouselDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CarouselDemo.scala index 473785460..ae41cbd33 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CarouselDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CarouselDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object CarouselDemo extends AutoDemo with CssView { +object CarouselDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CheckboxButtonsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CheckboxButtonsDemo.scala index b21c18ba0..d1c9b0378 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CheckboxButtonsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/CheckboxButtonsDemo.scala @@ -11,7 +11,6 @@ object CheckboxButtonsDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.button.UdashButtonGroup import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ val options = SeqProperty("Checkbox 1", "Checkbox 2", "Checkbox 3") @@ -40,7 +39,6 @@ object CheckboxButtonsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DatePickerDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DatePickerDemo.scala index 65d29f978..e139d5354 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DatePickerDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DatePickerDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object DatePickerDemo extends AutoDemo with CssView { +object DatePickerDemo extends AutoDemo { private val (rendered, source) = { import java.{util => ju} diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DateRangePickerDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DateRangePickerDemo.scala index 92878c039..bd250d9ff 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DateRangePickerDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DateRangePickerDemo.scala @@ -6,7 +6,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object DateRangePickerDemo extends AutoDemo with CssView { +object DateRangePickerDemo extends AutoDemo { private val (rendered, source) = { import java.util.concurrent.TimeUnit diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DropdownsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DropdownsDemo.scala index 1a4e8fefa..f2fc83dfb 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DropdownsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/DropdownsDemo.scala @@ -15,7 +15,6 @@ object DropdownsDemo extends AutoDemo with CrossLogging { import io.udash.bootstrap.dropdown.UdashDropdown import io.udash.bootstrap.dropdown.UdashDropdown._ import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import org.scalajs.dom.window import scalatags.JsDom.all._ @@ -69,7 +68,7 @@ object DropdownsDemo extends AutoDemo with CrossLogging { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ + (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/IconsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/IconsDemo.scala index 1b13b3185..679d59ad6 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/IconsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/IconsDemo.scala @@ -10,7 +10,6 @@ object IconsDemo extends AutoDemo { import io.udash.bootstrap._ import io.udash.bootstrap.button._ import io.udash.bootstrap.utils.UdashIcons - import io.udash.css.CssView._ import scalatags.JsDom.all._ UdashButtonToolbar()( @@ -34,7 +33,6 @@ object IconsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (div(GuideStyles.frame)(rendered), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/InlineFormDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/InlineFormDemo.scala index 0ea9ce1d3..a394489c9 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/InlineFormDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/InlineFormDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object InlineFormDemo extends AutoDemo with CssView { +object InlineFormDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/InputGroupDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/InputGroupDemo.scala index 5e7c8789a..b53832ced 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/InputGroupDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/InputGroupDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object InputGroupDemo extends AutoDemo with CssView { +object InputGroupDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/JumbotronDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/JumbotronDemo.scala index 3586050eb..470588391 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/JumbotronDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/JumbotronDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object JumbotronDemo extends AutoDemo with CssView { +object JumbotronDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/LabelsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/LabelsDemo.scala index a3ed69a77..d81cc31fb 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/LabelsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/LabelsDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object LabelsDemo extends AutoDemo with CssView { +object LabelsDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ListGroupDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ListGroupDemo.scala index a980f2060..b821e85d4 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ListGroupDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ListGroupDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object ListGroupDemo extends AutoDemo with CssView { +object ListGroupDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavbarDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavbarDemo.scala index 2c9fd628f..09afc47f1 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavbarDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavbarDemo.scala @@ -21,7 +21,6 @@ object NavbarDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.nav.{UdashNav, UdashNavbar} import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import org.scalajs.dom.Event import scalatags.JsDom.all._ @@ -68,7 +67,7 @@ object NavbarDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ + (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavigationDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavigationDemo.scala index 03278698e..91e9a8d9f 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavigationDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavigationDemo.scala @@ -14,7 +14,6 @@ object NavigationDemo extends AutoDemo { import io.udash.bootstrap.dropdown.UdashDropdown import io.udash.bootstrap.nav.{UdashNav, UdashNavbar} import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import org.scalajs.dom.html.Anchor import scalatags.JsDom.all._ @@ -53,7 +52,6 @@ object NavigationDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavsDemo.scala index 52103c634..2909277e8 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/NavsDemo.scala @@ -21,7 +21,6 @@ object NavsDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.nav.UdashNav import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import org.scalajs.dom.Event import scalatags.JsDom.all._ @@ -66,7 +65,6 @@ object NavsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/PaginationDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/PaginationDemo.scala index d1f59f7ed..6eab0243d 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/PaginationDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/PaginationDemo.scala @@ -13,7 +13,6 @@ object PaginationDemo extends AutoDemo { import io.udash.bootstrap.button.{UdashButton, UdashButtonGroup} import io.udash.bootstrap.pagination.UdashPagination import io.udash.bootstrap.pagination.UdashPagination._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ val showArrows = Property(true) @@ -54,7 +53,6 @@ object PaginationDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/PopoversDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/PopoversDemo.scala index 8678a8d5c..316f58af6 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/PopoversDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/PopoversDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object PopoversDemo extends AutoDemo with CssView { +object PopoversDemo extends AutoDemo { private val (rendered, source) = { import io.udash.bootstrap._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ProgressBarDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ProgressBarDemo.scala index d382a87d2..8894a637b 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ProgressBarDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ProgressBarDemo.scala @@ -13,7 +13,6 @@ object ProgressBarDemo extends AutoDemo { import io.udash.bootstrap.button._ import io.udash.bootstrap.progressbar.UdashProgressBar import io.udash.css.CssStyleName - import io.udash.css.CssView._ import scalatags.JsDom.all._ val showPercentage = Property(true) @@ -76,7 +75,6 @@ object ProgressBarDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/RadioButtonsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/RadioButtonsDemo.scala index dace968e1..fb0336f49 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/RadioButtonsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/RadioButtonsDemo.scala @@ -10,7 +10,6 @@ object RadioButtonsDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.button._ import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ val options = SeqProperty("Radio 1", "Radio 2", "Radio 3") @@ -37,7 +36,6 @@ object RadioButtonsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ResponsiveEmbedDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ResponsiveEmbedDemo.scala index dba9a71be..3e3302e8d 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ResponsiveEmbedDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ResponsiveEmbedDemo.scala @@ -8,7 +8,6 @@ object ResponsiveEmbedDemo extends AutoDemo { private val (rendered, source) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ div( @@ -36,7 +35,6 @@ object ResponsiveEmbedDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleCollapseDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleCollapseDemo.scala index 716109be7..0c4a1edea 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleCollapseDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleCollapseDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object SimpleCollapseDemo extends AutoDemo with CssView { +object SimpleCollapseDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleFormDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleFormDemo.scala index dd9e48026..9af2c6836 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleFormDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleFormDemo.scala @@ -7,7 +7,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object SimpleFormDemo extends AutoDemo with CssView { +object SimpleFormDemo extends AutoDemo { sealed trait ShirtSize diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleModalDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleModalDemo.scala index 4fd0627a8..b1a24403e 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleModalDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/SimpleModalDemo.scala @@ -13,7 +13,6 @@ object SimpleModalDemo extends AutoDemo { import io.udash.bootstrap.button.{UdashButton, UdashButtonGroup} import io.udash.bootstrap.modal.UdashModal import io.udash.bootstrap.modal.UdashModal._ - import io.udash.css.CssView._ import org.scalajs.dom.window import scalatags.JsDom.all._ @@ -72,7 +71,6 @@ object SimpleModalDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/StaticButtonsGroupDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/StaticButtonsGroupDemo.scala index 888bc8778..c059e3259 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/StaticButtonsGroupDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/StaticButtonsGroupDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object StaticButtonsGroupDemo extends AutoDemo with CssView { +object StaticButtonsGroupDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/StaticsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/StaticsDemo.scala index 011a48a81..8649bc539 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/StaticsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/StaticsDemo.scala @@ -8,7 +8,6 @@ object StaticsDemo extends AutoDemo { private val (rendered, source) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ div(Grid.row)( @@ -37,7 +36,6 @@ object StaticsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/TableDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/TableDemo.scala index d40d12025..f2e1a7834 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/TableDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/TableDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object TableDemo extends AutoDemo with CssView { +object TableDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ToggleButtonsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ToggleButtonsDemo.scala index 3a2da9672..e79b91029 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ToggleButtonsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ToggleButtonsDemo.scala @@ -10,7 +10,6 @@ object ToggleButtonsDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.button.UdashButton import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ val buttons = Color.values.map { color => @@ -48,7 +47,6 @@ object ToggleButtonsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/TooltipsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/TooltipsDemo.scala index fb34f901f..6cd11555b 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/TooltipsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/TooltipsDemo.scala @@ -12,7 +12,6 @@ object TooltipsDemo extends AutoDemo { import io.udash.bootstrap.badge.UdashBadge import io.udash.bootstrap.button.UdashButton import io.udash.bootstrap.tooltip.UdashTooltip - import io.udash.css.CssView._ import scalatags.JsDom.all._ import scala.concurrent.duration.DurationInt @@ -61,7 +60,6 @@ object TooltipsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (rendered.setup(_.applyTags(GuideStyles.frame)), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendBindingsView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendBindingsView.scala index 3f7cfa25e..9123ca77e 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendBindingsView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendBindingsView.scala @@ -10,7 +10,7 @@ import scalatags.JsDom case object FrontendBindingsViewFactory extends StaticViewFactory[FrontendBindingsState.type](() => new FrontendBindingsView) -class FrontendBindingsView extends View with CssView { +class FrontendBindingsView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendFormsView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendFormsView.scala index 90d67e2f0..65aaa251b 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendFormsView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendFormsView.scala @@ -10,7 +10,7 @@ import scalatags.JsDom case object FrontendFormsViewFactory extends StaticViewFactory[FrontendFormsState.type](() => new FrontendFormsView) -class FrontendFormsView extends View with CssView { +class FrontendFormsView extends View { import JsDom.all._ import io.udash.web.guide.Context._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendIntroView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendIntroView.scala index 2fef0398e..39adf3dab 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendIntroView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendIntroView.scala @@ -12,7 +12,7 @@ import scalatags.JsDom case object FrontendIntroViewFactory extends StaticViewFactory[FrontendIntroState.type](() => new FrontendIntroView) -class FrontendIntroView extends View with CssView { +class FrontendIntroView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendMVPView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendMVPView.scala index 4eaa502f7..1c9247522 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendMVPView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendMVPView.scala @@ -11,7 +11,7 @@ import scalatags.JsDom case object FrontendMVPViewFactory extends StaticViewFactory[FrontendMVPState.type](() => new FrontendMVPView) -class FrontendMVPView extends View with CssView { +class FrontendMVPView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendPropertiesView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendPropertiesView.scala index 42681b05e..863c55342 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendPropertiesView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendPropertiesView.scala @@ -10,7 +10,7 @@ import scalatags.JsDom case object FrontendPropertiesViewFactory extends StaticViewFactory[FrontendPropertiesState.type](() => new FrontendPropertiesView) -class FrontendPropertiesView extends View with CssView { +class FrontendPropertiesView extends View { import JsDom.all._ import io.udash.web.guide.Context._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendRoutingView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendRoutingView.scala index 441cf5836..a7f11b227 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendRoutingView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendRoutingView.scala @@ -27,7 +27,7 @@ class FrontendRoutingPresenter(url: Property[String]) extends Presenter[Frontend } } -class FrontendRoutingView(url: Property[String]) extends View with CssView { +class FrontendRoutingView(url: Property[String]) extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendTemplatesView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendTemplatesView.scala index aa8057ad1..6a61ffcf0 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendTemplatesView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendTemplatesView.scala @@ -13,7 +13,7 @@ import scalatags.JsDom case object FrontendTemplatesViewFactory extends StaticViewFactory[FrontendTemplatesState.type](() => new FrontendTemplatesView) -class FrontendTemplatesView extends View with CssView { +class FrontendTemplatesView extends View { import JsDom.all._ import io.udash.web.guide.Context._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/BindAttributeDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/BindAttributeDemo.scala index 23e6e572b..032ebc406 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/BindAttributeDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/BindAttributeDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object BindAttributeDemo extends AutoDemo with CssView { +object BindAttributeDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/BindDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/BindDemo.scala index 8054415a3..86f01b8a5 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/BindDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/BindDemo.scala @@ -6,7 +6,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object BindDemo extends AutoDemo with CssView { +object BindDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/CheckButtonsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/CheckButtonsDemo.scala index 13feeccbb..4c2132b6f 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/CheckButtonsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/CheckButtonsDemo.scala @@ -10,7 +10,6 @@ object CheckButtonsDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.form.UdashInputGroup import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import org.scalajs.dom.html.Input import scalatags.JsDom.all._ @@ -48,7 +47,6 @@ object CheckButtonsDemo extends AutoDemo { override protected def demoWithSource(): (Modifier, Iterator[String]) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ (div(id := "check-buttons-demo", GuideStyles.frame, GuideStyles.useBootstrap)( form(containerFluid)( div(Grid.row)(div(firstCheckButtons)), diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/CheckboxDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/CheckboxDemo.scala index 0ec482797..6359ce949 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/CheckboxDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/CheckboxDemo.scala @@ -11,7 +11,6 @@ object CheckboxDemo extends AutoDemo { import io.udash.bootstrap.form.UdashInputGroup import io.udash.bootstrap.form.UdashInputGroup._ import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import org.scalajs.dom.html.Div import scalatags.JsDom import scalatags.JsDom.all._ @@ -55,7 +54,6 @@ object CheckboxDemo extends AutoDemo { override protected def demoWithSource(): (Modifier, Iterator[String]) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ ( div( id := "checkbox-demo", diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/FileInputDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/FileInputDemo.scala index 481799507..93957826d 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/FileInputDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/FileInputDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object FileInputDemo extends AutoDemo with CssView { +object FileInputDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/IntroFormDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/IntroFormDemo.scala index fba3f3e11..caa3225f3 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/IntroFormDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/IntroFormDemo.scala @@ -16,7 +16,6 @@ object IntroFormDemo extends AutoDemo { import io.udash.bootstrap._ import io.udash.bootstrap.button.UdashButton import io.udash.bootstrap.form._ - import io.udash.css.CssView._ import io.udash.web.guide.components.BootstrapUtils import scala.collection.mutable diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/MultiSelectDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/MultiSelectDemo.scala index 64a952768..b695e9de7 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/MultiSelectDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/MultiSelectDemo.scala @@ -10,7 +10,6 @@ object MultiSelectDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.form.UdashInputGroup import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ sealed trait Fruit @@ -45,7 +44,7 @@ object MultiSelectDemo extends AutoDemo { override protected def demoWithSource(): (Modifier, Iterator[String]) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ + (div(id := "multi-select-demo", GuideStyles.frame, GuideStyles.useBootstrap)( form(containerFluid)( div(Grid.row)(firstMultiSelect), diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/ProduceDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/ProduceDemo.scala index 37109cdf6..b99bc1223 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/ProduceDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/ProduceDemo.scala @@ -9,10 +9,8 @@ object ProduceDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ - import io.udash.css.CssView._ import org.scalajs.dom.window import scalatags.JsDom.all._ - import scala.util.Random @silent("deprecated") @@ -41,7 +39,6 @@ object ProduceDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ ( div( id := "produce-demo", diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/RadioButtonsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/RadioButtonsDemo.scala index 5216be57c..83f42d86d 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/RadioButtonsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/RadioButtonsDemo.scala @@ -12,7 +12,6 @@ object RadioButtonsDemo extends AutoDemo { import io.udash.bootstrap.form.UdashInputGroup import io.udash.bootstrap.form.UdashInputGroup._ import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import org.scalajs.dom.html.Input import scalatags.JsDom.all._ @@ -50,7 +49,7 @@ object RadioButtonsDemo extends AutoDemo { override protected def demoWithSource(): (Modifier, Iterator[String]) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ + (div(id := "radio-buttons-demo", GuideStyles.frame, GuideStyles.useBootstrap)( form(containerFluid)( div(Grid.row)(firstRadioButtons), diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/RepeatDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/RepeatDemo.scala index 938cd4b5c..add8da96b 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/RepeatDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/RepeatDemo.scala @@ -9,10 +9,8 @@ object RepeatDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ - import io.udash.css.CssView._ import org.scalajs.dom.window import scalatags.JsDom.all._ - import scala.util.Random val integers = SeqProperty(1, 2, 3, 4) @@ -38,7 +36,6 @@ object RepeatDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (div(id := "repeat-demo", GuideStyles.frame)(rendered), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/SelectDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/SelectDemo.scala index 0e19b44c6..41b2a97a7 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/SelectDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/SelectDemo.scala @@ -10,7 +10,6 @@ object SelectDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.form.UdashInputGroup import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ sealed trait Fruit @@ -45,7 +44,7 @@ object SelectDemo extends AutoDemo { override protected def demoWithSource(): (Modifier, Iterator[String]) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ + (div(id := "select-demo", GuideStyles.frame, GuideStyles.useBootstrap)( form(containerFluid)( div(Grid.row)(firstSelect), diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/ShowIfDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/ShowIfDemo.scala index 1b6b7d63c..37d18b15a 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/ShowIfDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/ShowIfDemo.scala @@ -5,7 +5,7 @@ import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles import scalatags.JsDom.all._ -object ShowIfDemo extends AutoDemo with CssView { +object ShowIfDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/TextAreaDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/TextAreaDemo.scala index 2cc5c3631..3eb1bc5cc 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/TextAreaDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/TextAreaDemo.scala @@ -9,7 +9,6 @@ object TextAreaDemo extends AutoDemo { private val (rendered, source) = { import io.udash._ import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import scalatags.JsDom.all._ val text = Property("") @@ -30,7 +29,6 @@ object TextAreaDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, Iterator[String]) = { - import io.udash.css.CssView._ (div(id := "text-area-demo", GuideStyles.frame, GuideStyles.useBootstrap)(rendered), source.linesIterator) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/TextInputDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/TextInputDemo.scala index c94663d20..a047989be 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/TextInputDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/TextInputDemo.scala @@ -10,7 +10,6 @@ object TextInputDemo extends AutoDemo { import io.udash._ import io.udash.bootstrap.form.UdashInputGroup import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ import org.scalajs.dom.html.Div import scalatags.JsDom import scalatags.JsDom.all._ @@ -53,7 +52,7 @@ object TextInputDemo extends AutoDemo { override protected def demoWithSource(): (Modifier, Iterator[String]) = { import io.udash.bootstrap.utils.BootstrapStyles._ - import io.udash.css.CssView._ + (div(id := "inputs-demo", GuideStyles.frame, GuideStyles.useBootstrap)( form(containerFluid)( firstInputs, br, secondInputs diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcClientServerView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcClientServerView.scala index 51a5e07d8..d9774c42c 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcClientServerView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcClientServerView.scala @@ -10,7 +10,7 @@ import scalatags.JsDom case object RpcClientServerViewFactory extends StaticViewFactory[RpcClientServerState.type](() => new RpcClientServerView) -class RpcClientServerView extends View with CssView { +class RpcClientServerView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcInterfacesView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcInterfacesView.scala index f29cfd37a..93d02435a 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcInterfacesView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcInterfacesView.scala @@ -10,7 +10,7 @@ import scalatags.JsDom case object RpcInterfacesViewFactory extends StaticViewFactory[RpcInterfacesState.type](() => new RpcInterfacesView) -class RpcInterfacesView extends View with CssView { +class RpcInterfacesView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcIntroView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcIntroView.scala index 1a87415bf..49a6c8ec8 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcIntroView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcIntroView.scala @@ -11,7 +11,7 @@ import scalatags.JsDom case object RpcIntroViewFactory extends StaticViewFactory[RpcIntroState.type](() => new RpcIntroView) -class RpcIntroView extends View with CssView { +class RpcIntroView extends View { import JsDom.all._ import io.udash.web.guide.Context._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcSerializationView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcSerializationView.scala index 88ef27265..b891f75b8 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcSerializationView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcSerializationView.scala @@ -11,7 +11,7 @@ import scalatags.JsDom case object RpcSerializationViewFactory extends StaticViewFactory[RpcSerializationState.type](() => new RpcSerializationView) -class RpcSerializationView extends View with CssView { +class RpcSerializationView extends View { import Context._ import JsDom.all._ diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcServerClientView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcServerClientView.scala index a6b9753c2..1e9f6bc28 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcServerClientView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcServerClientView.scala @@ -10,7 +10,7 @@ import scalatags.JsDom case object RpcServerClientViewFactory extends StaticViewFactory[RpcServerClientState.type](() => new RpcServerClientView) -class RpcServerClientView extends View with CssView { +class RpcServerClientView extends View { import JsDom.all._ import io.udash.web.guide.Context._ diff --git a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/Buttons.scala b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/Buttons.scala deleted file mode 100644 index dc2daa486..000000000 --- a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/Buttons.scala +++ /dev/null @@ -1,21 +0,0 @@ -package io.udash.web.homepage.components - -import io.udash.web.homepage.styles.partials.ButtonsStyle - -import scalatags.JsDom.all._ - -/** - * Created by malchik on 2016-04-04. - */ -object Buttons { - import io.udash.css.CssView._ - def whiteBorderButton(link: String, label: String, xs: Modifier*): Modifier = - a(href := link, target := "_blank", ButtonsStyle.btnDefault, xs: Modifier)( - div(ButtonsStyle.btnDefaultInner)(label) - ) - - def blackBorderButton(link: String, label: String, xs: Modifier*): Modifier = - a(href := link, target := "_blank", ButtonsStyle.btnDefault, ButtonsStyle.btnDefaultBlack, xs: Modifier)( - div(ButtonsStyle.btnDefaultInner, ButtonsStyle.btnDefaultInnerBlack)(label) - ) -} diff --git a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/Header.scala b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/Header.scala index 55e8c89db..2732a3171 100644 --- a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/Header.scala +++ b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/Header.scala @@ -13,7 +13,6 @@ import org.scalajs.dom.raw.Element import scalatags.JsDom.all._ object Header extends HeaderButtons with HeaderNav { - import io.udash.css.CssView._ override val buttonStyles: HeaderButtonsStyles = HeaderStyles override val navStyles: HeaderNavStyles = HeaderStyles diff --git a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/ErrorView.scala b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/ErrorView.scala index 6594095c0..0dfa455c5 100644 --- a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/ErrorView.scala +++ b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/ErrorView.scala @@ -14,7 +14,7 @@ import scalatags.JsDom.tags2._ object ErrorViewFactory extends StaticViewFactory[IndexState](() => new ErrorView) -class ErrorView extends View with CssView { +class ErrorView extends View { import scalatags.JsDom.all._ private val content = section(HomepageStyles.sectionError)( diff --git a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/IndexView.scala b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/IndexView.scala index bc94076dc..a2e7ec562 100644 --- a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/IndexView.scala +++ b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/IndexView.scala @@ -6,9 +6,9 @@ import io.udash.web.commons.config.ExternalUrls import io.udash.web.commons.styles.GlobalStyles import io.udash.web.commons.views.{Image, SVG, Size} import io.udash.web.homepage._ -import io.udash.web.homepage.components.Buttons import io.udash.web.homepage.components.demo.DemoComponent -import io.udash.web.homepage.styles.partials.HomepageStyles +import io.udash.web.homepage.styles.partials.{ButtonsStyle, HomepageStyles} +import scalatags.JsDom case object IndexViewFactory extends ViewFactory[IndexState] { override def create(): (View, Presenter[IndexState]) = { @@ -37,11 +37,20 @@ class IndexView(state: Property[IndexState]) extends View { } private object IndexView { - import io.udash.css.CssView._ - import scalatags.JsDom.all._ - import scalatags.JsDom.tags2._ - private val sectionIntro = section(HomepageStyles.sectionIntro)( + import JsDom.all._ + + private def whiteBorderButton(link: String, label: String, xs: Modifier*): Modifier = + a(href := link, target := "_blank", ButtonsStyle.btnDefault, xs: Modifier)( + div(ButtonsStyle.btnDefaultInner)(label) + ) + + private def blackBorderButton(link: String, label: String, xs: Modifier*): Modifier = + a(href := link, target := "_blank", ButtonsStyle.btnDefault, ButtonsStyle.btnDefaultBlack, xs: Modifier)( + div(ButtonsStyle.btnDefaultInner, ButtonsStyle.btnDefaultInnerBlack)(label) + ) + + private val sectionIntro = JsDom.tags2.section(HomepageStyles.sectionIntro)( div(GlobalStyles.body, HomepageStyles.body)( div(HomepageStyles.introInner)( a(href := ExternalUrls.scalajs, HomepageStyles.introScala, target := "_blank")( @@ -55,12 +64,12 @@ private object IndexView { span("framework for building", br(), "beautiful and maintainable", br()), span(GlobalStyles.grey)("Web Applications") ), - Buttons.whiteBorderButton(ExternalUrls.guide, "Start your project") + whiteBorderButton(ExternalUrls.guide, "Start your project") ) ) ) - private val sectionFeatures = section(HomepageStyles.section)( + private val sectionFeatures = JsDom.tags2.section(HomepageStyles.section)( div(GlobalStyles.body, HomepageStyles.body)( h1( "Combined forces", br(), "of Scala & JavaScript" @@ -85,7 +94,7 @@ private object IndexView { ) ) - private val sectionMore = section(HomepageStyles.section)( + private val sectionMore = JsDom.tags2.section(HomepageStyles.section)( div(GlobalStyles.body, HomepageStyles.body)( h1("Why Udash?"), ul(HomepageStyles.moreList)( @@ -131,12 +140,12 @@ private object IndexView { ) ) - private def sectionDemo(state: Property[IndexState]) = section(HomepageStyles.sectionDemo)( + private def sectionDemo(state: Property[IndexState]) = JsDom.tags2.section(HomepageStyles.sectionDemo)( div(GlobalStyles.body, HomepageStyles.body)( h1("Have a code preview"), new DemoComponent(state).getTemplate, p(HomepageStyles.demoDescription)("It's free, try it now!"), - Buttons.blackBorderButton(ExternalUrls.guide, "Start your project") + blackBorderButton(ExternalUrls.guide, "Start your project") ) ) } \ No newline at end of file diff --git a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/RootView.scala b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/RootView.scala index 8d3a06ba6..f9e014ed3 100644 --- a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/RootView.scala +++ b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/views/RootView.scala @@ -14,7 +14,7 @@ import scala.scalajs.js object RootViewFactory extends StaticViewFactory[RootState.type](() => new RootView) -class RootView extends ContainerView with CssView { +class RootView extends ContainerView { import scalatags.JsDom.all._ private val content = div(