TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-09-30 00:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tailwind setup

Browse Source 
- Adopted postcss and tailwind config to new version
- renamed colors bluegray->slate etc to not have custom
  definitions (hope to reduce migration next time)
- tailwind now doesn't build the complete css anymore, so the
  `dev-ui-build` script must compile both
This commit is contained in:
eikek
2021-12-20 23:03:05 +01:00
parent e9d5377a45
commit f5e375614f
50 changed files with 592 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/webapp/src/main/elm/Page/Home/SideMenu.elm
View File

@@ -36,7 +36,7 @@ view texts flags settings model =
, title = texts.editMode
, inputClass =
[ ( S.secondaryBasicButton, True )
, ( "bg-gray-200 dark:bg-bluegray-600", selectActive model )
, ( "bg-gray-200 dark:bg-slate-600", selectActive model )
]
}
, MB.CustomButton

22
modules/webapp/src/main/elm/Page/Home/View2.elm
View File

@@ -296,7 +296,7 @@ defaultMenuBar texts flags settings model =
, title = texts.selectModeTitle
, inputClass =
[ ( btnStyle, True )
, ( "bg-gray-200 dark:bg-bluegray-600", selectActive model )
, ( "bg-gray-200 dark:bg-slate-600", selectActive model )
]
}
, MB.Dropdown
@@ -375,11 +375,11 @@ defaultMenuBar texts flags settings model =
, inputClass =
[ ( btnStyle, True )
, ( "hidden sm:inline-block", False )
, ( "bg-gray-200 dark:bg-bluegray-600", settings.cardPreviewFullWidth )
, ( "bg-gray-200 dark:bg-slate-600", settings.cardPreviewFullWidth )
]
}
]
, rootClasses = "mb-2 pt-1 dark:bg-bluegray-700 items-center text-sm"
, rootClasses = "mb-2 pt-1 dark:bg-slate-700 items-center text-sm"
}
@@ -401,7 +401,7 @@ editMenuBar texts model svm =
, title = texts.editSelectedItems selectCount
, inputClass =
[ ( btnStyle, True )
, ( "bg-gray-200 dark:bg-bluegray-600", svm.action == EditSelected )
, ( "bg-gray-200 dark:bg-slate-600", svm.action == EditSelected )
, ( "hidden", model.searchMenuModel.searchMode == Data.SearchMode.Trashed )
]
}
@@ -412,7 +412,7 @@ editMenuBar texts model svm =
, title = texts.reprocessSelectedItems selectCount
, inputClass =
[ ( btnStyle, True )
, ( "bg-gray-200 dark:bg-bluegray-600", svm.action == ReprocessSelected )
, ( "bg-gray-200 dark:bg-slate-600", svm.action == ReprocessSelected )
, ( "hidden", model.searchMenuModel.searchMode == Data.SearchMode.Trashed )
]
}
@@ -423,7 +423,7 @@ editMenuBar texts model svm =
, title = texts.deleteSelectedItems selectCount
, inputClass =
[ ( btnStyle, True )
, ( "bg-gray-200 dark:bg-bluegray-600", svm.action == DeleteSelected )
, ( "bg-gray-200 dark:bg-slate-600", svm.action == DeleteSelected )
, ( "hidden", model.searchMenuModel.searchMode == Data.SearchMode.Trashed )
]
}
@@ -434,7 +434,7 @@ editMenuBar texts model svm =
, title = texts.undeleteSelectedItems selectCount
, inputClass =
[ ( btnStyle, True )
, ( "bg-gray-200 dark:bg-bluegray-600", svm.action == RestoreSelected )
, ( "bg-gray-200 dark:bg-slate-600", svm.action == RestoreSelected )
, ( "hidden", model.searchMenuModel.searchMode == Data.SearchMode.Normal )
]
}
@@ -445,7 +445,7 @@ editMenuBar texts model svm =
, title = texts.mergeItemsTitle selectCount
, inputClass =
[ ( btnStyle, True )
, ( "bg-gray-200 dark:bg-bluegray-600", svm.action == MergeSelected )
, ( "bg-gray-200 dark:bg-slate-600", svm.action == MergeSelected )
, ( "hidden", model.searchMenuModel.searchMode == Data.SearchMode.Trashed )
]
}
@@ -456,7 +456,7 @@ editMenuBar texts model svm =
, title = texts.publishItemsTitle selectCount
, inputClass =
[ ( btnStyle, True )
, ( "bg-gray-200 dark:bg-bluegray-600", svm.action == PublishSelected )
, ( "bg-gray-200 dark:bg-slate-600", svm.action == PublishSelected )
, ( "hidden", model.searchMenuModel.searchMode == Data.SearchMode.Trashed )
]
}
@@ -483,7 +483,7 @@ editMenuBar texts model svm =
, MB.TextLabel
{ icon = ""
, label = String.fromInt selectCount
, class = "px-4 py-2 w-10 rounded-full font-bold bg-blue-100 dark:bg-lightblue-600 "
, class = "px-4 py-2 w-10 rounded-full font-bold bg-blue-100 dark:bg-sky-600 "
}
, MB.CustomButton
{ tagger = ResetSearch
@@ -502,7 +502,7 @@ editMenuBar texts model svm =
, title = texts.exitSelectMode
, inputClass =
[ ( btnStyle, True )
, ( "bg-gray-200 dark:bg-bluegray-600", selectActive model )
, ( "bg-gray-200 dark:bg-slate-600", selectActive model )
]
}
]

2
modules/webapp/src/main/elm/Page/Login/View2.elm
View File

@@ -97,7 +97,7 @@ openIdLinks texts flags =
{ label = texts.or
, topCss = "w-2/3 mb-4 hidden md:inline-flex w-full"
, labelCss = "px-4 bg-gray-200 bg-opacity-50"
, lineColor = "bg-gray-300 dark:bg-bluegray-600"
, lineColor = "bg-gray-300 dark:bg-slate-600"
}
, div [ class "flex flex-row space-x-4 items-center justify-center" ]
(List.map renderLink provs)

2
modules/webapp/src/main/elm/Page/NewInvite/View2.elm
View File

@@ -53,7 +53,7 @@ viewContent texts flags _ model =
[ div
[ class "inline-flex items-center justify-center"
, class "absolute left-0 top-0 h-full w-10"
, class "text-gray-400 dark:text-bluegray-400"
, class "text-gray-400 dark:text-slate-400"
]
[ i [ class "fa fa-key" ] []
]

6
modules/webapp/src/main/elm/Page/Queue/View2.elm
View File

@@ -55,7 +55,7 @@ viewSidebar texts visible _ _ model =
[ href "#"
, class S.sidebarLink
, class cls
, classList [ ( "bg-blue-100 dark:bg-bluegray-600", model.queueView == v ) ]
, classList [ ( "bg-blue-100 dark:bg-slate-600", model.queueView == v ) ]
, onClick (SetQueueView v)
]
[ i [ class icon ]
@@ -63,7 +63,7 @@ viewSidebar texts visible _ _ model =
, div
[ class "ml-3" ]
[ text label ]
, div [ class "ml-auto bg-gray-200 border rounded-full h-6 w-6 flex items-center justify-center text-xs dark:bg-bluegray-800 dark:text-bluegray-200 dark:border-bluegray-800 dark:bg-opacity-50" ]
, div [ class "ml-auto bg-gray-200 border rounded-full h-6 w-6 flex items-center justify-center text-xs dark:bg-slate-800 dark:text-slate-200 dark:border-slate-800 dark:bg-opacity-50" ]
[ count v |> String.fromInt |> text
]
]
@@ -191,7 +191,7 @@ renderJobLog : JobDetail -> Html Msg
renderJobLog job =
div
[ class " absolute top-12 left-0 w-full h-full-12 z-40 flex flex-col items-center px-4 py-2 "
, class "bg-white bg-opacity-80 dark:bg-black dark:bg-bluegray-900 dark:bg-opacity-90"
, class "bg-white bg-opacity-80 dark:bg-black dark:bg-slate-900 dark:bg-opacity-90"
]
[ div [ class (S.box ++ "py-2 px-2 flex flex-col w-full") ]
[ div [ class "flex flex-row mb-4 px-2" ]

4
modules/webapp/src/main/elm/Page/Share/Menubar.elm
View File

@@ -91,7 +91,7 @@ view texts flags model =
, attrs =
[ href "#"
, title texts.extendedSearch
, classList [ ( "bg-gray-200 dark:bg-bluegray-600", model.searchMode == SearchBarNormal ) ]
, classList [ ( "bg-gray-200 dark:bg-slate-600", model.searchMode == SearchBarNormal ) ]
]
}
]
@@ -147,5 +147,5 @@ view texts flags model =
]
}
]
, rootClasses = "mb-2 pt-1 dark:bg-bluegray-700 items-center text-sm"
, rootClasses = "mb-2 pt-1 dark:bg-slate-700 items-center text-sm"
}

18
modules/webapp/src/main/elm/Page/ShareDetail/View.elm
View File

@@ -97,7 +97,7 @@ itemData texts flags model shareId itemId =
"mb-4 sm:mb-6"
headerStyle =
"py-2 bg-blue-50 hover:bg-blue-100 dark:bg-bluegray-700 dark:hover:bg-opacity-100 dark:hover:bg-bluegray-600 text-lg font-medium rounded-lg"
"py-2 bg-blue-50 hover:bg-blue-100 dark:bg-slate-700 dark:hover:bg-opacity-100 dark:hover:bg-slate-600 text-lg font-medium rounded-lg"
showTag tag =
div
@@ -200,9 +200,9 @@ itemPreview texts flags settings model =
Maybe.withDefault (texts.noName ++ ".pdf") attach.name
in
div
[ class "flex flex-grow flex-col h-full border-t dark:border-bluegray-600"
[ class "flex flex-grow flex-col h-full border-t dark:border-slate-600"
]
[ div [ class "flex flex-col sm:flex-row items-center py-1 px-1 border-l border-r dark:border-bluegray-600" ]
[ div [ class "flex flex-col sm:flex-row items-center py-1 px-1 border-l border-r dark:border-slate-600" ]
[ div [ class "text-base font-bold flex-grow w-full text-center sm:text-left break-all" ]
[ text attachName
, text " ("
@@ -242,7 +242,7 @@ itemPreview texts flags settings model =
]
, attachmentSelect texts model
, div
[ class "flex w-full h-full mb-4 border-b border-l border-r dark:border-bluegray-600"
[ class "flex w-full h-full mb-4 border-b border-l border-r dark:border-slate-600"
, style "min-height" "500px"
]
[ embed
@@ -299,7 +299,7 @@ passwordContent texts flags versionInfo model =
attachmentSelect : Texts -> Model -> Html Msg
attachmentSelect texts model =
div
[ class "flex flex-row border-l border-t border-r px-2 py-2 dark:border-bluegray-600 "
[ class "flex flex-row border-l border-t border-r px-2 py-2 dark:border-slate-600 "
, class "overflow-x-auto overflow-y-none"
, classList
[ ( "hidden", not model.attachMenuOpen )
@@ -319,11 +319,11 @@ menuItem texts model pos attach =
in
a
[ classList <|
[ ( "border-blue-500 dark:border-lightblue-500", pos == 0 )
, ( "dark:border-bluegray-600", pos /= 0 )
[ ( "border-blue-500 dark:border-sky-500", pos == 0 )
, ( "dark:border-slate-600", pos /= 0 )
]
, class "flex flex-col relative border rounded px-1 py-1 mr-2"
, class " hover:shadow dark:hover:border-bluegray-500"
, class " hover:shadow dark:hover:border-slate-500"
, href "#"
, onClick (SelectActiveAttachment pos)
]
@@ -331,7 +331,7 @@ menuItem texts model pos attach =
[ classList
[ ( "hidden", not visible )
]
, class "absolute right-1 top-1 text-blue-400 dark:text-lightblue-400 text-xl"
, class "absolute right-1 top-1 text-blue-400 dark:text-sky-400 text-xl"
]
[ i [ class iconClass ] []
]