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

Jump to bottom

fix(Global): Visual change flat without shadow inconsistency #1629

Merged
merged 1 commit into from
Aug 29, 2024
Merged

fix(Global): Visual change flat without shadow inconsistency #1629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions code/src/cljs/sixsq/nuvla/ui/pages/apps/apps_application/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,7 @@
is-module-published? (subscribe [::apps-subs/is-module-published?])
{:keys [id created updated name parent-path price]} @module]
[ui/Segment {:secondary true
:color "blue"
:raised true}
:color "blue"}
[:h4 {:class "tab-app-detail"} (str/capitalize (@tr [:summary]))]
[ui/Table {:basic "very"
:padded false
Expand Down
3 changes: 1 addition & 2 deletions code/src/cljs/sixsq/nuvla/ui/pages/apps/apps_applications_sets/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,7 @@
is-module-published? (subscribe [::apps-subs/is-module-published?])
{:keys [id created updated name parent-path path]} @module]
[ui/Segment {:secondary true
:color "blue"
:raised true}
:color "blue"}
[:h4 (str/capitalize (@tr [:summary]))]
[ui/Table {:basic "very"
:padded false}
Expand Down
6 changes: 2 additions & 4 deletions code/src/cljs/sixsq/nuvla/ui/pages/apps/apps_project/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@
module (subscribe [::apps-subs/module])]
(fn []
(let [children (:children @module)]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[:h4 {:class "tab-app-detail"} (str/capitalize (@tr [:content]))]
(if (empty? children)
[ui/Message {:warning true}
Expand All @@ -70,8 +69,7 @@
(let [tr (subscribe [::i18n-subs/tr])
module (subscribe [::apps-subs/module])
{:keys [id created updated name parent-path path]} @module]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[:h4 {:class "tab-app-detail"} (str/capitalize (@tr [:project]))]
[ui/Grid
[ui/GridColumn
Expand Down
1 change: 0 additions & 1 deletion code/src/cljs/sixsq/nuvla/ui/pages/apps/views_detail.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,7 +1371,6 @@
device (subscribe [::main-subs/device])
{:keys [logo-url]} @(subscribe [::subs/module])]
[ui/Segment {:secondary true
:raised true
:padded true}
[ui/Grid {:columns 1
:stackable true}
Expand Down
2 changes: 0 additions & 2 deletions code/src/cljs/sixsq/nuvla/ui/pages/dashboard/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
(let [tr @(subscribe [::i18n-subs/tr])
{:keys [resource tab-index tab-index-event]} utils/target-nbs]
[ui/Segment {:secondary true
:raised true
:class "nuvla-edges"
:style {:display "flex"
:flex-direction "column"
Expand Down Expand Up @@ -122,7 +121,6 @@
[]
(let [tr @(subscribe [::i18n-subs/tr])]
[ui/Segment {:secondary true
:raised true
:class "audit-logs"
:style {:display "flex"
:flex-direction "column"
Expand Down
6 changes: 2 additions & 4 deletions code/src/cljs/sixsq/nuvla/ui/pages/data_set/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,11 +552,9 @@
[ui/GridColumn
[ui/SegmentGroup {:style {:display "flex"
:justify-content "space-between"
:background "#f3f4f5"}
:raised true}
:background "#f3f4f5"}}
[ui/Segment {:secondary true
:color "green"
:raised true}
:color "green"}

[:h4 {:style {:margin-top 0}} (str/capitalize (@tr [:summary]))]

Expand Down
3 changes: 1 addition & 2 deletions code/src/cljs/sixsq/nuvla/ui/pages/deployment_sets_detail/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,7 @@
[{:keys [id created updated created-by state operational-status] :as deployment-set} creating?]
(let [tr (subscribe [::i18n-subs/tr])]
[ui/Segment {:secondary true
:color "blue"
:raised true}
:color "blue"}
[:h4 (if creating?
(str (@tr [:creating-new]) (str/lower-case (@tr [:deployment-group])))
(@tr [:deployment-group]))]
Expand Down
9 changes: 3 additions & 6 deletions code/src/cljs/sixsq/nuvla/ui/pages/deployments_detail/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,7 @@
{:keys [id created updated name description
parent-path path logo-url]} module
desc-short (values/markdown->summary description)]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[ui/Segment (merge style/basic {:floated "right"})
[ui/Image {:src (or logo-url "")
:bordered true
Expand Down Expand Up @@ -515,10 +514,8 @@
urls (get-in module [:content :urls])]

[ui/SegmentGroup {:style {:display "flex", :justify-content "space-between",
:background "#f3f4f5"}
:raised true}
[ui/Segment {:secondary true
:raised true}
:background "#f3f4f5"}}
[ui/Segment {:secondary true}

[:h4 {:style {:margin-top 0}} (str/capitalize (@tr [:summary]))]

Expand Down
16 changes: 6 additions & 10 deletions code/src/cljs/sixsq/nuvla/ui/pages/edges/add_modal.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
[ui/Divider {:horizontal true}
[ui/Header (@tr [:nuvlabox-quick-install])]]

[ui/SegmentGroup {:raised true}
[ui/SegmentGroup
(if k8s-install?
[:<>
[ui/Segment {:loading (nil? @zip-url)
Expand Down Expand Up @@ -291,27 +291,24 @@
[ui/Divider {:horizontal true}
[ui/Header (@tr [:instructions])]]

[ui/SegmentGroup {:raised true}
[ui/SegmentGroup
[ui/Segment {:loading (nil? nuvlabox-trigger-file)
:text-align :center
:raised true}
:text-align :center}
[ui/Label {:circular true
:color "green"} "1"]
[:h5 {:style {:margin "0.5em 0 1em 0"}}
(@tr [:nuvlabox-modal-usb-copy])
[ui/Popup {:content (@tr [:nuvlabox-modal-usb-copy-warning])
:trigger (r/as-element [ui/Icon {:class icons/i-info}])}]]]

[ui/Segment {:text-align :center
:raised true}
[ui/Segment {:text-align :center}
[ui/Label {:circular true
:color "green"} "2"]
[:h5 {:style {:margin "0.5em 0 1em 0"}}
(@tr [:nuvlabox-modal-usb-plug])]
[:span (@tr [:nuvlabox-modal-usb-plug-info])]]

[ui/Segment {:text-align :center
:raised true}
[ui/Segment {:text-align :center}
[ui/Label {:circular true
:color "green"} "3"]
[:h5 {:style {:margin "0.5em 0 1em 0"}}
Expand Down Expand Up @@ -364,7 +361,6 @@
[icons/DockerIcon {:size :massive}]]]
[ui/Card
{:on-click (fn [] (reset! install-strategy k8s-based))
:raised true
:style (when (= k8s-based @install-strategy)
{:outline "5px #21ba45 solid"})}
[ui/CardContent {:text-align :center}
Expand All @@ -376,7 +372,7 @@
[PlaybooksToggle playbooks-toggle]])]]]
[ui/Form
[ui/Header {:style {:text-align "center"}} "Docker"]
[ui/Segment {:raised true}
[ui/Segment

[ui/FormCheckbox {:label "Compose file bundle"
:radio true
Expand Down
3 changes: 1 addition & 2 deletions code/src/cljs/sixsq/nuvla/ui/pages/edges/views_cluster.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,7 @@
{:keys [id name description owners tags created updated version orchestrator status-notes]} @cluster]
[:<>
[ui/Segment {:secondary true
:color "blue"
:raised true}
:color "blue"}
[:h4 (str/capitalize (@tr [:cluster])) " " (@tr [:summary])]
[ClusterViewHeader]

Expand Down
27 changes: 9 additions & 18 deletions code/src/cljs/sixsq/nuvla/ui/pages/edges_detail/views.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,8 +1185,7 @@
[{:keys [id created updated owner created-by state] :as nuvlabox}
{:keys [nuvlabox-api-endpoint]}]
(let [tr (subscribe [::i18n-subs/tr])]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[NeHeader]
[ui/Table {:basic "very"}
[ui/TableBody
Expand Down Expand Up @@ -1355,8 +1354,7 @@

(defn TabOverviewHost
[nb-status ssh-creds]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[:h4 "Host"]
[StatusOrNotAvailable nb-status [HostInfo nb-status ssh-creds]]])

Expand Down Expand Up @@ -1469,8 +1467,7 @@
(defn TabOverviewStatus
[{:keys [online] :as nb-status}]
(let [tr @(subscribe [::i18n-subs/tr])]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[:h4 "Status "
[ui/Popup
{:trigger (r/as-element [:span
Expand All @@ -1486,8 +1483,7 @@
(defn TabOverviewTags
[{:keys [id] :as nuvlabox}]
(let [tr (subscribe [::i18n-subs/tr])]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[:h4 (str/capitalize (@tr [:tags]))]
[components/EditableTags nuvlabox #(dispatch [::events/edit id {:tags %}
(@tr [:updated-successfully])])]]))
Expand Down Expand Up @@ -1515,8 +1511,7 @@
(defn BoxInfraServices
[]
(let [services @(subscribe [::subs/infra-services])]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[:h4 [uix/TR :infrastructure-services]]
[ui/ListSA {:divided true :relaxed true}
(for [{:keys [id name description subtype]} services]
Expand All @@ -1534,8 +1529,7 @@
cluster-node-role cluster-managers cluster-nodes orchestrator cluster-node-labels]
:as _nuvlabox}]
(let [tr (subscribe [::i18n-subs/tr])]
[ui/Segment {:secondary true
:raised true}
[ui/Segment {:secondary true}
[:h4 (str/capitalize (@tr [:cluster])) " " (@tr [:status])
(when orchestrator
[ui/Label {:circular true
Expand Down Expand Up @@ -1848,8 +1842,7 @@

; taking too much space at the moment. TBD later, once more plots are added
;[ui/Segment {:secondary true
; :color "olive"
; :raised true}
; :color "olive"}
; [plot/Polar {:height 80
; :data {:labels (map (fn [[key v]] key) items-severity)
; :datasets [{:data (map (fn [[k values]] (count values)) items-severity)
Expand All @@ -1861,8 +1854,7 @@
; :position "left"}}}]]

[ui/Segment {:secondary true
:color "brown"
:raised true}
:color "brown"}
[ui/StatisticGroup {:size "mini"
:style {:display "inline-block"
:text-align "center"
Expand Down Expand Up @@ -2027,8 +2019,7 @@
[ui/LabelDetail n]]

[ui/Segment {:secondary true
:color "grey"
:raised true}
:color "grey"}

[ui/Container
[ui/Dropdown
Expand Down
1 change: 0 additions & 1 deletion code/src/cljs/sixsq/nuvla/ui/utils/view_components.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
[{:keys [class icon label]} & children]
[ui/Segment {:class class
:secondary true
:raised true
:style {:height "100%"
:display "flex"
:flex-direction "column"}}
Expand Down
Loading