Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance: schedules consistent style #678

Merged
merged 8 commits into from
Jun 15, 2023
Merged

enhance: schedules consistent style #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3353f8
fix: remove tabs from add-deployment
plyr4 Jun 9, 2023
3e64e54
chore: separate refactor
plyr4 Jun 9, 2023
efc6f1d
Merge branch 'main' into fix/deployment-add-tabs
plyr4 Jun 12, 2023
2478c8b
Merge branch 'main' of github.com:go-vela/ui into fix/deployment-add-…
plyr4 Jun 15, 2023
bb0d1a3
enhance: use consistent form styling for schedules
plyr4 Jun 15, 2023
00e39a6
fix: add header to edit schedule
plyr4 Jun 15, 2023
e8c068c
revert: Nav.elm changes for deployments
plyr4 Jun 15, 2023
abe9f32
Merge branch 'main' into enhance/schedules-consistent-style
wass3rw3rk Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/elm/Pages/Schedules/Model.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ type alias ScheduleForm =

defaultScheduleUpdate : ScheduleForm
defaultScheduleUpdate =
ScheduleForm "Daily" "0 0 * * *" True
ScheduleForm "" "0 0 * * *" True



Expand Down
9 changes: 6 additions & 3 deletions src/elm/Pages/Schedules/View.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import Html
, a
, button
, div
, h2
, span
, td
, text
Expand Down Expand Up @@ -171,9 +172,10 @@ updateScheduleHref org repo s =
-}
addSchedule : PartialModel a msg -> Html Msg
addSchedule model =
div [ class "add-schedule", Util.testAttribute "add-schedule" ]
div [ class "manage-schedule", Util.testAttribute "manage-schedule" ]
[ div []
[ addForm model.schedulesModel
[ h2 [] [ text "Add Schedule" ]
, addForm model.schedulesModel
]
]

Expand Down Expand Up @@ -212,7 +214,8 @@ editSchedule model =
Success _ ->
div [ class "manage-schedule", Util.testAttribute "manage-schedule" ]
[ div []
[ editForm model.schedulesModel
[ h2 [] [ text "View/Edit Schedule" ]
, editForm model.schedulesModel
]
]

Expand Down
24 changes: 16 additions & 8 deletions src/scss/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,7 +1440,8 @@ details.build-toggle {
}

.manage-secret .header,
.manage-deployment .header {
.manage-deployment .header,
.manage-schedule .header {
display: flex;
flex-direction: row;
align-items: center;
Expand All @@ -1451,20 +1452,23 @@ details.build-toggle {
}

.manage-secret h2,
.manage-deployment h2 {
.manage-deployment h2,
.manage-schedule h2 {
margin: 0;

border-bottom: 2px solid var(--color-secondary);
}

.secret-form,
.deployment-form {
.deployment-form,
.schedule-form {
margin-bottom: 0.5rem;
padding-top: 1rem;
}

.secret-form section,
.deployment-form section {
.deployment-form section,
.schedule-form section {
justify-content: flex-start;
margin-bottom: 1rem;
}
Expand Down Expand Up @@ -1547,7 +1551,8 @@ details.build-toggle {

.manage-secret textarea,
.update-secret textarea,
.manage-deployment textarea {
.manage-deployment textarea,
.manage-schedule textarea {
width: 70%;
margin-bottom: 0.5rem;
padding: 0.5rem;
Expand All @@ -1567,17 +1572,20 @@ details.build-toggle {
}

.manage-secret textarea,
.manage-deployment textarea {
.manage-deployment textarea,
.manage-schedule textarea {
max-width: 70%;
}

.secret-form .help,
.deployment-form .help {
.deployment-form .help,
.schedule-form .help {
padding-bottom: 1rem;
}

.secret-form .form-action,
.deployment-form .form-action {
.deployment-form .form-action,
.schedule-form .form-action {
padding-left: 1rem;
}

Expand Down