From 650a709523c6843808d248d8bda2322be36707d0 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <arnaud.levy@noesya.coop>
Date: Fri, 31 May 2024 13:21:44 +0200
Subject: [PATCH] Nouvelles couleurs (#1965)
* Nice fonts
* colors
* wip
* better and fix
* order
---
app/assets/stylesheets/admin/commons/forms.sass | 7 +++++++
app/assets/stylesheets/admin/commons/table.sass | 3 +++
app/assets/stylesheets/admin/pure/navigation.sass | 10 +++-------
app/assets/stylesheets/admin/pure/style.sass | 10 ++++++----
app/assets/stylesheets/admin/pure/variables.sass | 2 ++
app/assets/stylesheets/commons/_forms.sass | 3 +--
app/views/admin/layouts/themes/pure/_hero.html.erb | 4 ++--
app/views/admin/layouts/themes/pure/_nav.html.erb | 10 +++++-----
8 files changed, 29 insertions(+), 20 deletions(-)
create mode 100644 app/assets/stylesheets/admin/commons/forms.sass
diff --git a/app/assets/stylesheets/admin/commons/forms.sass b/app/assets/stylesheets/admin/commons/forms.sass
new file mode 100644
index 000000000..03b7a04e7
--- /dev/null
+++ b/app/assets/stylesheets/admin/commons/forms.sass
@@ -0,0 +1,7 @@
+input.form-control[type=text],
+input.form-control[type=email],
+input.form-control[type=tel],
+input.form-control[type=password],
+input.form-control[type=url],
+textarea.form-control
+ font-family: $font-family-serif
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/commons/table.sass b/app/assets/stylesheets/admin/commons/table.sass
index 87e8a5469..22dfd9535 100644
--- a/app/assets/stylesheets/admin/commons/table.sass
+++ b/app/assets/stylesheets/admin/commons/table.sass
@@ -1,4 +1,7 @@
.table
+ td,
+ th
+ background: transparent !important
th:first-of-type,
td:first-of-type
padding-left: 0
diff --git a/app/assets/stylesheets/admin/pure/navigation.sass b/app/assets/stylesheets/admin/pure/navigation.sass
index 41ab8f64f..ce8874603 100644
--- a/app/assets/stylesheets/admin/pure/navigation.sass
+++ b/app/assets/stylesheets/admin/pure/navigation.sass
@@ -1,8 +1,6 @@
.navbar
- left: 0
- padding-top: $spacing2
- position: absolute
- right: 0
+ button
+ color: white
.bi
font-size: 26px
vertical-align: middle
@@ -27,10 +25,8 @@
margin-bottom: 20px
width: 100px
.menu-content
- margin-top: 150px
+ margin-top: 50px
position: relative
- h2
- font-weight: bold
ul
list-style-type: none
padding: 0
diff --git a/app/assets/stylesheets/admin/pure/style.sass b/app/assets/stylesheets/admin/pure/style.sass
index 8736e4eb7..34627c185 100644
--- a/app/assets/stylesheets/admin/pure/style.sass
+++ b/app/assets/stylesheets/admin/pure/style.sass
@@ -1,3 +1,5 @@
+body
+ background-color: $color-bg
h1,
h2
font-family: $font-family-serif
@@ -29,12 +31,12 @@ h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1
margin-bottom: $spacing1
.hero
- background-color: $color-background-alt
margin-bottom: 30px
+ min-height: 300px
padding-bottom: 30px
- padding-top: 150px
- @media (min-height: 800px)
- padding-top: 250px
+ .breadcrumb
+ *
+ color: $color-text-alt !important
main
min-height: 70vh
diff --git a/app/assets/stylesheets/admin/pure/variables.sass b/app/assets/stylesheets/admin/pure/variables.sass
index ce5845ab0..20991d752 100644
--- a/app/assets/stylesheets/admin/pure/variables.sass
+++ b/app/assets/stylesheets/admin/pure/variables.sass
@@ -1,3 +1,5 @@
+$color-bg: #FFFCF0
+
// MAIN COLORS
$color-accent: #0038FF
$color-text: #000000
diff --git a/app/assets/stylesheets/commons/_forms.sass b/app/assets/stylesheets/commons/_forms.sass
index 8121bddb5..900ce5936 100644
--- a/app/assets/stylesheets/commons/_forms.sass
+++ b/app/assets/stylesheets/commons/_forms.sass
@@ -14,9 +14,8 @@ input.form-control[type=tel],
input.form-control[type=password],
input.form-control[type=url],
textarea.form-control
- font-family: $font-family-serif
- font-size: $font-size-base
color: black
+ font-size: $font-size-base
@include media-breakpoint-up(lg)
font-size: $font-size-lg
diff --git a/app/views/admin/layouts/themes/pure/_hero.html.erb b/app/views/admin/layouts/themes/pure/_hero.html.erb
index 5b6a28d31..c65b71d8a 100644
--- a/app/views/admin/layouts/themes/pure/_hero.html.erb
+++ b/app/views/admin/layouts/themes/pure/_hero.html.erb
@@ -1,6 +1,7 @@
<div class="hero">
<div class="container-fluid">
- <div class="d-xl-flex">
+ <%= render_breadcrumbs builder: Osuny::BreadcrumbsOnRailsBuilder %>
+ <div class="d-xl-flex mt-5">
<h1><%= yield :title %></h1>
<div class="ms-xl-auto text-xl-end mt-2">
<%= yield :title_right %>
@@ -11,6 +12,5 @@
<%= yield :title_left %>
</div>
<% end %>
- <%= render_breadcrumbs builder: Osuny::BreadcrumbsOnRailsBuilder %>
</div>
</div>
\ No newline at end of file
diff --git a/app/views/admin/layouts/themes/pure/_nav.html.erb b/app/views/admin/layouts/themes/pure/_nav.html.erb
index cdee6e84b..0f1b76fe2 100644
--- a/app/views/admin/layouts/themes/pure/_nav.html.erb
+++ b/app/views/admin/layouts/themes/pure/_nav.html.erb
@@ -1,10 +1,10 @@
<%
context ||= :admin
%>
-<nav class="navbar navbar-main navbar-light bg-transparent" aria-label="Navigation">
- <div class="container-fluid">
+<nav class="navbar navbar-main navbar-dark bg-black" aria-label="Navigation">
+ <div class="container-fluid py-2">
<%= link_to admin_root_path, class: 'navbar-brand' do %>
- <%= image_tag 'osuny-black.svg', class: 'img-fluid' %>
+ <%= image_tag 'osuny-white.svg', class: 'img-fluid' %>
<% end %>
<button class="btn-open bg-transparent border-0"
type="button"
@@ -21,7 +21,7 @@ context ||= :admin
</nav>
<div class="collapse" id="menu">
<div class="navbar">
- <div class="container-fluid">
+ <div class="container-fluid py-2">
<%= link_to admin_root_path, class: 'navbar-brand' do %>
<%= image_tag 'osuny-white.svg', class: 'img-fluid', width: 100 %>
<% end %>
@@ -39,7 +39,7 @@ context ||= :admin
</div>
</div>
<div class="menu-content">
- <div class="container-fluid">
+ <div class="container-fluid py-2">
<div class="row">
<%= render_navigation context: context %>
<div class="col-sm-6 col-md-4 col-lg-3">
--
GitLab