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.

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

fix: form style consistency #762

Merged
merged 4 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions src/elm/Pages/Deployments/Form.elm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import Html
, em
, input
, label
, p
, section
, span
, strong
Expand Down Expand Up @@ -116,13 +117,11 @@ viewDeployEnabled repo_settings =
case repo_settings of
RemoteData.Success repo ->
if repo.allow_deploy then
section []
p []
[]

else
section [ class "notice" ]
[ strong [] [ text "Deploy webhook for this repo must be enabled in settings" ]
]
p [ class "notice" ] [ text "Deploy webhook for this repo must be enabled in settings" ]

_ ->
section [] []
Expand Down
6 changes: 3 additions & 3 deletions src/elm/Pages/Deployments/View.elm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ addDeployment : PartialModel a msg -> Html Msg
addDeployment model =
div [ class "manage-deployment", Util.testAttribute "add-deployment" ]
[ div []
[ addForm model.deploymentModel
[ h2 [] [ text "Add Deployment" ]
, addForm model.deploymentModel
]
]

Expand All @@ -58,8 +59,7 @@ addForm deploymentModel =
""
in
div [ class "deployment-form" ]
[ h2 [ class "deployment-header" ] [ text "Add Deployment" ]
, viewDeployEnabled deploymentModel.repo_settings
[ viewDeployEnabled deploymentModel.repo_settings

-- GitHub default is "production". If we support more SCMs, this line may need tweaking
, viewValueInput "Target" deployment.target "provide the name for the target deployment environment (default: \"production\")"
Expand Down
12 changes: 6 additions & 6 deletions src/elm/Pages/Secrets/Form.elm
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ viewEventsSelect secret model =
scheduleOption =
if schedulesAllowed then
[ strong [ class "settings-subtitle" ] [ text "Schedule" ]
, div [ class "form-controls", class "-two-col-secrets" ]
, div [ class "form-controls", class "-two-col" ]
[ checkbox "Schedule"
"schedule"
secret.allowEvents.schedule.run
Expand All @@ -202,7 +202,7 @@ viewEventsSelect secret model =
, pullRequestWarning
]
, strong [ class "settings-subtitle" ] [ text "Push" ]
, div [ class "form-controls", class "-two-col-secrets" ]
, div [ class "form-controls", class "-two-col" ]
[ checkbox "Push"
"allow_push_branch"
secret.allowEvents.push.branch
Expand All @@ -215,7 +215,7 @@ viewEventsSelect secret model =
OnChangeEvent "allow_push_tag"
]
, strong [ class "settings-subtitle" ] [ text "Pull Request" ]
, div [ class "form-controls", class "-two-col-secrets" ]
, div [ class "form-controls", class "-two-col" ]
[ checkbox "Opened"
"allow_pull_opened"
secret.allowEvents.pull.opened
Expand All @@ -238,15 +238,15 @@ viewEventsSelect secret model =
OnChangeEvent "allow_pull_reopened"
]
, strong [ class "settings-subtitle" ] [ text "Deployments" ]
, div [ class "form-controls", class "-two-col-secrets" ]
, div [ class "form-controls", class "-two-col" ]
[ checkbox "Created"
"allow_deploy_created"
secret.allowEvents.deploy.created
<|
OnChangeEvent "allow_deploy_created"
]
, strong [ class "settings-subtitle" ] [ text "Comment" ]
, div [ class "form-controls", class "-two-col-secrets" ]
, div [ class "form-controls", class "-two-col" ]
[ checkbox "Created"
"allow_comment_created"
secret.allowEvents.comment.created
Expand All @@ -259,7 +259,7 @@ viewEventsSelect secret model =
OnChangeEvent "allow_comment_edited"
]
, strong [ class "settings-subtitle" ] [ text "Delete" ]
, div [ class "form-controls", class "-two-col-secrets" ]
, div [ class "form-controls", class "-two-col" ]
[ checkbox "Branch"
"allow_push_delete_branch"
secret.allowEvents.push.delete_branch
Expand Down
15 changes: 2 additions & 13 deletions src/scss/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
// <label class="form-label">...</label>
// </div>
textarea {
width: 70%;
width: 100%;
margin-top: 0.2rem;
margin-bottom: 0.5rem;
padding: 0.5rem;
Expand Down Expand Up @@ -246,7 +246,7 @@

.form-controls {
display: flex;
justify-content: space-between;
justify-content: flex-start;
padding: 0.5rem 1rem;

border: none;
Expand All @@ -261,16 +261,6 @@
}
}

&.-two-col-secrets {
flex-flow: row wrap;
gap: 0.5rem;
max-width: 30%;

.form-control {
flex: 0 0 40%;
}
}

.form-control {
margin-right: 0.5rem;
}
Expand All @@ -287,7 +277,6 @@
// .-row is for horizontally stacking controls
&.-row {
flex-flow: row nowrap;
justify-content: flex-start;

.form-control:not(:last-child) {
margin-right: 0.5rem;
Expand Down
24 changes: 1 addition & 23 deletions src/scss/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1553,6 +1553,7 @@ details.build-toggle {
.secret-form,
.deployment-form,
.schedule-form {
max-width: 45rem;
margin-bottom: 0.5rem;
padding-top: 1rem;
}
Expand Down Expand Up @@ -1632,25 +1633,6 @@ details.build-toggle {
padding: 1rem;
}

.manage-secret .subheader,
.manage-deployment .subheader {
width: 80%;
margin-top: 1rem;

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

.manage-secret input,
.manage-deployment input {
max-width: 400px;
}

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

.secret-form .help,
.deployment-form .help,
.schedule-form .help {
Expand All @@ -1663,10 +1645,6 @@ details.build-toggle {
padding-left: 1rem;
}

.deployment-form h2.deployment-header {
margin-bottom: 1rem;
}

.add-deployment-buttons {
justify-content: flex-end;
}
Expand Down
Loading