scss-ify eboutic.css

Sas style improvement

club/templates/club/club_detail.jinja

@@ -26,10 +26,9 @@
     {% if club.logo %}
       <div class="club_logo"><img src="{{ club.logo.url }}" alt="{{ club.name }}"></div>
     {% endif %}
+    <h3>{{ club.name }}</h3>
     {% if page_revision %}
       {{ page_revision|markdown }}
-    {% else %}
-      <h3>{{ club.name }}</h3>
     {% endif %}
   </div>
 {% endblock %}

com/static/com/css/news-list.scss

@@ -3,6 +3,7 @@
 
 #news {
   display: flex;
+  gap: 1em;
 
   @media (max-width: 800px) {
     flex-direction: column;
@@ -26,12 +27,14 @@
   }
 
   h3 {
-    background: $second-color;
-    box-shadow: $shadow-color 1px 1px 1px;
-    padding: 0.4em;
+    --box-shadow: rgb(60 64 67 / 30%) 0 1px 3px 0, rgb(60 64 67 / 15%) 0 3px 7px 2px;
+    background: lighten($second-color, 5%);
+    box-shadow: var(--box-shadow);
+    padding: .75rem;
     margin: 0 0 0.5em 0;
     text-transform: uppercase;
     font-size: 17px;
+    border-radius: 10px;
 
     &:not(:first-of-type) {
       margin: 2em 0 1em 0;
@@ -39,12 +42,11 @@
 
     .feed {
       float: right;
-      color: #f26522;
+      color: #e25512;
     }
   }
 
   @media screen and (max-width: $small-devices) {
-
     #left_column,
     #right_column {
       flex: 100%;
@@ -57,6 +59,7 @@
     max-height: 600px;
     overflow-y: scroll;
     overflow-x: clip;
+    margin-top: 1em;
 
     #load-more-news-button {
       text-align: center;
@@ -76,15 +79,11 @@
     font-size: 70%;
     margin-bottom: 1em;
 
-    h3 {
-      margin-bottom: 0;
-    }
-
     #links_content {
       overflow: auto;
       box-shadow: $shadow-color 1px 1px 1px;
       min-height: 20em;
-      padding-bottom: 1em;
+      padding: 1em;
 
       h4 {
         margin-left: 5px;
@@ -121,6 +120,8 @@
     }
 
     #birthdays_content {
+      box-shadow: $shadow-color 1px 1px 1px;
+      padding: 1em;
       ul.birthdays_year {
         margin: 0;
         list-style-type: none;
@@ -135,8 +136,7 @@
         }
 
         ul {
-          margin: 0;
-          margin-left: 1em;
+          margin: .5em 0 0 1em;
           list-style-type: square;
           list-style-position: inside;
           font-weight: normal;
@@ -150,9 +150,13 @@
   /* EVENTS TODAY AND NEXT FEW DAYS */
   .news_events_group {
     box-shadow: $shadow-color 1px 1px 1px;
-    margin-left: 1em;
+    margin-left: 0;
     margin-bottom: 0.5em;
 
+    @media screen and (max-width: $small-devices) {
+      margin-left: 3px;
+    }
+
     .news_events_group_date {
       display: table-cell;
       padding: 0.6em;

com/templates/com/news_list.jinja

@@ -23,7 +23,7 @@
         <a target="#" href="{{ url("com:news_feed") }}"><i class="fa fa-rss feed"></i></a>
       </h3>
       {% if user.is_authenticated and (user.is_com_admin or user.memberships.board().ongoing().exists()) %}
-        <a class="btn btn-blue margin-bottom" href="{{ url("com:news_new") }}">
+        <a class="btn btn-blue" href="{{ url("com:news_new") }}">
           <i class="fa fa-plus"></i>
           {% trans %}Create news{% endtrans %}
         </a>

core/static/core/style.scss

@@ -271,7 +271,7 @@ body {
 
   /*--------------------------------CONTENT------------------------------*/
   #content {
-    padding: 1em 1%;
+    padding: 1.5em 3%;
     box-shadow: $shadow-color 0 5px 10px;
     background: $white-color;
     overflow: auto;

core/templates/core/fragment/user_visibility.jinja

@@ -18,7 +18,7 @@
     <span class="helptext">{{ form.is_viewable.help_text }}</span>
     {{ form.is_viewable.errors }}
   </fieldset>
-  <fieldset class="form-group" x-show="!isViewable">
+  <fieldset class="form-group" x-show="!isViewable" x-transition x-cloak>
     {{ form.whitelisted_users.as_field_group() }}
   </fieldset>
   <fieldset class="form-group">

eboutic/static/eboutic/css/eboutic.css

@@ -1,163 +0,0 @@
-#eboutic {
-  display: flex;
-  flex-direction: row-reverse;
-  align-items: flex-start;
-  column-gap: 20px;
-  margin: 0 20px 20px;
-}
-
-#eboutic-title {
-  margin-left: 20px;
-}
-
-#eboutic h3 {
-  margin-left: 0;
-  margin-right: 0;
-}
-
-#basket {
-  min-width: 300px;
-  border-radius: 8px;
-  box-shadow:
-    rgb(60 64 67 / 30%) 0 1px 3px 0,
-    rgb(60 64 67 / 15%) 0 4px 8px 3px;
-  padding: 10px;
-}
-
-#basket h3 {
-  margin-top: 0;
-}
-
-@media screen and (max-width: 765px) {
-  #eboutic {
-    flex-direction: column-reverse;
-    align-items: center;
-    margin: 10px;
-    row-gap: 20px;
-  }
-  #eboutic-title {
-    margin-bottom: 20px;
-    margin-top: 4px;
-  }
-  #basket {
-    width: -webkit-fill-available;
-  }
-}
-
-#eboutic .item-list {
-  margin-left: 0;
-  list-style: none;
-}
-
-#eboutic .item-list li {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
-
-#eboutic .item-row {
-  gap: 10px;
-}
-
-#eboutic .item-name {
-  word-break: break-word;
-  width: 100%;
-  line-height: 100%;
-  white-space: normal;
-}
-
-#eboutic .fa-plus,
-#eboutic .fa-minus {
-  cursor: pointer;
-  background-color: #354a5f;
-  color: white;
-  border-radius: 50%;
-  padding: 5px;
-  font-size: 10px;
-  line-height: 10px;
-  width: 10px;
-  text-align: center;
-}
-
-#eboutic .item-quantity {
-  min-width: 65px;
-  justify-content: space-between;
-  align-items: center;
-  display: flex;
-  gap: 5px;
-}
-
-#eboutic .item-price {
-  min-width: 65px;
-  text-align: right;
-}
-
-/*  CSS du catalogue  */
-
-#eboutic #catalog {
-  display: flex;
-  flex-grow: 1;
-  flex-direction: column;
-  row-gap: 30px;
-}
-
-#eboutic .category-header {
-  margin-bottom: 15px;
-}
-
-#eboutic .product-group {
-  display: flex;
-  flex-wrap: wrap;
-  column-gap: 15px;
-  row-gap: 15px;
-}
-
-#eboutic .card.selected::after {
-  content: "🛒";
-  position: absolute;
-  top: 5px;
-  right: 5px;
-  padding: 5px;
-  border-radius: 50%;
-  box-shadow: 0 0 12px 2px rgb(0 0 0 / 14%);
-  background-color: white;
-  width: 20px;
-  height: 20px;
-  font-size: 16px;
-  line-height: 20px;
-}
-
-#eboutic .catalog-buttons {
-  display: flex;
-  justify-content: center;
-  column-gap: 30px;
-  margin: 30px 0 0;
-}
-
-#eboutic input {
-  all: unset;
-}
-
-#eboutic .catalog-buttons button {
-  min-width: 60px;
-}
-
-#eboutic .catalog-buttons form {
-  margin: 0;
-}
-
-@media screen and (max-width: 765px) {
-  #eboutic #catalog {
-    row-gap: 15px;
-    width: 100%;
-  }
-
-  #eboutic section {
-    text-align: center;
-  }
-
-  #eboutic .product-group {
-    justify-content: space-around;
-    flex-direction: column;
-  }
-}

eboutic/static/eboutic/css/eboutic.scss

@@ -0,0 +1,162 @@
+#eboutic-title {
+  margin-left: 20px;
+}
+
+#eboutic {
+  display: flex;
+  flex-direction: row-reverse;
+  align-items: flex-start;
+  column-gap: 20px;
+  margin: 0 20px 20px;
+
+  h3 {
+    margin-left: 0;
+    margin-right: 0;
+  }
+
+  #basket {
+    --box-shadow:
+    rgb(60 64 67 / 30%) 0 1px 3px 0,
+    rgb(60 64 67 / 15%) 0 4px 8px 3px;
+    min-width: 300px;
+    border-radius: 8px;
+    box-shadow: var(--box-shadow);
+    padding: 10px;
+    h3 {
+      margin-top: 0;
+    }
+  }
+
+  @media screen and (max-width: 765px) {
+    flex-direction: column-reverse;
+    align-items: center;
+    margin: 10px;
+    row-gap: 20px;
+
+    #eboutic-title {
+      margin-bottom: 20px;
+      margin-top: 4px;
+    }
+    #basket {
+      width: -webkit-fill-available;
+    }
+  }
+
+  .item-list {
+    margin-left: 0;
+    list-style: none;
+
+    li {
+      display: flex;
+      align-items: center;
+      margin-bottom: 10px;
+    }
+  }
+
+  .item-row {
+    gap: 10px;
+  }
+
+  .item-name {
+    word-break: break-word;
+    width: 100%;
+    line-height: 100%;
+    white-space: normal;
+  }
+
+  .fa-plus,
+  .fa-minus {
+    cursor: pointer;
+    background-color: #354a5f;
+    color: white;
+    border-radius: 50%;
+    padding: 5px;
+    font-size: 10px;
+    line-height: 10px;
+    width: 10px;
+    text-align: center;
+  }
+
+  .item-quantity {
+    min-width: 65px;
+    justify-content: space-between;
+    align-items: center;
+    display: flex;
+    gap: 5px;
+  }
+
+  .item-price {
+    min-width: 65px;
+    text-align: right;
+  }
+
+/*  CSS du catalogue  */
+
+  #catalog {
+    display: flex;
+    flex-grow: 1;
+    flex-direction: column;
+    row-gap: 30px;
+  }
+
+  .category-header {
+    margin-bottom: 15px;
+  }
+
+  .product-group {
+    display: flex;
+    flex-wrap: wrap;
+    column-gap: 15px;
+    row-gap: 15px;
+  }
+
+  .card.selected::after {
+    --box-shadow: 0 0 12px 2px rgb(0 0 0 / 14%);
+    content: "🛒";
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    padding: 5px;
+    border-radius: 50%;
+    box-shadow: var(--box-shadow);
+    background-color: white;
+    width: 20px;
+    height: 20px;
+    font-size: 16px;
+    line-height: 20px;
+  }
+
+  input {
+    all: unset;
+  }
+  .catalog-buttons {
+    display: flex;
+    justify-content: center;
+    column-gap: 30px;
+    margin: 30px 0 0;
+
+    button {
+      min-width: 60px;
+    }
+    form {
+      margin: 0;
+    }
+  }
+
+
+  @media screen and (max-width: 765px) {
+    #catalog {
+      row-gap: 15px;
+      width: 100%;
+    }
+
+    section {
+      text-align: center;
+    }
+
+    .product-group {
+      justify-content: space-around;
+      flex-direction: column;
+    }
+  }
+}

eboutic/templates/eboutic/eboutic_main.jinja

@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% block additional_css %}
-  <link rel="stylesheet" href="{{ static("eboutic/css/eboutic.css") }}">
+  <link rel="stylesheet" href="{{ static("eboutic/css/eboutic.scss") }}">
   <link rel="stylesheet" href="{{ static("core/components/card.scss") }}">
 {% endblock %}
 
@@ -170,8 +170,6 @@
         {% for category, items in priority_groups.list|groupby('category') %}
           {% if items|count > 0 %}
             <section>
-                            {# I would have wholeheartedly directly used the header element instead
-                            but it has already been made messy in core/style.scss #}
               <div class="category-header">
                 <h3>{{ category }}</h3>
                 {% if items[0].category_comment %}

sas/static/sas/css/picture.scss

@@ -134,7 +134,7 @@
           --loading-size: 20px
         }
 
-        @media (max-width: 1000px) {
+        @media (min-width: 700px) and (max-width: 1000px) {
           max-width: calc(50% - 5px);
         }
 
@@ -201,75 +201,70 @@
   }
 }
 
-.general {
+#pict .general {
   display: flex;
   flex-direction: row;
-  gap: 20px;
+  gap: 3em;
+  justify-content: space-evenly;
 
   @media (max-width: 1000px) {
+    gap: 1em;
     flex-direction: column;
   }
 
-  >.infos {
+  .infos, .tools {
+    flex: 1;
     display: flex;
     flex-direction: column;
-    width: 50%;
-
-    >div>div {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-
-      >*:first-child {
-        min-width: 150px;
-
-        @media (max-width: 1000px) {
-          min-width: auto;
-        }
-      }
+    gap: .5em;
+    @media (min-width: 700px) {
+      max-width: 350px;
     }
   }
+  .infos > div, .tools > div > div {
+    display: flex;
+    flex-direction: column;
+    gap: .35em;
+  }
+
+  .tools > div, >.infos >div>div {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
 
   >.tools {
-    display: flex;
-    flex-direction: column;
-    width: 50%;
+    flex: 1;
 
-    >div {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
+    >div>div {
+      >a.btn {
+        background-color: $primary-neutral-light-color;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 0;
+        color: black;
+        width: 40px;
+        height: 40px;
+        font-size: 20px;
 
-      >div {
-        >a.button {
-          box-sizing: border-box;
-          background-color: $primary-neutral-light-color;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          padding: 10px;
-          color: black;
-          border-radius: 5px;
-          width: 40px;
-          height: 40px;
-
-          &:hover {
-            background-color: #aaa;
-          }
+        &:hover {
+          background-color: #aaa;
         }
+      }
 
-        >a.text.danger {
-          color: red;
+      >a.text.danger {
+        color: red;
 
-          &:hover {
-            color: darkred;
-          }
+        &:hover {
+          color: darkred;
         }
+      }
 
-        &.buttons {
-          display: flex;
-          gap: 5px;
-        }
+      &.buttons {
+        display: flex;
+        flex-direction: row;
+        gap: 5px;
       }
     }
   }

sas/templates/sas/main.jinja

@@ -12,6 +12,17 @@
   {% trans %}See all the photos taken during events organised by the AE.{% endtrans %}
 {%- endblock %}
 
+{% block metatags %}
+  <meta property="og:url" content="{{ request.build_absolute_uri() }}" />
+  <meta property="og:type" content="website" />
+  <meta property="og:title" content="Stock à souvenirs" />
+  <meta
+    property="og:description"
+    content="Retrouvez toutes les photos prises durant les événements organisés par l'AE."
+  />
+  <meta property="og:image" content="{{ request.build_absolute_uri(static("core/img/logo_no_text.png")) }}" />
+{% endblock %}
+
 {% set is_sas_admin = user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
 
 {% from "sas/macros.jinja" import display_album %}

sas/templates/sas/picture.jinja

@@ -118,15 +118,20 @@
                 <a class="text" :href="currentPicture.full_size_url">
                   {% trans %}HD version{% endtrans %}
                 </a>
-                <br>
-                <a class="text danger" :href="currentPicture.report_url">
+                <a class="text danger " :href="currentPicture.report_url">
                   {% trans %}Ask for removal{% endtrans %}
                 </a>
               </div>
               <div class="buttons">
-                <a class="button" :href="currentPicture.edit_url"><i class="fa-regular fa-pen-to-square edit-action"></i></a>
-                <a class="button" href="?rotate_left"><i class="fa-solid fa-rotate-left"></i></a>
-                <a class="button" href="?rotate_right"><i class="fa-solid fa-rotate-right"></i></a>
+                <a
+                  class="btn btn-no-text"
+                  :href="currentPicture.edit_url"
+                  x-show="{{ user.has_perm("sas.change_sasfile")|tojson }} || currentPicture.owner.id === {{ user.id }}"
+                >
+                  <i class="fa-regular fa-pen-to-square edit-action"></i>
+                </a>
+                <a class="btn btn-no-text" href="?rotate_left"><i class="fa-solid fa-rotate-left"></i></a>
+                <a class="btn btn-no-text" href="?rotate_right"><i class="fa-solid fa-rotate-right"></i></a>
               </div>
             </div>
           </div>